r613 - trunk/WindowMaker

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Aug 24 10:54:16 PDT 2004


Author: jim
Date: 2004-08-24 11:54:14 -0600 (Tue, 24 Aug 2004)
New Revision: 613

Modified:
   trunk/WindowMaker/WindowMaker-0.80.2-newbuttons-1.patch
Log:
Put in correct WindowMaker-0.80.2-newbuttons-1.patch patch

Modified: trunk/WindowMaker/WindowMaker-0.80.2-newbuttons-1.patch
===================================================================
--- trunk/WindowMaker/WindowMaker-0.80.2-newbuttons-1.patch	2004-08-24 17:51:50 UTC (rev 612)
+++ trunk/WindowMaker/WindowMaker-0.80.2-newbuttons-1.patch	2004-08-24 17:54:14 UTC (rev 613)
@@ -1,310 +1,1252 @@
 Submitted By: Oliver Brakmann <obrakmann AT gmx DOT net>
 Date: 2003-11-11
-Initial Package Version: 0.80.2
-Origin: http://www.jmknoble.net/WindowMaker/patches/#menu-mapping
-	Adjusted for 0.80.2 by Oliver Brakmann <obrakmann AT gmx DOT net>
-Description: Fixes inconsistent popup positions of Windowmaker menus. Now all
-             menus pop up horizontally centered around the mouse cursor. They
-             also pop up so that they are always on the screen horizontally.
+Initial Package Version: Windowmaker 0.80.2
+Origin: http://vlaadworld.net/
+        Adjusted for 0.80.2 by Oliver Brakmann <obrakmann AT gmx DOT net>
+Description: This patch adds a new, third button style for window title bars.
+             To use it, select it from WPrefs.app's 'Other configuration' tab.
+             Note that though you only see a blank tile in that tab, the new
+             buttons still work flawlessly when selected.
 
-diff -Naur WindowMaker-0.80.2-orig/src/appicon.c WindowMaker-0.80.2/src/appicon.c
---- WindowMaker-0.80.2-orig/src/appicon.c	2002-01-08 14:45:07.000000000 +0100
-+++ WindowMaker-0.80.2/src/appicon.c	2003-11-04 23:15:13.000000000 +0100
-@@ -506,6 +506,7 @@
- {
-     WMenu *menu;
-     WScreen *scr = wapp->main_window_desc->screen_ptr;
-+    int mx, my;
-     int i;
+diff -Naur WindowMaker-0.80.2/WPrefs.app/Configurations.c WindowMaker-0.80.2-patched/WPrefs.app/Configurations.c
+--- WindowMaker-0.80.2/WPrefs.app/Configurations.c	2002-01-08 14:44:38.000000000 +0100
++++ WindowMaker-0.80.2-patched/WPrefs.app/Configurations.c	2003-11-05 00:10:17.000000000 +0100
+@@ -42,6 +42,7 @@
+     WMFrame *titlF;
+     WMButton *oldsB;
+     WMButton *newsB;
++    WMButton *nextB;
  
-     if (!scr->icon_menu) {
-@@ -524,17 +525,13 @@
-     menu->flags.realized = 0;
-     wMenuRealize(menu);
+     WMFrame *animF;
+     WMButton *animB;
+@@ -68,6 +69,7 @@
  
--    x -= menu->frame->core->width/2;
--    if (x + menu->frame->core->width > scr->scr_width)
--	x = scr->scr_width - menu->frame->core->width;
--    if (x < 0)
--	x = 0;
-+    wMenuCalculatePosition(menu, x, y, DEF_MENU_RELPOS, &mx, &my);
+ #define OLDS_IMAGE	"oldstyle"
+ #define NEWS_IMAGE	"newstyle"
++#define NEXT_IMAGE	"nextstyle"
  
-     /* set client data */
-     for (i = 0; i < menu->entry_no; i++) {
- 	menu->entries[i]->clientdata = wapp;
+ #define ANIM_IMAGE	"animations"
+ #define SUPERF_IMAGE	"moreanim"
+@@ -86,14 +88,19 @@
+ static void
+ showData(_Panel *panel)
+ {
++    char *str;
++	
+     WMPerformButtonClick(panel->icoB[GetSpeedForKey("IconSlideSpeed")]);
+     
+     WMPerformButtonClick(panel->shaB[GetSpeedForKey("ShadeSpeed")]);
+     
+-    if (GetBoolForKey("NewStyle")) {
+-	WMPerformButtonClick(panel->newsB);
+-    } else {
++    str = GetStringForKey("Newstyle");
++    if (str && strcasecmp(str, "next") == 0) {
++	WMPerformButtonClick(panel->nextB);
++    } else if(str && strcasecmp(str, "old") == 0) {
+ 	WMPerformButtonClick(panel->oldsB);
++    } else {
++	WMPerformButtonClick(panel->newsB);			
      }
--    wMenuMapAt(menu, x, y, False);
-+    wMenuMapAt(menu, mx, my, False);
- }
+     
+     WMSetButtonSelected(panel->animB, !GetBoolForKey("DisableAnimations"));
+@@ -326,21 +333,35 @@
+     }
  
+     panel->oldsB = WMCreateButton(panel->titlF, WBTOnOff);
+-    WMResizeWidget(panel->oldsB, 74, 40);
++    WMResizeWidget(panel->oldsB, 37, 40);
+     WMMoveWidget(panel->oldsB, 15, 60);
+     WMSetButtonImagePosition(panel->oldsB, WIPImageOnly);
+     path = LocateImage(OLDS_IMAGE);
+     if (path) {
+-	icon = WMCreatePixmapFromFile(scr, path);
+-	if (icon) {
+-	    WMSetButtonImage(panel->oldsB, icon);
+-	    WMReleasePixmap(icon);
+-	}
+-	wfree(path);
++       icon = WMCreatePixmapFromFile(scr, path);
++       if (icon) {
++	   WMSetButtonImage(panel->oldsB, icon);
++           WMReleasePixmap(icon);
++       }
++    }
++		
++    panel->nextB = WMCreateButton(panel->titlF, WBTOnOff);
++    WMResizeWidget(panel->nextB, 37, 40);
++    WMMoveWidget(panel->nextB, 52, 60);
++    WMSetButtonImagePosition(panel->nextB, WIPImageOnly);
++    path = LocateImage(NEXT_IMAGE);
++    if (path) {
++       icon = WMCreatePixmapFromFile(scr, path);
++       if (icon) {
++           WMSetButtonImage(panel->nextB, icon);
++           WMReleasePixmap(icon);
++       }
++       wfree(path);
+     }
  
-diff -Naur WindowMaker-0.80.2-orig/src/dock.c WindowMaker-0.80.2/src/dock.c
---- WindowMaker-0.80.2-orig/src/dock.c	2002-02-21 12:28:48.000000000 +0100
-+++ WindowMaker-0.80.2/src/dock.c	2003-11-04 23:15:13.000000000 +0100
-@@ -3385,6 +3385,7 @@
-     WApplication *wapp = NULL;
-     int index = 0;
-     int x_pos;
-+    int mx, my;
-     int n_selected;
-     int appIsRunning = aicon->running && aicon->icon && aicon->icon->owner;
+     WMGroupButtons(panel->newsB, panel->oldsB);
+-    
++    WMGroupButtons(panel->newsB, panel->nextB);
++   
+     WMMapSubwidgets(panel->titlF);
  
-@@ -3519,14 +3520,9 @@
-     if (!dock->menu->flags.realized)
- 	wMenuRealize(dock->menu);
- 
--    if (dock->type == WM_CLIP) {
--	x_pos = event->xbutton.x_root+2;
--    } else {
--	x_pos = dock->on_right_side ?
--	    scr->scr_width - dock->menu->frame->core->width - 2 : 0;
--    }
--
--    wMenuMapAt(dock->menu, x_pos, event->xbutton.y_root+2, False);
-+    wMenuCalculatePosition(dock->menu, event->xbutton.x_root,
-+			   event->xbutton.y_root+2, DEF_MENU_RELPOS, &mx, &my);
-+    wMenuMapAt(dock->menu, mx, my, False);
- 
-     /* allow drag select */
-     event->xany.send_event = True;
-@@ -3538,11 +3534,14 @@
- static void
- openClipWorkspaceMenu(WScreen *scr, int x, int y)
- {
-+    int mx, my;
-+   
-     if (!scr->clip_ws_menu) {
- 	scr->clip_ws_menu = wWorkspaceMenuMake(scr, False);
+     /**************** Features ******************/
+@@ -496,7 +517,13 @@
      }
-     wWorkspaceMenuUpdate(scr, scr->clip_ws_menu);
--    wMenuMapAt(scr->clip_ws_menu, x, y, False);
-+    wMenuCalculatePosition(scr->clip_ws_menu, x, y, DEF_MENU_RELPOS, &mx, &my);
-+    wMenuMapAt(scr->clip_ws_menu, mx, my, False);
- }
+     SetSpeedForKey(i, "ShadeSpeed");
  
+-    SetBoolForKey(WMGetButtonSelected(panel->newsB), "NewStyle");
++    if (WMGetButtonSelected(panel->newsB)) {
++	SetStringForKey("new", "NewStyle");
++    } else if (WMGetButtonSelected(panel->oldsB)) {
++	SetStringForKey("old", "NewStyle");			
++    } else {
++	SetStringForKey("next", "NewStyle");			
++    }
+     
+     SetBoolForKey(!WMGetButtonSelected(panel->animB), "DisableAnimations");
+     SetBoolForKey(WMGetButtonSelected(panel->supB), "Superfluous");
+diff -Naur WindowMaker-0.80.2/WPrefs.app/tiff/Makefile.am WindowMaker-0.80.2-patched/WPrefs.app/tiff/Makefile.am
+--- WindowMaker-0.80.2/WPrefs.app/tiff/Makefile.am	2000-04-02 23:05:08.000000000 +0200
++++ WindowMaker-0.80.2-patched/WPrefs.app/tiff/Makefile.am	2003-11-05 00:10:17.000000000 +0100
+@@ -27,6 +27,7 @@
+ 	msty2.tiff \
+ 	msty3.tiff \
+ 	newstyle.tiff \
++	nextstyle.tiff \
+ 	nonopaque.tiff \
+ 	oldstyle.tiff \
+ 	opaque.tiff \
+diff -Naur WindowMaker-0.80.2/WPrefs.app/tiff/nextstyle.tiff WindowMaker-0.80.2-patched/WPrefs.app/tiff/nextstyle.tiff
+--- WindowMaker-0.80.2/WPrefs.app/tiff/nextstyle.tiff	1970-01-01 01:00:00.000000000 +0100
++++ WindowMaker-0.80.2-patched/WPrefs.app/tiff/nextstyle.tiff	2003-11-05 00:10:17.000000000 +0100
+@@ -0,0 +1 @@
++II* X  ttttttttttttttttttttttttttttttttttttttttttttttttttttttuuuuuuuuuuuuuuuuuuuuuttttttttttttttttttttttttttttttttt   """"""""""""""""""""""""""""""""""""""""""""""""""""""&&&&&&&&&&&&&&&&&&&&&(((&&&(((&&&&&&&&&&&&&&&&&&&&&&&&   """"""""""""""""""""""""""""""""""""""""""""""""""""""&&&&&&&&&&&&&&&&&&&&&&&&((((((((((((((((((((((((((((((   """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""((((((   """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""                                    ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   ÿúÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿöööööòöîîî´¶´   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   ÿÿÿ‹”ÞææÿúÿöööææîÍÒͤ¡¤141”‘‹   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   ÿÿÿîöö)()ÅÊÍöòöææ椥¬A at 9”‹‹‹   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   ÿÿÿÿÿÿÅÊÍ),)ÕÖÕ´º´10)ÞÚÞ¤¥¤‹‰‹   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   ÿÿÿöúÿöÿÿÞÞÞ)()æêæÅÆÅ”‘‹‹‰ƒ   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   öúÿîòöîîöÕÖÕ ÅÆŤ¥¤ƒƒƒ‰ƒ   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   öööÞÞÞ”•” $ ÍÎͽº½  smsjusƒ{   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   öòö´²´ ()ÅÂÅÞÞÞÞÚÞ¤¥¤ ZUR{u{   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   îîî9<AÍÒÕÕÒÕœ¡¤”•”½º´‹…ƒjmj   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""   ´¶´”™”¤ª¬”™œ”•‹”‰‹‹‰ƒƒ‹sujƒ}ƒ   ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""                                    ÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&"""ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&&&&&&&&&&&&&&&&&&&&&&&&&(((((((((((((((((((((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&&&&&&&&&&&&&&&&&&&(((&&&(((((((((((((((((((((((((((                                                                                                               ««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««   ««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««   ««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««   ««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««   SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSÿÿÿ««««««                                                                                                   «««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««     þ              %       !       *                
 N   0      ~                           @       O      ”      œ         (              /exports/home/wettoad/Coding/WM-0.80.0-patched/WPrefs.app/tiff/nextstyle.tiff Created with The GIMP    H      H   
+\ No newline at end of file
+diff -Naur WindowMaker-0.80.2/WPrefs.app/tiff/oldstyle.tiff WindowMaker-0.80.2-patched/WPrefs.app/tiff/oldstyle.tiff
+--- WindowMaker-0.80.2/WPrefs.app/tiff/oldstyle.tiff	1999-05-01 19:44:44.000000000 +0200
++++ WindowMaker-0.80.2-patched/WPrefs.app/tiff/oldstyle.tiff	2003-11-05 00:10:17.000000000 +0100
+@@ -1,5 +1 @@
+-II* .  ¸òˆKÀAƒ&D¸ÐáCE
+-!j$®1üÇà+fì¸qâǏ9b’ä¤ò(mšti¥Ï”1s¶¬92äÊ’;{Þœ™ò_Y‘ÂE‹+YE¹RþË¡¨P¦DµÒÕ+¤/O½º
+-4Ìߤ~Öª5ZV©Y¶|¥Ší:VnߥS‡Êµ7kÚ«o£þy[´n5¨}ÛÎݺŽÝ}lϽ'öë3¡oIÿ3fΚ=gî¼ùÆŽòbéäISWNY]°ð,¥üoPºiãæ­[¶ïÚ¶gç^ÿ”.ê¶Äòã«V¬É6}æöž)︼{ßµ‡zn¿xxÌѧO>˜tvÆ훩ï\½²ñÎ…CÏ/-nÿÑ·‡?ž¬;·ÿÝKüõB¯ôÉHå}õÓã =òÔ×ýØ¡ÝpÉkÝ56H§Â	&(‚=Pþõô>4û½vÇç ,ó=Üè³V1룈8Rÿ#w=J‡¢V9ìˆAs¿=‹Õ–PÜI"€¸¼'ðø¢
?¥èƒŠ0¶8‚5’4âÌ_RL%£N-ñ€ÒŠ(„,É<½0ãO(åLb2ÛùtK3·’ÍÞâsÎ)ãÉ+Ϭ
+-Ë:?G2Ì¥¸`M2ä’]*©ÔRÒ*­ÌäҏƱ‚ŠÏÙ Šµ©T±xì"ƒò¬¶`+3¸&î*ù*Ë㰺몧nÀêm þi¸±úšh¨ÉF›n¼À[à¿À[j±åV[i½­ÖÚi³Ý6,±ÌýŽ;²àÎÓV'ö®¤îºËî»ë±Ûž»éµ‡^zï­§¾úè»Ïþ»£z þ¢z|°!‡b¸¡‡j¤aGuäG}´1Çc¼±ÖsÜ	&k²‰'ÊI§˜vªé›hú™§™eêÙg˜c¶9§˜iÖùçZ`ž¹YhÑÉ"+»ô¥—Z¶¬åËXa™•–[qµ•WOˬ1û[·ßõûÙp€
6Þh½Í6ríõ´p»íwØq§wÙi+3בz×½÷Ùw¿ý÷xëѶ=à°Ã8`w3öTçÈãO8Ñ‚£—Øë¤ÓÏ8ò”cù      &       !       è                
+-       
    ð      þ                           5       &         R               oldstyle.tiff created with The GIMP 
+\ No newline at end of file
++II* X  ttttttttttttttttttttttttttttttttttttttttttttttttttttttuuuuuuuuuuuuuuuuuuuuuttttttttttttttttttttttttttttttttt   """"""""""""""""""""""""""""""""""""""""""""""""""""""&&&&&&&&&&&&&&&&&&&&&(((&&&(((&&&&&&&&&&&&&&&&&&&&&&&&   """"""""""""""""""""""""""""""""""""""""""""""""""""""&&&&&&&&&&&&&&&&&&&&&&&&((((((((((((((((((((((((((((((   """"""""""""""""""""""""""""""""""""""""""""""""""""""&&&&&&&&&&&&&&&&&&&&&(((&&&(((((((((((((((((((((((((((   """"""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥   SSS¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥SSS   ¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥SSS   SSS¥¥¥¥¥¥¥¥¥¥¥¥SSS   SSS¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥¥¥¥SSS   SSS¥¥¥¥¥¥SSS   SSS¥¥¥¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥¥¥¥¥¥¥SSS   SSSSSS   SSS¥¥¥¥¥¥¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥¥¥¥¥¥¥¥¥¥SSS      SSS¥¥¥¥¥¥¥¥¥¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥¥¥¥¥¥¥¥¥¥SSS      SSS¥¥¥¥¥¥¥¥¥¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥¥¥¥¥¥¥SSS   SSSSSS   SSS¥¥¥¥¥¥¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥¥¥¥SSS   SSS¥¥¥¥¥¥SSS   SSS¥¥¥¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥SSS   SSS¥¥¥¥¥¥¥¥¥¥¥¥SSS   SSS¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥   SSS¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥SSS   ¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿ¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥¥SSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&ÿÿÿSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS(((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&&&&&&&&&&&&&&&&&&&&&&&&&(((((((((((((((((((((((((((""""""""""""""""""""""""""""""""""""""""""""""""""""""&&&&&&&&&&&&&&&&&&&&&(((&&&(((((((((((((((((((((((((((                                                                                                               ««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««   ««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««   ««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««   ««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««««   SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSÿÿÿ««««««                                                                                                   «««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««   ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ«««ÿÿÿ««««««     þ              %       !       *                
 M   0      ~                           @       O      ”      œ         (              /exports/home/wettoad/Coding/WM-0.80.0-patched/WPrefs.app/tiff/oldstyle.tiff  Created with The GIMP    H      H   
+\ No newline at end of file
+diff -Naur WindowMaker-0.80.2/WPrefs.app/xpm/Makefile.am WindowMaker-0.80.2-patched/WPrefs.app/xpm/Makefile.am
+--- WindowMaker-0.80.2/WPrefs.app/xpm/Makefile.am	2000-04-02 23:05:08.000000000 +0200
++++ WindowMaker-0.80.2-patched/WPrefs.app/xpm/Makefile.am	2003-11-05 00:10:17.000000000 +0100
+@@ -28,6 +28,7 @@
+ 	msty2.xpm \
+ 	msty3.xpm \
+ 	newstyle.xpm \
++	nextstyle.xpm \
+ 	nonopaque.xpm \
+ 	oldstyle.xpm \
+ 	opaque.xpm \
+diff -Naur WindowMaker-0.80.2/WPrefs.app/xpm/nextstyle.xpm WindowMaker-0.80.2-patched/WPrefs.app/xpm/nextstyle.xpm
+--- WindowMaker-0.80.2/WPrefs.app/xpm/nextstyle.xpm	1970-01-01 01:00:00.000000000 +0100
++++ WindowMaker-0.80.2-patched/WPrefs.app/xpm/nextstyle.xpm	2003-11-05 00:10:17.000000000 +0100
+@@ -0,0 +1,120 @@
++/* XPM */
++static char * nextstyle_xpm[] = {
++"37 33 84 1",
++" 	c None",
++".	c #747474",
++"+	c #757575",
++"@	c #000000",
++"#	c #222222",
++"$	c #262626",
++"%	c #282828",
++"&	c #080808",
++"*	c #FFFFFF",
++"=	c #FFFAFF",
++"-	c #FFFFF6",
++";	c #F6F6F6",
++">	c #F6F2F6",
++",	c #EEEEEE",
++"'	c #B4B6B4",
++")	c #8B8D94",
++"!	c #DEE6E6",
++"~	c #E6E6EE",
++"{	c #CDD2CD",
++"]	c #A4A1A4",
++"^	c #313431",
++"/	c #94918B",
++"(	c #EEF6F6",
++"_	c #292829",
++":	c #C5CACD",
++"<	c #E6E6E6",
++"[	c #A4A5AC",
++"}	c #414039",
++"|	c #948D8B",
++"1	c #8B8D8B",
++"2	c #292C29",
++"3	c #D5D6D5",
++"4	c #B4BAB4",
++"5	c #313029",
++"6	c #DEDADE",
++"7	c #A4A5A4",
++"8	c #8B898B",
++"9	c #F6FAFF",
++"0	c #F6FFFF",
++"a	c #DEDEDE",
++"b	c #181818",
++"c	c #E6EAE6",
++"d	c #C5C6C5",
++"e	c #8B8983",
++"f	c #EEF2F6",
++"g	c #EEEEF6",
++"h	c #101010",
++"i	c #201818",
++"j	c #838183",
++"k	c #838983",
++"l	c #949594",
++"m	c #202420",
++"n	c #CDCECD",
++"o	c #BDBABD",
++"p	c #202018",
++"q	c #736D73",
++"r	c #6A7573",
++"s	c #83817B",
++"t	c #B4B2B4",
++"u	c #202829",
++"v	c #C5C2C5",
++"w	c #201C18",
++"x	c #5A5552",
++"y	c #7B757B",
++"z	c #393C41",
++"A	c #CDD2D5",
++"B	c #D5D2D5",
++"C	c #9CA1A4",
++"D	c #BDBAB4",
++"E	c #8B8583",
++"F	c #6A6D6A",
++"G	c #949994",
++"H	c #A4AAAC",
++"I	c #94999C",
++"J	c #94958B",
++"K	c #94898B",
++"L	c #83818B",
++"M	c #73756A",
++"N	c #837D83",
++"O	c #060606",
++"P	c #070707",
++"Q	c #030303",
++"R	c #ABABAB",
++"S	c #535353",
++"..................+++++++...........@",
++"##################$$$$$$$%$%$$$$$$$$@",
++"##################$$$$$$$$%%%%%%%%%%@",
++"###################################%@",
++"###################################%&",
++"####################@@@@@@@@@@@@*%%%&",
++"####################@=****-;>,'@*%%%&",
++"####################@*)!=;~{]^/@*%%%&",
++"####################@*(_:><[}|1@*%%%&",
++"####################@**:2345678@*%%%&",
++"####################@*90ab_cd/e@*%%%&",
++"####################@9fg3hid7jk@*%%%&",
++"####################@;almnopqrs@*%%%&",
++"####################@>tuva67wxy@*%%%&",
++"####################@,zABClDEbF@*%%%&",
++"####################@'GHIJKeLMN@*%%%&",
++"####################@@@@@@@@@@@@*%%%&",
++"####################*************%%%&",
++"##################$$$$$$$$$%%%%%%%%%&",
++"##################$$$$$$$%$%%%%%%%%%&",
++"OOOOOOOOOOOOOOOOOOPPPPPPPPPPPPP&&&&&Q",
++"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
++"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@",
++"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@",
++"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@",
++"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@",
++"SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS*RR@",
++"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@R*RR@",
++"********************************R*RR@",
++"********************************R*RR@",
++"********************************R*RR@",
++"********************************R*RR@",
++"********************************R*RR@"};
+diff -Naur WindowMaker-0.80.2/WPrefs.app/xpm/oldstyle.xpm WindowMaker-0.80.2-patched/WPrefs.app/xpm/oldstyle.xpm
+--- WindowMaker-0.80.2/WPrefs.app/xpm/oldstyle.xpm	1999-05-01 19:44:44.000000000 +0200
++++ WindowMaker-0.80.2-patched/WPrefs.app/xpm/oldstyle.xpm	2003-11-05 00:10:17.000000000 +0100
+@@ -1,45 +1,51 @@
+ /* XPM */
+-static char * image_name[] = {
+-"38 33 9 1",
+-" 	c #739C739C739C",
+-".	c #000000000000",
+-"X	c #210821082108",
+-"o	c #294A294A294A",
+-"O	c #FFFFFFFFFFFF",
+-"+	c #084208420842",
+-"@	c #A528A528A528",
+-"#	c #529452945294",
+-"$	c #AD6AAD6AAD6A",
+-"                                     .",
+-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.",
+-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.",
+-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.",
+-"XXXXXXXXXXXXXXXXXXXoOOOOOOOOOOOOOOooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO at .#@@@@@@#.@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO at .#@@@@@@#.@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+",
+-"XXXXXXXXXXXXXXXXXXXoO#############ooo+",
+-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+",
+-"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+",
+-"+++++++++++++++++++++++++++++++++++++.",
+-"......................................",
+-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
+-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
+-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
+-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.",
+-"##################################O$$.",
+-".................................$O$$.",
+-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
+-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
+-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
+-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.",
+-"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$."};
++static char * oldstyle_xpm[] = {
++"37 33 15 1",
++" 	c None",
++".	c #747474",
++"+	c #757575",
++"@	c #000000",
++"#	c #222222",
++"$	c #262626",
++"%	c #282828",
++"&	c #FFFFFF",
++"*	c #080808",
++"=	c #A5A5A5",
++"-	c #535353",
++";	c #060606",
++">	c #070707",
++",	c #030303",
++"'	c #ABABAB",
++"..................+++++++...........@",
++"##################$$$$$$$%$%$$$$$$$$@",
++"##################$$$$$$$$%%%%%%%%%%@",
++"##################$$$$$$$%$%%%%%%%%%@",
++"##################$&&&&&&&&&&&&&&%%%*",
++"##################$&============-%%%*",
++"##################$&=@-======-@=-%%%*",
++"##################$&=- at -====- at -=-%%%*",
++"##################$&==- at -==- at -==-%%%*",
++"##################$&===- at --@-===-%%%*",
++"##################$&====-@@-====-%%%*",
++"##################$&====-@@-====-%%%*",
++"##################$&===- at --@-===-%%%*",
++"##################$&==- at -==- at -==-%%%*",
++"##################$&=- at -====- at -=-%%%*",
++"##################$&=@-======-@=-%%%*",
++"##################$&============-%%%*",
++"##################$&-------------%%%*",
++"##################$$$$$$$$$%%%%%%%%%*",
++"##################$$$$$$$%$%%%%%%%%%*",
++";;;;;;;;;;;;;;;;;;>>>>>>>>>>>>>*****,",
++"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
++"''''''''''''''''''''''''''''''''''''@",
++"''''''''''''''''''''''''''''''''''''@",
++"''''''''''''''''''''''''''''''''''''@",
++"''''''''''''''''''''''''''''''''''''@",
++"---------------------------------&''@",
++"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'&''@",
++"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@",
++"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@",
++"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@",
++"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@",
++"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@"};
+diff -Naur WindowMaker-0.80.2/src/WindowMaker.h WindowMaker-0.80.2-patched/src/WindowMaker.h
+--- WindowMaker-0.80.2/src/WindowMaker.h	2002-02-21 12:28:48.000000000 +0100
++++ WindowMaker-0.80.2-patched/src/WindowMaker.h	2003-11-05 00:10:17.000000000 +0100
+@@ -237,6 +237,10 @@
+ #define WD_BOTTOMLEFT	6
+ #define WD_BOTTOMRIGHT	7
  
-diff -Naur WindowMaker-0.80.2-orig/src/menu.c WindowMaker-0.80.2/src/menu.c
---- WindowMaker-0.80.2-orig/src/menu.c	2002-02-21 12:28:48.000000000 +0100
-+++ WindowMaker-0.80.2/src/menu.c	2003-11-04 23:15:13.000000000 +0100
-@@ -2740,6 +2740,65 @@
- }
++/* titlebar style */
++#define TS_NEW		0
++#define TS_OLD		1
++#define TS_NEXT		2
  
+ /* workspace border position */
+ #define	WB_NONE		0
+diff -Naur WindowMaker-0.80.2/src/def_pixmaps.h WindowMaker-0.80.2-patched/src/def_pixmaps.h
+--- WindowMaker-0.80.2/src/def_pixmaps.h	1999-05-27 01:18:34.000000000 +0200
++++ WindowMaker-0.80.2-patched/src/def_pixmaps.h	2003-11-05 00:10:17.000000000 +0100
+@@ -97,6 +97,272 @@
+ ".........."
+ };
  
-+/* Calculate the optimal position at which to map the given menu,
-+ * if the cursor position is (<x>,<y>) and the percentage * 10 of the
-+ * menu that should be to the left of the cursor is given by
-+ * <relpos>.  Return the calculated position in <menux> and <menuy>.
-+ * 
-+ * If <relpos> is less than 0, the calculated position will be
-+ * (<x>+delta, <y>) where `delta' is some small number of pixels. If
-+ * <relpos> is greater than 1000, the calculated position will be
-+ * (<x>-(w + delta), <y>), where `w' is the width of the menu.
-+ * Otherwise, the calculated position is equivalent to
-+ * (<x>-(w * <relpos> / 1000), <y>).
-+ * 
-+ * After the above calculation, the position is adjusted for appearing
-+ * off the screen horizontally, with a bias toward the lefthand edge.
-+ * That is, if w is less than or equal to the width of the screen, the
-+ * menu position is adjusted so the that menu appears entirely on the
-+ * screen.  If w is greater than the width of the screen, the menu
-+ * position is adjusted such that the left edge of the menu appears at
-+ * the left edge of the screen.
-+ */
-+#define DELTA_X		2
-+void
-+wMenuCalculatePosition(WMenu *menu, int x, int y, int relpos, int *mx, int *my)
-+{
-+   WScreen *wscr;
-+   int sw;
-+   int mw;
-+   int dx;
++static char *NEXT_CLOSE_XPM[] = {
++"10 10 69 1",
++" 	c None",
++".	c #FBFBFB",
++"+	c #F9F9F9",
++"@	c #F7F7F7",
++"#	c #F4F4F4",
++"$	c #F0F0F0",
++"%	c #EDEDED",
++"&	c #E8E8E8",
++"*	c #AFAFAF",
++"=	c #FCFCFC",
++"-	c #8B8B8B",
++";	c #DEDEDE",
++">	c #E0E0E0",
++",	c #C7C7C7",
++"'	c #999999",
++")	c #2B2B2B",
++"!	c #878787",
++"~	c #F1F1F1",
++"{	c #222222",
++"]	c #C2C2C2",
++"^	c #EBEBEB",
++"/	c #DCDCDC",
++"(	c #9F9F9F",
++"_	c #363636",
++":	c #FEFEFE",
++"<	c #C1C1C1",
++"[	c #232323",
++"}	c #CFCFCF",
++"|	c #282828",
++"1	c #D5D5D5",
++"2	c #FAFAFA",
++"3	c #F6F6F6",
++"4	c #D3D3D3",
++"5	c #121212",
++"6	c #BEBEBE",
++"7	c #898989",
++"8	c #838383",
++"9	c #EEEEEE",
++"0	c #E9E9E9",
++"a	c #CDCDCD",
++"b	c #080808",
++"c	c #131313",
++"d	c #A1A1A1",
++"e	c #7F7F7F",
++"f	c #808080",
++"g	c #D9D9D9",
++"h	c #8D8D8D",
++"i	c #1D1D1D",
++"j	c #C9C9C9",
++"k	c #B4B4B4",
++"l	c #191919",
++"m	c #6A6A6A",
++"n	c #6C6C6C",
++"o	c #7A7A7A",
++"p	c #B1B1B1",
++"q	c #202020",
++"r	c #BBBBBB",
++"s	c #D4D4D4",
++"t	c #151515",
++"u	c #515151",
++"v	c #747474",
++"w	c #3A3A3A",
++"x	c #CCCCCC",
++"y	c #B3B3B3",
++"z	c #939393",
++"A	c #A3A3A3",
++"B	c #919191",
++"C	c #858585",
++"D	c #7C7C7C",
++"...+@#$%&*",
++"=-;#%>,')!",
++"=~{]^/(_!!",
++"=:<[}*|1(!",
++"2 at 345[>678",
++"@90abc6def",
++"#ghijklmno",
++"~pqrgs(tuv",
++"%wxx'-p8tn",
++"yzAB7C8enD"};
 +
-+   *mx = x;
-+   *my = y;
 +
-+   if ((NULL == menu) || (NULL == menu->frame) ||
-+       (NULL == menu->frame->core) || (NULL == menu->frame->screen_ptr)) {
-+      return;
-+   }
-+   wscr = menu->frame->screen_ptr;
-+   sw = wscr->scr_width;
-+   mw = menu->frame->core->width + (2 * FRAME_BORDER_WIDTH);
++static char * NEXT_BROKEN_CLOSE_XPM[] = {
++"10 10 8 1",
++" 	c None",
++".	c #E0E0E0",
++"+	c #7D7D7D",
++"@	c #DBDBDB",
++"#	c #BDBDBD",
++"$	c #080808",
++"%	c #363636",
++"&	c #D4D4D4",
++".........+",
++".+ at ...#+$+",
++"..$#. at +%++",
++"..###++&++",
++"...&...#++",
++"...&..#+++",
++". at +##+%%%+",
++".+$#@&+$%%",
++".%##++++$%",
++"++++++++%+"};
 +
-+   if (relpos < 0) {
-+      *mx = x + DELTA_X;
-+   } else if (relpos > MAX_MENU_RELPOS) {
-+      *mx = x - (mw + DELTA_X);
-+   } else {
-+      *mx = x - (mw * relpos) / MAX_MENU_RELPOS;
-+   }
++static char *NEXT_KILL_XPM[] = {
++"10 10 64 1",
++" 	c None",
++".	c #FBFBFB",
++"+	c #FAFAFA",
++"@	c #F7F7F7",
++"#	c #F5F5F5",
++"$	c #F6F6F6",
++"%	c #EEEEEE",
++"&	c #B3B3B3",
++"*	c #FCFCFC",
++"=	c #8B8B8B",
++"-	c #E3E3E3",
++";	c #F4F4F4",
++">	c #ECECEC",
++",	c #EAEAEA",
++"'	c #BFBFBF",
++")	c #474747",
++"!	c #A5A5A5",
++"~	c #EFEFEF",
++"{	c #262626",
++"]	c #B6B6B6",
++"^	c #B4B4B4",
++"/	c #282828",
++"(	c #A3A3A3",
++"_	c #FEFEFE",
++":	c #E0E0E0",
++"<	c #B8B8B8",
++"[	c #C5C5C5",
++"}	c #DCDCDC",
++"|	c #D3D3D3",
++"1	c #E4E4E4",
++"2	c #B1B1B1",
++"3	c #878787",
++"4	c #D5D5D5",
++"5	c #202020",
++"6	c #222222",
++"7	c #F1F1F1",
++"8	c #959595",
++"9	c #838383",
++"0	c #DBDBDB",
++"a	c #252525",
++"b	c #E9E9E9",
++"c	c #F0F0F0",
++"d	c #999999",
++"e	c #808080",
++"f	c #9B9B9B",
++"g	c #C2C2C2",
++"h	c #7C7C7C",
++"i	c #7A7A7A",
++"j	c #232323",
++"k	c #CCCCCC",
++"l	c #C1C1C1",
++"m	c #181818",
++"n	c #404040",
++"o	c #747474",
++"p	c #E7E7E7",
++"q	c #303030",
++"r	c #C9C9C9",
++"s	c #ACACAC",
++"t	c #787878",
++"u	c #141414",
++"v	c #6C6C6C",
++"w	c #8F8F8F",
++"x	c #858585",
++"y	c #7F7F7F",
++"...+@#$$%&",
++"*=-+;>,')!",
++"*~{];#^/((",
++"*_:<[}|123",
++"+ at +456;789",
++"@~706abcde",
++"#0fg#$3ehi",
++"c=jk>%lmno",
++"pqr}s(^tuv",
++"2w!d=x9yvh"};
 +
-+   dx = sw - (*mx + mw);
-+   if (dx < 0) {
-+      *mx += dx;
-+   }
-+   if (*mx < 0) {
-+      *mx = 0;
-+   }
-+}
-+#undef DELTA_X
++static char *NEXT_ICONIFY_XPM[] = {
++"10 10 72 1",
++" 	c None",
++".	c #FCFCFC",
++"+	c #FAFAFA",
++"@	c #F8F8F8",
++"#	c #F6F6F6",
++"$	c #F2F2F2",
++"%	c #EFEFEF",
++"&	c #EAEAEA",
++"*	c #A6A6A6",
++"=	c #FEFEFE",
++"-	c #FDFDFD",
++";	c #F9F9F9",
++">	c #E2E2E2",
++",	c #CBCBCB",
++"'	c #AFAFAF",
++")	c #808080",
++"!	c #717171",
++"~	c #FFFFFF",
++"{	c #FBFBFB",
++"]	c #F1F1F1",
++"^	c #E5E5E5",
++"/	c #CCCCCC",
++"(	c #838383",
++"_	c #A0A0A0",
++":	c #989898",
++"<	c #8B8B8B",
++"[	c #7F7F7F",
++"}	c #E8E8E8",
++"|	c #ADADAD",
++"1	c #181818",
++"2	c #171717",
++"3	c #161616",
++"4	c #141414",
++"5	c #0A0A0A",
++"6	c #000000",
++"7	c #A2A2A2",
++"8	c #747474",
++"9	c #6C6C6C",
++"0	c #F0F0F0",
++"a	c #B9B9B9",
++"b	c #B7B7B7",
++"c	c #B1B1B1",
++"d	c #868686",
++"e	c #020202",
++"f	c #EDEDED",
++"g	c #939393",
++"h	c #676767",
++"i	c #696969",
++"j	c #8E8E8E",
++"k	c #787878",
++"l	c #757575",
++"m	c #777777",
++"n	c #767676",
++"o	c #EBEBEB",
++"p	c #525252",
++"q	c #626262",
++"r	c #F3F3F3",
++"s	c #E1E1E1",
++"t	c #B5B5B5",
++"u	c #5F5F5F",
++"v	c #424242",
++"w	c #5B5B5B",
++"x	c #9D9D9D",
++"y	c #969696",
++"z	c #E4E4E4",
++"A	c #444444",
++"B	c #2E2E2E",
++"C	c #A9A9A9",
++"D	c #7C7C7C",
++"E	c #797979",
++"F	c #5D5D5D",
++"G	c #646464",
++"...+@#$%&*",
++".=-;%>,')!",
++"-~={]^/'(!",
++"_'*:<[}|)!",
++"123456%789",
++"0abcdefghi",
++"jklmneonpq",
++"rs^>te}uvw",
++"f_xy9ezABp",
++"CDDEue7FpG"};
 +
+ #ifdef XKB_BUTTON_HINT
+ #include "extend_pixmaps.h"
+ #endif /* XKB_BUTTON_HINT */
+diff -Naur WindowMaker-0.80.2/src/defaults.c WindowMaker-0.80.2-patched/src/defaults.c
+--- WindowMaker-0.80.2/src/defaults.c	2002-01-08 14:45:07.000000000 +0100
++++ WindowMaker-0.80.2-patched/src/defaults.c	2003-11-05 00:10:17.000000000 +0100
+@@ -220,6 +220,11 @@
+     {NULL, 0, 0}
+ };
+ 
++static WOptionEnumeration seTitlebarModes[] = {
++    {"new", TS_NEW, 0}, {"old", TS_OLD, 0},
++    {"next", TS_NEXT, 0}, {NULL, 0, 0}
++};
 +
- void
- OpenWorkspaceMenu(WScreen *scr, int x, int y)
- {
-diff -Naur WindowMaker-0.80.2-orig/src/menu.h WindowMaker-0.80.2/src/menu.h
---- WindowMaker-0.80.2-orig/src/menu.h	2002-01-08 14:45:13.000000000 +0100
-+++ WindowMaker-0.80.2/src/menu.h	2003-11-04 23:15:13.000000000 +0100
-@@ -133,6 +133,8 @@
- WMenu *wMenuUnderPointer(WScreen *screen);
- void wMenuSaveState(WScreen *scr);
- void wMenuRestoreState(WScreen *scr);
-+void wMenuCalculatePosition(WMenu *menu, int x, int y, int relpos,
-+			    int *mx, int *my);
+ static WOptionEnumeration seColormapModes[] = {
+     {"Manual", WCM_CLICK, 0}, {"ClickToFocus", WCM_CLICK, 1},
+     {"Auto", WCM_POINTER, 0}, {"FocusFollowMouse", WCM_POINTER, 1},
+@@ -355,8 +360,8 @@
+     {"FocusMode",	"manual",		seFocusModes,
+ 	&wPreferences.focus_mode,	getEnum,	NULL
+     }, /* have a problem when switching from manual to sloppy without restart */
+-    {"NewStyle",	"NO",			NULL,
+-	&wPreferences.new_style, 	getBool, 	NULL
++    {"NewStyle",	"new",			seTitlebarModes,
++	&wPreferences.new_style, 	getEnum, 	NULL
+     },
+     {"DisableDock",	"NO",		(void*) WM_DOCK,
+ 	NULL, 	getBool,        setIfDockPresent
+@@ -1050,7 +1055,7 @@
  
- 
- #endif
-diff -Naur WindowMaker-0.80.2-orig/src/rootmenu.c WindowMaker-0.80.2/src/rootmenu.c
---- WindowMaker-0.80.2-orig/src/rootmenu.c	2002-02-21 12:28:48.000000000 +0100
-+++ WindowMaker-0.80.2/src/rootmenu.c	2003-11-04 23:17:38.000000000 +0100
-@@ -1799,6 +1799,7 @@
- OpenRootMenu(WScreen *scr, int x, int y, int keyboard)
- {
-     WMenu *menu=NULL;
-+    int mx, my;
-     WMPropList *definition;
-     /*
-     static WMPropList *domain=NULL;
-@@ -1821,8 +1822,10 @@
- 	    
- 	    if (keyboard)
- 		wMenuMapAt(menu, 0, 0, True);
--	    else
--		wMenuMapCopyAt(menu, x-menu->frame->core->width/2, y);
-+	    else {
-+		wMenuCalculatePosition(menu, x, y, DEF_MENU_RELPOS, &mx, &my);
-+		wMenuMapCopyAt(menu, mx, my);
-+	    }
+ 	if (dict)
+ 	  plvalue = WMGetFromPLDictionary(dict, entry->plkey);
+-	else
++	else 
+ 	  plvalue = NULL;
+ 	
+ 	if (!plvalue) {
+@@ -1061,8 +1066,8 @@
+ 	if (plvalue) {
+ 	    /* convert data */
+ 	    (*entry->convert)(NULL, entry, plvalue, entry->addr, &tdata);
+-            if (entry->update) {
+-                (*entry->update)(NULL, entry, tdata, entry->extra_data);
++             if (entry->update) {
++                 (*entry->update)(NULL, entry, tdata, entry->extra_data);
+             }
  	}
- 	return;
      }
-@@ -1877,8 +1880,7 @@
-             newx = x - menu->frame->core->width/2;
-             newy = y - menu->frame->core->height/2;
-         } else {
--            newx = x - menu->frame->core->width/2;
--            newy = y;
-+	    wMenuCalculatePosition(menu, x, y, DEF_MENU_RELPOS, &newx, &newy);
-         }
-         wMenuMapAt(menu, newx, newy, keyboard);
+diff -Naur WindowMaker-0.80.2/src/extend_pixmaps.h WindowMaker-0.80.2-patched/src/extend_pixmaps.h
+--- WindowMaker-0.80.2/src/extend_pixmaps.h	2002-02-21 12:28:48.000000000 +0100
++++ WindowMaker-0.80.2-patched/src/extend_pixmaps.h	2003-11-05 00:10:17.000000000 +0100
+@@ -113,5 +113,79 @@
+ };
+ 
+ 
++static char *NEXT_XKBGROUP1_XPM[] = {
++"10 10 6 1",
++" 	c None",
++".	c #E0E0E0",
++"+	c #7D7D7D",
++"@	c #363636",
++"#	c #080808",
++"$	c #BDBDBD",
++".........+",
++"..@@@@@@++",
++"..@####+++",
++"..#+$$$$++",
++"..###+.$++",
++"..#++..$++",
++"..#$.$$$++",
++"..#@@@@+++",
++".$+#####@@",
++"+++++++@@@"};
+ 
++static char *NEXT_XKBGROUP2_XPM[] = {
++"10 10 6 1",
++" 	c None",
++".	c #E0E0E0",
++"+	c #7D7D7D",
++"@	c #BDBDBD",
++"#	c #080808",
++"$	c #363636",
++".........+",
++".@##@@$#++",
++".#.+#+###+",
++".#+######+",
++".########+",
++"..######++",
++"..@####+++",
++".@@@#$++++",
++". at ++#$++$$",
++"+++++++$$$"};
++
++static char *NEXT_XKBGROUP3_XPM[] = {
++"10 10 6 1",
++" 	c None",
++".	c #E0E0E0",
++"+	c #7D7D7D",
++"@	c #BDBDBD",
++"#	c #080808",
++"$	c #363636",
++".........+",
++"..@####.++",
++".@######.+",
++".#.+##.+#+",
++".#++##++#+",
++".########+",
++".##@##@##+",
++".+##@@##$+",
++". at +####$$$",
++"+++++++$$$"};
++
++static char *NEXT_XKBGROUP4_XPM[] = {
++"10 10 6 1",
++" 	c None",
++".	c #E0E0E0",
++"+	c #7D7D7D",
++"@	c #BDBDBD",
++"#	c #080808",
++"$	c #363636",
++".........+",
++"..@####.++",
++".@#@@@@#.+",
++".##$@@#$#+",
++".#$$@@$$#+",
++".#@@@@++#+",
++".#+#++#.#+",
++".+#+##$#$+",
++". at +####$$$",
++"+++++++$$$"};
+ 
+diff -Naur WindowMaker-0.80.2/src/framewin.c WindowMaker-0.80.2-patched/src/framewin.c
+--- WindowMaker-0.80.2/src/framewin.c	2002-01-08 14:45:13.000000000 +0100
++++ WindowMaker-0.80.2-patched/src/framewin.c	2003-11-05 00:10:17.000000000 +0100
+@@ -136,10 +136,12 @@
+     else
+ 	theight = 0;
+     
+-    if (wPreferences.new_style) {
++    if (wPreferences.new_style == TS_NEW) {
+ 	bsize = theight;
+-    } else {
++    } else if (wPreferences.new_style == TS_OLD) {
+ 	bsize = theight - 7;
++    } else {
++	bsize = theight - 8;
      }
-diff -Naur WindowMaker-0.80.2-orig/src/switchmenu.c WindowMaker-0.80.2/src/switchmenu.c
---- WindowMaker-0.80.2-orig/src/switchmenu.c	2002-01-08 14:45:33.000000000 +0100
-+++ WindowMaker-0.80.2/src/switchmenu.c	2003-11-04 23:30:25.000000000 +0100
-@@ -95,6 +95,7 @@
- {
-     WMenu *switchmenu = scr->switch_menu;
-     WWindow *wwin;
-+    int mx, my;
-     static int initialized = 0;
      
-     if (!initialized) {
-@@ -121,16 +122,15 @@
+     if (fwin->titlebar) {
+@@ -150,7 +152,7 @@
+ 
+ 	    fwin->flags.need_texture_remake = 1;
+ 	    
+-	    if (wPreferences.new_style) {
++	    if (wPreferences.new_style == TS_NEW) {
+ 		if (fwin->left_button) {
+ 		    wCoreConfigure(fwin->left_button, 0, 0, bsize, bsize);
+ 		}
+@@ -192,7 +194,7 @@
+ 	    /* we had a titlebar, but now we don't need it anymore */
+ 	    for (i=0; i < (fwin->flags.single_texture ? 1 : 3); i++) {
+ 		FREE_PIXMAP(fwin->title_back[i]);
+-		if (wPreferences.new_style) {
++		if (wPreferences.new_style == TS_NEW) {
+ 		    FREE_PIXMAP(fwin->lbutton_back[i]);
+ 		    FREE_PIXMAP(fwin->rbutton_back[i]);
+ #ifdef XKB_BUTTON_HINT
+@@ -230,7 +232,7 @@
+ 
+ 	    if (flags & WFF_LEFT_BUTTON) {
+ 		fwin->flags.left_button = 1;
+-		if (wPreferences.new_style) {
++		if (wPreferences.new_style == TS_NEW) {
+ 		    fwin->left_button = wCoreCreate(fwin->core, 0, 0,
+ 						    bsize, bsize);
+ 		    if (width < theight*4) {
+@@ -238,7 +240,7 @@
+ 		    } else {
+ 			XMapRaised(dpy, fwin->left_button->window);
+ 		    }
+-		} else {
++		} else if (wPreferences.new_style == TS_OLD) {
+ 		    fwin->left_button = 
+ 			wCoreCreate(fwin->titlebar, 3, (theight-bsize)/2,
+ 				    bsize, bsize);
+@@ -251,13 +253,26 @@
+ 		    } else {
+ 			XMapRaised(dpy, fwin->left_button->window);
+ 		    }
++		} else {
++		    fwin->left_button = 
++			wCoreCreate(fwin->titlebar, 3, (theight-bsize)/2,
++				    bsize, bsize);
++		    
++		    XSetWindowBackground(dpy, fwin->left_button->window,
++					 scr->widget_texture->dark.pixel);
++		    
++		    if (width < theight*3) {
++			fwin->flags.lbutton_dont_fit = 1;
++		    } else {
++			XMapRaised(dpy, fwin->left_button->window);
++		    }
+ 		}
+ 	    }
+         
+ #ifdef XKB_BUTTON_HINT
+ 	    if (flags & WFF_LANGUAGE_BUTTON) {
+ 		fwin->flags.language_button = 1;
+-		if (wPreferences.new_style) {
++		if (wPreferences.new_style == TS_NEW) {
+ 		    fwin->language_button = wCoreCreate(fwin->core,
+ 							bsize, 0, bsize, bsize);
+ 		    
+@@ -285,17 +300,23 @@
+ 	    
+ 	    if (flags & WFF_RIGHT_BUTTON) {
+ 		fwin->flags.right_button = 1;
+-                if (wPreferences.new_style) {
++                if (wPreferences.new_style == TS_NEW) {
+ 		    fwin->right_button =
+ 			wCoreCreate(fwin->core, width-bsize+1, 0,
+ 				    bsize, bsize);
+-                } else {
++                } else if (wPreferences.new_style == TS_OLD) {
+ 		    fwin->right_button =
+ 			wCoreCreate(fwin->titlebar, width-bsize-3,
+ 				    (theight-bsize)/2, bsize, bsize);
+ 		    XSetWindowBackground(dpy, fwin->right_button->window,
+ 					 scr->widget_texture->normal.pixel);
+-                }
++                } else {
++		    fwin->right_button =
++			wCoreCreate(fwin->titlebar, width-bsize-3,
++				    (theight-bsize)/2, bsize, bsize);
++		    XSetWindowBackground(dpy, fwin->right_button->window,
++					 scr->widget_texture->dark.pixel);
++		}
  		
- 		if (keyboard)
- 		    wMenuMapAt(switchmenu, 0, 0, True);
--		else
--		    wMenuMapCopyAt(switchmenu, 
--				   x-switchmenu->frame->core->width/2, y);
-+		else {
-+		    wMenuCalculatePosition(switchmenu, x, y, DEF_MENU_RELPOS,
-+					   &mx, &my);
-+		    wMenuMapCopyAt(switchmenu, mx, my);
-+		}
+ 		if (width < theight*2) {
+ 		    fwin->flags.rbutton_dont_fit = 1;
+@@ -304,7 +325,7 @@
+ 		}
  	    }
- 	} else {
--	    if (keyboard && x==scr->scr_width/2 && y==scr->scr_height/2) {
--		y = y - switchmenu->frame->core->height/2;
--	    }
--	    wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2, y,
--		       keyboard);
-+	    wMenuCalculatePosition(switchmenu, x, y, DEF_MENU_RELPOS, &mx, &my);
-+	    wMenuMapAt(switchmenu, mx, my, keyboard);
+ 	    
+-            if (wPreferences.new_style)
++            if (wPreferences.new_style == TS_NEW)
+ 		updateTitlebar(fwin);
+ 
+ 	    XMapRaised(dpy, fwin->titlebar->window);
+@@ -438,7 +459,7 @@
+     
+     for (i=0; i < (fwin->flags.single_texture ? 1 : 3); i++) {
+ 	FREE_PIXMAP(fwin->title_back[i]);
+-        if (wPreferences.new_style) {
++        if (wPreferences.new_style == TS_NEW) {
+ 	    FREE_PIXMAP(fwin->lbutton_back[i]);
+ #ifdef XKB_BUTTON_HINT
+ 	    FREE_PIXMAP(fwin->languagebutton_back[i]);
+@@ -475,7 +496,7 @@
+     x = 0;
+     w = fwin->core->width + 1;
+ 
+-    if (wPreferences.new_style) {
++    if (wPreferences.new_style == TS_NEW) {
+ 	if (fwin->flags.hide_left_button || !fwin->left_button
+ 	    || fwin->flags.lbutton_dont_fit) {
+ 	    x = 0;
+@@ -524,14 +545,14 @@
+     }
+ #endif
+     
+-    if (wPreferences.new_style) {
++    if (wPreferences.new_style == TS_NEW) {
+ 	if (!fwin->flags.hide_right_button && fwin->right_button
+ 	    && !fwin->flags.rbutton_dont_fit) {
+ 	    w -= fwin->right_button->width;
  	}
- 	return;
      }
-@@ -157,8 +157,8 @@
-             newx = x - switchmenu->frame->core->width/2;
-             newy = y - switchmenu->frame->core->height/2;
-         } else {
--            newx = x - switchmenu->frame->core->width/2;
--            newy = y;
-+	    wMenuCalculatePosition(switchmenu, x, y, DEF_MENU_RELPOS,
-+				   &newx, &newy);
-         }
-         wMenuMapAt(switchmenu, newx, newy, keyboard);
-     }
-diff -Naur WindowMaker-0.80.2-orig/src/wconfig.h.in WindowMaker-0.80.2/src/wconfig.h.in
---- WindowMaker-0.80.2-orig/src/wconfig.h.in	2002-01-08 14:45:33.000000000 +0100
-+++ WindowMaker-0.80.2/src/wconfig.h.in	2003-11-04 23:15:13.000000000 +0100
-@@ -548,6 +548,9 @@
  
- #define MAX_MENU_TEXT_LENGTH 512
+-    if (wPreferences.new_style || fwin->titlebar->width!=w)
++    if (wPreferences.new_style == TS_NEW || fwin->titlebar->width!=w)
+ 	fwin->flags.need_texture_remake = 1;
  
-+#define MAX_MENU_RELPOS		1000
-+#define DEF_MENU_RELPOS		(MAX_MENU_RELPOS / 2)
-+
- #define MAX_RESTART_ARGS	16
+     wCoreConfigure(fwin->titlebar, x, 0, w, theight);
+@@ -559,7 +580,7 @@
+ #endif
  
- #define MAX_COMMAND_SIZE	1024
-diff -Naur WindowMaker-0.80.2-orig/src/winmenu.c WindowMaker-0.80.2/src/winmenu.c
---- WindowMaker-0.80.2-orig/src/winmenu.c	2002-04-15 13:08:06.000000000 +0200
-+++ WindowMaker-0.80.2/src/winmenu.c	2003-11-04 23:15:13.000000000 +0100
-@@ -637,6 +637,7 @@
- {
-     WMenu *menu;
-     WScreen *scr = wwin->screen_ptr;
-+    int mx, my;
+     if (fwin->titlebar) {
+-	if (wPreferences.new_style) {
++	if (wPreferences.new_style == TS_NEW) {
+ 	    updateTitlebar(fwin);
+ 	} else {
+ #ifdef XKB_BUTTON_HINT
+@@ -608,7 +629,7 @@
  
-     wwin->flags.menu_open_for_me = 1;
+     
+     if (fwin->titlebar) {
+-	if (wPreferences.new_style) {
++	if (wPreferences.new_style == TS_NEW) {
+ 	    updateTitlebar(fwin);
+ 	} else {
+ 	    XClearWindow(dpy, fwin->titlebar->window);
+@@ -650,7 +671,7 @@
+         return;
+     }
+     
+-    if (wPreferences.new_style) {
++    if (wPreferences.new_style == TS_NEW) {
+ 	if (left) {
+ 	    limg = RGetSubImage(img, 0, 0, bwidth, bheight);
+ 	} else
+@@ -793,7 +814,7 @@
+ 	if (fwin->title_texture[i]->any.type!=WTEX_SOLID) {
+ 	    XSetWindowBackgroundPixmap(dpy, fwin->titlebar->window,
+ 				       fwin->title_back[i]);
+-	    if (wPreferences.new_style) {
++	    if (wPreferences.new_style == TS_NEW) {
+ 		if (fwin->left_button && fwin->lbutton_back[i])
+ 		    XSetWindowBackgroundPixmap(dpy, fwin->left_button->window,
+ 					       fwin->lbutton_back[i]);
+@@ -812,7 +833,7 @@
+ 	} else {
+ 	    pixel = fwin->title_texture[i]->solid.normal.pixel;
+ 	    XSetWindowBackground(dpy, fwin->titlebar->window, pixel);
+-	    if (wPreferences.new_style) {
++	    if (wPreferences.new_style == TS_NEW) {
+ 		if (fwin->left_button)
+ 		    XSetWindowBackground(dpy, fwin->left_button->window,
+ 					 pixel);
+@@ -857,7 +878,7 @@
  
-@@ -661,14 +662,14 @@
+     if (fwin->title_texture[state] && fwin->titlebar) {
+ 	FREE_PIXMAP(fwin->title_back[state]);
+-	if (wPreferences.new_style) {
++	if (wPreferences.new_style == TS_NEW) {
+ 	    FREE_PIXMAP(fwin->lbutton_back[state]);
+ 	    FREE_PIXMAP(fwin->rbutton_back[state]);
+ #ifdef XKB_BUTTON_HINT
+@@ -897,7 +918,7 @@
+ #endif
  
-     updateMenuForWindow(menu, wwin);
-     
--    x -= menu->frame->core->width/2;
--    if (x + menu->frame->core->width > wwin->frame_x+wwin->frame->core->width)
--	x = wwin->frame_x+wwin->frame->core->width - menu->frame->core->width;
--    if (x < wwin->frame_x) 
--	x = wwin->frame_x;
-+    wMenuCalculatePosition(menu, x, y, DEF_MENU_RELPOS, &mx, &my);
-+    if (mx + menu->frame->core->width > wwin->frame_x+wwin->frame->core->width)
-+	mx = wwin->frame_x+wwin->frame->core->width - menu->frame->core->width;
-+    if (mx < wwin->frame_x) 
-+	mx = wwin->frame_x;
+ 	    fwin->title_back[state] = pmap;
+-	    if (wPreferences.new_style) {
++	    if (wPreferences.new_style == TS_NEW) {
+ 		fwin->lbutton_back[state] = lpmap;
+ 		fwin->rbutton_back[state] = rpmap;
+ #ifdef XKB_BUTTON_HINT
+@@ -1021,7 +1042,7 @@
+         int allButtons = 1;
  
-     if (!wwin->flags.internal_window)
--	wMenuMapAt(menu, x, y, keyboard);
-+	wMenuMapAt(menu, mx, my, keyboard);
- }
  
- 
-@@ -677,6 +678,7 @@
+-        if (!wPreferences.new_style) {
++        if (!wPreferences.new_style == TS_NEW) {
+ 	    if (fwin->left_button && !fwin->flags.hide_left_button
+ 		&& !fwin->flags.lbutton_dont_fit)
+ 		lofs += fwin->left_button->width + 3;
+@@ -1099,7 +1120,7 @@
+ reconfigure(WFrameWindow *fwin, int x, int y, int width, int height,
+ 	    Bool dontMove)
  {
-     WMenu *menu;
-     WScreen *scr = wwin->screen_ptr;
-+    int mx, my;
+-    int k = (wPreferences.new_style ? 4 : 3);
++    int k = (wPreferences.new_style == TS_NEW ? 4 : 3);
+     int resizedHorizontally = 0;
+     
+     if (dontMove)
+@@ -1174,7 +1195,7 @@
+ 	    }
+ 	}
+ 	
+-        if (wPreferences.new_style) {	    
++        if (wPreferences.new_style == TS_NEW) {	    
+ 	    if (fwin->right_button)
+ 		XMoveWindow(dpy, fwin->right_button->window, 
+ 			    width - fwin->right_button->width + 1, 0);
+@@ -1302,7 +1323,7 @@
+ 	width = fwin->titlebar->width - 6 - 6;
+     }
  
-     wwin->flags.menu_open_for_me = 1;
+-    if (!wPreferences.new_style) {
++    if (!wPreferences.new_style == TS_NEW) {
+ 	if (fwin->left_button && !fwin->flags.hide_left_button
+ 	    && !fwin->flags.lbutton_dont_fit)
+ 	    width -= fwin->left_button->width + 3;
+@@ -1347,20 +1368,30 @@
+ 	    }
+ 	}
+ 	XSetClipMask(dpy, copy_gc, None);
+-	XSetForeground(dpy, copy_gc, scr->white_pixel);
++	if (wPreferences.new_style == TS_NEXT) {
++	    XSetForeground(dpy, copy_gc, scr->black_pixel);
++	} else {
++	    XSetForeground(dpy, copy_gc, scr->white_pixel);
++	}
+ 	d=1;
+-	if (wPreferences.new_style) {
++	if (wPreferences.new_style == TS_NEW) {
+ 	    XFillRectangle(dpy, button->window, copy_gc, 0, 0,
+ 			   button->width-1, button->height-1);
+ 	    XSetForeground(dpy, copy_gc, scr->black_pixel);
+ 	    XDrawRectangle(dpy, button->window, copy_gc, 0, 0,
+ 			   button->width-1, button->height-1);
+-	} else {
++	} else if (wPreferences.new_style == TS_OLD) {
+ 	    XFillRectangle(dpy, button->window, copy_gc, 0, 0,
+ 			   button->width, button->height);
+ 	    XSetForeground(dpy, copy_gc, scr->black_pixel);
+ 	    XDrawRectangle(dpy, button->window, copy_gc, 0, 0,
+ 			   button->width, button->height);
++	} else {
++	    XFillRectangle(dpy, button->window, copy_gc, 0, 0,
++			   button->width-3, button->height-3);
++	    XSetForeground(dpy, copy_gc, scr->black_pixel);
++	    XDrawRectangle(dpy, button->window, copy_gc, 0, 0,
++			   button->width-3, button->height-3);
+ 	}
+     } else {
+ 	XClearWindow(dpy, button->window);
+@@ -1373,7 +1404,7 @@
+ 	}
+ 	d=0;
+ 	
+-        if (wPreferences.new_style) {
++        if (wPreferences.new_style == TS_NEW) {
+ 	    if (texture->any.type==WTEX_SOLID || pushed) {
+ 		wDrawBevel(button->window, button->width, button->height,
+ 			   (WTexSolid*)texture, WREL_RAISED);
+@@ -1390,7 +1421,7 @@
+ 	x = (button->width - width)/2 + d;
+ 	y = (button->height - image->height)/2 + d;
+ 	XSetClipOrigin(dpy, copy_gc, x-left, y);
+-        if (!wPreferences.new_style) {
++        if (!(wPreferences.new_style == TS_NEW)) {
+ 	    XSetForeground(dpy, copy_gc, scr->black_pixel);
+ 	    if (!pushed) {
+ 		if (image->depth==1)
+@@ -1400,9 +1431,15 @@
+ 		    XCopyArea(dpy, image->image, button->window, copy_gc,
+ 			      left, 0, width, image->height, x, y);
+ 	    } else {
+-		XSetForeground(dpy, copy_gc, scr->dark_pixel);
+-		XFillRectangle(dpy, button->window, copy_gc, 0, 0,
+-			       button->width, button->height);
++		if (wPreferences.new_style == TS_OLD) {
++		    XSetForeground(dpy, copy_gc, scr->dark_pixel);
++		    XFillRectangle(dpy, button->window, copy_gc, 0, 0,
++			           button->width, button->height);
++		} else {
++		    XSetForeground(dpy, copy_gc, scr->black_pixel);
++		    XCopyArea(dpy, image->image, button->window, copy_gc,
++				 left, 0, width, image->height, x, y);
++		}
+ 	    }
+         } else {
+ 	    if (pushed) {
+diff -Naur WindowMaker-0.80.2/src/menu.c WindowMaker-0.80.2-patched/src/menu.c
+--- WindowMaker-0.80.2/src/menu.c	2002-02-21 12:28:48.000000000 +0100
++++ WindowMaker-0.80.2-patched/src/menu.c	2003-11-05 00:10:17.000000000 +0100
+@@ -544,7 +544,7 @@
+ 	twidth = WMWidthOfString(scr->menu_title_font, menu->frame->title,
+ 				 strlen(menu->frame->title));
+         theight = menu->frame->top_width;
+-        twidth += theight + (wPreferences.new_style ? 16 : 8);
++        twidth += theight + (wPreferences.new_style == TS_NEW ? 16 : 8);
+     } else {
+ 	twidth = 0;
+ 	theight = 0;
+diff -Naur WindowMaker-0.80.2/src/screen.c WindowMaker-0.80.2-patched/src/screen.c
+--- WindowMaker-0.80.2/src/screen.c	2002-02-21 12:28:48.000000000 +0100
++++ WindowMaker-0.80.2-patched/src/screen.c	2003-11-05 00:10:17.000000000 +0100
+@@ -168,41 +168,72 @@
+     WPixmap *pix;
  
-@@ -701,8 +703,7 @@
+     /* create predefined pixmaps */
+-    pix = wPixmapCreateFromXPMData(scr, PRED_CLOSE_XPM);
++    if (wPreferences.new_style == TS_NEXT) {
++	pix = wPixmapCreateFromXPMData(scr, NEXT_CLOSE_XPM);
++    } else {
++	pix = wPixmapCreateFromXPMData(scr, PRED_CLOSE_XPM);
++    }
+     if (pix)
+       pix->shared = 1;
+     scr->b_pixmaps[WBUT_CLOSE] = pix;
  
-     updateMenuForWindow(menu, wwin);
-     
--    x -= menu->frame->core->width/2;
--
--    wMenuMapAt(menu, x, y, False);
-+    wMenuCalculatePosition(menu, x, y, DEF_MENU_RELPOS, &mx, &my);
-+    wMenuMapAt(menu, mx, my, False);
- }
+-    pix = wPixmapCreateFromXPMData(scr, PRED_BROKEN_CLOSE_XPM);
++    if (wPreferences.new_style == TS_NEXT) {
++        pix = wPixmapCreateFromXPMData(scr, NEXT_BROKEN_CLOSE_XPM);
++    } else {
++        pix = wPixmapCreateFromXPMData(scr, PRED_BROKEN_CLOSE_XPM);
++    }
+     if (pix)
+       pix->shared = 1;
+     scr->b_pixmaps[WBUT_BROKENCLOSE] = pix;
  
+-    pix = wPixmapCreateFromXPMData(scr, PRED_ICONIFY_XPM);
++    if (wPreferences.new_style == TS_NEXT) {
++        pix = wPixmapCreateFromXPMData(scr, NEXT_ICONIFY_XPM);
++    } else {
++        pix = wPixmapCreateFromXPMData(scr, PRED_ICONIFY_XPM);
++    }
+     if (pix)
+       pix->shared = 1;
+     scr->b_pixmaps[WBUT_ICONIFY] = pix;
+ #ifdef XKB_BUTTON_HINT
+-    pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP1_XPM);
++    if (wPreferences.new_style == TS_NEXT) {
++        pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP1_XPM);
++    } else {
++        pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP1_XPM);
++    }
+     if (pix)
+       pix->shared = 1;
+     scr->b_pixmaps[WBUT_XKBGROUP1] = pix;
+-    pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP2_XPM);
++    if (wPreferences.new_style == TS_NEXT) {
++    	pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP2_XPM);
++    } else {
++    	pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP2_XPM);
++    }
+     if (pix)
+       pix->shared = 1;
+     scr->b_pixmaps[WBUT_XKBGROUP2] = pix;
+-    pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP3_XPM);
++    if (wPreferences.new_style == TS_NEXT) {
++    	pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP3_XPM);
++    } else {
++    	pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP3_XPM);
++    }
+     if (pix)
+       pix->shared = 1;
+     scr->b_pixmaps[WBUT_XKBGROUP3] = pix;
+-    pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP4_XPM);
++    if (wPreferences.new_style == TS_NEXT) {
++    	pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP4_XPM);
++    } else {
++    	pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP4_XPM);
++    }
+     if (pix)
+       pix->shared = 1;
+     scr->b_pixmaps[WBUT_XKBGROUP4] = pix;
+ #endif
+ 
+-    
+-    pix = wPixmapCreateFromXPMData(scr, PRED_KILL_XPM);
++    if (wPreferences.new_style == TS_NEXT) {
++	pix = wPixmapCreateFromXPMData(scr, NEXT_KILL_XPM);
++    } else {
++	pix = wPixmapCreateFromXPMData(scr, PRED_KILL_XPM);
++    }
+     if (pix)
+       pix->shared = 1;
+     scr->b_pixmaps[WBUT_KILL] = pix;
+diff -Naur WindowMaker-0.80.2/src/texture.c WindowMaker-0.80.2-patched/src/texture.c
+--- WindowMaker-0.80.2/src/texture.c	2002-01-08 14:45:33.000000000 +0100
++++ WindowMaker-0.80.2-patched/src/texture.c	2003-11-05 00:10:17.000000000 +0100
+@@ -707,20 +707,32 @@
+ 	segs[1].y1 = 1;
+ 	segs[1].x2 = width - 2;
+ 	segs[1].y2 = height - 2;
+-	XDrawSegments(dpy, d, dim, segs, 2);
++	if (wPreferences.new_style == TS_NEXT) {
++	    XDrawSegments(dpy, d, dark, segs, 2);
++	} else {
++	    XDrawSegments(dpy, d, dim, segs, 2);
++	}
+ 	segs[0].x1 = 0;
+ 	segs[0].x2 = width - 1;
+ 	segs[0].y2 = segs[0].y1 = height - 1;
+ 	segs[1].x1 = segs[1].x2 = width - 1;
+ 	segs[1].y1 = 0;
+ 	segs[1].y2 = height - 1;
+-	XDrawSegments(dpy, d, dark, segs, 2);
++	if (wPreferences.new_style == TS_NEXT) {
++    	    XDrawSegments(dpy, d, light, segs, 2);
++	} else {
++	    XDrawSegments(dpy, d, dark, segs, 2);
++	}
+ 	segs[0].x1 = segs[0].y1 = segs[0].y2 = 0;
+ 	segs[0].x2 = width - 2;
+ 	segs[1].x1 = segs[1].y1 = 0;
+ 	segs[1].x2 = 0;
+ 	segs[1].y2 = height - 2;
+-	XDrawSegments(dpy, d, light, segs, 2);
++	if (wPreferences.new_style == TS_NEXT) {
++    	    XDrawSegments(dpy, d, dark, segs, 2);
++	} else {
++    	    XDrawSegments(dpy, d, light, segs, 2);
++	}
+ 	if (relief==WREL_ICON) {
+ 	    segs[0].x1 = segs[0].y1 = segs[0].y2 = 1;
+ 	    segs[0].x2 = width - 2;




More information about the patches mailing list