gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

fixed typo bug in WPrefs/WindozeCycling

Browse Source 
commented out unfinished background stuff in WPrefs
added updated potfiles
fixed circulate raise
This commit is contained in:
kojima
2001-01-06 23:52:00 +00:00
parent c6199adc29
commit 7ab70f692f
16 changed files with 4270 additions and 2269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -10,6 +10,11 @@ Changes since version 0.63.0:
- fixed a crash bug in WPrefs menu editor - fixed a crash bug in WPrefs menu editor
- added es and pt potfiles from conectiva/eliphas - added es and pt potfiles from conectiva/eliphas
- added updated galician potfile (Jesus Bravo Alvarez <jba@pobox.com>) - added updated galician potfile (Jesus Bravo Alvarez <jba@pobox.com>)
- added update hungarian potfiles (HORVATH Szabolcs <horvaths@inf.elte.hu>)
- added updated single-click patch from John Morrissey <jwm@horde.net>
- added updated danish translations (Birger Langkjer <birger.langkjer@image.dk>)
- fixed WindozeCycling config in WPrefs
- fixed circulate raise withour WindozeCycling
Changes since version 0.62.1: Changes since version 0.62.1:
............................. .............................

3
WPrefs.app/Appearance.c
View File

@@ -1895,6 +1895,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->colF); WMMapSubwidgets(panel->colF);
#ifdef unfinished
/*** root bg ***/ /*** root bg ***/
panel->bgF = WMCreateFrame(panel->frame); panel->bgF = WMCreateFrame(panel->frame);
@@ -1920,7 +1921,7 @@ createPanel(Panel *p)
WMMapSubwidgets(panel->bgF); WMMapSubwidgets(panel->bgF);
#endif
/*** options ***/ /*** options ***/
panel->optF = WMCreateFrame(panel->frame); panel->optF = WMCreateFrame(panel->frame);
WMSetFrameRelief(panel->optF, WRFlat); WMSetFrameRelief(panel->optF, WRFlat);

2
WPrefs.app/Expert.c
View File

@@ -99,7 +99,7 @@ storeDefaults(_Panel *panel)
SetBoolForKey(WMGetButtonSelected(panel->swi[2]), "SaveSessionOnExit"); SetBoolForKey(WMGetButtonSelected(panel->swi[2]), "SaveSessionOnExit");
SetBoolForKey(WMGetButtonSelected(panel->swi[3]), "UseSaveUnders"); SetBoolForKey(WMGetButtonSelected(panel->swi[3]), "UseSaveUnders");
SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindowsCycling"); SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling");
SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill"); SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill");
SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking"); SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking");
} }

2
WPrefs.app/WPrefs.h
View File

@@ -42,7 +42,7 @@
/****/ /****/
#define WVERSION "0.42" #define WVERSION "0.43"
#define WMVERSION "0.62.x" #define WMVERSION "0.62.x"

33
WindowMaker/menu.da
View File

@@ -105,8 +105,7 @@
"Copyright..." LEGAL_PANEL "Copyright..." LEGAL_PANEL
"Systemkonsol" EXEC xconsole "Systemkonsol" EXEC xconsole
"Systembelastning" SHEXEC xosview || xload "Systembelastning" SHEXEC xosview || xload
"Procesliste" EXEC xterm -fg wheat -bg black -fn 6x10 -geometry "Procesliste" EXEC xterm -fg wheat -bg black -fn 6x10 -geometry 80x50 -e top
80x50 -e top
"Manualer" EXEC xman "Manualer" EXEC xman
"Info" END "Info" END
"Kør..." SHEXEC "%a(Kør,Indtast kommando der skal udføres:)" "Kør..." SHEXEC "%a(Kør,Indtast kommando der skal udføres:)"
@@ -125,8 +124,7 @@
"LyX" EXEC lyx "LyX" EXEC lyx
"Netscape" EXEC netscape "Netscape" EXEC netscape
"Ghostview" EXEC ghostview %a(GhostView,Indtast filnavn) "Ghostview" EXEC ghostview %a(GhostView,Indtast filnavn)
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Indta "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)
st PDF-filnavn)
"TkDesk" EXEC tkdesk "TkDesk" EXEC tkdesk
"Applikationer" END "Applikationer" END
"Tekstbehandling" MENU "Tekstbehandling" MENU
@@ -144,8 +142,7 @@ st PDF-filnavn)
"Diverse" END "Diverse" END
"Tilbehør" MENU "Tilbehør" MENU
"Lommeregner" EXEC xcalc "Lommeregner" EXEC xcalc
"Vindues Egenskaber" SHEXEC xprop | xmessage -center -title 'xpr "Vindues Egenskaber" SHEXEC xprop | xmessage -center -title 'xprop' -file -
op' -file -
"Vælg skrifttype" EXEC xfontsel "Vælg skrifttype" EXEC xfontsel
"Terminalemulator" EXEC xminicom "Terminalemulator" EXEC xminicom
"Forstørrelsesglas" EXEC xmag "Forstørrelsesglas" EXEC xmag
@@ -173,12 +170,9 @@ op' -file -
"Arbejdsbord" END "Arbejdsbord" END
"Udseende" MENU "Udseende" MENU
"Temaer" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/Windo "Temaer" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
wMaker/Themes WITH setstyle "Stil" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Stil" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowM "Ikonsæt" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
aker/Styles WITH setstyle
"Ikonsæt" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/W
indowMaker/IconSets WITH seticons
"Baggrund" MENU "Baggrund" MENU
"Ensfarvet" MENU "Ensfarvet" MENU
"Sort" WS_BACK '(solid, black)' "Sort" WS_BACK '(solid, black)'
@@ -191,8 +185,7 @@ indowMaker/IconSets WITH seticons
"Bordeaux" WS_BACK '(solid, "#400020")' "Bordeaux" WS_BACK '(solid, "#400020")'
"Ensfarvet" END "Ensfarvet" END
"Nuancer" MENU "Nuancer" MENU
"Solopgang" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4 "Solopgang" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
)'
"Himmel" WS_BACK '(vgradient, blue4, white)' "Himmel" WS_BACK '(vgradient, blue4, white)'
"Blå Skygger" WS_BACK '(vgradient, "#7080a5", "#101020")' "Blå Skygger" WS_BACK '(vgradient, "#7080a5", "#101020")'
"Indigo Skygger" WS_BACK '(vgradient, "#746ebc", "#242e4c")' "Indigo Skygger" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
@@ -200,16 +193,12 @@ indowMaker/IconSets WITH seticons
"Hvede Skygger" WS_BACK '(vgradient, "#a09060", "#302010")' "Hvede Skygger" WS_BACK '(vgradient, "#a09060", "#302010")'
"Grå Skygger" WS_BACK '(vgradient, "#636380", "#131318")' "Grå Skygger" WS_BACK '(vgradient, "#636380", "#131318")'
"Bordeaux Skygger" WS_BACK '(vgradient, "#600040", "#180010")' "Bordeaux Skygger" WS_BACK '(vgradient, "#600040", "#180010")'
"Flag" WS_BACK '(mdgradient, green, red, white, "Flag" WS_BACK '(mdgradient, green, red, white, green)'
green)'
"Nuancer" END "Nuancer" END
"Billeder" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUste "Billeder" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
p/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Baggrund" END "Baggrund" END
"Gem Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/ "Gem Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Tema navn,Indtast navn:)"
Themes/"%a(Tema navn,Indtast navn:)" "Gem Ikonsæt" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonsæt navn,Indtast navn:)"
"Gem Ikonsæt" SHEXEC geticonset $HOME/GNUstep/Library/WindowMake
r/IconSets/"%a(Ikonsæt navn,Indtast navn:)"
"Udseende" END "Udseende" END
"Afslut" MENU "Afslut" MENU

272
WindowMaker/menu.hu
View File

@@ -1,12 +1,14 @@
/* /*
* WindowMaker Fomenu konfiguracioja * WindowMaker fomenu konfiguracioja
* Verzio: 0.20.3 * Verzio: 0.61
* *
* Csanaki Csaba prew@mail.matav.hu * Horvath Szabolcs <horvathsz@penguinpowered.com> - 2000. junius
* A 0.20.3-s verziohoz keszult forditast
* Prew (Csanaki Csaba <prew@mail.matav.hu>) keszitette. Koszonet erte!
* *
* Szintakszis: * Szintakszis:
* *
* <Title> [SHORTCUT <Shortcut>] <Command> <Parameters> * <Title> [SHORTCUT <Shortcut>] <Parancs> <Parameterek>
* *
* <Title> egy szoveg, amelyet cimkent kell hasznalni. Ha tartalmaz space-t, * <Title> egy szoveg, amelyet cimkent kell hasznalni. Ha tartalmaz space-t,
* akkor idezojelbe ("... ...") kell tenni. * akkor idezojelbe ("... ...") kell tenni.
@@ -18,63 +20,63 @@
* *
* Nem lehet letrehozni shortcut-ot MENU vagy OPEN_MENU bejegyzesben. * Nem lehet letrehozni shortcut-ot MENU vagy OPEN_MENU bejegyzesben.
* *
* <Command> az itt kovetkezo utasitasok valamelyike: * <Parancs> az itt kovetkezo utasitasok valamelyike:
* MENU - kezdi a/az (al)menudefiniciot * MENU - kezdi a/az (al)menudefiniciot
* END - befejezi a/az (al)menudefiniciot * END - befejezi a/az (al)menudefiniciot
* OPEN_MENU - menu megnyitas * OPEN_MENU - menu megnyitas
* WORKSPACE_MENU - a munkafelulet kezelesehez almenuket illeszt be * WORKSPACE_MENU - a munkafelulet kezelesehez almenuket illeszt be
* EXEC <program> - egy kulso programot indit el * EXEC <program> - egy kulso programot indit el
* SHEXEC <command> - executes a shell command (like gimp > /dev/null) * SHEXEC <parancs> - vegrehajt egy shell parancsot (pl.: gimp > /dev/null)
* EXIT - kilepes az ablakmanagerbol * EXIT - kilepes az ablakmanagerbol
* RESTART [<window manager>] - ujrainditja a WindowMaker-t vagy elindit * RESTART [<ablakkezelo>] - ujrainditja a WindowMaker-t vagy elindit
* egy ablakmanagert * egy ablakmanagert
* REFRESH - a kepernyo tartalmat frissiti * REFRESH - a kepernyo tartalmat frissiti
* ARRANGE_ICONS - a munkafelulet ikonjait ujrarendezi * ARRANGE_ICONS - a munkafelulet ikonjait ujrarendezi
* SHUTDOWN - minden alkalmazast bezar * SHUTDOWN - minden alkalmazast bezar
* SHOW_ALL - minden alkalmazast visszahoz a munkafeluletre * SHOW_ALL - minden alkalmazast visszahoz a munkafeluletre
* HIDE_OTHERS - a munkafeluleten (a pillanatnyilag aktiv kivetelevel) * HIDE_OTHERS - a munkafeluleten (a pillanatnyilag aktiv kivetelevel)
* minden ablakot elrejt * minden ablakot elrejt
* SAVE_SESSION - elmenti a munkafelulet aktualis allapotat, amely * SAVE_SESSION - elmenti a munkafelulet aktualis allapotat, amely
* magaba foglal minden futo alkalmazast, minden jellemzo- * magaba foglal minden futo alkalmazast, minden jellemzo-
* jukkel (geometria; kepernyo pozicio; munkafelulet, * jukkel (geometria; kepernyo pozicio; munkafelulet,
* melyen talalhatok; dock vagy clip amibol kiindultak, es * melyen talalhatok; dock vagy clip amibol kiindultak, es
* ha minimalizalod, akkor arnyekos vagy rejtett). Tehat * ha minimalizalod, akkor arnyekos vagy rejtett). Tehat
* elmenti az aktualis beallitasokat, amik eppen haszna- * elmenti az aktualis beallitasokat, amik eppen haszna-
* latban van. Minden WindowMaker inditasakor ezzel a be- * latban van. Minden WindowMaker inditasakor ezzel a be-
* allitassal fog indulni, mindaddig mig egy ujabb * allitassal fog indulni, mindaddig mig egy ujabb
* SAVE_SESSION vagy CLEAR_SESSION nem hasznalsz. * SAVE_SESSION vagy CLEAR_SESSION nem hasznalsz.
* Ha SaveSessionOnExit = Yes; a WindowMaker domain * Ha SaveSessionOnExit = Yes; a WindowMaker domain
* file-ban, akkor a mentes automatikusan megtortenik, ha * file-ban, akkor a mentes automatikusan megtortenik, ha
* kilepsz a WindowMaker-bol, felulirodik az eddig mentett * kilepsz a WindowMaker-bol, felulirodik az eddig mentett
* SAVE_SESSION bejegyzes. * SAVE_SESSION bejegyzes.
* CLEAR_SESSION - torli az elozo session parametereket. Ennek nem lesz * CLEAR_SESSION - torli az elozo session parametereket. Ennek nem lesz
* semmilyen hatasa, ha a SaveSessionOnExit = True. * semmilyen hatasa, ha a SaveSessionOnExit = True.
* INFO - Info Panel megjelenitese * INFO - Info Panel megjelenitese
* *
* OPEN_MENU szintakszisa: * OPEN_MENU szintakszisa:
* 1. File menu kezeles. * 1. File menu kezeles.
* // megnyitja file.menu-t, melynek tartalmaznia kell egy ervenyes menu * // megnyitja file.menu-t, melynek tartalmaznia kell egy ervenyes menu
* // file-t, es beszurja * // file-t, es beszurja
* OPEN_MENU file.menu * OPEN_MENU file.menu
* 2. Pipe menu kezeles. * 2. Pipe menu kezeles.
* // megnyitja a parancsot es hasznalja a stdout to construct menu-t. * // megnyitja a parancsot es hasznalja a stdout to construct menu-t.
* // A parancs kimenetenek egy ervenyes menu leirasnak kell lennie. * // A parancs kimenetenek egy ervenyes menu leirasnak kell lennie.
* // Space lehet a '|' es a parancs kozott. * // Space lehet a '|' es a parancs kozott.
* OPEN_MENU | command * OPEN_MENU | command
* 3. Konyvtar kezeles. * 3. Konyvtar kezeles.
* // Megnyit egy vagy tobb konyvtarat es letrehoz egy konyvtarat, * // Megnyit egy vagy tobb konyvtarat es letrehoz egy konyvtarat,
* // alkonyvtarat, vegrehajthato file-okat es azokat ABC sorrendbe * // alkonyvtarat, vegrehajthato file-okat es azokat ABC sorrendbe
* // rendezi. * // rendezi.
* OPEN_MENU /some/dir [/some/other/dir ...] * OPEN_MENU /some/dir [/some/other/dir ...]
* 4. Konyvtar kezeles parancsal. * 4. Konyvtar kezeles parancsal.
* // Megnyit egy vagy tobb konyvtarat es letrehoz egy konyvtarat, * // Megnyit egy vagy tobb konyvtarat es letrehoz egy konyvtarat,
* // alkonyvtarat, vegrehajtja az adott parancsot a megfelelo * // alkonyvtarat, vegrehajtja az adott parancsot a megfelelo
* // opcioval. * // opcioval.
* OPEN_MENU /some/dir [/some/other/dir ...] WITH command -options * OPEN_MENU /some/dir [/some/other/dir ...] WITH command -options
* *
* <Parameters> a vegrehajthato program * <Parameterek> a vegrehajthato program
* *
* ** EXEC parancssor leirasa * ** EXEC parancs leirasa
* %s - a megadott helyre beszurja a kijelolt szoveget. Ha nincs szoveg * %s - a megadott helyre beszurja a kijelolt szoveget. Ha nincs szoveg
* kijelolve, a parancs torlodik. * kijelolve, a parancs torlodik.
* %a(message) - megnyit egy beviteli mezot a megadott szoveggel * %a(message) - megnyit egy beviteli mezot a megadott szoveggel
@@ -91,121 +93,127 @@
* Peldaul: * Peldaul:
* *
* "Teszt" MENU * "Teszt" MENU
* // XTerminal * // XTerminal
* "XTerm" EXEC xterm * "XTerm" EXEC xterm
* // XView * // XView
* "XView apps" OPEN_MENU "/usr/openwin/bin" * "XView apps" OPEN_MENU "/usr/openwin/bin"
* // egyeb X11 alkalmazasok * // egyeb X11 alkalmazasok
* "X11 apps" OPEN_MENU /usr/X11/bin $HOME/bin/X11 * "X11 apps" OPEN_MENU /usr/X11/bin $HOME/bin/X11
* // egyeb hatter kep * // egyeb hatter kep
* "Background" OPEN_MENU $HOME/images /usr/share/images WITH wmsetbg -u -t * "Background" OPEN_MENU $HOME/images /usr/share/images WITH wmsetbg -u -t * // megnyitja a style.menu-t az adott bejegyzesben
* // megnyitja a style.menu-t az adott bejegyzesben * "Style" OPEN_MENU style.menu
* "Style" OPEN_MENU style.menu
* "Teszt" END * "Teszt" END
*/ */
#include "wmmacros" #include "wmmacros"
"Alkalmazasok" MENU "Alkalmazások" MENU
"Informacio" MENU "Infó" MENU
"Informacios..." INFO_PANEL "Információs panel..." INFO_PANEL
"Jogi..." LEGAL_PANEL "Jogi..." LEGAL_PANEL
"Rendszer konzol" EXEC xconsole "Rendszer konzol" EXEC xconsole
"Rendszer kihasznaltsag" SHEXEC xosview || xload "Rendszer kihasználtság" SHEXEC xosview || xload
"Processz lista" EXEC xterm -e top "Processz lista" EXEC xterm -e top
"Manual bongeszo" EXEC xman "Kézikönyv böngésző" EXEC xman
"Informacio" END "Infó" END
"XTerminal" EXEC xterm -sb "Futtatás..." SHEXEC %a(Futtatás,Írd be a futtatni kívánt programot:)
"X Terminál" EXEC xterm -sb
"Rxvt" EXEC rxvt -bg black -fg white -fn fixed "Rxvt" EXEC rxvt -bg black -fg white -fn fixed
"Munkafeluletek" WORKSPACE_MENU "Gnome terminál" EXEC gnome-terminal --background black --foreground white --font -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
"Alkalmazasok" MENU "Munkafelületek" WORKSPACE_MENU
"Grafikai" MENU "Alkalmazások" MENU
"Grafika" MENU
"Gimp" SHEXEC gimp >/dev/null "Gimp" SHEXEC gimp >/dev/null
"XV" EXEC xv "XV" EXEC xv
"XPaint" EXEC xpaint "XPaint" EXEC xpaint
"XFig" EXEC xfig "XFig" EXEC xfig
"Grafikai" END "Grafika" END
"X File Manager" EXEC xfm "X File Manager" EXEC xfm
"OffiX Files" EXEC files "OffiX Files" EXEC files
"LyX" EXEC lyx "LyX" EXEC lyx
"Netscape" EXEC netscape "Netscape" EXEC netscape
"Ghostview" EXEC ghostview %a(Enter file to view) "Ghostview" EXEC ghostview %a(GhostView,Kérem a fájl nevét)
"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view) "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Kérem a PDF fájl nevét)
"TkDesk" EXEC tkdesk "TkDesk" EXEC tkdesk
"Alkalmazasok" END "Alkalmazások" END
"Szerkesztok" MENU "Szerkesztők" MENU
"XFte" EXEC xfte "XFte" EXEC xfte
"XEmacs" SHEXEC xemacs || emacs "XEmacs" SHEXEC xemacs || emacs
"XJed" EXEC xjed "XJed" EXEC xjed
"NEdit" EXEC nedit "NEdit" EXEC nedit
"Xedit" EXEC xedit "Xedit" EXEC xedit
"VI" EXEC xterm -e vi "VI" EXEC xterm -e vi
"Szerkesztok" END "Szerkesztők" END
"Egyeb" MENU "Egyéb" MENU
"Xmcd" SHEXEC xmcd 2> /dev/null "Xmcd" SHEXEC xmcd 2> /dev/null
"Xplaycd" EXEC xplaycd "Xplaycd" EXEC xplaycd
"Xmixer" EXEC xmixer "Xmixer" EXEC xmixer
"Egyeb" END "Egyéb" END
"Kellekek" MENU "Kellékek" MENU
"Szamologep" EXEC xcalc "Számológép" EXEC xcalc
"Ablak jellemzok" SHEXEC xprop | xmessage -center -title 'xprop' -file - "Ablak jellemzők" SHEXEC xprop | xmessage -center -title 'xprop' -file -
"Betutipus" EXEC xfontsel "Font kiválasztás" EXEC xfontsel
"Terminal emulacio" EXEC xminicom "Terminál emuláció" EXEC xminicom
"Nagyito" EXEC xmag "Képernyőterület másolása" EXEC xmag
"Colormap" EXEC xcmap "Színtérkép" EXEC xcmap
"XKill" EXEC xkill "Program kilövése" EXEC xkill
"Ora" EXEC asclock -shape "Vágólap" EXEC xclipboard
"Vagolap" EXEC xclipboard "Kellékek" END
"Kellekek" END
"Valogatas" MENU "Kijelölés" MENU
"Masolas" SHEXEC echo '%s' | wxcopy "Másolás" SHEXEC echo '%s' | wxcopy
"Level iras" EXEC xterm -name mail -T "Pine" -e pine %s "Levél írása" EXEC xterm -name mail -T "Pine" -e pine %s
"Navigator" EXEC netscape %s "Netscape" EXEC netscape %s
"Kereses a Manualban" SHEXEC MANUAL_SEARCH(%s) "Keresés a Manuálokban" SHEXEC MANUAL_SEARCH(%s)
"Valogatas" END "Kijelölés" END
"Munkafelulet" MENU "Munkafelület" MENU
"Elrejtes" HIDE_OTHERS "Elrejtés" HIDE_OTHERS
"Mindent mutat" SHOW_ALL "Mindent mutat" SHOW_ALL
"Ikonok elrendezese" ARRANGE_ICONS "Ikonok elrendezése" ARRANGE_ICONS
"Frissites" REFRESH "Frissítés" REFRESH
"Zarolas" EXEC xlock -allowroot -usefirst "Zárolás" EXEC xlock -allowroot -usefirst
"Session jellemzok mentese" SAVE_SESSION "Session mentése" SAVE_SESSION
"Session jellemzok torlese" CLEAR_SESSION "Elmentett Session törlése" CLEAR_SESSION
"Munkafelulet" END "Munkafelület" END
"Megjelenites" MENU "Megjelenés" MENU
"Temak" OPEN_MENU THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle "Témák" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
"Stilusok" OPEN_MENU STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle "Stílusok" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
"Ikon beallitasok" OPEN_MENU ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons "Ikonok" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
"Hatter" MENU "Háttér" MENU
"Szolid" MENU "Szolíd" MENU
"Fekete" WS_BACK '(solid, black)' "Fekete" WS_BACK '(solid, black)'
"Kek" WS_BACK '(solid, "#505075")' "Kék" WS_BACK '(solid, "#505075")'
"Indigo" WS_BACK '(solid, "#243e6c")' "Indigó" WS_BACK '(solid, "#243e6c")'
"Sotetkek" WS_BACK '(solid, "#224477")' "Sötétkék" WS_BACK '(solid, "#180090")'
"Lila" WS_BACK '(solid, "#554466")' "Lila" WS_BACK '(solid, "#554466")'
"Buza" WS_BACK '(solid, "wheat4")' "Búza" WS_BACK '(solid, "wheat4")'
"Sotetszurke" WS_BACK '(solid, "#333340")' "Sötétszürke" WS_BACK '(solid, "#333340")'
"Voros" WS_BACK '(solid, "#400020")' "Vörös" WS_BACK '(solid, "#400020")'
"Szolid" END "Szolíd" END
"Gradiens" MENU "Gradiens" MENU
"Halvany" WS_BACK '(mdgradient, green, red, white, green)' "Naplemente" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
"Egkek" WS_BACK '(vgradient, blue4, white)' "Égkék" WS_BACK '(vgradient, blue4, white)'
"Indigós" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
"Búza színű" WS_BACK '(vgradient, "#a09060", "#302010")'
"Lilás" WS_BACK '(vgradient, "#636380", "#131318")'
"Vöröses" WS_BACK '(vgradient, "#600040", "#180010")'
"Gradiens" END "Gradiens" END
"Kepek" OPEN_MENU BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t "Képek" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
"Hatter" END "Háttér" END
"Temak mentese" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)" "Téma mentése" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl nevét:)"
"Ikonbeallitasok mentese" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)" "Ikonbeállítások mentése" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg a fájl nevét:)"
"Megjelenites" END "Konfiguráló program" EXEC /usr/X11R6/bin/WPrefs
"Megjelenés" END
"Kilepes" MENU "Kilépés" MENU
"Ujrainditas" RESTART "Újraindítás" RESTART
"AfterStep inditasa" RESTART afterstep "BlackBox indítása" RESTART blackbox
"Kilepes..." EXIT "kwm indítása" RESTART kwm
"Kilepes a sessionbol..." SHUTDOWN "IceWM indítása" RESTART icewm
"Kilepes" END "Kilépés..." EXIT
"Alkalmazasok" END "Kilépés" END
"Alkalmazások" END

542
WindowMaker/plmenu.da
View File

@@ -1,242 +1,336 @@
( (
"Applikationer", "Applikationer",
(
"Info",
("Info Panel...", INFO_PANEL),
("Copyright...", LEGAL_PANEL),
("Systemkonsol", EXEC, "xconsole"),
("Systembelastning", EXEC, "xosview || xload"),
(
"Procesliste",
EXEC,
"xterm -fg wheat -bg black -fn 6x10 -geometry 80x50 -e top"
),
("Manualer", EXEC, "xman")
),
(
"K\370r...",
SHEXEC,
"%a(K\370r,Indtast kommando der skal udf\370res:)"
),
("XTerm", EXEC, "xterm -sb"),
("Rxvt", EXEC, "rxvt -bg black -fg white"),
("Arbejdsborde", WORKSPACE_MENU),
(
"Applikationer",
(
"Grafik",
("Gimp", SHEXEC, "gimp >/dev/null"),
("XV", EXEC, "xv"),
("XPaint", EXEC, "xpaint"),
("XFig", EXEC, "xfig")
),
("X Filh\345ndtering", EXEC, "xfm"),
("OffiX Files", EXEC, "files"),
("LyX", EXEC, "lyx"),
("Netscape", EXEC, "netscape"),
("Ghostview", EXEC, "ghostview %a(GhostView,Indtast filnavn)"),
(
"Acrobat",
EXEC,
"/usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)"
),
("TkDesk", EXEC, "tkdesk")
),
(
"Tekstbehandling",
("XFte", EXEC, "xfte"),
("Emacs", SHEXEC, "xemacs || emacs"),
("XJed", EXEC, "xjed"),
("NEdit", EXEC, "nedit"),
("Xedit", EXEC, "xedit"),
("VI", EXEC, "xterm -e vi")
),
(
"Diverse",
("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
("Xplaycd", EXEC, xplaycd),
("Xmixer", EXEC, xmixer)
),
(
"Tilbeh\370r",
(Lommeregner, EXEC, xcalc),
(
"Vindues Egenskaber",
SHEXEC,
"xprop | xmessage -center -title 'xprop' -file -"
),
("V\346lg skrifttype", EXEC, xfontsel),
(Terminalemulator, EXEC, xminicom),
("Forst\370rrelsesglas", EXEC, xmag),
(Farver, EXEC, xcmap),
(XKill, EXEC, xkill),
(ASClock, EXEC, "asclock -shape"),
(Udklipsbord, EXEC, xclipboard)
),
(
"Markeret",
(Kopier, SHEXEC, "echo '%s' | wxcopy"),
("Send e-post til", EXEC, "xterm -name mail -T Pine -e pine %s"),
("Indtast URL", EXEC, "netscape %s"),
("S\370g i Manual", EXEC, "MANUAL_SEARCH(%s)")
),
(
"Arbejdsbord",
("Skjul andre", HIDE_OTHERS),
("Vis alle", SHOW_ALL),
("Arranger ikoner", ARRANGE_ICONS),
("Genindl\346s", REFRESH),
("L\345s", EXEC, "xlock -allowroot -usefirst"),
("Gem milj\370", SAVE_SESSION),
("Slet gemt milj\370", CLEAR_SESSION)
),
(
"Udseende",
(
"Temaer",
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowM
aker/Themes WITH setstyle"
),
(
"Stil",
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowM
aker/Styles WITH setstyle"
),
(
"Ikons\346t",
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/Windo
wMaker/IconSets WITH seticons"
),
(
"Baggrund",
(
"Ensfarvet",
( (
"Sort", "Info",
EXEC, ("Info Panel...", INFO_PANEL),
"wdwrite WindowMaker WorkspaceBack '(solid, black)'" ("Ophavsret...", LEGAL_PANEL),
(
"Systemkonsol",
EXEC,
"xconsole"
),
("Systembelastning", SHEXEC, "xosview || xload"),
(
"Procesliste",
EXEC,
"xterm -fg wheat -bg black -fn 6x10 -geometry 80x50 -e top"
),
(
"Manualer",
EXEC,
"xman"
)
),
("Kør...", SHEXEC, "%a(Kør,Indtast kommando der skal udføres:)"),
(
"XTerm",
EXEC,
"xterm -sb"
), ),
( (
"Bl\345", "Rxvt",
EXEC, EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'" "rxvt -bg black -fg white"
),
("Arbejdsborde", WORKSPACE_MENU),
(
"Applikationer",
(
"Grafik",
("Gimp", SHEXEC, "gimp >/dev/null"),
(
"XV",
EXEC,
"xv"
),
(
"XPaint",
EXEC,
"xpaint"
),
(
"XFig",
EXEC,
"xfig"
)
),
(
"X-filhåndtering",
EXEC,
"xfm"
),
(
"OffiX Files",
EXEC,
"files"
),
(
"LyX",
EXEC,
"lyx"
),
(
"Netscape",
EXEC,
"netscape"
),
(
"Ghostview",
EXEC,
"ghostview %a(GhostView,Indtast filnavn)"
),
(
"Acrobat",
EXEC,
"/usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)"
),
(
"TkDesk",
EXEC,
"tkdesk"
)
), ),
( (
"Indigo", "Tekstbehandling",
EXEC, (
"wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'" "XFte",
EXEC,
"xfte"
),
("Emacs", SHEXEC, "xemacs || emacs"),
(
"XJed",
EXEC,
"xjed"
),
(
"NEdit",
EXEC,
"nedit"
),
(
"Xedit",
EXEC,
"xedit"
),
(
"VI",
EXEC,
"xterm -e vi"
)
), ),
( (
"M\370rkebl\345", "Diverse",
EXEC, ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
"wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'" (
"Xplaycd",
EXEC,
"xplaycd"
),
(
"Xmixer",
EXEC,
"xmixer"
)
), ),
( (
"Lilla", "Tilbehør",
EXEC, (
"wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'" "Lommeregner",
EXEC,
"xcalc"
),
("Vinduesegenskaber", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
(
"Vælg skrifttype",
EXEC,
"xfontsel"
),
(
"Terminalemulator",
EXEC,
"xminicom"
),
(
"Forstørrelsesglas",
EXEC,
"xmag"
),
(
"Farver",
EXEC,
"xcmap"
),
(
"XKill",
EXEC,
"xkill"
),
(
"ASClock",
EXEC,
"asclock -shape"
),
(
"Udklipsbord",
EXEC,
"xclipboard"
)
), ),
( (
"Hvede", "Markering",
EXEC, ("Kopiér", SHEXEC, "echo '%s' | wxcopy"),
"wdwrite WindowMaker WorkspaceBack '(solid, \"wheat4\")'" (
"Send e-post til",
EXEC,
"xterm -name mail -T Pine -e pine %s"
),
(
"Indtast URL",
EXEC,
"netscape %s"
),
("Søg i manual", EXEC, "MANUAL_SEARCH(%s)")
), ),
( (
"M\370rkegr\345", "Arbejdsbord",
EXEC, ("Skjul andre", HIDE_OTHERS),
"wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'" ("Vis alle", SHOW_ALL),
("Arrangér ikoner", ARRANGE_ICONS),
("Genindlæs", REFRESH),
(
"Lås",
EXEC,
"xlock -allowroot -usefirst"
),
("Gem session", SAVE_SESSION),
("Slet gemt session", CLEAR_SESSION)
), ),
( (
"Bordeaux", "Udseende",
EXEC, (
"wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'" "Temaer",
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
),
(
"Stil",
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
),
(
"Ikonsæt",
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
),
(
"Baggrund",
(
"Ensfarvet",
(
"Sort",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, black)'"
),
(
"Blå",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"
),
(
"Indigo",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"
),
(
"Mørkeblå",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"
),
(
"Lilla",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"
),
(
"Hvede",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"wheat4\")'"
),
(
"Mørkegrå",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"
),
(
"Bordeaux",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'"
)
),
(
"Nuancer",
(
"Solopgang",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"
),
(
"Himmel",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"
),
(
"Blå Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"
),
(
"Indigo Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"
),
(
"Lilla Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"
),
(
"Hvede Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"
),
(
"Grå Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"
),
(
"Bordeaux Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'"
),
(
"Flag",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(mdgradient, green, red, white, green)'"
)
),
(
"Billeder",
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
)
),
("Gem Tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Tema navn,Indtast navn:)"),
("Gem Ikonsæt", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikonsæt navn,Indtast navn:)")
),
(
"Afslut",
("Genstart", RESTART),
("Start Blackbox", RESTART, blackbox),
("Start kwm", RESTART, kwm),
("Start IceWM", RESTART, icewm),
("Afslut...", EXIT)
) )
),
(
"Nuancer",
(
"Solopgang",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black,
deepskyblue4, tomato4)'"
),
(
"Himmel",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"
),
(
"Bl\345 Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#10102
0\")'"
),
(
"Indigo Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4
c\")'"
),
(
"Lilla Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#15142
6\")'"
),
(
"Hvede Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#30201
0\")'"
),
(
"Gr\345 Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#13131
8\")'"
),
(
"Bordeaux Skygger",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#18001
0\")'"
),
(
"Flag",
EXEC,
"wdwrite WindowMaker WorkspaceBack '(mdgradient, green, red, white, g
reen)'"
)
),
(
"Billeder",
OPEN_MENU,
"-noext /usr/local/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/
WindowMaker/Backgrounds WITH wmsetbg -u -t"
)
),
(
"Gem Tema",
SHEXEC,
"getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Tema navn,Indta
st navn:)\""
),
(
"Gem Ikons\346t",
SHEXEC,
"geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikons\346t nav
n,Indtast navn:)\""
)
),
(
"Afslut",
("Genstart", RESTART),
("Start Blackbox", RESTART, blackbox),
("Start kwm", RESTART, kwm),
("Start IceWM", RESTART, icewm),
("Afslut...", EXIT)
)
) )

2
contrib/README
View File

@@ -11,3 +11,5 @@ for version: 0.52.0
author: author:
Sebastien Bauer <seb_bauer@bigfoot.com> Sebastien Bauer <seb_bauer@bigfoot.com>
John Morrissey <jwm@horde.net>

2
po/Makefile.am
View File

@@ -6,7 +6,7 @@ CLEANFILES = $(CATALOGS) WindowMaker.pot
EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po \ EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po \
no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po zh_TW.Big5.po\ no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po zh_TW.Big5.po\
zh_CN.po sk.po da.po bg.po zh_CN.po sk.po da.po bg.po hu.po
POTFILES = \ POTFILES = \
$(top_builddir)/src/appicon.c \ $(top_builddir)/src/appicon.c \

2
po/README
View File

@@ -34,7 +34,7 @@ zh_TW.Big5.po Chinese Li Wei Jih <lwj83@cs.ccu.edu.tw>
zh_CN.po Chinese Wang Jian <larkw@263.net> zh_CN.po Chinese Wang Jian <larkw@263.net>
sk.po Slovak Milan Hromada <mhromada@elas.sk> sk.po Slovak Milan Hromada <mhromada@elas.sk>
bg.po Bulgarian Slavei Karadjov <slaff@exco.net> bg.po Bulgarian Slavei Karadjov <slaff@exco.net>
hu.po Hungarian HORVATH Szabolcs <horvaths@inf.elte.hu>
Some translations are based on previous translations by other people. Some translations are based on previous translations by other people.

1482
po/da.po
View File

File diff suppressed because it is too large Load Diff

1475
po/hu.po Normal file
View File

File diff suppressed because it is too large Load Diff

189
src/cycling.c
View File

@@ -47,8 +47,6 @@ extern WShortKey wKeyBindings[WKBD_LAST];
static WWindow* static WWindow*
nextToFocusAfter(WWindow *wwin) nextToFocusAfter(WWindow *wwin)
{ {
@@ -106,6 +104,74 @@ nextToFocusBefore(WWindow *wwin)
} }
static WWindow*
nextFocusWindow(WWindow *wwin)
{
WWindow *tmp, *closest, *min;
Window d;
if (!wwin)
return NULL;
tmp = wwin->prev;
closest = NULL;
min = wwin;
d = 0xffffffff;
while (tmp) {
if (wWindowCanReceiveFocus(tmp)
&& (!WFLAGP(tmp, skip_window_list)|| tmp->flags.internal_window)) {
if (min->client_win > tmp->client_win)
min = tmp;
if (tmp->client_win > wwin->client_win
&& (!closest
|| (tmp->client_win - wwin->client_win) < d)) {
closest = tmp;
d = tmp->client_win - wwin->client_win;
}
}
tmp = tmp->prev;
}
if (!closest||closest==wwin)
return min;
return closest;
}
static WWindow*
prevFocusWindow(WWindow *wwin)
{
WWindow *tmp, *closest, *max;
Window d;
if (!wwin)
return NULL;
tmp = wwin->prev;
closest = NULL;
max = wwin;
d = 0xffffffff;
while (tmp) {
if (wWindowCanReceiveFocus(tmp) &&
(!WFLAGP(tmp, skip_window_list) || tmp->flags.internal_window)) {
if (max->client_win < tmp->client_win)
max = tmp;
if (tmp->client_win < wwin->client_win
&& (!closest
|| (wwin->client_win - tmp->client_win) < d)) {
closest = tmp;
d = wwin->client_win - tmp->client_win;
}
}
tmp = tmp->prev;
}
if (!closest||closest==wwin)
return max;
return closest;
}
void void
StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next) StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
{ {
@@ -115,23 +181,37 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
WWindow *newFocused; WWindow *newFocused;
WWindow *oldFocused; WWindow *oldFocused;
int modifiers; int modifiers;
XModifierKeymap *keymap; XModifierKeymap *keymap = NULL;
Bool hasModifier;
Bool somethingElse = False; Bool somethingElse = False;
XEvent ev; XEvent ev;
if (!wwin) if (!wwin)
return; return;
keymap = XGetModifierMapping(dpy); if (next)
hasModifier = (wKeyBindings[WKBD_FOCUSNEXT].modifier != 0);
else
hasModifier = (wKeyBindings[WKBD_FOCUSPREV].modifier != 0);
if (hasModifier) {
keymap = XGetModifierMapping(dpy);
XGrabKeyboard(dpy, scr->root_win, False, GrabModeAsync, GrabModeAsync, XGrabKeyboard(dpy, scr->root_win, False, GrabModeAsync, GrabModeAsync,
CurrentTime); CurrentTime);
}
if (next) { if (next) {
newFocused = nextToFocusAfter(wwin); if (wPreferences.windows_cycling)
newFocused = nextToFocusAfter(wwin);
else
newFocused = nextFocusWindow(wwin);
} else { } else {
newFocused = nextToFocusBefore(wwin); if (wPreferences.windows_cycling)
newFocused = nextToFocusBefore(wwin);
else
newFocused = prevFocusWindow(wwin);
} }
scr->flags.doing_alt_tab = 1; scr->flags.doing_alt_tab = 1;
@@ -142,6 +222,11 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
wWindowFocus(newFocused, scr->focused_window); wWindowFocus(newFocused, scr->focused_window);
oldFocused = newFocused; oldFocused = newFocused;
if (hasModifier)
done = False;
else
done = True;
#if 0 #if 0
if (wPreferences.popup_switchmenu && if (wPreferences.popup_switchmenu &&
(!scr->switch_menu || !scr->switch_menu->flags.mapped)) { (!scr->switch_menu || !scr->switch_menu->flags.mapped)) {
@@ -209,9 +294,12 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
} }
} }
} }
XFreeModifiermap(keymap); if (keymap)
XFreeModifiermap(keymap);
XUngrabKeyboard(dpy, CurrentTime); if (hasModifier) {
XUngrabKeyboard(dpy, CurrentTime);
}
wSetFocusTo(scr, newFocused); wSetFocusTo(scr, newFocused);
if (wPreferences.circ_raise) { if (wPreferences.circ_raise) {
@@ -229,84 +317,3 @@ StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next)
} }
static WWindow*
nextFocusWindow(WScreen *scr)
{
WWindow *tmp, *wwin, *closest, *min;
Window d;
if (!(wwin = scr->focused_window))
return NULL;
tmp = wwin->prev;
closest = NULL;
min = wwin;
d = 0xffffffff;
while (tmp) {
if (wWindowCanReceiveFocus(tmp)
&& (!WFLAGP(tmp, skip_window_list)|| tmp->flags.internal_window)) {
if (min->client_win > tmp->client_win)
min = tmp;
if (tmp->client_win > wwin->client_win
&& (!closest
|| (tmp->client_win - wwin->client_win) < d)) {
closest = tmp;
d = tmp->client_win - wwin->client_win;
}
}
tmp = tmp->prev;
}
if (!closest||closest==wwin)
return min;
return closest;
}
static WWindow*
prevFocusWindow(WScreen *scr)
{
WWindow *tmp, *wwin, *closest, *max;
Window d;
if (!(wwin = scr->focused_window))
return NULL;
tmp = wwin->prev;
closest = NULL;
max = wwin;
d = 0xffffffff;
while (tmp) {
if (wWindowCanReceiveFocus(tmp) &&
(!WFLAGP(tmp, skip_window_list) || tmp->flags.internal_window)) {
if (max->client_win < tmp->client_win)
max = tmp;
if (tmp->client_win < wwin->client_win
&& (!closest
|| (wwin->client_win - tmp->client_win) < d)) {
closest = tmp;
d = wwin->client_win - tmp->client_win;
}
}
tmp = tmp->prev;
}
if (!closest||closest==wwin)
return max;
return closest;
}
void CycleWindow(WScreen *scr, Bool forward)
{
WWindow *wwin;
if (forward)
wwin = nextFocusWindow(scr);
else
wwin = prevFocusWindow(scr);
if (wwin != NULL)
wSetFocusTo(scr, wwin);
}

12
src/event.c
View File

@@ -1474,19 +1474,11 @@ handleKeyPress(XEvent *event)
} }
break; break;
case WKBD_FOCUSNEXT: case WKBD_FOCUSNEXT:
if (wKeyBindings[WKBD_FOCUSNEXT].modifier != 0 StartWindozeCycle(wwin, event, True);
&& wPreferences.windows_cycling)
StartWindozeCycle(wwin, event, True);
else
CycleWindow(scr, True);
break; break;
case WKBD_FOCUSPREV: case WKBD_FOCUSPREV:
if (wKeyBindings[WKBD_FOCUSPREV].modifier != 0 StartWindozeCycle(wwin, event, False);
&& wPreferences.windows_cycling)
StartWindozeCycle(wwin, event, False);
else
CycleWindow(scr, False);
break; break;
#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)

2
src/funcs.h
View File

@@ -97,8 +97,6 @@ void PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next); void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next);
void CycleWindow(WScreen *scr, Bool forward);
#ifdef USECPP #ifdef USECPP
char *MakeCPPArgs(char *path); char *MakeCPPArgs(char *path);
#endif #endif

2
wrlib/Makefile.am
View File

@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = no-dependencies
lib_LTLIBRARIES = libwraster.la lib_LTLIBRARIES = libwraster.la
libwraster_la_LDFLAGS = -version-info 2:0:0 libwraster_la_LDFLAGS = -version-info 2:1:0
bin_SCRIPTS = get-wraster-flags bin_SCRIPTS = get-wraster-flags