cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it compile under egcs (patches sent to the author, waiting for reply).

Browse Source
This commit is contained in:
fgsch 1999-07-26 03:57:06 +00:00
parent 9121fa0e71
commit 5d6e646e15
4 changed files with 122 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/blackbox/patches/patch-aa Normal file
View File

@ -0,0 +1,11 @@
--- src/Window.hh Mon May 24 21:14:29 1999
+++ src/Window.hh Sun Jul 25 23:53:07 1999
@@ -105,7 +105,7 @@
struct frame {
Bool shaped;
Pixmap utitle, ftitle, uhandle, fhandle, ubutton, fbutton, pbutton,
- frame, rfhandle, ruhandle;
+ _frame, rfhandle, ruhandle;
Window window, title, border, handle, close_button, iconify_button,
maximize_button, resize_handle;

11
x11/blackbox/patches/patch-ab Normal file
View File

@ -0,0 +1,11 @@
--- src/Toolbar.hh Sun May 16 15:45:47 1999
+++ src/Toolbar.hh Sun Jul 25 23:53:22 1999
@@ -45,7 +45,7 @@
GC buttonGC;
struct frame {
- Pixmap frame, label, wlabel, button, pbutton, clk, reading;
+ Pixmap _frame, label, wlabel, button, pbutton, clk, reading;
Window window, workspaceLabel, workspacePrev, workspaceNext,
windowLabel, windowPrev, windowNext, clock;

40
x11/blackbox/patches/patch-ac Normal file
View File

@ -0,0 +1,40 @@
--- src/Toolbar.cc Mon May 24 21:44:23 1999
+++ src/Toolbar.cc Sun Jul 25 23:54:45 1999
@@ -124,7 +124,7 @@
InputOutput, screen->getVisual(), create_mask, &attrib);
blackbox->saveToolbarSearch(frame.clock, this);
- frame.frame = frame.label = frame.wlabel = frame.button = frame.pbutton =
+ frame._frame = frame.label = frame.wlabel = frame.button = frame.pbutton =
frame.clk = frame.reading = None;
reconfigure();
@@ -137,7 +137,7 @@
Toolbar::~Toolbar(void) {
XUnmapWindow(display, frame.window);
- if (frame.frame) image_ctrl->removeImage(frame.frame);
+ if (frame._frame) image_ctrl->removeImage(frame._frame);
if (frame.label) image_ctrl->removeImage(frame.label);
if (frame.wlabel) image_ctrl->removeImage(frame.wlabel);
if (frame.button) image_ctrl->removeImage(frame.button);
@@ -232,8 +232,8 @@
(frame.clock_w + (frame.button_w * 4) + frame.wlabel_w +
(frame.bevel_w * 6) + 6));
- Pixmap tmp = frame.frame;
- frame.frame =
+ Pixmap tmp = frame._frame;
+ frame._frame =
image_ctrl->renderImage(frame.width, frame.height,
&(screen->getTResource()->toolbar.texture));
if (tmp) image_ctrl->removeImage(tmp);
@@ -303,7 +303,7 @@
frame.bevel_w, frame.bevel_w, frame.clock_w,
frame.clock_h);
- XSetWindowBackgroundPixmap(display, frame.window, frame.frame);
+ XSetWindowBackgroundPixmap(display, frame.window, frame._frame);
XSetWindowBackgroundPixmap(display, frame.workspaceLabel, frame.wlabel);
XSetWindowBackgroundPixmap(display, frame.windowLabel, frame.label);

60
x11/blackbox/patches/patch-ad Normal file
View File

@ -0,0 +1,60 @@
--- src/Window.cc Mon May 24 23:22:47 1999
+++ src/Window.cc Sun Jul 25 23:55:32 1999
@@ -411,9 +411,9 @@
}
if (frame.border != None) {
- if (frame.frame) {
- image_ctrl->removeImage(frame.frame);
- frame.frame = None;
+ if (frame._frame) {
+ image_ctrl->removeImage(frame._frame);
+ frame._frame = None;
}
blackbox->removeWindowSearch(frame.border);
@@ -586,10 +586,10 @@
}
if (decorations.border) {
- frame.frame =
+ frame._frame =
image_ctrl->renderImage(frame.border_w, frame.border_h,
&(screen->getWResource()->frame.texture));
- XSetWindowBackgroundPixmap(display, frame.border, frame.frame);
+ XSetWindowBackgroundPixmap(display, frame.border, frame._frame);
XClearWindow(display, frame.border);
}
@@ -827,12 +827,12 @@
}
if (decorations.border) {
- tmp = frame.frame;
- frame.frame =
+ tmp = frame._frame;
+ frame._frame =
image_ctrl->renderImage(frame.border_w, frame.border_h,
&(screen->getWResource()->frame.texture));
if (tmp) image_ctrl->removeImage(tmp);
- XSetWindowBackgroundPixmap(display, frame.border, frame.frame);
+ XSetWindowBackgroundPixmap(display, frame.border, frame._frame);
XClearWindow(display, frame.border);
}
@@ -1160,12 +1160,12 @@
setFocusFlag(focused);
if (decorations.border) {
- tmp = frame.frame;
- frame.frame =
+ tmp = frame._frame;
+ frame._frame =
image_ctrl->renderImage(frame.border_w, frame.border_h,
&(screen->getWResource()->frame.texture));
if (tmp) image_ctrl->removeImage(tmp);
- XSetWindowBackgroundPixmap(display, frame.border, frame.frame);
+ XSetWindowBackgroundPixmap(display, frame.border, frame._frame);
XClearWindow(display, frame.border);
}