diff -u -Naur blackbox-0.65.0/README.Fink blackbox-0.65.0.fink/README.Fink --- blackbox-0.65.0/README.Fink Wed Dec 31 19:00:00 1969 +++ blackbox-0.65.0.fink/README.Fink Tue Nov 19 18:15:19 2002 @@ -0,0 +1,26 @@ +This revision of Blackbox has been specially patched to be more usable +within a rootless X environment. All of the Blackbox menus may now be +accessed by clicks to the toolbar. Specifically: + + o The Root Menu: Click on the clock at the left end of the toolbar + for the `root' launcher window which contains a + list of apps. To customize this, examine the file + @PREFIX@/share/Blackbox/menu. + + o Workspace Menu: Click on the workspace name at the right of the + toolbar. This menu allows you to switch between + workspaces (a.k.a. Virtual Desktops), or create + new ones. + + o Icons Menu: Click the central window-name region of the + toolbar. This menu contains a list of any currently + iconified/minimized windows (via the [_] button on + window title-bars). + + o Toolbar Options Menu: Still reached by right-clicking anywhere on + the toolbar. + +Additionally, the title-bar widgets have been rearranged to be +slightly less pathological (i.e., no longer placing the close button +two pixels away from the resize button). Customizable button +arrangements will come in the next revision. diff -u -Naur blackbox-0.65.0/data/menu.in blackbox-0.65.0.fink/data/menu.in --- blackbox-0.65.0/data/menu.in Fri Jan 25 05:33:09 2002 +++ blackbox-0.65.0.fink/data/menu.in Tue Nov 19 18:16:25 2002 @@ -53,28 +53,19 @@ # # example: -[begin] (Blackbox) +[begin] (Blackbox 0.65.0) [exec] (xterm) {xterm -ls} [exec] (rxvt) {rxvt} - [exec] (StarOffice) {soffice} [exec] (XEmacs) {xemacs} - [exec] (Acroread) {acroread} + [exec] (Emacs) {emacs} + [exec] (Console-Emacs) {xterm -e emacs -nw} [submenu] (Graphics) [exec] (The GIMP) {gimp} [exec] (Image Magick) {display} [end] - [submenu] (Mozilla) - [exec] (Mozilla Navigator) {mozilla} - [submenu] (More...) - [exec] (Mozilla Mail) {mozilla -mail} - [exec] (Mozilla News) {mozilla -news} - [exec] (Mozilla Composer) {mozilla -edit} - [end] - [end] - [submenu] (X Utilities) [exec] (Xfontsel) {xfontsel} [exec] (Xman) {xman} @@ -95,6 +86,8 @@ [restart] (Start FVWM) {fvwm} [restart] (Start WindowMaker) {wmaker} [restart] (Start Afterstep) {afterstep} + [restart] (Start Oroborus) {oroborus} + [restart] (Start IceWM} {icewm} [restart] (Start Enlightenment) {enlightenment} [restart] (Start TWM) {twm} [restart] (Start KWM) {kwm} diff -u -Naur blackbox-0.65.0/data/nu.pcf.gz.uu blackbox-0.65.0.fink/data/nu.pcf.gz.uu --- blackbox-0.65.0/data/nu.pcf.gz.uu Wed Dec 31 19:00:00 1969 +++ blackbox-0.65.0.fink/data/nu.pcf.gz.uu Tue Nov 19 18:15:19 2002 @@ -0,0 +1,70 @@ +begin 644 nu.pcf.gz +M'XL("%.^VCT``VYU+G!C9@#MFG]L5E<9Q[]O?]"?M*4PG-!!+>APX.P]?=N^ +M%73=*(P*@V[MMFXPNXUN`V&3C\ST_[G.? +M<^@E]T+TK?+"77V)MEVJ:# +MEUL@K>[0-_>1-2*!!_6E@/1JXWBV+$6Z.F^XKF7QHI:NUN6+5V!1]]J>>[JK +M'UG;LZ9ZT_UW=]_+3/3JNJO1MJ)U>4=7>^OMBW#3HO85RV[N:%VQO*O3S=R& +M]K9K%[8NOQYMN'51Z_5+.IQ:='8M,64WWGQM2]>MK2T=2[!XQ?(.//!P=JX1 +M&6>!K(O]<;GPC_=T.H%U12/J_I6??E8OP??[?3^>2/;[\51_NC>>3O,NO34= +MYT67I7B72+(BJ>^REVR%OOB)9"(>[T\G^VB2R`KXS+(VF>J7NTNX))*I+91* +MQ2F0+4MML7=C7;(F`;OL/`)VV>%>+!`/2@5:C+PD^OO3<;\_O35NEB2]-;,Y +MKJ=K%N>_/CZ]]AQ+.AW/CE3;/>;[:?UHTWJXZ:U^]N)?N&-%)ENAC3./FC). +ML(^S[.]CED\AF4X]EFV1T"9^,KU5.TAZ2]8NGN(ED4IO>Y39="*[.$D^/%WA +M)[1QG[&C2_7YMO.XN4N946WS+[YD+MR9D2:HLLT?<U07*(G"!OD7?(67)>MV,LF$,6D#;233:1'620 +M/$>.DC?(*7*>5+#S*E)+6D@G64]\LHOL)8?("?(6>9>4,GA5DRA90E:1#21% +MGB3[DB$#9#\Y0HZ3TZ2TB.,B5:26M)`V +MLI[L('O)$7**E'*;JR4=I(<\29XCKY'SI+J$[4DWR9`ALHN\ +M0-X@J&!;TDRZ288,D1/D+)DRB<^>-)-NDB%#Y#AYEU15`D_P>=?HM>%]9K;9 +M-RV0-%_0)X'I@52?6V9(?9F\0^52SBZR)XP\>=^YQYYJ'D6N<)_W!6:><@)T[/ZMG +M^YXH-F5.6;FSC@4A:1E&/O,RI]YMYZY7)%"6&WAV$1F+70^KXXXES-\*'=SU +MS9<^\D=IJW6UK^MWY#*YGR2V)]9W[/W>;*.;C[L.83M/Q,"^6)Y'L%]T\7=)RTSI+S*69=RYUZ/]R-B5^DP +M0\J#\W;WN&#_86.:(6M@UUYKZ[WI<@S[IQW;%3+F*R1?Y:S?!`R?#RH=+3T> +M^][F2IL:T9@HS[1&RJV/Y#O/P\X'&(X;[EY6[HS!3>US"?J8[K,D,/\/"5-A +MSBXNN2'ZP?@3YK=V_D4REEF2U^LSA\QVM&N*90VMSQ1>@HTM'\MFJJSK6#;C:03/:F$VVD?LN6D:AOWSPQCV +MT>"[6H5A?W'7Q.X-;HRS9]:<<6RLCXYE4S1.?=CY:[0S+7#Q>^O.,7\N+XVFHWK:Z/9N.,9S:9R +MG/JPO-8^/.;S2;HG]#([CGN6>IL?9Q]SG:\X'[ +MCMC]VSVS3`W,=30;=YRCV;AQ0Z^_WB.J,!P+YSGK,5X_>>/TH\MG!,J#9ST; +M.]T]Q)VG/;,%;7,NP:9X')NB<>K_E^*%/<<$U]KN?>YSU5HE`9LP/PL["X:M +M;=#&'>]H-D$_JPQ0&K+^86/1OYF2ZOP\:3]-^K#QPIU;V/G#^FO.)=@4CV-3 +M-$Z]^ZZ&S=O&77M^"'M>;OP8K3][5M=SLN].-=Z#_458DLN>\K/?7`K9IIC] +ME'*<9?3U"L:?2IYOIO`\.)5GL(::C8_B8[B2 +MIZ"/XRK,Y1/X!*[&)U$+#PIUB*(>#6A$#$WX%.9C`3Z-S^`:-.-:7(>%:,$B +M+,;U6()6?!9+L0PW8#E6H`TWXB:THP,WXQ;QA?Q"#;A47P)F]&+ +MQ]"'+?`11P))I-"/-+8B@VWX,K9C![Z"K^)K>!Q/X.O8B5WX!KZ);^%)?!M/ +M83<&\!U\%]_#()[&][$'S^`'^"%^A+WX,7Z"?1C"3_$S/(O]^#E^@0-X#K_$ +M\_@57L"O\1L;78N6U\2<>B.M#/ +MR3':G(R,K*\.V`Z.T8_;;C"`.][!4;3?C_['FOL'O'_D8/A;D?U;D?[WJSZS +MZ'_?744\$H/YD+Z8W$#T9_25Y&ZREFP@CY`^TD]VD)WD*?(TV4N>)<^3%\D1 +MPDN\D>LH\<(`?)87*,O$)>)V^2M\D928Q)O5&I +M-RKU1J7>J-2;L=0;E7JCTF!4&HQ*@U%I,"H-1J7)M&LR[9I,.Z^V5E)/4B5I +MG:112>LE;9"T4=*8I*+GB9XG>I[H>:+GB9XG>I[H>:+GB9XG>DKTE.@IH]?D +MN2MJ^X#7(.!IL.QE'@XRC +M0<;1*'J-HMHVBURAZC:+7*'J-HMHVB%Q.]F.C%1"\F>C'1BXE>3/1B +MHA<3O9CH-8F>>(`G#N$UB9ZXA"<^X8E3>.(5GKB%)WZAQ"^4^(42OU#B%TK\ +M0HE?*/$+)7ZAQ"^4^(42OU#B%TK\0HE?*/$+)7ZAQ"^4^(42OU#B%TK\0HE? +M*/$+)7Z@Q"^4$CWQ"Z5$3XF>$KTZT:L3/8EW2H*ADFBH)!RJ.M&3@*@D(BH) +MB4J"H8J*GD1%)6%125Q4$AB51$85%3V)C4J"HY+HJ"0\*HF/2@*DD@BI&"*S +39QK[-X-+^7]R_P00M?M4S"@``$85 +` +end diff -u -Naur blackbox-0.65.0/data/styles/Cyclism blackbox-0.65.0.fink/data/styles/Cyclism --- blackbox-0.65.0/data/styles/Cyclism Wed Dec 31 19:00:00 1969 +++ blackbox-0.65.0.fink/data/styles/Cyclism Tue Nov 19 18:15:19 2002 @@ -0,0 +1,137 @@ +! title: cyclism +! author: safari_al +! email: tr@rebel.net.au +! +! comment: "So Jim dug along with the rest. The earth was rich and warm, +! it smelled of all that was good, and his back did not ache as +! he had expected. Nor did his knees... It might be, Jim thought, +! what hands were intednded for, this steady digging into the earth, +! as wings were meant for flying over the curve of the planet to +! another season. He knelt and dug." +! +! - David Malouf, _Fly Away Peter_ +! +! info: root image courtesy of david coulson +! +! font by artwiz + + + +toolbar: raised gradient diagonal + toolbar.color: #343718 + toolbar.colorTo: #000000 + +toolbar.clock: parentrelative + toolbar.clock.textColor: #fff5f3 + +toolbar.label: parentrelative + toolbar.label.textColor: #fff5f3 + +toolbar.windowLabel: parentrelative + toolbar.windowLabel.textColor: #fff5f3 + +toolbar.button: parentrelative + toolbar.button.picColor: #fee9e4 + +toolbar.button.pressed: sunken gradient diagonal + toolbar.button.pressed.color: #000000 + toolbar.button.pressed.colorTo: #7f7f8b + + + +menu.title: raised gradient diagonal + menu.title.color: #7f7f8b + menu.title.colorTo: #000000 + menu.title.textColor: #acaebb + +menu.frame: raised gradient diagonal + menu.frame.color: #343718 + menu.frame.colorTo: #000000 + menu.frame.textColor: #5f6053 + +menu.hilite: parentrelative + menu.hilite.textColor: #fee9e4 + +menu.bullet: triangle + menu.bullet.position: right + + + +window.title.focus: raised gradient diagonal + window.title.focus.color: #7f7f8b + window.title.focus.colorTo: #000000 +window.title.unfocus: raised gradient diagonal + window.title.unfocus.color: #7f7f8b + window.title.unfocus.colorTo: #000000 + +window.label.focus: parentrelative + window.label.focus.textColor: #fee9e4 +window.label.unfocus: parentrelative + window.label.unfocus.textColor: #acaebb + +window.button.focus: parentrelative + window.button.focus.picColor: #acaebb +window.button.unfocus: parentrelative + window.button.unfocus.picColor: #acaebb +window.button.pressed: sunken gradient diagonal + window.button.pressed.color: #000000 + window.button.pressed.colorTo: #7f7f8b + +window.frame.focus: flat solid + window.frame.focus.color: #7f7f8b + window.frame.focusColor: #7f7f8b +window.frame.unfocus: flat solid + window.frame.unfocus.color: #000000 + window.frame.unfocusColor: #000000 + +window.handle.focus: raised gradient diagonal + window.handle.focus.color: #343718 + window.handle.focus.colorTo: #000000 +window.handle.unfocus: raised gradient diagonal + window.handle.unfocus.color: #343718 + window.handle.unfocus.colorTo: #000000 + +window.grip.focus: raised gradient diagonal + window.grip.focus.color: #7f7f8b + window.grip.focus.colorTo: #000000 +window.grip.unfocus: raised gradient diagonal + window.grip.unfocus.color: #7f7f8b + window.grip.unfocus.colorTo: #000000 + + + +borderColor: #000000 +*font: nu +*justify: left + +borderWidth: 1 +bevelWidth: 2 +frameWidth: 1 +handleWidth: 2 + +rootCommand: bsetbg -f ~/.blackbox/backgrounds/cyclism.jpg + + + +bbpager.frame: raised gradient diagonal + bbpager.frame.color: #343718 + bbpager.frame.colorTo: #000000 + +bbpager.desktop: parentrelative +bbpager.desktop.focus: parentrelative + +bbpager.window: raised gradient diagonal + bbpager.window.color: #7f7f8b + bbpager.window.colorTo: #000000 +bbpager.window.focus: raised gradient diagonal + bbpager.window.focus.color: #fee9e4 + bbpager.window.focus.colorTo: #000000 + +bbpager.desktop.focusStyle: border +bbpager.window.focusStyle: texture + +bbpager.active.desktop.borderColor: #fee9e4 +bbpager.active.window.borderColor: #000000 +bbpager.inactive.window.borderColor: #000000 + +! have a nice day diff -u -Naur blackbox-0.65.0/data/styles/Makefile.am blackbox-0.65.0.fink/data/styles/Makefile.am --- blackbox-0.65.0/data/styles/Makefile.am Tue Jul 23 14:39:58 2002 +++ blackbox-0.65.0.fink/data/styles/Makefile.am Tue Nov 19 18:15:19 2002 @@ -2,7 +2,7 @@ styledir = $(pkgdatadir)/styles MAINTAINERCLEANFILES = Makefile.in -style_DATA = Artwiz Cthulhain Flux Minimal Nyz Operation Outcomes Rampage Rancor Results Shade Spiff TDF Twice +style_DATA = Artwiz Cyclism Cthulhain Flux Minimal Nyz Operation Outcomes Rampage Rancor Results Shade Spiff TDF Twice distclean-local: rm -f *\~ .\#* diff -u -Naur blackbox-0.65.0/data/styles/Makefile.in blackbox-0.65.0.fink/data/styles/Makefile.in --- blackbox-0.65.0/data/styles/Makefile.in Wed Sep 18 13:34:45 2002 +++ blackbox-0.65.0.fink/data/styles/Makefile.in Tue Nov 19 18:15:19 2002 @@ -75,7 +75,7 @@ styledir = $(pkgdatadir)/styles MAINTAINERCLEANFILES = Makefile.in -style_DATA = Artwiz Cthulhain Flux Minimal Nyz Operation Outcomes Rampage Rancor Results Shade Spiff TDF Twice +style_DATA = Artwiz Cthulhain Cyclism Flux Minimal Nyz Operation Outcomes Rampage Rancor Results Shade Spiff TDF Twice mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = diff -u -Naur blackbox-0.65.0/src/Screen.hh blackbox-0.65.0.fink/src/Screen.hh --- blackbox-0.65.0/src/Screen.hh Wed Sep 4 13:15:26 2002 +++ blackbox-0.65.0.fink/src/Screen.hh Tue Nov 19 18:15:19 2002 @@ -252,6 +252,7 @@ inline Workspace *getCurrentWorkspace(void) { return current_workspace; } inline Workspacemenu *getWorkspacemenu(void) { return workspacemenu; } + inline Iconmenu *getIconmenu(void) { return iconmenu; } inline unsigned int getHandleWidth(void) const { return resource.handle_width; } diff -u -Naur blackbox-0.65.0/src/Toolbar.cc blackbox-0.65.0.fink/src/Toolbar.cc --- blackbox-0.65.0/src/Toolbar.cc Sat Aug 10 02:29:41 2002 +++ blackbox-0.65.0.fink/src/Toolbar.cc Tue Nov 19 18:15:19 2002 @@ -331,31 +331,35 @@ frame.rect.width(), frame.rect.height()); } - XMoveResizeWindow(display, frame.workspace_label, frame.bevel_w, - frame.bevel_w, frame.workspace_label_w, - frame.label_h); - XMoveResizeWindow(display, frame.psbutton, - ((frame.bevel_w * 2) + frame.workspace_label_w + 1), + // Set up widgets, from left to right: + XMoveResizeWindow(display, frame.clock, frame.bevel_w, + frame.bevel_w, frame.clock_w, + frame.label_h); + + XMoveResizeWindow(display, frame.pwbutton, (frame.bevel_w * 2) + + frame.clock_w + 1, frame.bevel_w + 1, + frame.button_w, frame.button_w); + XMoveResizeWindow(display, frame.nwbutton, (frame.bevel_w * 3) + + frame.clock_w + frame.button_w + 2, frame.bevel_w + 1, frame.button_w, frame.button_w); - XMoveResizeWindow(display, frame.nsbutton, - ((frame.bevel_w * 3) + frame.workspace_label_w + - frame.button_w + 2), frame.bevel_w + 1, frame.button_w, - frame.button_w); - XMoveResizeWindow(display, frame.window_label, - ((frame.bevel_w * 4) + (frame.button_w * 2) + - frame.workspace_label_w + 3), frame.bevel_w, - frame.window_label_w, frame.label_h); - XMoveResizeWindow(display, frame.pwbutton, - ((frame.bevel_w * 5) + (frame.button_w * 2) + - frame.workspace_label_w + frame.window_label_w + 4), + + XMoveResizeWindow(display, frame.window_label, + (frame.bevel_w * 4) + (frame.button_w * 2) + frame.clock_w + 3, + frame.bevel_w, + frame.window_label_w, + frame.label_h); + + XMoveResizeWindow(display, frame.psbutton, (frame.bevel_w * 5) + + (frame.button_w * 2) + frame.clock_w + + frame.workspace_label_w + frame.window_label_w + 4, frame.bevel_w + 1, frame.button_w, frame.button_w); - XMoveResizeWindow(display, frame.nwbutton, - ((frame.bevel_w * 6) + (frame.button_w * 3) + - frame.workspace_label_w + frame.window_label_w + 5), + XMoveResizeWindow(display, frame.nsbutton, (frame.bevel_w * 6) + + (frame.button_w * 3) + frame.clock_w + + frame.workspace_label_w + frame.window_label_w + 5, frame.bevel_w + 1, frame.button_w, frame.button_w); - XMoveResizeWindow(display, frame.clock, - frame.rect.width() - frame.clock_w - (frame.bevel_w * 2), - frame.bevel_w, frame.clock_w, frame.label_h); + XMoveResizeWindow(display, frame.workspace_label, frame.rect.width() - frame.workspace_label_w - + frame.bevel_w, frame.bevel_w, frame.workspace_label_w, + frame.label_h); ToolbarStyle *style = screen->getToolbarStyle(); frame.base = style->toolbar.render(frame.rect.width(), frame.rect.height(), @@ -747,35 +751,59 @@ XClearWindow(display, frame.clock); checkClock(True, True); } + #else + else if (be->window == frame.clock) { + // Show the root menu + popMenu(screen->getRootmenu(), be->x_root, be->y_root); + } #endif // HAVE_STRFTIME - else if (! on_top) { + // else if (! on_top) { + // Window w[1] = { frame.window }; + // screen->raiseWindows(w, 1); + // } + else if (be->window==frame.workspace_label) { + // Clicks on workspace portion of taskbar bring up Workspaces menu + popMenu(screen->getWorkspacemenu(), be->x_root, be->y_root); + + } else if (be->window==frame.window_label) { + // Clicks on label portion of toolbar bring up Icons menu + popMenu(screen->getIconmenu(), be->x_root, be->y_root); + + }else if(be->window==frame.window){ + // fprintf(stderr,"Toolbar click at %i,%i\n",be->x,be->y); + + { + int ck_l, ck_r, wn_l, wn_r, ws_l, ws_r; + ck_l = frame.bevel_w; ck_r = ck_l + frame.clock_w; + // fprintf(stderr,"Clock region: %i-%i\n",ck_l,ck_r); + + wn_l = (frame.bevel_w * 4) + (frame.button_w * 2) + frame.clock_w + 3; + wn_r = wn_l + frame.window_label_w; + // fprintf(stderr,"Wind. region: %i-%i\n",wn_l,wn_r); + + ws_l = frame.rect.width() - frame.workspace_label_w - frame.bevel_w; + ws_r = ws_l + frame.workspace_label_w; + // fprintf(stderr,"Wksp. region: %i-%i\n",ws_l,ws_r); + + if (be->x <= ck_r && be->x >= ck_l) + popMenu(screen->getRootmenu(), be->x_root, be->y_root); + else if (be->x <= wn_r && be->x >= wn_l) + popMenu(screen->getIconmenu(), be->x_root, be->y_root); + else if (be->x <= ws_r && be->x >= ws_l) + popMenu(screen->getWorkspacemenu(), be->x_root, be->y_root); + + } + } + + // Keep toolbar-raising behavior on left-click + if (! on_top) { Window w[1] = { frame.window }; screen->raiseWindows(w, 1); } } else if (be->button == 2 && (! on_top)) { XLowerWindow(display, frame.window); } else if (be->button == 3) { - if (toolbarmenu->isVisible()) { - toolbarmenu->hide(); - } else { - int x, y; - - x = be->x_root - (toolbarmenu->getWidth() / 2); - y = be->y_root - (toolbarmenu->getHeight() / 2); - - if (x < 0) - x = 0; - else if (x + toolbarmenu->getWidth() > screen->getWidth()) - x = screen->getWidth() - toolbarmenu->getWidth(); - - if (y < 0) - y = 0; - else if (y + toolbarmenu->getHeight() > screen->getHeight()) - y = screen->getHeight() - toolbarmenu->getHeight(); - - toolbarmenu->move(x, y); - toolbarmenu->show(); - } + popMenu(toolbarmenu,be->x_root,be->y_root); } } @@ -816,8 +844,10 @@ if (re->x >= 0 && re->x < static_cast(frame.button_w) && re->y >= 0 && re->y < static_cast(frame.button_w)) screen->nextFocus(); - } else if (re->window == frame.window_label) - screen->raiseFocus(); + } else if (re->window == frame.window_label){ + // If uncommented, will drop the toolbar's focus back below any occluding windows + //screen->raiseFocus(); + } #ifndef HAVE_STRFTIME else if (re->window == frame.clock) { XClearWindow(display, frame.clock); @@ -965,6 +995,42 @@ clock_timer->setTimeout(aMinuteFromNow()); } +// For display of menus based on toolbar clicks +void Toolbar::popMenu(Basemenu *theMenu, int x_root, int y_root){ + int thePosition; + Bool isTop; + thePosition = screen->getToolbarPlacement(); + + if (thePosition==TopLeft || thePosition==TopCenter || thePosition==TopRight){ + isTop=True; + }else if(thePosition==BottomLeft || thePosition==BottomCenter || thePosition==BottomRight){ + isTop=False; + } + + if (! theMenu->isVisible()) { + int x, y; + + x = x_root - (theMenu->getWidth() / 2); + y = y_root - (theMenu->getHeight() / 2); + + if (x < 0) + x = 0; + else if (x + theMenu->getWidth() > screen->getWidth()) + x = screen->getWidth() - theMenu->getWidth(); + + if (isTop){ + y = frame.rect.height(); + }else if (!isTop){ + y = screen->getHeight() - theMenu->getHeight() - + frame.rect.height() - (2 * screen->getBorderWidth()) - 1; + } + + theMenu->move(x, y); + theMenu->show(); + } else { + theMenu->hide(); + } +} void Toolbar::HideHandler::timeout(void) { toolbar->hidden = ! toolbar->hidden; diff -u -Naur blackbox-0.65.0/src/Toolbar.hh blackbox-0.65.0.fink/src/Toolbar.hh --- blackbox-0.65.0/src/Toolbar.hh Tue Jul 9 16:32:12 2002 +++ blackbox-0.65.0.fink/src/Toolbar.hh Tue Nov 19 18:15:19 2002 @@ -155,6 +155,7 @@ void leaveNotifyEvent(const XCrossingEvent * /*unused*/); void exposeEvent(const XExposeEvent *ee); void keyPressEvent(const XKeyEvent *ke); + void popMenu(Basemenu *theMenu, int x, int y); void edit(void); void reconfigure(void); diff -u -Naur blackbox-0.65.0/src/Window.cc blackbox-0.65.0.fink/src/Window.cc --- blackbox-0.65.0/src/Window.cc Tue Sep 17 11:23:35 2002 +++ blackbox-0.65.0.fink/src/Window.cc Tue Nov 19 18:15:19 2002 @@ -699,34 +699,26 @@ unsigned int bw = frame.button_w + frame.bevel_w + 1, by = frame.bevel_w + 1, lx = by, lw = frame.inside_w - by; - if (decorations & Decor_Iconify) { - if (frame.iconify_button == None) createIconifyButton(); - - XMoveResizeWindow(blackbox->getXDisplay(), frame.iconify_button, by, by, - frame.button_w, frame.button_w); - XMapWindow(blackbox->getXDisplay(), frame.iconify_button); - XClearWindow(blackbox->getXDisplay(), frame.iconify_button); - - lx += bw; - lw -= bw; - } else if (frame.iconify_button) { - destroyIconifyButton(); - } - int bx = frame.inside_w - bw; - - if (decorations & Decor_Close) { + // Position Close Button + // + if (decorations & Decor_Close) { if (frame.close_button == None) createCloseButton(); - XMoveResizeWindow(blackbox->getXDisplay(), frame.close_button, bx, by, + XMoveResizeWindow(blackbox->getXDisplay(), frame.close_button, by, by, frame.button_w, frame.button_w); XMapWindow(blackbox->getXDisplay(), frame.close_button); XClearWindow(blackbox->getXDisplay(), frame.close_button); - bx -= bw; + lx += bw; lw -= bw; } else if (frame.close_button) { destroyCloseButton(); } + + int bx = frame.rect.width() - bw; + + // Position Maximize Button + // if (decorations & Decor_Maximize) { if (frame.maximize_button == None) createMaximizeButton(); @@ -735,10 +727,25 @@ XMapWindow(blackbox->getXDisplay(), frame.maximize_button); XClearWindow(blackbox->getXDisplay(), frame.maximize_button); + bx -= bw; lw -= bw; } else if (frame.maximize_button) { destroyMaximizeButton(); } + + // Position Iconify Button + // + if (decorations & Decor_Iconify) { + XMoveResizeWindow(blackbox->getXDisplay(), frame.iconify_button, bx, by, + frame.button_w, frame.button_w); + XMapWindow(blackbox->getXDisplay(), frame.iconify_button); + XClearWindow(blackbox->getXDisplay(), frame.iconify_button); + + lw -= bw; + } else if (frame.iconify_button){ + destroyIconifyButton(); + } + frame.label_w = lw - by; XMoveResizeWindow(blackbox->getXDisplay(), frame.label, lx, frame.bevel_w, frame.label_w, frame.label_h); diff -u -Naur blackbox-0.65.0/src/i18n.hh blackbox-0.65.0.fink/src/i18n.hh --- blackbox-0.65.0/src/i18n.hh Sun Mar 31 17:53:07 2002 +++ blackbox-0.65.0.fink/src/i18n.hh Tue Nov 19 18:15:19 2002 @@ -39,6 +39,7 @@ #endif // HAVE_NL_TYPES_H } +typedef void *nl_catd; class I18n { private: