[gentoo-commits] gentoo commit in src/patchsets/windowmaker/0.92.0: WindowMaker-0.91.0-alt-adialog.patch WindowMaker-0.91.0-alt-clipnotext.patch windowmaker-0.92.0-app-icon-fix.patch windowmaker-0.92.0-composite-non-24bit-depth.patch windowmaker-0.92.0-darwin-setlocale.patch windowmaker-0.92.0-dialog-history.patch windowmaker-0.92.0-doubleclick-maximise.patch windowmaker-0.92.0-empty-command-fatal-error.patch windowmaker-0.92.0-findfile-overflow.patch windowmaker-0.92.0-gettext.patch windowmaker-0.92.0-gif-before-ungif.patch windowmaker-0.92.0-interix3.patch windowmaker-0.92.0-math_h.patch windowmaker-0.92.0-maximise-borderless-too-small.patch windowmaker-0.92.0-mouse-window-focus.patch windowmaker-0.92.0-nls.patch windowmaker-0.92.0-no-clip-title.patch windowmaker-0.92.0-no-pop-empty-array.patch windowmaker-0.92.0-pointer-integer-warn-fix.patch windowmaker-0.92.0-single-click-dockapp-start.patch windowmaker-0.92.0-workspace-change-crash.patch windowmaker-0.92.0-xcha ngeproperty-64bit s-fix.patch windowmaker-0.92.0-xinerama-switchpanel-corruption.patch wlist-0.9x.patch

[Fabian Groffen (grobian)]

grobian     10/12/01 17:46:52

  Added:                windowmaker-0.92.0-app-icon-fix.patch
                        windowmaker-0.92.0-composite-non-24bit-depth.patch
                        windowmaker-0.92.0-darwin-setlocale.patch
                        windowmaker-0.92.0-dialog-history.patch
                        windowmaker-0.92.0-doubleclick-maximise.patch
                        windowmaker-0.92.0-empty-command-fatal-error.patch
                        windowmaker-0.92.0-findfile-overflow.patch
                        windowmaker-0.92.0-gettext.patch
                        windowmaker-0.92.0-gif-before-ungif.patch
                        windowmaker-0.92.0-interix3.patch
                        windowmaker-0.92.0-math_h.patch
                        windowmaker-0.92.0-maximise-borderless-too-small.patch
                        windowmaker-0.92.0-mouse-window-focus.patch
                        windowmaker-0.92.0-nls.patch
                        windowmaker-0.92.0-no-clip-title.patch
                        windowmaker-0.92.0-no-pop-empty-array.patch
                        windowmaker-0.92.0-pointer-integer-warn-fix.patch
                        windowmaker-0.92.0-single-click-dockapp-start.patch
                        windowmaker-0.92.0-workspace-change-crash.patch
                        windowmaker-0.92.0-xchangeproperty-64bits-fix.patch
                        windowmaker-0.92.0-xinerama-switchpanel-corruption.patch
                        wlist-0.9x.patch
  Removed:              WindowMaker-0.91.0-alt-adialog.patch
                        WindowMaker-0.91.0-alt-clipnotext.patch
  Log:
  windowmaker-0.92.0-patchset-2

Revision  Changes    Path
1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-app-icon-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-app-icon-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-app-icon-fix.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-app-icon-fix.patch
===================================================================

# HG changeset patch
# User Vladimir Nadvornik <nadvornik@××××.cz>
# Date 1250812164 -7200
# Node ID 016cb2f2fbd035dae812f914fbff17e916fec86a
# Parent c24c1b6787cac93c80689d4fff21fd6930388a20
Fix findBestIcon()

    This patch fixes the issue described here:

    https://bugzilla.novell.com/show_bug.cgi?id=371974

Transplanted from git://repo.or.cz/wmaker-crm.git
commit e113ec10c9add6e3001c583a2c87b4a33cfb255b

--- a/src/wmspec.c	Tue Aug 14 15:32:00 2007 +0400
+++ b/src/wmspec.c	Fri Aug 21 01:49:24 2009 +0200
@@ -402,7 +402,7 @@
      * results in better overall aesthetics -Dan */
     wanted = wPreferences.icon_size * wPreferences.icon_size;
 
-    for (icon=NULL, distance=LONG_MAX, i=0L; i<items-1; ) {
+    for (icon=NULL, distance=wanted, i=0L; i<items-1; ) {
         size = data[i] * data[i+1];
         if (size==0)
             break;




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-composite-non-24bit-depth.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-composite-non-24bit-depth.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-composite-non-24bit-depth.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-composite-non-24bit-depth.patch
===================================================================

# HG changeset patch
# User John H. Robinson, IV <jaqque@××××.org>
# Date 1225082572 25200
# Node ID ce1b81cb49375becb2268da560cb586f9aaf7bb6
# Parent e07d85ba8a2719cdd2e50715405bac2cc7e69f6c
Workaround for Composite problems when default depth is not 24.

  This is really a workaround patch, the proper fix would be to have
WindowMaker know about Composite, and take advantage of its features.

Author: Paulo Cesar Pereira de Andrade <pcpa@××××××××××××.br>

--- a/src/main.c	Thu Apr 27 12:16:58 2006 -0700
+++ b/src/main.c	Sun Oct 26 21:42:52 2008 -0700
@@ -828,6 +828,16 @@
         exit(1);
     }
 
+    if (wVisualID < 0)
+	/*
+	 *   If unspecified, use default visual instead of waiting
+	 * for wrlib/context.c:bestContext() that may end up choosing
+	 * the "fake" 24 bits added by the Composite extension.
+	 *   This is required to avoid all sort of corruptions when
+	 * composite is enabled, and at a depth other than 24.
+	 */
+	wVisualID = (int)DefaultVisual(dpy, DefaultScreen(dpy))->visualid;
+
     /* check if the user specified a complete display name (with screen).
      * If so, only manage the specified screen */
     if (DisplayName)




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-darwin-setlocale.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-darwin-setlocale.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-darwin-setlocale.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-darwin-setlocale.patch
===================================================================
--- configure.ac
+++ configure.ac
@@ -336,6 +336,8 @@
 case $host_os in
 	freebsd*)
 		AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"]);;
+	darwin*)
+		AC_CHECK_LIB([X11], setlocale, [LIBS="$LIBS -lX11"]);;
 	*)
 	;;
 esac



1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-dialog-history.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-dialog-history.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-dialog-history.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-dialog-history.patch
===================================================================

# HG changeset patch
# User John H. Robinson, IV <jaqque@××××.org>
# Date 1229205460 28800
# Node ID 85840502e696838a1a4caf845c1687a81f29e73c
# Parent ded22ccbb04f0893e7d33055066674c9a3116bd8
Added WMGetTextFieldCursorPosition

This patch adds a function WMGetTextFieldCursorPosition to the WINGs library.
This function is used by the 'adialog' patch.

Submitted by: Gilbert Ashley <amigo@×××××××.org>
Author: unknown
Origin: ALT/Sisyphus Linux, Alexey Voinov <voins@××××××××.ru>

--- a/WINGs/WINGs/WINGs.h	Sat Dec 13 13:53:46 2008 -0800
+++ b/WINGs/WINGs/WINGs.h	Sat Dec 13 13:57:40 2008 -0800
@@ -1125,6 +1125,8 @@
 
 void WMSetTextFieldCursorPosition(WMTextField *tPtr, unsigned int position);
 
+unsigned WMGetTextFieldCursorPosition(WMTextField *tPtr);
+
 void WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next);
 
 void WMSetTextFieldPrevTextField(WMTextField *tPtr, WMTextField *prev);
--- a/WINGs/wtextfield.c	Sat Dec 13 13:53:46 2008 -0800
+++ b/WINGs/wtextfield.c	Sat Dec 13 13:57:40 2008 -0800
@@ -659,6 +659,14 @@
             paintTextField(tPtr);
         }
     }
+}
+
+unsigned
+WMGetTextFieldCursorPosition(WMTextField *tPtr)
+{
+    CHECK_CLASS(tPtr, WC_TextField);
+
+    return tPtr->cursorPosition;
 }
 
 


# HG changeset patch
# User John H. Robinson, IV <jaqque@××××.org>
# Date 1229206241 28800
# Node ID 714532b354dd0e89ae06060d64916ac592ba7e99
# Parent 85840502e696838a1a4caf845c1687a81f29e73c
Adds history to some dialog boxes

This patch adds history to some dialog boxes. To use it replace %a with %A in
menu file (like in "Run..." menu item).You can specify third parameter to %A to
use different histories for differen dialogs. All history files is kept in
~/GNUstep/.AppInfo/WindowMaker/. Number of history lines controlled by
DialogHistoryLines parameter (one for all dialogs). Default is to keep 500
lines. Also commands and directories completion added. Press Tab to complete
something.

Author: unknown
Origin: ALT/Sisyphus Linux, Alexey Voinov <voins@××××××××.ru>
Submitted by: Gilbert Ashley

I've added the fragments to patch the default menu files, so that this feature
is enabled by default.

--- a/WindowMaker/menu	Sat Dec 13 13:57:40 2008 -0800
+++ b/WindowMaker/menu	Sat Dec 13 14:10:41 2008 -0800
@@ -116,7 +116,7 @@
 		"Process List" EXEC xterm -e top
 		"Manual Browser" EXEC xman
 	"Info" END
-	"Run..." SHEXEC %a(Run,Type command to run:)
+	"Run..." SHEXEC %A(Run,Type command to run:)
 	"XTerm" EXEC xterm -sb 
 	"Mozilla Firefox" EXEC firefox
 	"Workspaces" WORKSPACE_MENU
--- a/WindowMaker/menu.bg	Sat Dec 13 13:57:40 2008 -0800
+++ b/WindowMaker/menu.bg	Sat Dec 13 14:10:41 2008 -0800
@@ -1,222 +1,222 @@
-/*
- * Дефиниция на главното меню за WindowMaker
- *
- * Синтаксисът е:
- *
- * <Заглавие> [SHORTCUT <комбинация>] <команда> <параметри>
- *
- * <Заглавие> е какъв да е низ, който ще се използва като название на
- * съответния елемент от менюто. Ако включва интервали, трябва да се
- * огради с ".
- * 
- * SHORTCUT определя клавишна комбинация ("бърз клавиш") за този
- * елемент на менюто. <комбинация> има същия синтаксис, както клавишните
- * комбинации във файла $HOME/GNUstep/Defaults/WindowMaker,
- * напр. RootMenuKey или MiniaturizeKey.
- *
- * Не може да се посочва клавишна комбинация за MENU и OPEN_MENU.
- * 
- * <Command> може да бъде: 
- *	MENU - започва дефиниция на (под)меню
- *	END  - завършва дефиницията на (под)меню
- *	OPEN_MENU - чете менюто от файл, програмен канал или
- *                  файловете от директория, евентуално предшествани
- *                  от команда.
- *	WORKSPACE_MENU - добавя подменю за работните места. Може да се
- *                       използва само едно такова подменю.
- *	EXEC <program> - изпълнява външна програма
- *	SHEXEC <command> - изпълнява команда на командната обвивка
- *                         (напр. gimp > /dev/null)
- *	EXIT - излиза от администратора на прозорците
- *	RESTART [<администратор>] - рестартира WindowMaker или
- *                                  страртира друг администратор на
- *                                  прозорците
- *	REFRESH - опреснява (прерисува) работната площ
- *	ARRANGE_ICONS - преподрежда иконките на работното място.
- *	SHUTDOWN - убива всички клиенти (и приключва X-сесията)
- *	SHOW_ALL - показва всички скрити прозорци на работното място
- *	HIDE_OTHERS - скрива всички прозорци на работното място, освен
- *                    имащия фокус (или последния получавал фокус)
- *	SAVE_SESSION - запазва текущото състояние на работната площ, в
- *                     това число всички стартирани приложения,
- *                     местата на прозорците им, на дока,
- *                     кламера. Това състояние ще бъде възстановено
- *                     при всяко стартиране на WindowMaker, докато
- *                     наново не се използва SAVE_SESSION или
- *                     CLEAR_SESSION. Ако SaveSessionOnExit = Yes в
- *                     конфигурационната база-данни на Window Maker,
- *                     то при всяко излизане от WindowMaker
- *                     състоянието на сесията автоматично ще бъде
- *                     запазено. 
- *	CLEAR_SESSION - изтрива данните за по-рано запазена
- *                      сесия. Това няма никакъв ефект, ако
- *                      SaveSessionOnExit = Yes.
- *	INFO - показва панела "Инфо".
- *
- * Синтаксис на OPEN_MENU:
- *   1. Меню от файл:
- *	// отваря файл-меню, който трябва да съдържа меню и го вмъква
- *      // на текущото място.
- *	OPEN_MENU файл-меню
- *   2. Меню от програмен канал:
- *	// пуска командата и очаква тя да генерира меню на стандартния
- *      // си изход.
- *	OPEN_MENU | команда
- *   3. Меню от директория:
- *	// Отваря едната или повече директории и прави сортирано
- *      // азбучно меню за всички изпълними файлове и поддиректории в
- *      // тях. 
- *	OPEN_MENU директория1 [директория2 ...]
- *   4. Меню от директория с команда
- *	// Отваря едната или повече директории и прави сортирано
- *      // азбучно меню за всички поддиректории и четими файлове, като
- *      // всеки от файловете ще бъде обработван с командата.
- *	OPEN_MENU [опции] директория1 [директория2 ...] WITH команда -опции
- *		Опции:
- * 			-noext 	Пропуска всичко, което е след
- *                              последната точка в името на файла.
- *
- * <параметри> е програмата, която трябва да се изпълни.
- *
- * ** Опции за командния ред с EXEC:
- * %s - замества се с избраното в момента
- * %a(title[,prompt]) - отваря диалогова клетка с заглавие "title" и
- *                      незадължителна подкана prompt, след което се
- *                      замества с въведеното.
- * %w - замества се с XID (номера) на прозореца с фокус.
- * %W - замества се с номера на текущото работно място.
- * 
- * Преди специалните символи (като % и ") може да поставяте \ за да
- * загубят специалното си значение:
- * пример: xterm -T "\"Hello World\""
- *
- * Допустими са и стандартните комбинации като \n
- *
- * Всяка команда MENU трябва да има съответна команда END.
- *
- * Пример:
- *
- * "Проба" MENU
- *	"XTerm" EXEC xterm
- *		// прави подменю със съдържимото от /usr/openwin/bin
- *	"XView приложения" OPEN_MENU "/usr/openwin/bin"
- *		// някои X11-приложения от различни директории
- *	"X11 приложения" OPEN_MENU /usr/X11/bin $HOME/bin/X11
- *		// за картинки на фона
- *	"Фон" OPEN_MENU -noext $HOME/images /usr/share/images WITH wmsetbg -u -t
- *		// Вмъква style.menu тук.
- *	"Style" OPEN_MENU style.menu
- * "Проба" END
- */
-
-#include "wmmacros"
-
-"Applications" MENU
-	"Инфо" MENU
-		"Информационен панел..." INFO_PANEL
-		"Лицензионен панел..." LEGAL_PANEL
-		"Системна конзола" EXEC xconsole
-		"Натоварване на системата" SHEXEC xosview || xload
-		"Списък процеси" EXEC xterm -e top
-		"Ръководства" EXEC xman
-	"Инфо" END
-	"Стартирай..." SHEXEC %a(Run,Въведете команда, която да се стартира:)
-	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
-	"Работни места" WORKSPACE_MENU
-	"Приложения" MENU
-		"Графични" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Графични" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
-  		"TkDesk" EXEC tkdesk
-	"Приложения" END
-	"Редактори" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Редактори" END
-	"Разни" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Разни" END
-	"Инструменти" MENU
-		"Калкукатор" EXEC xcalc
-		"Свойства на прозореца" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Избор на шрифт" EXEC xfontsel
-		"Емулатор на терминал" EXEC xminicom
-		"Лупа" EXEC xmag
-		"Цветова палитра" EXEC xcmap
-		"XKill" EXEC xkill
-		"Clipboard" EXEC xclipboard
-	"Инструменти" END
-
-	"Избор" MENU
-		"Copy" SHEXEC echo '%s' | wxcopy
-		"Mail To" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Navigate" EXEC netscape %s
-		"Search in Manual" SHEXEC MANUAL_SEARCH(%s)
-	"Избор" END
-
-	"Работно място" MENU
-		"Скрий другите" HIDE_OTHERS
-		"Покажи всички" SHOW_ALL
-		"Подреди иконките" ARRANGE_ICONS
-		"Опресни" REFRESH
-		"Заключи" EXEC xlock -allowroot -usefirst
-		"Запази сесията" SAVE_SESSION
-		"Изчисти запазената сесия" CLEAR_SESSION
-	"Работни места" END
-
-	"Изглед" MENU
-		"Теми" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
-		"Стилове" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
-		"Колекции иконки" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
-		"Фон" MENU
-			"Плътен" MENU
-                        	"Черен" WS_BACK '(solid, black)'
-                        	"Син"  WS_BACK '(solid, "#505075")'
-				"Тъмно виолетово" WS_BACK '(solid, "#243e6c")'
-				"Силно синьо" WS_BACK '(solid, "#180090")'
-                        	"Мораво" WS_BACK '(solid, "#554466")'
-                        	"Пшеничен"  WS_BACK '(solid, "wheat4")'
-                        	"Тъмно сив"  WS_BACK '(solid, "#333340")'
-                        	"Винен" WS_BACK '(solid, "#400020")'
-			"Плътен" END
-			"Градиент" MENU
-				"Слънце" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
-				"Небе" WS_BACK '(vgradient, blue4, white)'
-    				"Сини сенки" WS_BACK '(vgradient, "#7080a5", "#101020")'
-				"Виолетови сенки" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
-			    	"Морави сенки" WS_BACK '(vgradient, "#654c66", "#151426")'
-    				"Пшенични сенки" WS_BACK '(vgradient, "#a09060", "#302010")'
-    				"Сиви сенки" WS_BACK '(vgradient, "#636380", "#131318")'
-    				"Винени сенки" WS_BACK '(vgradient, "#600040", "#180010")'
-			"Градиент" END
-			"Images" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
-		"Фон" END
-		"Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
-		"Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
-		"Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-	"Изглед" END
-
-	"Изход"	MENU
-		"Рестартиране" RESTART
-		"Стартирай BlackBox" RESTART blackbox
-		"Стартирай kwm" RESTART kwm
-		"Стартирай IceWM" RESTART icewm
-		"Изход..."  EXIT
-	"Изход" END
-"Приложения" END
\ No newline at end of file
+/*
+ * Дефиниция на главното меню за WindowMaker
+ *
+ * Синтаксисът е:
+ *
+ * <Заглавие> [SHORTCUT <комбинация>] <команда> <параметри>
+ *
+ * <Заглавие> е какъв да е низ, който ще се използва като название на
+ * съответния елемент от менюто. Ако включва интервали, трябва да се
+ * огради с ".
+ * 
+ * SHORTCUT определя клавишна комбинация ("бърз клавиш") за този
+ * елемент на менюто. <комбинация> има същия синтаксис, както клавишните
+ * комбинации във файла $HOME/GNUstep/Defaults/WindowMaker,
+ * напр. RootMenuKey или MiniaturizeKey.
+ *
+ * Не може да се посочва клавишна комбинация за MENU и OPEN_MENU.
+ * 
+ * <Command> може да бъде: 
+ *	MENU - започва дефиниция на (под)меню
+ *	END  - завършва дефиницията на (под)меню
+ *	OPEN_MENU - чете менюто от файл, програмен канал или
+ *                  файловете от директория, евентуално предшествани
+ *                  от команда.
+ *	WORKSPACE_MENU - добавя подменю за работните места. Може да се
+ *                       използва само едно такова подменю.
+ *	EXEC <program> - изпълнява външна програма
+ *	SHEXEC <command> - изпълнява команда на командната обвивка
+ *                         (напр. gimp > /dev/null)
+ *	EXIT - излиза от администратора на прозорците
+ *	RESTART [<администратор>] - рестартира WindowMaker или
+ *                                  страртира друг администратор на
+ *                                  прозорците
+ *	REFRESH - опреснява (прерисува) работната площ
+ *	ARRANGE_ICONS - преподрежда иконките на работното място.
+ *	SHUTDOWN - убива всички клиенти (и приключва X-сесията)
+ *	SHOW_ALL - показва всички скрити прозорци на работното място
+ *	HIDE_OTHERS - скрива всички прозорци на работното място, освен
+ *                    имащия фокус (или последния получавал фокус)
+ *	SAVE_SESSION - запазва текущото състояние на работната площ, в
+ *                     това число всички стартирани приложения,
+ *                     местата на прозорците им, на дока,
+ *                     кламера. Това състояние ще бъде възстановено
+ *                     при всяко стартиране на WindowMaker, докато
+ *                     наново не се използва SAVE_SESSION или
+ *                     CLEAR_SESSION. Ако SaveSessionOnExit = Yes в
+ *                     конфигурационната база-данни на Window Maker,
+ *                     то при всяко излизане от WindowMaker
+ *                     състоянието на сесията автоматично ще бъде
+ *                     запазено. 
+ *	CLEAR_SESSION - изтрива данните за по-рано запазена
+ *                      сесия. Това няма никакъв ефект, ако
+ *                      SaveSessionOnExit = Yes.
+ *	INFO - показва панела "Инфо".
+ *
+ * Синтаксис на OPEN_MENU:
+ *   1. Меню от файл:
+ *	// отваря файл-меню, който трябва да съдържа меню и го вмъква
+ *      // на текущото място.
+ *	OPEN_MENU файл-меню
+ *   2. Меню от програмен канал:
+ *	// пуска командата и очаква тя да генерира меню на стандартния
+ *      // си изход.
+ *	OPEN_MENU | команда
+ *   3. Меню от директория:
+ *	// Отваря едната или повече директории и прави сортирано
+ *      // азбучно меню за всички изпълними файлове и поддиректории в
+ *      // тях. 
+ *	OPEN_MENU директория1 [директория2 ...]
+ *   4. Меню от директория с команда
+ *	// Отваря едната или повече директории и прави сортирано
+ *      // азбучно меню за всички поддиректории и четими файлове, като
+ *      // всеки от файловете ще бъде обработван с командата.
+ *	OPEN_MENU [опции] директория1 [директория2 ...] WITH команда -опции
+ *		Опции:
+ * 			-noext 	Пропуска всичко, което е след
+ *                              последната точка в името на файла.
+ *
+ * <параметри> е програмата, която трябва да се изпълни.
+ *
+ * ** Опции за командния ред с EXEC:
+ * %s - замества се с избраното в момента
+ * %a(title[,prompt]) - отваря диалогова клетка с заглавие "title" и
+ *                      незадължителна подкана prompt, след което се
+ *                      замества с въведеното.
+ * %w - замества се с XID (номера) на прозореца с фокус.
+ * %W - замества се с номера на текущото работно място.
+ * 
+ * Преди специалните символи (като % и ") може да поставяте \ за да
+ * загубят специалното си значение:
+ * пример: xterm -T "\"Hello World\""
+ *
+ * Допустими са и стандартните комбинации като \n
+ *
+ * Всяка команда MENU трябва да има съответна команда END.
+ *
+ * Пример:
+ *
+ * "Проба" MENU
+ *	"XTerm" EXEC xterm
+ *		// прави подменю със съдържимото от /usr/openwin/bin
+ *	"XView приложения" OPEN_MENU "/usr/openwin/bin"
+ *		// някои X11-приложения от различни директории
+ *	"X11 приложения" OPEN_MENU /usr/X11/bin $HOME/bin/X11
+ *		// за картинки на фона
+ *	"Фон" OPEN_MENU -noext $HOME/images /usr/share/images WITH wmsetbg -u -t
+ *		// Вмъква style.menu тук.
+ *	"Style" OPEN_MENU style.menu
+ * "Проба" END
+ */
+
+#include "wmmacros"
+
+"Applications" MENU
+	"Инфо" MENU
+		"Информационен панел..." INFO_PANEL
+		"Лицензионен панел..." LEGAL_PANEL
+		"Системна конзола" EXEC xconsole
+		"Натоварване на системата" SHEXEC xosview || xload
+		"Списък процеси" EXEC xterm -e top
+		"Ръководства" EXEC xman
+	"Инфо" END
+	"Стартирай..." SHEXEC %A(Run,Въведете команда, която да се стартира:)
+	"XTerm" EXEC xterm -sb 
+	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
+	"Работни места" WORKSPACE_MENU
+	"Приложения" MENU
+		"Графични" MENU
+			"Gimp" SHEXEC gimp >/dev/null
+			"XV" EXEC xv
+			"XPaint" EXEC xpaint
+			"XFig" EXEC xfig
+		"Графични" END
+		"X File Manager" EXEC xfm
+		"OffiX Files" EXEC files
+		"LyX" EXEC lyx
+		"Netscape" EXEC netscape 
+  		"Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
+		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
+  		"TkDesk" EXEC tkdesk
+	"Приложения" END
+	"Редактори" MENU
+		"XFte" EXEC xfte
+		"XEmacs" SHEXEC xemacs || emacs
+		"XJed" EXEC xjed 
+		"NEdit" EXEC nedit
+		"Xedit" EXEC xedit
+		"VI" EXEC xterm -e vi
+	"Редактори" END
+	"Разни" MENU
+		"Xmcd" SHEXEC xmcd 2> /dev/null
+		"Xplaycd" EXEC xplaycd
+		"Xmixer" EXEC xmixer
+	"Разни" END
+	"Инструменти" MENU
+		"Калкукатор" EXEC xcalc
+		"Свойства на прозореца" SHEXEC xprop | xmessage -center -title 'xprop' -file -
+		"Избор на шрифт" EXEC xfontsel
+		"Емулатор на терминал" EXEC xminicom
+		"Лупа" EXEC xmag
+		"Цветова палитра" EXEC xcmap
+		"XKill" EXEC xkill
+		"Clipboard" EXEC xclipboard
+	"Инструменти" END
+
+	"Избор" MENU
+		"Copy" SHEXEC echo '%s' | wxcopy
+		"Mail To" EXEC xterm -name mail -T "Pine" -e pine %s
+		"Navigate" EXEC netscape %s
+		"Search in Manual" SHEXEC MANUAL_SEARCH(%s)
+	"Избор" END
+
+	"Работно място" MENU
+		"Скрий другите" HIDE_OTHERS
+		"Покажи всички" SHOW_ALL
+		"Подреди иконките" ARRANGE_ICONS
+		"Опресни" REFRESH
+		"Заключи" EXEC xlock -allowroot -usefirst
+		"Запази сесията" SAVE_SESSION
+		"Изчисти запазената сесия" CLEAR_SESSION
+	"Работни места" END
+
+	"Изглед" MENU
+		"Теми" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
+		"Стилове" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
+		"Колекции иконки" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
+		"Фон" MENU
+			"Плътен" MENU
+                        	"Черен" WS_BACK '(solid, black)'
+                        	"Син"  WS_BACK '(solid, "#505075")'
+				"Тъмно виолетово" WS_BACK '(solid, "#243e6c")'
+				"Силно синьо" WS_BACK '(solid, "#180090")'
+                        	"Мораво" WS_BACK '(solid, "#554466")'
+                        	"Пшеничен"  WS_BACK '(solid, "wheat4")'
+                        	"Тъмно сив"  WS_BACK '(solid, "#333340")'
+                        	"Винен" WS_BACK '(solid, "#400020")'
+			"Плътен" END
+			"Градиент" MENU
+				"Слънце" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
+				"Небе" WS_BACK '(vgradient, blue4, white)'
+    				"Сини сенки" WS_BACK '(vgradient, "#7080a5", "#101020")'
+				"Виолетови сенки" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
+			    	"Морави сенки" WS_BACK '(vgradient, "#654c66", "#151426")'
+    				"Пшенични сенки" WS_BACK '(vgradient, "#a09060", "#302010")'
+    				"Сиви сенки" WS_BACK '(vgradient, "#636380", "#131318")'
+    				"Винени сенки" WS_BACK '(vgradient, "#600040", "#180010")'
+			"Градиент" END
+			"Images" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
+		"Фон" END
+		"Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
+		"Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
+		"Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+	"Изглед" END
+
+	"Изход"	MENU
+		"Рестартиране" RESTART
+		"Стартирай BlackBox" RESTART blackbox
+		"Стартирай kwm" RESTART kwm
+		"Стартирай IceWM" RESTART icewm
+		"Изход..."  EXIT
+	"Изход" END
+"Приложения" END
--- a/WindowMaker/plmenu	Sat Dec 13 13:57:40 2008 -0800
+++ b/WindowMaker/plmenu	Sat Dec 13 14:10:41 2008 -0800
@@ -1,106 +1,106 @@
-("Applications",
- ("Info",
-  ("Info Panel", INFO_PANEL),
-  ("Legal", LEGAL_PANEL),
-  ("System Console", EXEC, "xconsole"),
-  ("System Load", SHEXEC, "xosview || xload"),
-  ("Process List", EXEC, "xterm -e top"),
-  ("Manual Browser", EXEC, "xman")
- ),
- ("Run...", SHEXEC, "%a(Run,Type command to run:)"),
- ("XTerm", EXEC, "xterm -sb"),
- ("Mozilla Firefox", EXEC, "firefox"),
- ("Workspaces", WORKSPACE_MENU),
- ("Applications",
-  ("Gimp", SHEXEC, "gimp >/dev/null"),
-  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
-  ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
-  ("Abiword", EXEC, "abiword"),
-  ("Dia", EXEC, "dia"),
-  ("OpenOffice.org",
-   ("OpenOffice.org", EXEC, "ooffice"),
-   ("Writer", EXEC, "oowriter"),
-   ("Spreadsheet", EXEC, "oocalc"),
-   ("Draw", EXEC, "oodraw"),
-   ("Impress", EXEC, "ooimpress")
-  ),
-  ("Editors",
-   ("XEmacs", EXEC, "xemacs"),
-   ("Emacs", EXEC, "emacs"),
-   ("XJed", EXEC, "xjed"),
-   ("VI", EXEC, "xterm -e vi"),
-   ("GVIM", EXEC, "gvim"),
-   ("NEdit", EXEC, "nedit"),
-   ("Xedit", EXEC, "xedit")
-  ),
-  ("Multimedia",
-   ("XMMS", 
-    ("XMMS", EXEC, "xmms"),
-    ("XMMS play/pause", EXEC, "xmms -t"),
-    ("XMMS stop", EXEC, "xmms -s")
-   ),
-   ("Xine video player", EXEC, "xine"),
-   ("MPlayer", EXEC, "mplayer")
-  )
- ),
- ("Utils",
-  ("Calculator", EXEC, "xcalc"),
-  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Font Chooser", EXEC, "xfontsel"),
-  ("Magnify", EXEC, "wmagnify"),
-  ("Colormap", EXEC, "xcmap"),
-  ("Kill X Application", EXEC, "xkill")
- ),
- ("Selection",
-  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
-  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Navigate", EXEC, "mozilla %s"),
-  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
- ),
- ("Commands",
-  ("Hide Others", HIDE_OTHERS),
-  ("Show All", SHOW_ALL),
-  ("Arrange Icons", ARRANGE_ICONS),
-  ("Refresh", REFRESH),
-  ("Lock", EXEC, "xlock -allowroot -usefirst")
- ),
- ("Appearance",
-  ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-  ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-  ("Background",
-   ("Solid",
-	("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-	("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
-	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-	("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
-	("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
-	("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
-	("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
-	("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-   ),
-   ("Gradient",
-	("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
-	("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
-	("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
-	("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
-	("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
-	("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
-	("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-	("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-   ),
-   ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-   ),   
-   ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-   ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-   ), 
-   ("Session",
-    ("Save Session", SAVE_SESSION),
-    ("Clear Session", CLEAR_SESSION),
-	("Restart Window Maker", RESTART),
-	("Start BlackBox", RESTART, blackbox),
-	("Start IceWM", RESTART, icewm),
-	("Exit", EXIT)
-   )
-)
+("Applications",
+ ("Info",
+  ("Info Panel", INFO_PANEL),
+  ("Legal", LEGAL_PANEL),
+  ("System Console", EXEC, "xconsole"),
+  ("System Load", SHEXEC, "xosview || xload"),
+  ("Process List", EXEC, "xterm -e top"),
+  ("Manual Browser", EXEC, "xman")
+ ),
+ ("Run...", SHEXEC, "%A(Run,Type command to run:)"),
+ ("XTerm", EXEC, "xterm -sb"),
+ ("Mozilla Firefox", EXEC, "firefox"),
+ ("Workspaces", WORKSPACE_MENU),
+ ("Applications",
+  ("Gimp", SHEXEC, "gimp >/dev/null"),
+  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
+  ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
+  ("Abiword", EXEC, "abiword"),
+  ("Dia", EXEC, "dia"),
+  ("OpenOffice.org",
+   ("OpenOffice.org", EXEC, "ooffice"),
+   ("Writer", EXEC, "oowriter"),
+   ("Spreadsheet", EXEC, "oocalc"),
+   ("Draw", EXEC, "oodraw"),
+   ("Impress", EXEC, "ooimpress")
+  ),
+  ("Editors",
+   ("XEmacs", EXEC, "xemacs"),
+   ("Emacs", EXEC, "emacs"),
+   ("XJed", EXEC, "xjed"),
+   ("VI", EXEC, "xterm -e vi"),
+   ("GVIM", EXEC, "gvim"),
+   ("NEdit", EXEC, "nedit"),
+   ("Xedit", EXEC, "xedit")
+  ),
+  ("Multimedia",
+   ("XMMS", 
+    ("XMMS", EXEC, "xmms"),
+    ("XMMS play/pause", EXEC, "xmms -t"),
+    ("XMMS stop", EXEC, "xmms -s")
+   ),
+   ("Xine video player", EXEC, "xine"),
+   ("MPlayer", EXEC, "mplayer")
+  )
+ ),
+ ("Utils",
+  ("Calculator", EXEC, "xcalc"),
+  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+  ("Font Chooser", EXEC, "xfontsel"),
+  ("Magnify", EXEC, "wmagnify"),
+  ("Colormap", EXEC, "xcmap"),
+  ("Kill X Application", EXEC, "xkill")
+ ),
+ ("Selection",
+  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
+  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
+  ("Navigate", EXEC, "mozilla %s"),
+  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
+ ),
+ ("Commands",
+  ("Hide Others", HIDE_OTHERS),
+  ("Show All", SHOW_ALL),
+  ("Arrange Icons", ARRANGE_ICONS),
+  ("Refresh", REFRESH),
+  ("Lock", EXEC, "xlock -allowroot -usefirst")
+ ),
+ ("Appearance",
+  ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+  ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+  ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+  ("Background",
+   ("Solid",
+	("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+	("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
+	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
+	("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
+	("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
+	("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
+	("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
+	("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
+   ),
+   ("Gradient",
+	("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
+	("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
+	("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
+	("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
+	("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
+	("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
+	("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
+	("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
+   ),
+   ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+   ),   
+   ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+   ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
+   ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+   ), 
+   ("Session",
+    ("Save Session", SAVE_SESSION),
+    ("Clear Session", CLEAR_SESSION),
+	("Restart Window Maker", RESTART),
+	("Start BlackBox", RESTART, blackbox),
+	("Start IceWM", RESTART, icewm),
+	("Exit", EXIT)
+   )
+)
--- a/WindowMaker/plmenu.bg	Sat Dec 13 13:57:40 2008 -0800
+++ b/WindowMaker/plmenu.bg	Sat Dec 13 14:10:41 2008 -0800
@@ -1,106 +1,106 @@
-("Приложения",
- ("Инфо",
-  ("Информационен панел...", INFO_PANEL),
-  ("Лицензионен панел...", LEGAL_PANEL),
-  ("Системна конзола", EXEC, "xconsole"),
-  ("Натоварване на системата", SHEXEC, "xosview || xload"),
-  ("Списък на процесите", EXEC, "xterm -e top"),
-  ("Ръководства", EXEC, "xman")
-  ),
- ("Стартирай...", SHEXEC, "%a(Run,Въведете команда, която да се стартира:)"),
- ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
- ("Работни места", WORKSPACE_MENU),
- ("Приложения",
-  ("Графични",
-   ("Gimp", SHEXEC, "gimp >/dev/null"),
-   ("XV", EXEC, "xv"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("X File Manager", EXEC, "xfm"),
-  ("OffiX Files", EXEC, "files"),
-  ("LyX", EXEC, "lyx"),
-  ("Netscape", EXEC, "netscape"),
-  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
-  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
-  ("TkDesk", EXEC, "tkdesk")
-  ),
- ("Редактори",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("Разни",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("Инструменти",
-  ("Калкулатор", EXEC, "xcalc"),
-  ("Свойства на прозореца", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Избор на шрифт", EXEC, "xfontsel"),
-  ("Емулатор на терминал", EXEC, "xminicom"),
-  ("Лупа", EXEC, "xmag"),
-  ("Цветна палитра", EXEC, "xcmap"),
-  ("XKill", EXEC, "xkill"),
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Clipboard", EXEC, "xclipboard")
-  ),
- ("Избор",
-  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
-  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Navigate", EXEC, "netscape %s"),
-  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
-  ),
- ("Работно място",
-  ("Скрий другите", HIDE_OTHERS),
-  ("Покажи всички", SHOW_ALL),
-  ("Подреди иконките", ARRANGE_ICONS),
-  ("Опресни", REFRESH),
-  ("Заключи", EXEC, "xlock -allowroot -usefirst"),
-  ("Запази сесията", SAVE_SESSION),
-  ("Изчисти запазената сесия", CLEAR_SESSION)
-  ),
- ("Изглед",
-  ("Теми", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-  ("Стилове", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("Колекции иконки", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-  ("Фон",
-   ("Плътен",
-    ("Черен", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-    ("Син",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
-    ("Тъмнолилав", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-    ("Ясно синьо", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#180090\")'"),
-    ("Мораво", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
-    ("Пшенично", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
-    ("Тъмно сиво", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
-    ("Винено", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-    ),
-   ("Градиент",
-    ("Слънце", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
-    ("Небе", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
-    ("Сини сенки",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
-    ("Лилави сенки", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
-    ("Морави сенки", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
-    ("Пшенични сенки",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
-    ("Сиви сенки",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-    ("Винени сенки",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-    ),
-   ("Изображения", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-   ),   
-  ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-  ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-  ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-  ), 
- ("Изход",
-  ("Рестартиране", RESTART),
-  ("Стартирай BlackBox", RESTART, blackbox),
-  ("Стартирай kwm", RESTART, kwm),
-  ("Стартирай IceWM", RESTART, icewm),
-  ("Изход...", EXIT)
- )
-)
\ No newline at end of file
+("Приложения",
+ ("Инфо",
+  ("Информационен панел...", INFO_PANEL),
+  ("Лицензионен панел...", LEGAL_PANEL),
+  ("Системна конзола", EXEC, "xconsole"),
+  ("Натоварване на системата", SHEXEC, "xosview || xload"),
+  ("Списък на процесите", EXEC, "xterm -e top"),
+  ("Ръководства", EXEC, "xman")
+  ),
+ ("Стартирай...", SHEXEC, "%A(Run,Въведете команда, която да се стартира:)"),
+ ("XTerm", EXEC, "xterm -sb"),
+ ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
+ ("Работни места", WORKSPACE_MENU),
+ ("Приложения",
+  ("Графични",
+   ("Gimp", SHEXEC, "gimp >/dev/null"),
+   ("XV", EXEC, "xv"),
+   ("XPaint", EXEC, "xpaint"),
+   ("XFig", EXEC, "xfig")
+   ),
+  ("X File Manager", EXEC, "xfm"),
+  ("OffiX Files", EXEC, "files"),
+  ("LyX", EXEC, "lyx"),
+  ("Netscape", EXEC, "netscape"),
+  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
+  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
+  ("TkDesk", EXEC, "tkdesk")
+  ),
+ ("Редактори",
+  ("XFte", EXEC, "xfte"),
+  ("XEmacs", SHEXEC, "xemacs || emacs"),
+  ("XJed", EXEC, "xjed"),
+  ("NEdit", EXEC, "nedit"),
+  ("Xedit", EXEC, "xedit"),
+  ("VI", EXEC, "xterm -e vi")
+  ),
+ ("Разни",
+  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
+  ("Xplaycd", EXEC, "xplaycd"),
+  ("Xmixer", EXEC, "xmixer")
+  ),
+ ("Инструменти",
+  ("Калкулатор", EXEC, "xcalc"),
+  ("Свойства на прозореца", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+  ("Избор на шрифт", EXEC, "xfontsel"),
+  ("Емулатор на терминал", EXEC, "xminicom"),
+  ("Лупа", EXEC, "xmag"),
+  ("Цветна палитра", EXEC, "xcmap"),
+  ("XKill", EXEC, "xkill"),
+  ("ASClock", EXEC, "asclock -shape"),
+  ("Clipboard", EXEC, "xclipboard")
+  ),
+ ("Избор",
+  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
+  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
+  ("Navigate", EXEC, "netscape %s"),
+  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
+  ),
+ ("Работно място",
+  ("Скрий другите", HIDE_OTHERS),
+  ("Покажи всички", SHOW_ALL),
+  ("Подреди иконките", ARRANGE_ICONS),
+  ("Опресни", REFRESH),
+  ("Заключи", EXEC, "xlock -allowroot -usefirst"),
+  ("Запази сесията", SAVE_SESSION),
+  ("Изчисти запазената сесия", CLEAR_SESSION)
+  ),
+ ("Изглед",
+  ("Теми", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+  ("Стилове", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+  ("Колекции иконки", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+  ("Фон",
+   ("Плътен",
+    ("Черен", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+    ("Син",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
+    ("Тъмнолилав", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
+    ("Ясно синьо", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#180090\")'"),
+    ("Мораво", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
+    ("Пшенично", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
+    ("Тъмно сиво", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
+    ("Винено", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
+    ),
+   ("Градиент",
+    ("Слънце", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
+    ("Небе", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
+    ("Сини сенки",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
+    ("Лилави сенки", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
+    ("Морави сенки", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
+    ("Пшенични сенки",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
+    ("Сиви сенки",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
+    ("Винени сенки",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
+    ),
+   ("Изображения", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+   ),   
+  ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+  ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
+  ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+  ), 
+ ("Изход",
+  ("Рестартиране", RESTART),
+  ("Стартирай BlackBox", RESTART, blackbox),
+  ("Стартирай kwm", RESTART, kwm),
+  ("Стартирай IceWM", RESTART, icewm),
+  ("Изход...", EXIT)
+ )
+)
--- a/WindowMaker/plmenu.es	Sat Dec 13 13:57:40 2008 -0800
+++ b/WindowMaker/plmenu.es	Sat Dec 13 14:10:41 2008 -0800
@@ -7,7 +7,7 @@
   ("Lista de Procesos", EXEC, "xterm -e top"),
   ("Paginas del Manual", EXEC, "xman")
   ),
- ("Ejecutar...", SHEXEC, "%a(Run,Type command to run:)"),
+ ("Ejecutar...", SHEXEC, "%A(Run,Type command to run:)"),
  ("XTerm", EXEC, "xterm -sb"),
  ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
  ("Espacio de Trabajo", WORKSPACE_MENU),
--- a/WindowMaker/plmenu.ja	Sat Dec 13 13:57:40 2008 -0800
+++ b/WindowMaker/plmenu.ja	Sat Dec 13 14:10:41 2008 -0800
@@ -7,7 +7,7 @@
   ("プロセス一覧", EXEC, "xterm -e top"),
   ("マニュアルブラウザ", EXEC, "xman")
   ),
- ("コマンド実行", SHEXEC, "%a(Run,Type command to run:)"),
+ ("コマンド実行", SHEXEC, "%A(Run,Type command to run:)"),
  ("KTerm", EXEC, "kterm -sb"),
  ("Rxvt", EXEC, "rxvt -bg black -fg white"),
  ("ワークスペース", WORKSPACE_MENU),
--- a/src/WindowMaker.h	Sat Dec 13 13:57:40 2008 -0800
+++ b/src/WindowMaker.h	Sat Dec 13 14:10:41 2008 -0800
@@ -475,6 +475,8 @@
     RImage *swtileImage;
     RImage *swbackImage[9];
 
+    int history_lines;
+ 
     struct {
         unsigned int nodock:1;	       /* don't display the dock */
         unsigned int noclip:1;         /* don't display the clip */
--- a/src/defaults.c	Sat Dec 13 13:57:40 2008 -0800
+++ b/src/defaults.c	Sat Dec 13 14:10:41 2008 -0800
@@ -860,6 +860,9 @@
     },
     {"SelectCursor", "(builtin, cross)",	(void*)WCUR_SELECT,
     NULL,				getCursor,	setCursor
+    },
+    {"DialogHistoryLines",	"500",		NULL,
+    &wPreferences.history_lines,	getInt,		NULL
     }
 };
 
--- a/src/dialog.c	Sat Dec 13 13:57:40 2008 -0800
+++ b/src/dialog.c	Sat Dec 13 14:10:41 2008 -0800
@@ -178,6 +178,328 @@
     return result;
 }
 
+typedef struct _WMInputPanelWithHistory
+{
+    WMInputPanel *panel;
+    WMArray *history;
+    int histpos;
+    char *prefix;
+    char *suffix;
+    char *rest;
+    WMArray *variants;
+    int varpos;
+} WMInputPanelWithHistory;
+
+static char *
+HistoryFileName(char *name)
+{
+    char *filename = NULL;
+
+    filename = wstrdup(wusergnusteppath());
+    filename = wstrappend(filename, "/.AppInfo/WindowMaker/History");
+    if(name && strlen(name)) {
+        filename = wstrappend(filename, ".");
+        filename = wstrappend(filename, name);
+    }
+    return filename;
+}
+
+static int
+matchString(void *str1, void *str2)
+{
+    return (strcmp((char*)str1, (char*)str2)==0 ? 1 : 0);
+}
+
+static WMArray *
+LoadHistory(char *filename, int max)
+{
+    WMPropList *plhistory;
+    WMPropList *plitem;
+    WMArray *history;
+    int i, num;
+
+    history = WMCreateArrayWithDestructor(1, wfree);
+    WMAddToArray(history, wstrdup(""));
+
+    plhistory = WMReadPropListFromFile((char*)filename);
+
+    if(plhistory && WMIsPLArray(plhistory)) {
+        num = WMGetPropListItemCount(plhistory);
+        if(num > max) num = max;
+
+        for(i = 0; i < num; ++i) {
+            plitem = WMGetFromPLArray(plhistory, i);
+            if(WMIsPLString(plitem) && WMFindInArray(history, matchString,
+				    WMGetFromPLString(plitem)) == WANotFound)
+                WMAddToArray(history, WMGetFromPLString(plitem));
+        }
+    }
+
+    return history;
+}
+
+static void
+SaveHistory(WMArray *history, char *filename)
+{
+    int i;
+    WMPropList *plhistory;
+
+    plhistory = WMCreatePLArray(NULL);
+
+    for(i = 0; i < WMGetArrayItemCount(history); ++i)
+        WMAddToPLArray(plhistory,
+            WMCreatePLString(WMGetFromArray(history, i)));
+
+    WMWritePropListToFile(plhistory, (char*)filename, False);
+    WMReleasePropList(plhistory);
+}
+
+static int
+strmatch(const char *str1, const char *str2)
+{
+    return !strcmp(str1, str2);
+}
+
+static int
+pstrcmp(const char **str1, const char **str2)
+{
+    return strcmp(*str1, *str2);
+}
+
+static void
+ScanFiles(const char *dir, const char *prefix, unsigned acceptmask,
+        unsigned declinemask, WMArray *result)
+{
+    int prefixlen;
+    DIR *d;
+    struct dirent *de;
+    struct stat sb;
+    char *fullfilename, *suffix;
+
+    prefixlen = strlen(prefix);
+    if((d = opendir(dir)) != NULL) {
+        while((de = readdir(d)) != NULL) {
+            if(strlen(de->d_name) > prefixlen &&
+                    !strncmp(prefix, de->d_name, prefixlen) &&
+                    strcmp(de->d_name, ".") != 0 &&
+                    strcmp(de->d_name, "..")) {
+                fullfilename = wstrconcat((char*)dir, "/");
+                fullfilename = wstrappend(fullfilename, de->d_name);
+
+                if(stat(fullfilename, &sb) == 0 &&
+                        (sb.st_mode & acceptmask) &&
+                        !(sb.st_mode & declinemask) &&
+                        WMFindInArray(result, (WMMatchDataProc*)strmatch,
+                            de->d_name + prefixlen) == WANotFound) {
+                    suffix = wstrdup(de->d_name + prefixlen);
+                    WMAddToArray(result, suffix);
+                }
+                wfree(fullfilename);
+            }
+        }
+        closedir(d);
+    }
+}
+
+static WMArray *
+GenerateVariants(const char * complete)
+{
+    Bool firstWord = True;
+    WMArray *variants = NULL;
+    char *pos = NULL, *path = NULL, *tmp = NULL, *dir = NULL, *prefix = NULL;
+
+    variants = WMCreateArrayWithDestructor(0, wfree);
+
+    while(*complete == ' ') ++complete;
+
+    if((pos = strrchr(complete, ' ')) != NULL) {
+        complete = pos + 1;
+        firstWord = False;
+    }
+
+    if((pos = strrchr(complete, '/')) != NULL) {
+        tmp = wstrndup((char*)complete, pos - complete + 1);
+        if(*tmp == '~' && *(tmp+1) == '/' && getenv("HOME")) {
+            dir = wstrdup(getenv("HOME"));
+            dir = wstrappend(dir, tmp + 1);
+            wfree(tmp);
+        } else {
+            dir = tmp;
+        }
+        prefix = wstrdup(pos + 1);
+        ScanFiles(dir, prefix, (unsigned)-1, 0, variants);
+        wfree(dir);
+        wfree(prefix);
+    } else if(*complete == '~') {
+        WMAddToArray(variants, wstrdup("/"));
+    } else if(firstWord) {
+        path = getenv("PATH");
+        while(path) {
+            pos = strchr(path, ':');
+            if(pos) {
+                tmp = wstrndup(path, pos - path);
+                path = pos + 1;
+            } else if(*path != '\0') {
+                tmp = wstrdup(path);
+                path = NULL;
+            } else break;
+            ScanFiles(tmp, complete,
+                    S_IXOTH | S_IXGRP | S_IXUSR, S_IFDIR, variants);
+            wfree(tmp);
+        }
+    }
+
+    WMSortArray(variants, (WMCompareDataProc*)pstrcmp);
+    return variants;
+}
+
+static void
+handleHistoryKeyPress(XEvent *event, void *clientData)
+{
+    char *text;
+    unsigned pos;
+    WMInputPanelWithHistory *p = (WMInputPanelWithHistory*)clientData;
+    KeySym ksym;
+
+    ksym = XLookupKeysym(&event->xkey, 0);
+
+    switch(ksym)
+    {
+        case XK_Up:
+            if(p->histpos < WMGetArrayItemCount(p->history) - 1) {
+                if(p->histpos == 0)
+                    wfree(WMReplaceInArray(p->history,
+                        0, WMGetTextFieldText(p->panel->text)));
+                p->histpos++;
+                WMSetTextFieldText(p->panel->text,
+                    WMGetFromArray(p->history, p->histpos));
+            }
+            break;
+        case XK_Down:
+            if(p->histpos > 0) {
+                p->histpos--;
+                WMSetTextFieldText(p->panel->text,
+                    WMGetFromArray(p->history, p->histpos));
+            }
+            break;
+        case XK_Tab:
+            if(!p->variants) {
+                text = WMGetTextFieldText(p->panel->text);
+		pos = WMGetTextFieldCursorPosition(p->panel->text);
+		p->prefix = wstrndup(text, pos);
+		p->suffix = wstrdup(text + pos);
+		wfree(text);
+                p->variants = GenerateVariants(p->prefix);
+                p->varpos = 0;
+                if(!p->variants) {
+                    wfree(p->prefix);
+                    wfree(p->suffix);
+                    p->prefix = NULL;
+                    p->suffix = NULL;
+                }
+            }
+            if(p->variants && p->prefix && p->suffix) {
+                p->varpos++;
+                if(p->varpos > WMGetArrayItemCount(p->variants))
+                    p->varpos = 0;
+                if(p->varpos > 0)
+                    text = wstrconcat(p->prefix,
+                        WMGetFromArray(p->variants, p->varpos - 1));
+		else
+                    text = wstrdup(p->prefix);
+		pos = strlen(text);
+                text = wstrappend(text, p->suffix);
+                WMSetTextFieldText(p->panel->text, text);
+		WMSetTextFieldCursorPosition(p->panel->text, pos);
+                wfree(text);
+            }
+            break;
+    }
+    if(ksym != XK_Tab) {
+        if(p->prefix) {
+            wfree(p->prefix);
+            p->prefix = NULL;
+        }
+        if(p->suffix) {
+            wfree(p->suffix);
+            p->suffix = NULL;
+        }
+        if(p->variants) {
+            WMFreeArray(p->variants);
+            p->variants = NULL;
+        }
+    }
+}
+
+int
+wAdvancedInputDialog(WScreen *scr, char *title, char *message,
+            char *name, char **text)
+{
+    WWindow *wwin;
+    Window parent;
+    char *result;
+    WMPoint center;
+    WMInputPanelWithHistory *p;
+    char *filename;
+
+    filename = HistoryFileName(name);
+    p = wmalloc(sizeof(WMInputPanelWithHistory));
+    p->panel = WMCreateInputPanel(scr->wmscreen, NULL, title, message, *text,
+			       _("OK"), _("Cancel"));
+    p->history = LoadHistory(filename, wPreferences.history_lines);
+    p->histpos = 0;
+    p->prefix = NULL;
+    p->suffix = NULL;
+    p->rest = NULL;
+    p->variants = NULL;
+    p->varpos = 0;
+    WMCreateEventHandler(WMWidgetView(p->panel->text), KeyPressMask,
+        handleHistoryKeyPress, p);
+
+    parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 320, 160, 0, 0, 0);
+    XSelectInput(dpy, parent, KeyPressMask|KeyReleaseMask);
+
+    XReparentWindow(dpy, WMWidgetXID(p->panel->win), parent, 0, 0);
+
+    center = getCenter(scr, 320, 160);
+    wwin = wManageInternalWindow(scr, parent, None, NULL, center.x, center.y,
+				 320, 160);
+
+    wwin->client_leader = WMWidgetXID(p->panel->win);
+
+    WMMapWidget(p->panel->win);
+
+    wWindowMap(wwin);
+
+    WMRunModalLoop(WMWidgetScreen(p->panel->win), WMWidgetView(p->panel->win));
+
+    if (p->panel->result == WAPRDefault) {
+	result = WMGetTextFieldText(p->panel->text);
+        wfree(WMReplaceInArray(p->history, 0, wstrdup(result)));
+        SaveHistory(p->history, filename);
+    }
+    else
+	result = NULL;
+
+    wUnmanageWindow(wwin, False, False);
+
+    WMDestroyInputPanel(p->panel);
+    WMFreeArray(p->history);
+    wfree(p);
+    wfree(filename);
+
+    XDestroyWindow(dpy, parent);
+
+    if (result==NULL)
+	return False;
+    else {
+        if (*text)
+            wfree(*text);
+        *text = result;
+
+        return True;
+    }
+}
 
 int
 wInputDialog(WScreen *scr, char *title, char *message, char **text)
--- a/src/dialog.h	Sat Dec 13 13:57:40 2008 -0800
+++ b/src/dialog.h	Sat Dec 13 14:10:41 2008 -0800
@@ -33,6 +33,7 @@
 
 int wMessageDialog(WScreen *scr, char *title, char *message,
                    char *defBtn, char *altBtn, char *othBtn);
+int wAdvancedInputDialog(WScreen *scr, char *title, char *message, char *name, char **text);
 int wInputDialog(WScreen *scr, char *title, char *message, char **text);
 
 int wExitDialog(WScreen *scr, char *title, char *message, char *defBtn,
--- a/src/misc.c	Sat Dec 13 13:57:40 2008 -0800
+++ b/src/misc.c	Sat Dec 13 14:10:41 2008 -0800
@@ -607,96 +607,59 @@
 
 
 static char*
-getuserinput(WScreen *scr, char *line, int *ptr)
+parseuserinputpart(char *line, int *ptr, char *endchars)
 {
-    char *ret;
-    char *title;
-    char *prompt;
-    int j, state;
-    int begin = 0;
-#define BUFSIZE 512
-    char tbuffer[BUFSIZE], pbuffer[BUFSIZE];
+	int depth = 0, begin;
+	char *value = NULL;
+	begin = ++*ptr;
 
+	while(line[*ptr] != '\0') {
+		if(line[*ptr] == '(') {
+			++depth;
+		} else if(depth > 0 && line[*ptr] == ')') {
+			--depth;
+		} else if(depth == 0 && strchr(endchars, line[*ptr]) != NULL) {
+			value = wmalloc(*ptr - begin + 1);
+			strncpy(value, line + begin, *ptr - begin);
+			value[*ptr - begin] = '\0';
+			break;
+		}
+		++*ptr;
+	}
 
-    title = _("Program Arguments");
-    prompt = _("Enter command arguments:");
-    ret = NULL;
-
-#define _STARTING 0
-#define _TITLE 1
-#define _PROMPT 2
-#define _DONE 3
-
-    state = _STARTING;
-    j = 0;
-    for (; line[*ptr]!=0 && state!=_DONE; (*ptr)++) {
-        switch (state) {
-        case _STARTING:
-            if (line[*ptr]=='(') {
-                state = _TITLE;
-                begin = *ptr+1;
-            } else {
-                state = _DONE;
-            }
-            break;
-
-        case _TITLE:
-            if (j <= 0 && line[*ptr]==',') {
-
-                j = 0;
-                if (*ptr > begin) {
-                    strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE));
-                    tbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0;
-                    title = (char*)tbuffer;
-                }
-                begin = *ptr+1;
-                state = _PROMPT;
-
-            } else if (j <= 0 && line[*ptr]==')') {
-
-                if (*ptr > begin) {
-                    strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE));
-                    tbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0;
-                    title = (char*)tbuffer;
-                }
-                state = _DONE;
-
-            } else if (line[*ptr]=='(') {
-                j++;
-            } else if (line[*ptr]==')') {
-                j--;
-            }
-
-            break;
-
-        case _PROMPT:
-            if (line[*ptr]==')' && j==0) {
-
-                if (*ptr-begin > 1) {
-                    strncpy(pbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE));
-                    pbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0;
-                    prompt = (char*)pbuffer;
-                }
-                state = _DONE;
-            } else if (line[*ptr]=='(')
-                j++;
-            else if (line[*ptr]==')')
-                j--;
-            break;
-        }
-    }
-    (*ptr)--;
-#undef _STARTING
-#undef _TITLE
-#undef _PROMPT
-#undef _DONE
-
-    if (!wInputDialog(scr, title, prompt, &ret))
-        return NULL;
-    else
-        return ret;
+	return value;
 }
 
+static char*
+getuserinput(WScreen *scr, char *line, int *ptr, Bool advanced)
+{
+    char *ret = NULL, *title = NULL, *prompt = NULL, *name = NULL;
+    int rv;
+
+    if(line[*ptr] == '(')
+	title = parseuserinputpart(line, ptr, ",)");
+    if(title != NULL && line[*ptr] == ',')
+	prompt = parseuserinputpart(line, ptr, ",)");
+    if(prompt != NULL && line[*ptr] == ',')
+	name = parseuserinputpart(line, ptr, ")");
+
+    if(advanced)
+        rv = wAdvancedInputDialog(scr,
+		title ? gettext(title):_("Program Arguments"),
+		prompt ? gettext(prompt):_("Enter command arguments:"),
+		name, &ret);
+    else
+        rv = wInputDialog(scr,
+		title ? gettext(title):_("Program Arguments"),
+		prompt ? gettext(prompt):_("Enter command arguments:"),
+		&ret);
+
+    if(title) wfree(title);
+    if(prompt) wfree(prompt);
+    if(name) wfree(name);
+
+    return rv ? ret : NULL;
+}
 
 #define S_NORMAL 0
 #define S_ESCAPE 1
@@ -814,8 +777,9 @@
                 break;
 
             case 'a':
+            case 'A':
                 ptr++;
-                user_input = getuserinput(scr, cmdline, &ptr);
+                user_input = getuserinput(scr, cmdline, &ptr, cmdline[ptr-1] == 'A');
                 if (user_input) {
                     slen = strlen(user_input);
                     olen += slen;




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-doubleclick-maximise.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-doubleclick-maximise.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-doubleclick-maximise.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-doubleclick-maximise.patch
===================================================================
diff -ur WindowMaker-0.92.0.orig/src/defaults.c WindowMaker-0.92.0/src/defaults.c
--- WindowMaker-0.92.0.orig/src/defaults.c	2009-10-28 13:11:59.544812000 +0100
+++ WindowMaker-0.92.0/src/defaults.c	2009-10-28 13:35:29.344762516 +0100
@@ -562,6 +562,9 @@
     {"TranslateMenu",	"YES",		NULL,
     &wPreferences.translate_menu,	getBool,	NULL
     },
+    {"DCMaximize", "NO",               NULL,
+    &wPreferences.dc_maximize,   getBool,        NULL
+    },
     /* style options */
     {"MenuStyle", 	"normal",  		seMenuStyles,
     &wPreferences.menu_style, getEnum, 	setMenuStyle
diff -ur WindowMaker-0.92.0.orig/src/window.c WindowMaker-0.92.0/src/window.c
--- WindowMaker-0.92.0.orig/src/window.c	2009-10-28 13:11:59.364429000 +0100
+++ WindowMaker-0.92.0/src/window.c	2009-10-28 13:18:44.219635690 +0100
@@ -3096,13 +3096,29 @@
 
     if (event->xbutton.button==Button1) {
         if (event->xbutton.state == 0) {
-            if (!WFLAGP(wwin, no_shadeable)) {
+           /* check preferences, maximize or shade */
+           if (wPreferences.dc_maximize) {
+              if (!WFLAGP(wwin, no_resizable)) {
+                 /* maximize window */
+                 if (wwin->flags.maximized != 0) {
+                    wUnmaximizeWindow(wwin);
+                    wwin->flags.maximized = 0;
+                 }
+                 else {
+                    wMaximizeWindow(wwin, MAX_VERTICAL|MAX_HORIZONTAL);
+                    wwin->flags.maximized = MAX_VERTICAL|MAX_HORIZONTAL;
+                 }
+              }
+           }
+	   else {
+             if (!WFLAGP(wwin, no_shadeable)) {
                 /* shade window */
                 if (wwin->flags.shaded)
-                    wUnshadeWindow(wwin);
+                   wUnshadeWindow(wwin);
                 else
-                    wShadeWindow(wwin);
-            }
+                   wShadeWindow(wwin);
+           }
+     }
         } else {
             int dir = 0;
 
diff -ur WindowMaker-0.92.0.orig/src/WindowMaker.h WindowMaker-0.92.0/src/WindowMaker.h
--- WindowMaker-0.92.0.orig/src/WindowMaker.h	2009-10-28 13:11:59.547716000 +0100
+++ WindowMaker-0.92.0/src/WindowMaker.h	2009-10-28 13:28:11.599489347 +0100
@@ -478,6 +478,9 @@
     unsigned int workspace_border_size; /* Size in pixels of the workspace border */
     char workspace_border_position;     /* Where to leave a workspace border */
 
+    /* double click on title bar maximize */
+    char dc_maximize;
+
     /* single click to lauch applications */
     char single_click;
 
diff -ur WindowMaker-0.92.0.orig/WPrefs.app/Expert.c WindowMaker-0.92.0/WPrefs.app/Expert.c
--- WindowMaker-0.92.0.orig/WPrefs.app/Expert.c	2009-10-28 13:11:57.555080000 +0100
+++ WindowMaker-0.92.0/WPrefs.app/Expert.c	2009-10-28 13:26:00.864274985 +0100
@@ -55,6 +55,7 @@
     WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking"));
     WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText"));
     WMSetButtonSelected(panel->swi[7], GetBoolForKey("SingleClickLaunch"));
+    WMSetButtonSelected(panel->swi[8], GetBoolForKey("DCMaximize"));
 }
 
 
@@ -67,10 +68,10 @@
     panel->box = WMCreateBox(panel->parent);
     WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
-    for (i=0; i<8; i++) {
+    for (i=0; i<9; i++) {
         panel->swi[i] = WMCreateSwitchButton(panel->box);
         WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
-        WMMoveWidget(panel->swi[i], 20, 20+i*25);
+        WMMoveWidget(panel->swi[i], 20, 20+i*23);
     }
 
     WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."));
@@ -81,6 +82,7 @@
     WMSetButtonText(panel->swi[5], _("Disable selection animation for selected icons."));
     WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart)."));
     WMSetButtonText(panel->swi[7], _("Launch applications and restore windows with a single click."));
+    WMSetButtonText(panel->swi[8], _("Double click on title bar maximize"));
 
     WMSetButtonEnabled(panel->swi[6], True);
 
@@ -106,6 +108,7 @@
     SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking");
     SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText");
     SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "SingleClickLaunch");
+    SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "DCMaximize");
 }
 
 



1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-empty-command-fatal-error.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-empty-command-fatal-error.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-empty-command-fatal-error.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-empty-command-fatal-error.patch
===================================================================

# HG changeset patch
# User John H. Robinson, IV <jaqque@××××.org>
# Date 1229206923 28800
# Node ID 9d3cac24b05fe672f821aa14d3dbed1a1cff1890
# Parent ceef975fe4e697423f61314b3fa5cf0d44d7a21c
Check for argc==0 when calling wtokensplit()

The WINGs-function wtokensplit does not set argv to NULL if no string has been
split - instead argc is set to 0.

You can only observe this issue if you compile Window Maker without any
optimization:

compile Window Maker with CFLAGS=""
run Window Maker and save a session
change session-file and replace a 'command xyz' line with 'command " "'
restart Window Maker
watch "Fatal error"-message

Author: Tobias Stoeckmann
Retrieved from: http://paldium.homeunix.org/tobias/wmaker/
Submitted by Gilbert Ashley <amigo@×××××××.org>

--- a/src/dock.c	Sat Dec 13 14:18:06 2008 -0800
+++ b/src/dock.c	Sat Dec 13 14:22:03 2008 -0800
@@ -2977,7 +2977,7 @@
 
     wtokensplit(cmdline, &argv, &argc);
 
-    if (argv==NULL) {
+    if (!argc) {
         if (cmdline)
             wfree(cmdline);
         if (state)
--- a/src/session.c	Sat Dec 13 14:18:06 2008 -0800
+++ b/src/session.c	Sat Dec 13 14:22:03 2008 -0800
@@ -381,7 +381,7 @@
 
     wtokensplit(command, &argv, &argc);
 
-    if (argv==NULL) {
+    if (!argc) {
         return 0;
     }
 




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-findfile-overflow.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-findfile-overflow.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-findfile-overflow.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-findfile-overflow.patch
===================================================================

# HG changeset patch
# User John H. Robinson, IV <jaqque@××××.org>
# Date 1229207180 28800
# Node ID 829f629ad8d832da06ca6446ec066f307a9ed285
# Parent 9d3cac24b05fe672f821aa14d3dbed1a1cff1890
Fix multiple errors in findfile.c

Problems:

1.)
During expansion of path, the resulting path can overflow the supplied
area of PATH_MAX+2 (buffer as well as buffer2). A tampered environment
variable can be used to modify program flow.

Proof:
[note: wmaker has been compiled with propolice]
$ export A="[tested with 4096x A]"
$ GNUSTEP_USER_ROOT="\$A\$A/\$A/\$A/" wmaker --for-real

--- a/WINGs/findfile.c	Sat Dec 13 14:22:03 2008 -0800
+++ b/WINGs/findfile.c	Sat Dec 13 14:26:20 2008 -0800
@@ -23,6 +23,7 @@
 
 #include "WUtil.h"
 
+#include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -79,6 +80,7 @@
 char*
 wexpandpath(char *path)
 {
+    char *origpath = path;
     char buffer2[PATH_MAX+2];
     char buffer[PATH_MAX+2];
     int i;
@@ -91,25 +93,29 @@
         path++;
         if (*path=='/' || *path==0) {
             home = wgethomedir();
+            if (strlen(home) > PATH_MAX)
+                goto error;
             strcat(buffer, home);
         } else {
             int j;
             j = 0;
             while (*path!=0 && *path!='/') {
+                if (j > PATH_MAX)
+                    goto error;
                 buffer2[j++] = *path;
                 buffer2[j] = 0;
                 path++;
             }
             home = getuserhomedir(buffer2);
-            if (!home)
-                return NULL;
+            if (!home || strlen(home) > PATH_MAX)
+                goto error;
             strcat(buffer, home);
         }
     }
 
     i = strlen(buffer);
 
-    while (*path!=0) {
+    while (*path!=0 && i <= PATH_MAX) {
         char *tmp;
 
         if (*path=='$') {
@@ -119,35 +125,50 @@
             if (*path=='(') {
                 path++;
                 while (*path!=0 && *path!=')') {
+                    if (j > PATH_MAX)
+                        goto error;
                     buffer2[j++] = *(path++);
                     buffer2[j] = 0;
                 }
-                if (*path==')')
+                if (*path==')') {
                     path++;
-                tmp = getenv(buffer2);
+                    tmp = getenv(buffer2);
+                } else {
+                    tmp = NULL;
+                }
                 if (!tmp) {
+                    if ((i += strlen(buffer2)+2) > PATH_MAX)
+                        goto error;
                     buffer[i] = 0;
                     strcat(buffer, "$(");
                     strcat(buffer, buffer2);
-                    strcat(buffer, ")");
-                    i += strlen(buffer2)+3;
+                    if (*(path-1)==')') {
+                        if (++i > PATH_MAX)
+                            goto error;
+                        strcat(buffer, ")");
+                    }
                 } else {
+                    if ((i += strlen(tmp)) > PATH_MAX)
+                        goto error;
                     strcat(buffer, tmp);
-                    i += strlen(tmp);
                 }
             } else {
                 while (*path!=0 && *path!='/') {
+                    if (j > PATH_MAX)
+                        goto error;
                     buffer2[j++] = *(path++);
                     buffer2[j] = 0;
                 }
                 tmp = getenv(buffer2);
                 if (!tmp) {
+                    if ((i += strlen(buffer2)+1) > PATH_MAX)
+                        goto error;
                     strcat(buffer, "$");
                     strcat(buffer, buffer2);
-                    i += strlen(buffer2)+1;
                 } else {
+                    if ((i += strlen(tmp)) > PATH_MAX)
+                        goto error;
                     strcat(buffer, tmp);
-                    i += strlen(tmp);
                 }
             }
         } else {
@@ -156,7 +177,16 @@
         }
     }
 
+    if (*path!=0)
+        goto error;
+
     return wstrdup(buffer);
+
+error:
+    errno = ENAMETOOLONG;
+    wsyserror(_("could not expand %s"), origpath);
+    /* FIXME: too many functions handle a return value of NULL incorrectly */
+    exit(1);
 }
 
 




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-gettext.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-gettext.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-gettext.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-gettext.patch
===================================================================
* drawback of not using AM_GNU_GETTEXT is that you have to cope with
  Solaris defining gettext(), but we want GNU gettext, which is in
  -lintl

--- configure.ac
+++ configure.ac
@@ -247,9 +247,9 @@
 
 INTLIBS=""
 
-AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"], 
-	AC_CHECK_LIB(intl, gettext, [INTLIBS="-lintl" HAVEGETTEXT="yes"],
-			 INTLIBS="" ))
+AC_CHECK_LIB(intl, gettext, [INTLIBS="-lintl" [HAVEGETTEXT="yes"]], [
+	INTLIBS=""
+	AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"]) ])
 
 AC_CHECK_PROG(XGETTEXT, xgettext, xgettext)
 



1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-gif-before-ungif.patch
===================================================================
--- configure.ac
+++ configure.ac
@@ -705,17 +705,17 @@
 
 if test "$gif" = yes; then
     my_libname=""
-    WM_CHECK_LIB(ungif, DGifOpenFileName, [$XLFLAGS $XLIBS])
-    if test "x$ac_cv_lib_ungif_DGifOpenFileName" = xyes; then
-        my_libname=-lungif
+    WM_CHECK_LIB(gif, DGifOpenFileName, [$XLFLAGS $XLIBS])
+    if test "x$ac_cv_lib_gif_DGifOpenFileName" = xyes; then
+        my_libname=-lgif
     fi
 dnl
 dnl libungif is the same thing as libgif for all practical purposes.
 dnl
     if test "x$my_libname" = x; then
-        WM_CHECK_LIB(gif, DGifOpenFileName, [$XLFLAGS $XLIBS])
-        if test "x$ac_cv_lib_gif_DGifOpenFileName" = xyes; then
-            my_libname=-lgif
+        WM_CHECK_LIB(ungif, DGifOpenFileName, [$XLFLAGS $XLIBS])
+        if test "x$ac_cv_lib_ungif_DGifOpenFileName" = xyes; then
+            my_libname=-lungif
         fi
     fi
 



1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-interix3.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-interix3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-interix3.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-interix3.patch
===================================================================
windows doesn't have socklen_t

--- WindowMaker-0.92.0.orig/WINGs/connection.c	2008-08-18 10:17:56 +0200
+++ WindowMaker-0.92.0/WINGs/connection.c	2008-08-18 10:25:11 +0200
@@ -201,7 +201,7 @@
 
         if (cPtr->state == WCInProgress) {
             Bool failed;
-            socklen_t len = sizeof(result);
+            int len = sizeof(result);
 
             WCErrorCode = 0;
             if (getsockopt(cPtr->sock, SOL_SOCKET, SO_ERROR,
@@ -462,7 +462,7 @@
 {
     WMConnection *cPtr;
     struct sockaddr_in *socketaddr;
-    socklen_t size;
+    int size;
     int sock, on;
 
     WCErrorCode = 0;
@@ -678,7 +678,7 @@
 WMAcceptConnection(WMConnection *listener)
 {
     struct sockaddr_in clientname;
-    socklen_t size;
+    int size;
     int newSock;
     WMConnection *newConnection;
 



1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-math_h.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-math_h.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-math_h.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-math_h.patch
===================================================================

  Add a missing #include <math.h>.

--- WindowMaker-0.92.0/configure.ac
+++ WindowMaker-0.92.0/configure.ac
@@ -78,7 +78,8 @@
 [  --with-incs-from        pass compiler flags to look for header files],
 	[inc_search_path="$withval $inc_search_path"])
 
-
+AC_CHECK_LIBM
+AC_SUBST([LIBM])
 
 dnl Checks for library functions.
 dnl ============================
--- WindowMaker-0.92.0/src/placement.c
+++ WindowMaker-0.92.0/src/placement.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
+#include <math.h>
 
 #include "WindowMaker.h"
 #include "wcore.h"



1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-maximise-borderless-too-small.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-maximise-borderless-too-small.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-maximise-borderless-too-small.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-maximise-borderless-too-small.patch
===================================================================

# HG changeset patch
# User John H. Robinson, IV <jaqque@××××.org>
# Date 1229205014 28800
# Node ID ff96eb3a10c98136aa55acf0caff18b69ca48ae0
# Parent cc00640a0aa908707adc6de8c0f5c60235493df0
Maximize borderless fix missing pixels

A minor bug has been bothering me for a long time. When you maximize a
borderless window in Window Maker, the window ends up too narrow and too short
by two pixels. I've attached a patch against CVS to fix the problem.

Submitted by: Gilbert Ashley  <amigo@×××××××.org>
Author: David Benbennick <dbenbenn@×××××.com>

--- a/src/actions.c	Sat Dec 13 13:48:24 2008 -0800
+++ b/src/actions.c	Sat Dec 13 13:50:14 2008 -0800
@@ -428,7 +428,9 @@
     wwin->flags.maximized = directions;
 
     if (directions & MAX_HORIZONTAL) {
-        new_width = (usableArea.x2-usableArea.x1)-FRAME_BORDER_WIDTH*2;
+        new_width = usableArea.x2 - usableArea.x1;
+        if (HAS_BORDER(wwin))
+                new_width -= FRAME_BORDER_WIDTH * 2;
         new_x = usableArea.x1;
     } else if (shrink_h) {
         new_x = wwin->old_geometry.x;
@@ -439,7 +441,9 @@
     }
 
     if (directions & MAX_VERTICAL) {
-        new_height = (usableArea.y2-usableArea.y1)-FRAME_BORDER_WIDTH*2;
+        new_height = usableArea.y2 - usableArea.y1;
+        if (HAS_BORDER(wwin))
+                new_height -= FRAME_BORDER_WIDTH * 2;
         new_y = usableArea.y1;
         if (WFLAGP(wwin, full_maximize)) {
             new_y -= wwin->frame->top_width;




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-mouse-window-focus.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-mouse-window-focus.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-mouse-window-focus.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-mouse-window-focus.patch
===================================================================

# HG changeset patch
# User John H. Robinson, IV <jhriv@××××.edu>
# Date 1225266843 25200
# Node ID 8640d186c4f424a9c7977cb3672ab96e855c36fa
# Parent ce1b81cb49375becb2268da560cb586f9aaf7bb6
Fixed inability to focus windows via mouse


http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=102314
Pedro Gimeno <parigalo@××××××××.es>

I found this statement in actions.c (function wSetFocusTo) suspicious:

    if (scr->flags.ignore_focus_events || LastFocusChange > timestamp)
        return;

timestamp is defined like this:

    int timestamp=LastTimestamp;

where LastTimestamp is of type Time (which is an unsigned 32-bit integer
according to my /usr/include/X11/X.h) and so is LastFocusChange.

This way of comparing timestamps is broken and not only because of the
signedness. If this is the cause of this bug, then it should be
reproducable exactly every 24 days, 20 hours, 31 mins, 23.648 seconds
(which is 2^31 milliseconds) or maybe the double.

I've attached a patch that compares the timestamps properly. It is done
against version 0.92.0-6.1 which is current in etch as of this writing.

I have just checked that it does not seem to break anything and that
reverting the condition (the direction of the comparison) causes the
expected symptoms. I have not verified that the bug is periodic, so I
can't be sure that this will fix it. If necessary I can wait for another
24 days (or maybe 48) if no downtime happens here, to verify the
periodicity of the bug and another 24 (or 48) more to check if the fix
works.

--- a/src/actions.c	Sun Oct 26 21:42:52 2008 -0700
+++ b/src/actions.c	Wed Oct 29 00:54:03 2008 -0700
@@ -78,6 +78,15 @@
 #define SHADE_STEPS	shadePars[(int)wPreferences.shade_speed].steps
 #define SHADE_DELAY	shadePars[(int)wPreferences.shade_speed].delay
 
+static int
+compareTimes(Time t1, Time t2)
+{
+    Time diff;
+    if (t1 == t2)
+      return 0;
+    diff = t1 - t2;
+    return (diff < 60000) ? 1 : -1;
+}
 
 /*
  *----------------------------------------------------------------------
@@ -99,11 +108,11 @@
 
     WWindow *old_focused;
     WWindow *focused=scr->focused_window;
-    int timestamp=LastTimestamp;
+    Time timestamp=LastTimestamp;
     WApplication *oapp=NULL, *napp=NULL;
     int wasfocused;
 
-    if (scr->flags.ignore_focus_events || LastFocusChange > timestamp)
+    if (scr->flags.ignore_focus_events || compareTimes(LastFocusChange, timestamp) > 0)
         return;
 
     if (!old_scr)




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-nls.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-nls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-nls.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-nls.patch
===================================================================
* use AM_GNU_GETTEXT macro, but do not enable, it requires gettext to be
  installed in order to run autoconf
* make sure we really don't need gettext

*--- configure.ac
*+++ configure.ac
*@@ -241,15 +241,16 @@
* dnl -------
* 
* 
*-dnl AM_GNU_GETTEXT
*+#NLSENABLE AM_GNU_GETTEXT([external])
*+#NLSENABLE HAVEGETTEXT="${USE_NLS}"
*+#NLSENABLE INTLIBS="${LIBINTL}"
* 
* 
*-
*-INTLIBS=""
*-
*-AC_CHECK_LIB(intl, gettext, [INTLIBS="-lintl" [HAVEGETTEXT="yes"]], [
*-	INTLIBS=""
*-	AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"]) ])
*+dnl INTLIBS=""
*+dnl 
*+dnl AC_CHECK_LIB(intl, gettext, [INTLIBS="-lintl" [HAVEGETTEXT="yes"]], [
*+dnl 	INTLIBS=""
*+dnl 	AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"]) ])
* 
* AC_CHECK_PROG(XGETTEXT, xgettext, xgettext)
* 
--- src/misc.c
+++ src/misc.c
@@ -645,13 +645,13 @@
 
     if(advanced)
         rv = wAdvancedInputDialog(scr,
-		title ? gettext(title):_("Program Arguments"),
-		prompt ? gettext(prompt):_("Enter command arguments:"),
+		title ? _(title):_("Program Arguments"),
+		prompt ? _(prompt):_("Enter command arguments:"),
 		name, &ret);
     else
         rv = wInputDialog(scr,
-		title ? gettext(title):_("Program Arguments"),
-		prompt ? gettext(prompt):_("Enter command arguments:"),
+		title ? _(title):_("Program Arguments"),
+		prompt ? _(prompt):_("Enter command arguments:"),
 		&ret);
 
     if(title) wfree(title);
--- src/rootmenu.c
+++ src/rootmenu.c
@@ -363,8 +363,11 @@
     if(!strncmp(NOTRANSLATE_PREFIX, title, strlen(NOTRANSLATE_PREFIX)))
 	return title + strlen(NOTRANSLATE_PREFIX);
     if(wPreferences.translate_menu)
+	#if defined(HAVE_LIBINTL_H) && defined(I18N)
 	return dgettext("menu-messages", title);
+	#else
     return title;
+	#endif
 }
 
 /********************************************************************/



1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-no-clip-title.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-no-clip-title.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-no-clip-title.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-no-clip-title.patch
===================================================================
Only in WindowMaker-0.92.0: nocliptitle.patch
diff -ur WindowMaker-0.92.0.orig/src/defaults.c WindowMaker-0.92.0/src/defaults.c
--- WindowMaker-0.92.0.orig/src/defaults.c	2009-10-28 13:07:57.594817000 +0100
+++ WindowMaker-0.92.0/src/defaults.c	2009-10-28 13:09:19.223404220 +0100
@@ -623,6 +623,9 @@
     {"ClipTitleFont",	DEF_CLIP_TITLE_FONT,	NULL,
     NULL,				getFont,	setClipTitleFont
     },
+    {"ShowClipTitle",	"YES",			NULL,
+    &wPreferences.show_clip_title,	getBool,	NULL
+    },
     {"LargeDisplayFont",DEF_WORKSPACE_NAME_FONT, NULL,
     NULL,				getFont,	setLargeDisplayFont
     },
Only in WindowMaker-0.92.0/src: defaults.c.orig
diff -ur WindowMaker-0.92.0.orig/src/dock.c WindowMaker-0.92.0/src/dock.c
--- WindowMaker-0.92.0.orig/src/dock.c	2009-10-28 13:07:56.325404000 +0100
+++ WindowMaker-0.92.0/src/dock.c	2009-10-28 13:09:19.221166695 +0100
@@ -1293,8 +1293,9 @@
 
     tx = CLIP_BUTTON_SIZE*ICON_SIZE/64;
 
-    WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx,
-                 ty, ws_name, length);
+    if(wPreferences.show_clip_title)
+        WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx,
+        	     ty, ws_name, length);
     /*WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, 4,
      2, ws_name, length);*/
 
Only in WindowMaker-0.92.0/src: dock.c.orig
diff -ur WindowMaker-0.92.0.orig/src/WindowMaker.h WindowMaker-0.92.0/src/WindowMaker.h
--- WindowMaker-0.92.0.orig/src/WindowMaker.h	2009-10-28 13:07:57.595432000 +0100
+++ WindowMaker-0.92.0/src/WindowMaker.h	2009-10-28 13:09:56.616645224 +0100
@@ -481,6 +481,8 @@
     /* single click to lauch applications */
     char single_click;
 
+    int show_clip_title;
+
     RImage *swtileImage;
     RImage *swbackImage[9];
 
Only in WindowMaker-0.92.0/src: WindowMaker.h.orig
Only in WindowMaker-0.92.0/src: WindowMaker.h.rej



1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-no-pop-empty-array.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-no-pop-empty-array.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-no-pop-empty-array.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-no-pop-empty-array.patch
===================================================================

# HG changeset patch
# User John H. Robinson, IV <jaqque@××××.org>
# Date 1229206686 28800
# Node ID ceef975fe4e697423f61314b3fa5cf0d44d7a21c
# Parent 17b8b5652f973923c0e07baddeb5765d9acedf55
Do not allow a pop from array if no more items are left

Author: Tobias Stoeckmann
Retrieved from: http://paldium.homeunix.org/tobias/wmaker/
Submitted by: Gilbert Ashley <amigo@×××××××.org>

--- a/WINGs/array.c	Sat Dec 13 14:17:09 2008 -0800
+++ b/WINGs/array.c	Sat Dec 13 14:18:06 2008 -0800
@@ -230,6 +230,8 @@
 void*
 WMPopFromArray(WMArray *array)
 {
+    wassertr(array->itemCount > 0);
+
     array->itemCount--;
 
     return array->items[array->itemCount];




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-pointer-integer-warn-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-pointer-integer-warn-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-pointer-integer-warn-fix.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-pointer-integer-warn-fix.patch
===================================================================

# HG changeset patch
# User Carlos R. Mafra <crmafra@×××××××.de>
# Date 1225932989 -3600
# Node ID 39c2c334b1cc3c160da95c0042e1f073048519ad
# Parent 112d01554c5363665c3dc108d5aaba87306da351
wmaker: Fix compiler warnings about pointer <--> integer conversion

There may be issues with running applications in 64-bit mode when
they were written with tacit assumptions about 32-bit platforms.
For example,

    * Assuming that a pointer can be cast back and forth to an integer

The reason is that the size of the integer and pointer may be different.
See the description of "[PATCH] Warn when casting a pointer (constant)
to an integer of different size." in the gcc mailing list

http://gcc.gnu.org/ml/gcc-patches/2005-12/msg01881.html

where it was also suggested the use of casts to uintptr_t. This is
what this patch does.

As a result the following warnings are fixed, leaving us with an
almost warning-free compilation in 64-bits:

defaults.c:1446: warning: cast to pointer from integer of different size
defaults.c:1457: warning: cast to pointer from integer of different size
defaults.c:1471: warning: cast to pointer from integer of different size
defaults.c:1486: warning: cast to pointer from integer of different size
icon.c:67: warning: cast from pointer to integer of different size
menu.c:112: warning: cast from pointer to integer of different size
switchmenu.c:452: warning: cast from pointer to integer of different size
window.c:140: warning: cast from pointer to integer of different size
window.c:2217: warning: cast to pointer from integer of different size
workspace.c:135: warning: cast to pointer from integer of different size
workspace.c:214: warning: cast to pointer from integer of different size
workspace.c:634: warning: cast to pointer from integer of different size
workspace.c:1330: warning: cast to pointer from integer of different size
workspace.c:1514: warning: cast to pointer from integer of different size
wfilepanel.c:135: warning: cast from pointer to integer of different size
wfilepanel.c:171: warning: cast from pointer to integer of different size
wfontpanel.c:499: warning: cast to pointer from integer of different size
wfontpanel.c:500: warning: cast to pointer from integer of different size
wfontpanel.c:505: warning: cast to pointer from integer of different size
wfontpanel.c:506: warning: cast to pointer from integer of different size
wfontpanel.c:776: warning: cast from pointer to integer of different size
wfontpanel.c:777: warning: cast from pointer to integer of different size
wfontpanel.c:877: warning: cast from pointer to integer of different size
wfontpanel.c:878: warning: cast from pointer to integer of different size
wpanel.c:363: warning: cast from pointer to integer of different size
fontl.c:42: warning: cast from pointer to integer of different size
fontl.c:42: warning: cast from pointer to integer of different size
fontl.c:42: warning: cast from pointer to integer of different size
fontl.c:90: warning: cast to pointer from integer of different size
puzzle.c:138: warning: cast from pointer to integer of different size
puzzle.c:225: warning: cast to pointer from integer of different size
wtableview.c:1031: warning: cast to pointer from integer of different size
wtableview.c:1067: warning: cast to pointer from integer of different size
wtableview.c:1069: warning: cast to pointer from integer of different size
wtableview.c:1074: warning: cast to pointer from integer of different size
wtabledelegates.c:234: warning: cast from pointer to integer of different size
wtabledelegates.c:250: warning: cast from pointer to integer of different size
wtabledelegates.c:265: warning: cast from pointer to integer of different size
wtabledelegates.c:287: warning: cast to pointer from integer of different size
wtabledelegates.c:351: warning: cast from pointer to integer of different size
wtabledelegates.c:372: warning: cast from pointer to integer of different size
wtabledelegates.c:393: warning: cast from pointer to integer of different size
wtabledelegates.c:410: warning: cast to pointer from integer of different size
test.c:44: warning: cast from pointer to integer of different size
test.c:47: warning: cast to pointer from integer of different size
test.c:55: warning: cast from pointer to integer of different size
test.c:58: warning: cast from pointer to integer of different size

--- a/WINGs/Examples/fontl.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/WINGs/Examples/fontl.c	Thu Nov 06 01:56:29 2008 +0100
@@ -24,6 +24,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <WINGs/WINGs.h>
 #include <WINGs/WUtil.h>
 
@@ -39,7 +40,8 @@
     void *d;
     WMLabel *l = (WMLabel*)data;
     d = WMGetHangedData(self);
-    sprintf(buf, "%i -  0x%x - 0%o", (int)d, (int)d, (int)d);
+    sprintf(buf, "%i -  0x%x - 0%o", (int)(uintptr_t)d, (int)(uintptr_t)d, 
+	    (int)(uintptr_t)d);
     WMSetLabelText(l, buf);
 }
 
@@ -87,7 +89,7 @@
             sprintf(buf, "%c", c);
             WMSetButtonText(lab, buf);
             WMSetButtonAction(lab, show, pos);
-            WMHangData(lab, (void*)c);
+            WMHangData(lab, (void*)(uintptr_t)c);
             if (c>0) {
                 WMGroupButtons(l0, lab);
             } else {
--- a/WINGs/Examples/puzzle.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/WINGs/Examples/puzzle.c	Thu Nov 06 01:56:29 2008 +0100
@@ -4,7 +4,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <WINGs/WINGs.h>
-
+#include <stdint.h>
 
 
 #define MAX_SIZE 	10*10
@@ -135,7 +135,7 @@
 {
     char buffer[300];
 
-    if (SlideButton((int)ptr)) {
+    if (SlideButton((int)(uintptr_t)ptr)) {
         MoveCount++;
 
         if (CheckWin()) {
@@ -222,7 +222,7 @@
             Button[i] = WMCreateButton(win, WBTMomentaryLight);
             WMSetWidgetBackgroundColor(Button[i], color);
             WMReleaseColor(color);
-            WMSetButtonAction(Button[i], buttonClick, (void*)i);
+            WMSetButtonAction(Button[i], buttonClick, (void*)(uintptr_t)i);
             WMResizeWidget(Button[i], WinSize/Size, WinSize/Size);
             WMMoveWidget(Button[i], x*(WinSize/Size), y*(WinSize/Size));
             sprintf(buf, "%i", i+1);
--- a/WINGs/Extras/test.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/WINGs/Extras/test.c	Thu Nov 06 01:56:29 2008 +0100
@@ -2,6 +2,7 @@
 
 #include <WINGs/WINGs.h>
 #include <stdio.h>
+#include <stdint.h>
 #include "wtableview.h"
 #include "wtabledelegates.h"
 
@@ -41,10 +42,10 @@
             col2[i] = 0;
         }
     }
-    if ((int)WMGetTableColumnId(column) == 1)
+    if ((int)(uintptr_t)WMGetTableColumnId(column) == 1)
         return col1[row];
     else
-        return (void*)col2[row];
+        return (void*)(uintptr_t)col2[row];
 }
 
 
@@ -52,10 +53,10 @@
 setValueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row,
                 void *data)
 {
-    if ((int)WMGetTableColumnId(column) == 1)
+    if ((int)(uintptr_t)WMGetTableColumnId(column) == 1)
         col1[row] = data;
     else
-        col2[row] = (int)data;
+        col2[row] = (int)(uintptr_t)data;
 }
 
 
--- a/WINGs/Extras/wtabledelegates.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/WINGs/Extras/wtabledelegates.c	Thu Nov 06 01:56:29 2008 +0100
@@ -1,5 +1,5 @@
 
-
+#include <stdint.h>
 #include <WINGs/WINGsP.h>
 
 #include "wtableview.h"
@@ -231,7 +231,7 @@
 {
     EnumSelectorData *strdata = (EnumSelectorData*)self->data;
     WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+    int i = (int)(uintptr_t)WMTableViewDataForCell(table, column, row);
 
     stringDraw(WMWidgetScreen(table), d,
                strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
@@ -247,7 +247,7 @@
 {
     EnumSelectorData *strdata = (EnumSelectorData*)self->data;
     WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+    int i = (int)(uintptr_t)WMTableViewDataForCell(table, column, row);
 
     stringDraw(WMWidgetScreen(table), d,
                strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
@@ -262,7 +262,7 @@
 {
     EnumSelectorData *strdata = (EnumSelectorData*)self->data;
     WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
-    int data = (int)WMTableViewDataForCell(strdata->table, column, row);
+    int data = (int)(uintptr_t)WMTableViewDataForCell(strdata->table, column, row);
 
     wassertr(data < strdata->count);
 
@@ -284,7 +284,7 @@
     WMUnmapWidget(strdata->widget);
 
     option = WMGetPopUpButtonSelectedItem(strdata->widget);
-    WMSetTableViewDataForCell(strdata->table, column, row, (void*)option);
+    WMSetTableViewDataForCell(strdata->table, column, row, (void*)(uintptr_t)option);
 }
 
 
@@ -348,7 +348,7 @@
 {
     BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
     WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+    int i = (int)(uintptr_t)WMTableViewDataForCell(table, column, row);
     WMScreen *scr = WMWidgetScreen(table);
 
     if (i) {
@@ -369,7 +369,7 @@
 {
     BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
     WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+    int i = (int)(uintptr_t)WMTableViewDataForCell(table, column, row);
     WMScreen *scr = WMWidgetScreen(table);
 
     if (i) {
@@ -390,7 +390,7 @@
 {
     BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
     WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
-    int data = (int)WMTableViewDataForCell(strdata->table, column, row);
+    int data = (int)(uintptr_t)WMTableViewDataForCell(strdata->table, column, row);
 
     WMSetButtonSelected(strdata->widget, data);
     WMMoveWidget(strdata->widget, rect.pos.x+1, rect.pos.y+1);
@@ -407,7 +407,7 @@
     int value;
 
     value = WMGetButtonSelected(strdata->widget);
-    WMSetTableViewDataForCell(strdata->table, column, row, (void*)value);
+    WMSetTableViewDataForCell(strdata->table, column, row, (void*)(uintptr_t)value);
     WMUnmapWidget(strdata->widget);
 }
 
--- a/WINGs/Extras/wtableview.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/WINGs/Extras/wtableview.c	Thu Nov 06 01:56:29 2008 +0100
@@ -2,6 +2,7 @@
 
 #include <WINGs/WINGsP.h>
 #include <X11/cursorfont.h>
+#include <stdint.h>
 
 #include "wtableview.h"
 
@@ -1028,7 +1029,7 @@
         if (!column->delegate || !column->delegate->drawCell)
             continue;
 
-        if (WMFindInArray(table->selectedRows, NULL, (void*)row) != WANotFound)
+        if (WMFindInArray(table->selectedRows, NULL, (void*)(uintptr_t)row) != WANotFound)
             (*column->delegate->drawSelectedCell)(column->delegate, column, row, d);
         else
             (*column->delegate->drawCell)(column->delegate, column, row, d);
@@ -1064,14 +1065,14 @@
 {
     int repaint = 0;
 
-    if (WMFindInArray(table->selectedRows, NULL, (void*)row) != WANotFound) {
+    if (WMFindInArray(table->selectedRows, NULL, (void*)(uintptr_t)row) != WANotFound) {
         if (!flag) {
-            WMRemoveFromArray(table->selectedRows, (void*)row);
+            WMRemoveFromArray(table->selectedRows, (void*)(uintptr_t)row);
             repaint = 1;
         }
     } else {
         if (flag) {
-            WMAddToArray(table->selectedRows, (void*)row);
+            WMAddToArray(table->selectedRows, (void*)(uintptr_t)row);
             repaint = 1;
         }
     }
--- a/WINGs/wfilepanel.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/WINGs/wfilepanel.c	Thu Nov 06 01:56:29 2008 +0100
@@ -8,6 +8,7 @@
 #include <dirent.h>
 #include <limits.h>
 #include <errno.h>
+#include <stdint.h>
 
 #ifndef PATH_MAX
 #define PATH_MAX 1024
@@ -132,7 +133,7 @@
         return;
 
     text = WMGetTextFieldText(panel->fileField);
-    textEvent = (int)WMGetNotificationClientData(notification);
+    textEvent = (int)(uintptr_t)WMGetNotificationClientData(notification);
 
     if (panel->flags.autoCompletion && textEvent!=WMDeleteTextEvent)
         i = closestListItem(list, text, False);
@@ -168,7 +169,7 @@
 {
     W_FilePanel *panel = (W_FilePanel*)observerData;
 
-    if ((int)WMGetNotificationClientData(notification)==WMReturnTextMovement) {
+    if ((int)(uintptr_t)WMGetNotificationClientData(notification)==WMReturnTextMovement) {
         WMPerformButtonClick(panel->okButton);
     }
 }
--- a/WINGs/wfontpanel.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/WINGs/wfontpanel.c	Thu Nov 06 01:56:29 2008 +0100
@@ -8,6 +8,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <X11/Xft/Xft.h>
 #include <fontconfig/fontconfig.h>
@@ -496,14 +497,14 @@
         for (j = 0; j < sizeof(scalableFontSizes)/sizeof(int); j++) {
             size = scalableFontSizes[j];
 
-            if (!WMCountInArray(face->sizes, (void*)size)) {
-                WMAddToArray(face->sizes, (void*)size);
+            if (!WMCountInArray(face->sizes, (void*)(uintptr_t)size)) {
+                WMAddToArray(face->sizes, (void*)(uintptr_t)size);
             }
         }
         WMSortArray(face->sizes, compare_int);
     } else {
-        if (!WMCountInArray(face->sizes, (void*)size)) {
-            WMAddToArray(face->sizes, (void*)size);
+        if (!WMCountInArray(face->sizes, (void*)(uintptr_t)size)) {
+            WMAddToArray(face->sizes, (void*)(uintptr_t)size);
             WMSortArray(face->sizes, compare_int);
         }
     }
@@ -773,8 +774,8 @@
     WMClearList(panel->sizLs);
 
     WM_ITERATE_ARRAY(face->sizes, size, i) {
-        if ((int)size != 0) {
-            sprintf(buffer, "%i", (int)size);
+        if ((int)(uintptr_t)size != 0) {
+            sprintf(buffer, "%i", (int)(uintptr_t)size);
 
             WMAddListItem(panel->sizLs, buffer);
         }
@@ -874,8 +875,8 @@
 
     WM_ITERATE_ARRAY(face->sizes, vsize, i) {
         char buffer[32];
-        if ((int)vsize != 0) {
-            sprintf(buffer, "%i", (int)vsize);
+        if ((int)(uintptr_t)vsize != 0) {
+            sprintf(buffer, "%i", (int)(uintptr_t)vsize);
 
             WMAddListItem(panel->sizLs, buffer);
         }
--- a/WINGs/wpanel.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/WINGs/wpanel.c	Thu Nov 06 01:56:29 2008 +0100
@@ -3,6 +3,7 @@
 #include "WINGsP.h"
 
 #include <X11/keysym.h>
+#include <stdint.h>
 
 
 
@@ -360,7 +361,7 @@
 {
     WMInputPanel *panel = (WMInputPanel*)observerData;
 
-    switch ((int)WMGetNotificationClientData(notification)) {
+    switch ((int)(uintptr_t)WMGetNotificationClientData(notification)) {
     case WMReturnTextMovement:
         if (panel->defBtn)
             WMPerformButtonClick(panel->defBtn);
--- a/WPrefs.app/editmenu.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/WPrefs.app/editmenu.c	Thu Nov 06 01:56:29 2008 +0100
@@ -24,6 +24,7 @@
 #include <WINGs/WINGsP.h>
 #include <WINGs/WUtil.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <assert.h>
 #include <ctype.h>
 
@@ -969,7 +970,7 @@
     if (!menu->flags.isEditing)
         return;
 
-    reason = (int)WMGetNotificationClientData(notif);
+    reason = (int)(uintptr_t)WMGetNotificationClientData(notif);
 
     switch (reason) {
     case WMEscapeTextMovement:
--- a/src/defaults.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/src/defaults.c	Thu Nov 06 01:56:29 2008 +0100
@@ -24,6 +24,7 @@
 #include "wconfig.h"
 
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -1451,7 +1452,7 @@
             foo |= WColorSettings;
         if (foo)
             WMPostNotificationName(WNMenuTitleAppearanceSettingsChanged, NULL,
-                                   (void*)foo);
+                                   (void*)(uintptr_t)foo);
 
         foo = 0;
         if (needs_refresh & REFRESH_MENU_TEXTURE)
@@ -1462,7 +1463,7 @@
             foo |= WColorSettings;
         if (foo)
             WMPostNotificationName(WNMenuAppearanceSettingsChanged, NULL,
-                                   (void*)foo);
+                                   (void*)(uintptr_t)foo);
 
         foo = 0;
         if (needs_refresh & REFRESH_WINDOW_FONT) {
@@ -1476,7 +1477,7 @@
         }
         if (foo)
             WMPostNotificationName(WNWindowAppearanceSettingsChanged, NULL,
-                                   (void*)foo);
+                                   (void*)(uintptr_t)foo);
 
         if (!(needs_refresh & REFRESH_ICON_TILE)) {
             foo = 0;
@@ -1491,7 +1492,7 @@
             }
             if (foo)
                 WMPostNotificationName(WNIconAppearanceSettingsChanged, NULL,
-                                       (void*)foo);
+                                       (void*)(uintptr_t)foo);
         }
         if (needs_refresh & REFRESH_ICON_TILE)
             WMPostNotificationName(WNIconTileSettingsChanged, NULL,  NULL);
--- a/src/icon.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/src/icon.c	Thu Nov 06 01:56:29 2008 +0100
@@ -26,6 +26,7 @@
 #include <X11/Xutil.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
@@ -64,7 +65,7 @@
 appearanceObserver(void *self, WMNotification *notif)
 {
     WIcon *icon = (WIcon*)self;
-    int flags = (int)WMGetNotificationClientData(notif);
+    int flags = (int)(uintptr_t)WMGetNotificationClientData(notif);
 
     if (flags & WTextureSettings) {
         icon->force_paint = 1;
--- a/src/menu.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/src/menu.c	Thu Nov 06 01:56:29 2008 +0100
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <ctype.h>
 #if 0
@@ -109,7 +110,7 @@
 appearanceObserver(void *self, WMNotification *notif)
 {
     WMenu *menu = (WMenu*)self;
-    int flags = (int)WMGetNotificationClientData(notif);
+    int flags = (int)(uintptr_t)WMGetNotificationClientData(notif);
 
     if (!menu->flags.realized)
         return;
--- a/src/switchmenu.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/src/switchmenu.c	Thu Nov 06 01:56:29 2008 +0100
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -449,7 +450,7 @@
     void *data = WMGetNotificationClientData(notif);
 
     if (strcmp(name, WMNWorkspaceNameChanged) == 0) {
-        UpdateSwitchMenuWorkspace(scr, (int)data);
+        UpdateSwitchMenuWorkspace(scr, (int)(uintptr_t)data);
     } else if (strcmp(name, WMNWorkspaceChanged) == 0) {
 
     }
--- a/src/window.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/src/window.c	Thu Nov 06 01:56:29 2008 +0100
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdint.h>
 
 /* For getting mouse wheel mappings from WINGs */
 #include <WINGs/WINGsP.h>
@@ -137,7 +138,7 @@
 appearanceObserver(void *self, WMNotification *notif)
 {
     WWindow *wwin = (WWindow*)self;
-    int flags = (int)WMGetNotificationClientData(notif);
+    int flags = (int)(uintptr_t)WMGetNotificationClientData(notif);
 
     if (!wwin->frame || (!wwin->frame->titlebar && !wwin->frame->resizebar))
         return;
@@ -2214,7 +2215,7 @@
 
         wwin->frame->workspace = workspace;
 
-        WMPostNotificationName(WMNChangedWorkspace, wwin, (void*)oldWorkspace);
+        WMPostNotificationName(WMNChangedWorkspace, wwin, (void*)(uintptr_t)oldWorkspace);
     }
 
     if (unmap) {
--- a/src/workspace.c	Sat Dec 13 14:27:52 2008 -0800
+++ b/src/workspace.c	Thu Nov 06 01:56:29 2008 +0100
@@ -29,6 +29,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
@@ -132,7 +133,7 @@
 #endif
 
         WMPostNotificationName(WMNWorkspaceCreated, scr,
-                               (void*)(scr->workspace_count-1));
+                               (void*)(uintptr_t)(scr->workspace_count-1));
         XFlush(dpy);
 
         return scr->workspace_count-1;
@@ -211,7 +212,7 @@
 #endif
 
     WMPostNotificationName(WMNWorkspaceDestroyed, scr,
-                           (void*)(scr->workspace_count-1));
+                           (void*)(uintptr_t)(scr->workspace_count-1));
 
     if (scr->current_workspace >= scr->workspace_count)
         wWorkspaceChange(scr, scr->workspace_count-1);
@@ -631,7 +632,7 @@
 
     showWorkspaceName(scr, workspace);
 
-    WMPostNotificationName(WMNWorkspaceChanged, scr, (void*)workspace);
+    WMPostNotificationName(WMNWorkspaceChanged, scr, (void*)(uintptr_t)workspace);
 
     /*   XSync(dpy, False); */
 }
@@ -1327,7 +1328,7 @@
     if (scr->clip_icon)
         wClipIconPaint(scr->clip_icon);
 
-    WMPostNotificationName(WMNWorkspaceNameChanged, scr, (void*)workspace);
+    WMPostNotificationName(WMNWorkspaceNameChanged, scr, (void*)(uintptr_t)workspace);
 }
 
 
@@ -1511,7 +1512,7 @@
             }
         }
 
-        WMPostNotificationName(WMNWorkspaceNameChanged, scr, (void*)i);
+        WMPostNotificationName(WMNWorkspaceNameChanged, scr, (void*)(uintptr_t)i);
     }
 }
 




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-single-click-dockapp-start.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-single-click-dockapp-start.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-single-click-dockapp-start.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-single-click-dockapp-start.patch
===================================================================

# HG changeset patch
# User John H. Robinson, IV <jaqque@××××.org>
# Date 1229206629 28800
# Node ID 17b8b5652f973923c0e07baddeb5765d9acedf55
# Parent 714532b354dd0e89ae06060d64916ac592ba7e99
Add option to allow starting DockApps with a single click

This patch is from the contrib directory. It adds an option to allow starting
DockApps with a single click. It's a handy option that adds only a few lines to
the code. It is a good feature patch example because it includes modifications
to the WPrefs application so that the feature can be easily enabled or
disabled. The one-click ability allows wmaker to integrate more seemlessly with
programs like ROX-Filer which can be configured to use single or double click
actions.

Author: unknown
Submitted by: Gilbert Ashley <amigo@×××××××.org>

--- a/WPrefs.app/Expert.c	Sat Dec 13 14:10:41 2008 -0800
+++ b/WPrefs.app/Expert.c	Sat Dec 13 14:17:09 2008 -0800
@@ -54,6 +54,7 @@
     WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill"));
     WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking"));
     WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText"));
+    WMSetButtonSelected(panel->swi[7], GetBoolForKey("SingleClickLaunch"));
 }
 
 
@@ -66,7 +67,7 @@
     panel->box = WMCreateBox(panel->parent);
     WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
 
-    for (i=0; i<7; i++) {
+    for (i=0; i<8; i++) {
         panel->swi[i] = WMCreateSwitchButton(panel->box);
         WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
         WMMoveWidget(panel->swi[i], 20, 20+i*25);
@@ -79,6 +80,7 @@
     WMSetButtonText(panel->swi[4], _("Disable confirmation panel for the Kill command."));
     WMSetButtonText(panel->swi[5], _("Disable selection animation for selected icons."));
     WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart)."));
+    WMSetButtonText(panel->swi[7], _("Launch applications and restore windows with a single click."));
 
     WMSetButtonEnabled(panel->swi[6], True);
 
@@ -103,6 +105,7 @@
     SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill");
     SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking");
     SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText");
+    SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "SingleClickLaunch");
 }
 
 
--- a/src/WindowMaker.h	Sat Dec 13 14:10:41 2008 -0800
+++ b/src/WindowMaker.h	Sat Dec 13 14:17:09 2008 -0800
@@ -472,6 +472,9 @@
     unsigned int workspace_border_size; /* Size in pixels of the workspace border */
     char workspace_border_position;     /* Where to leave a workspace border */
 
+    /* single click to lauch applications */
+    char single_click;
+
     RImage *swtileImage;
     RImage *swbackImage[9];
 
--- a/src/appicon.c	Sat Dec 13 14:10:41 2008 -0800
+++ b/src/appicon.c	Sat Dec 13 14:17:09 2008 -0800
@@ -590,6 +590,7 @@
     Bool movingSingle = False;
     int oldX = x;
     int oldY = y;
+    Bool hasMoved = False;
 
     if (aicon->editing || WCHECK_STATE(WSTATE_MODAL))
         return;
@@ -665,6 +666,7 @@
             break;
 
         case MotionNotify:
+            hasMoved = True;
             if (!grabbed) {
                 if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
                     || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
@@ -802,6 +804,9 @@
             if (wPreferences.auto_arrange_icons)
                 wArrangeIcons(scr, True);
 
+            if (wPreferences.single_click && !hasMoved)
+                iconDblClick(desc, event);
+
             done = 1;
             break;
         }
--- a/src/defaults.c	Sat Dec 13 14:10:41 2008 -0800
+++ b/src/defaults.c	Sat Dec 13 14:17:09 2008 -0800
@@ -552,6 +552,9 @@
     },
     {"DisableBlinking",	"NO",		NULL,
     &wPreferences.dont_blink,	getBool,	NULL
+    },
+    {"SingleClickLaunch",	"NO",	NULL,
+    &wPreferences.single_click,	getBool,	NULL
     },
     /* style options */
     {"MenuStyle", 	"normal",  		seMenuStyles,
--- a/src/dock.c	Sat Dec 13 14:10:41 2008 -0800
+++ b/src/dock.c	Sat Dec 13 14:17:09 2008 -0800
@@ -3758,7 +3758,7 @@
 
 
 
-static void
+static Bool
 handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
 {
     WScreen *scr = dock->screen_ptr;
@@ -3776,6 +3776,7 @@
     Bool docked;
     int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
     int omnipresent = aicon->omnipresent; /* this must be cached!!! */
+    Bool hasMoved = False;
 
 
     if (wPreferences.flags.noupdates)
@@ -3828,6 +3829,7 @@
             break;
 
         case MotionNotify:
+            hasMoved = True;
             if (!grabbed) {
                 if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
                     || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {
@@ -3977,9 +3979,11 @@
 #ifdef DEBUG
             puts("End icon move");
 #endif
-            return;
-        }
-    }
+            return hasMoved;
+        }
+    }
+
+    return False;  /* never reached */
 }
 
 
@@ -4116,8 +4120,11 @@
                 handleClipChangeWorkspace(scr, event);
             else
                 handleDockMove(dock, aicon, event);
-        } else
-            handleIconMove(dock, aicon, event);
+        } else {
+            Bool hasMoved = handleIconMove(dock, aicon, event);
+            if (wPreferences.single_click && !hasMoved)
+                iconDblClick(desc, event);
+        }
 
     } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
                aicon==scr->clip_icon) {
--- a/src/icon.c	Sat Dec 13 14:10:41 2008 -0800
+++ b/src/icon.c	Sat Dec 13 14:17:09 2008 -0800
@@ -891,6 +891,7 @@
     int dx=event->xbutton.x, dy=event->xbutton.y;
     int grabbed=0;
     int clickButton=event->xbutton.button;
+    Bool hasMoved = False;
 
     if (WCHECK_STATE(WSTATE_MODAL))
         return;
@@ -942,6 +943,7 @@
             break;
 
         case MotionNotify:
+            hasMoved = True;
             if (!grabbed) {
                 if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
                     || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
@@ -979,6 +981,8 @@
 
             if (wPreferences.auto_arrange_icons)
                 wArrangeIcons(wwin->screen_ptr, True);
+            if (wPreferences.single_click && !hasMoved)
+                miniwindowDblClick(desc, event);
             return;
 
         }




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-workspace-change-crash.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-workspace-change-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-workspace-change-crash.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-workspace-change-crash.patch
===================================================================

# HG changeset patch
# User Carlos R. Mafra <crmafra2@×××××.com>
# Date 1229313545 28800
# Node ID 5a2507602c48324fba0f07754a442a8cc6ab967c
# Parent 39c2c334b1cc3c160da95c0042e1f073048519ad
Fix buffer overflows in shortcut and workspace name handling

The handling of user defined shortcuts was not checking the length
of the shortcut before copying it to a fixed-length temporary buffer,

char buf[128];

     strcpy(buf, shortcutDefinition);

and strcpy() is well known for not checking if overflows will occur.

In particular, wmaker was crashing here if a big 'shortcut' was defined
either through WPrefs or by directly editing the configuration files.

This is now avoided by using strncpy() instead, and wmaker does not
crash anymore.

And this patch also fixes a similar buffer overflow for big workspace
names too.

Furthermore, use MAX_SHORTCUT_LENGTH instead of raw number and define
it to be 32 instead of 128.

--- a/src/defaults.c	Thu Nov 06 01:56:29 2008 +0100
+++ b/src/defaults.c	Sun Dec 14 19:59:05 2008 -0800
@@ -2523,7 +2523,7 @@
     KeySym ksym;
     char *val;
     char *k;
-    char buf[128], *b;
+    char buf[MAX_SHORTCUT_LENGTH], *b;
 
 
     GET_STRING_OR_DEFAULT("Key spec", val);
@@ -2536,7 +2536,7 @@
         return True;
     }
 
-    strcpy(buf, val);
+    strncpy(buf, val, MAX_SHORTCUT_LENGTH);
 
     b = (char*)buf;
 
--- a/src/rootmenu.c	Thu Nov 06 01:56:29 2008 +0100
+++ b/src/rootmenu.c	Sun Dec 14 19:59:05 2008 -0800
@@ -513,11 +513,11 @@
     Shortcut *ptr;
     KeySym ksym;
     char *k;
-    char buf[128], *b;
+    char buf[MAX_SHORTCUT_LENGTH], *b;
 
     ptr = wmalloc(sizeof(Shortcut));
 
-    strcpy(buf, shortcutDefinition);
+    strncpy(buf, shortcutDefinition, MAX_SHORTCUT_LENGTH);
     b = (char*)buf;
 
     /* get modifiers */
--- a/src/usermenu.c	Thu Nov 06 01:56:29 2008 +0100
+++ b/src/usermenu.c	Sun Dec 14 19:59:05 2008 -0800
@@ -139,7 +139,7 @@
     KeySym ksym;
     char *k;
     char *buffer;
-    char buf[128], *b;
+    char buf[MAX_SHORTCUT_LENGTH], *b;
     int keycount,i,j,mod;
 
     if (WMIsPLString(shortcut)) {
@@ -163,9 +163,10 @@
     for (i=0,j=0;i<keycount;i++) {
         data->key[j].modifier = 0;
         if (WMIsPLArray(shortcut)) {
-            strcpy(buf, WMGetFromPLString(WMGetFromPLArray(shortcut, i)));
+            strncpy(buf, WMGetFromPLString(WMGetFromPLArray(shortcut, i)),
+		    MAX_SHORTCUT_LENGTH);
         } else {
-            strcpy(buf, WMGetFromPLString(shortcut));
+            strncpy(buf, WMGetFromPLString(shortcut), MAX_SHORTCUT_LENGTH);
         }
         b = (char*)buf;
 
--- a/src/wconfig.h.in	Thu Nov 06 01:56:29 2008 +0100
+++ b/src/wconfig.h.in	Sun Dec 14 19:59:05 2008 -0800
@@ -489,6 +489,7 @@
 
 #define WM_PI 3.14159265358979323846
 
+#define MAX_SHORTCUT_LENGTH 32
 #define FRAME_BORDER_WIDTH 1	       /* width of window border for frames */
 
 #define RESIZEBAR_HEIGHT 8	       /* height of the resizebar */
--- a/src/workspace.c	Thu Nov 06 01:56:29 2008 +0100
+++ b/src/workspace.c	Sun Dec 14 19:59:05 2008 -0800
@@ -1384,7 +1384,7 @@
         i = scr->workspace_count-(menu->entry_no-2);
         ws = menu->entry_no - 2;
         while (i>0) {
-            strcpy(title, scr->workspaces[ws]->name);
+            strncpy(title, scr->workspaces[ws]->name, MAX_WORKSPACENAME_WIDTH);
 
             entry = wMenuAddCallback(menu, title, switchWSCommand, (void*)ws);
             entry->flags.indicator = 1;




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-xchangeproperty-64bits-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-xchangeproperty-64bits-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-xchangeproperty-64bits-fix.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-xchangeproperty-64bits-fix.patch
===================================================================

# HG changeset patch
# User Carlos R. Mafra <crmafra@×××××.com>
# Date 1253011934 -7200
# Node ID 9420959defee1a8936a715d6b5b42183eaef2e2c
# Parent d58ab202df60c2429cc1e8577e19710b706d2afa
Fix the call to XChangeProperty() in 64-bit mode

    The man page of XChangeProperty() says:

      "If the specified format is 32, the property data must be a
       long array."

    And as we call it with format 32, the type of 'data' must
    be 'long'. It happens to work nowadays in 32-bit architectures
    because sizeof(CARD32) = sizeof(long), but that is no longer
    true in 64-bit mode.

    This patch was downloaded from
    www.openbsd.org/cgi-bin/cvsweb/ports/x11/windowmaker/patches/patch-WINGs_wwindow_c
    and I thank Alexey I. Frolov and Vladimir Nadvornik for helping me
    to understand it on a wmaker-dev thread.

Transplanted from git://repo.or.cz/wmaker-crm.git
commit c7f2a189c48bd4c9eb87958fff66b52e0fdcb7ce

--- a/WINGs/wwindow.c	Mon Aug 24 10:10:03 2009 +0200
+++ b/WINGs/wwindow.c	Tue Sep 15 12:52:14 2009 +0200
@@ -254,14 +254,14 @@
 setMiniwindow(WMWindow *win, RImage *image)
 {
     WMScreen *scr= win->view->screen;
-    CARD32 *data;
+    long *data;
     int x, y;
     int o;
 
     if (!image)
       return;
 
-    data = wmalloc((image->width * image->height + 2) * sizeof(CARD32));
+    data = wmalloc((image->width * image->height + 2) * sizeof(long));
 
     o= 0;
     data[o++] = image->width;
@@ -269,7 +269,7 @@
 
     for (y= 0; y < image->height; y++) {
         for (x= 0; x < image->width; x++) {
-            CARD32 pixel;
+            long pixel;
             int offs= (x+y*image->width);
             
             if (image->format == RRGBFormat)




1.1                  src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-xinerama-switchpanel-corruption.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-xinerama-switchpanel-corruption.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/windowmaker-0.92.0-xinerama-switchpanel-corruption.patch?rev=1.1&content-type=text/plain

Index: windowmaker-0.92.0-xinerama-switchpanel-corruption.patch
===================================================================

# HG changeset patch
# User John H. Robinson, IV <jaqque@××××.org>
# Date 1229205226 28800
# Node ID ded22ccbb04f0893e7d33055066674c9a3116bd8
# Parent ff96eb3a10c98136aa55acf0caff18b69ca48ae0
xinerama switchpanel corruption fix

This is a small patch to fix an issue with the switchpanel and a large number
of windows which happens only on a Xinerama setup.

When the number of open windows is so large that displaying all of them would
cause the switchpanel to be too wide for the screen, the panel is supposed to
shrink and scroll to accomodate them all.

In Window Maker 0.92.0 this works for single head displays but not for
Xinerama. The panel extends to the next head and gets garbled. This patch fixes
the issue by correctly constraining the panel to the head with the cursor.

Submitted by: Gilbert Ashley <amigo@×××××××.org>
Author: Iain Patterson <wm@××××.cx>

--- a/src/switchpanel.c	Sat Dec 13 13:50:14 2008 -0800
+++ b/src/switchpanel.c	Sat Dec 13 13:53:46 2008 -0800
@@ -464,7 +464,7 @@
     iconsThatFitCount= count;
 
     if (width > rect.size.width) {
-        iconsThatFitCount = (WMScreenWidth(scr->wmscreen)-SCREEN_BORDER_SPACING)/ICON_TILE_SIZE;
+        iconsThatFitCount = (rect.size.width-SCREEN_BORDER_SPACING)/ICON_TILE_SIZE;
         width= iconsThatFitCount*ICON_TILE_SIZE;
     }
     




1.1                  src/patchsets/windowmaker/0.92.0/wlist-0.9x.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/wlist-0.9x.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/windowmaker/0.92.0/wlist-0.9x.patch?rev=1.1&content-type=text/plain

Index: wlist-0.9x.patch
===================================================================
diff -ur WindowMaker-0.91.0/WINGs/wlist.c WindowMaker-0.91.0-test/WINGs/wlist.c
--- WindowMaker-0.91.0/WINGs/wlist.c	2004-10-12 14:36:42.000000000 -0400
+++ WindowMaker-0.91.0-test/WINGs/wlist.c	2005-03-13 13:37:39.914633856 -0500
@@ -4,6 +4,8 @@
 
 #include "WINGsP.h"
 
+#include <X11/keysym.h>
+
 char *WMListDidScrollNotification = "WMListDidScrollNotification";
 char *WMListSelectionDidChangeNotification = "WMListSelectionDidChangeNotification";
 
@@ -44,6 +46,7 @@
         unsigned int redrawPending:1;
         unsigned int buttonPressed:1;
         unsigned int buttonWasPressed:1;
+	unsigned int focused:1;
     } flags;
 } List;
 
@@ -141,10 +144,10 @@
     lPtr->view->delegate = &_ListViewDelegate;
 
     WMCreateEventHandler(lPtr->view, ExposureMask|StructureNotifyMask
-                         |ClientMessageMask, handleEvents, lPtr);
+                         |FocusChangeMask|ClientMessageMask, handleEvents, lPtr);
 
     WMCreateEventHandler(lPtr->view, ButtonPressMask|ButtonReleaseMask
-                         |EnterWindowMask|LeaveWindowMask|ButtonMotionMask,
+                         |EnterWindowMask|LeaveWindowMask|ButtonMotionMask|KeyPressMask,
                          handleActionEvents, lPtr);
 
     lPtr->itemHeight = WMFontHeight(scrPtr->normalFont) + 1;
@@ -1044,6 +1047,11 @@
     int topItem = lPtr->topItem;
     static int lastClicked = -1, prevItem = -1;
 
+    /* for arrow keys handling */
+    char buffer[64];
+    KeySym ksym;
+    int count, row;
+
     CHECK_CLASS(data, WC_List);
 
     switch (event->type) {
@@ -1096,6 +1104,10 @@
     case ButtonPress:
         if (event->xbutton.x <= WMWidgetWidth(lPtr->vScroller))
             break;
+	/* need focus for keyboard events */
+	if (!lPtr->flags.focused);
+	    WMSetFocusToWidget(lPtr);
+
         if (event->xbutton.button == WINGsConfiguration.mouseWheelDown ||
             event->xbutton.button == WINGsConfiguration.mouseWheelUp) {
             int amount = 0;
@@ -1202,6 +1214,34 @@
             prevItem = tmp;
         }
         break;
+    case KeyPress:
+	/* handle arrow keys, space and return */
+	count = XLookupString(&event->xkey, buffer, 63, &ksym, NULL);
+	buffer[count] = '\0';
+	switch(ksym) {
+	case XK_Up:
+	   row = WMGetListSelectedItemRow(lPtr);
+	   WMSelectListItem(lPtr, row - 1);
+	   if (row <= topItem)
+	       scrollByAmount(lPtr, -1);
+	   break;
+	case XK_Down:
+	   row = WMGetListSelectedItemRow(lPtr);
+	   WMSelectListItem(lPtr, row + 1);
+	   if (row - topItem >= lPtr->fullFitLines)
+	       scrollByAmount(lPtr, 1);
+	   break;
+	case XK_space:
+	   if (lPtr->action)
+	       (*lPtr->action)(lPtr, lPtr->clientData);
+	   break;
+	case XK_Return:
+	   if (lPtr->doubleAction)
+	       (*lPtr->doubleAction)(lPtr, lPtr->clientData);
+	   break;  
+	}
+	break;
+
     }
     if (lPtr->topItem != topItem)
         WMPostNotificationName(WMListDidScrollNotification, lPtr, NULL);
Only in WindowMaker-0.91.0-test/WINGs: wlist.c.orig