gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 04:48:06 +01:00
Code Issues Projects Releases Wiki Activity

- fixed crash when saving window attributes

Browse Source 
- updated german translation
- small fix for the selection code in WINGs (possible memleak)
- added support for the ukrainian language in wsetfont
  (Bohdan Vlasyuk <bohdan@bodq.vstu.vinnica.ua>)
This commit is contained in:
dan
2002-01-17 03:07:28 +00:00
parent 8a25fdc672
commit 511a06628b
6 changed files with 1293 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -17,6 +17,10 @@ Changes since version 0.80.0:
- Fixed another focus related problem when changing workspaces. - Fixed another focus related problem when changing workspaces.
- Fixed problem with saving session when shared appicon is enabled (not - Fixed problem with saving session when shared appicon is enabled (not
all instances were saved in the session, only one per shared appicon) all instances were saved in the session, only one per shared appicon)
- Added support for the ukrainian language in wsetfont
(Bohdan Vlasyuk <bohdan@bodq.vstu.vinnica.ua>)
- Fixed a bug that crashed Window Maker when setting the "Emulate AppIcon"
option for a window using the window Inspector.
Changes since version 0.70.0: Changes since version 0.70.0:

19
WINGs/selection.c
View File

@@ -370,7 +370,6 @@ W_HandleSelectionEvent(XEvent *event)
Bool Bool
WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp, WMCreateSelectionHandler(WMView *view, Atom selection, Time timestamp,
WMSelectionProcs *procs, void *cdata) WMSelectionProcs *procs, void *cdata)
@@ -416,9 +415,15 @@ WMRequestSelection(WMView *view, Atom selection, Atom target, Time timestamp,
if (XGetSelectionOwner(W_VIEW_SCREEN(view)->display, selection) == None) if (XGetSelectionOwner(W_VIEW_SCREEN(view)->display, selection) == None)
return False; return False;
if (!XConvertSelection(W_VIEW_SCREEN(view)->display, selection, target,
W_VIEW_SCREEN(view)->clipboardAtom,
W_VIEW_DRAWABLE(view), timestamp)) {
return False;
}
handler = wmalloc(sizeof(SelectionCallback)); handler = wmalloc(sizeof(SelectionCallback));
handler->view = view; handler->view = view;
handler->selection = selection; handler->selection = selection;
handler->target = target; handler->target = target;
@@ -426,19 +431,13 @@ WMRequestSelection(WMView *view, Atom selection, Atom target, Time timestamp,
handler->callback = callback; handler->callback = callback;
handler->data = cdata; handler->data = cdata;
memset(&handler->flags, 0, sizeof(handler->flags)); memset(&handler->flags, 0, sizeof(handler->flags));
if (selCallbacks == NULL) { if (selCallbacks == NULL) {
selCallbacks = WMCreateArrayWithDestructor(4, wfree); selCallbacks = WMCreateArrayWithDestructor(4, wfree);
} }
WMAddToArray(selCallbacks, handler); WMAddToArray(selCallbacks, handler);
if (!XConvertSelection(W_VIEW_SCREEN(view)->display, selection, target,
W_VIEW_SCREEN(view)->clipboardAtom,
W_VIEW_DRAWABLE(view), timestamp)) {
return False;
}
return True; return True;
} }

3
po/README
View File

@@ -8,7 +8,8 @@ ja.po Japanese 1 ABE Shige <sabe@ibm.net>
Takeo Hashimoto <HashimotoTakeo@mac.com> Takeo Hashimoto <HashimotoTakeo@mac.com>
pt.po Portuguese Eliphas Levy Theodoro <eliphas@conectiva.com.br> pt.po Portuguese Eliphas Levy Theodoro <eliphas@conectiva.com.br>
de.po German Bernd Eggert <Bernd.Eggert@t-online.de> de.po German Bernd Eggert <Bernd.Eggert@t-online.de>
[Matthias Warkus <mawarkus@t-online.de>] Matthias Warkus <mawarkus@t-online.de>
Guido Scholz <guido.scholz@bayernline.de>
es.po Spanish Raul Benito Garcia <raul@fi.upm.es> es.po Spanish Raul Benito Garcia <raul@fi.upm.es>
ko.po Korean 1,2 Byeong-Chan Kim <redhands@linux.sarang.net> ko.po Korean 1,2 Byeong-Chan Kim <redhands@linux.sarang.net>
sv.po Swedish John Forgoil <forgoil@rsn.hk-r.se> sv.po Swedish John Forgoil <forgoil@rsn.hk-r.se>

1995
po/de.po
View File

File diff suppressed because it is too large Load Diff

22
src/winspector.c
View File

@@ -652,17 +652,19 @@ saveSettings(WMButton *button, InspectorPanel *panel)
different |= insertAttribute(dict, winDic, ANoLanguageButton, value, flags); different |= insertAttribute(dict, winDic, ANoLanguageButton, value, flags);
#endif #endif
value = (WMGetButtonSelected(panel->appChk[0])!=0) ? Yes : No; if (wwin->main_window!=None && wApplicationOf(wwin->main_window)!=NULL) {
different2 |= insertAttribute(dict, appDic, AStartHidden, value, flags); value = (WMGetButtonSelected(panel->appChk[0])!=0) ? Yes : No;
different2 |= insertAttribute(dict, appDic, AStartHidden, value, flags);
value = (WMGetButtonSelected(panel->appChk[1])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->appChk[1])!=0) ? Yes : No;
different2 |= insertAttribute(dict, appDic, ANoAppIcon, value, flags); different2 |= insertAttribute(dict, appDic, ANoAppIcon, value, flags);
value = (WMGetButtonSelected(panel->appChk[2])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->appChk[2])!=0) ? Yes : No;
different2 |= insertAttribute(dict, appDic, ASharedAppIcon, value, flags); different2 |= insertAttribute(dict, appDic, ASharedAppIcon, value, flags);
}
if (panel->inspected->fake_group) { if (wwin->fake_group) {
key2 = WMCreatePLString(panel->inspected->fake_group->identifier); key2 = WMCreatePLString(wwin->fake_group->identifier);
if (WMIsPropListEqualTo(key, key2)) { if (WMIsPropListEqualTo(key, key2)) {
WMMergePLDictionaries(winDic, appDic, True); WMMergePLDictionaries(winDic, appDic, True);
different |= different2; different |= different2;
@@ -674,8 +676,8 @@ saveSettings(WMButton *button, InspectorPanel *panel)
} }
WMReleasePropList(key2); WMReleasePropList(key2);
WMReleasePropList(appDic); WMReleasePropList(appDic);
} else if (panel->inspected->main_window != panel->inspected->client_win) { } else if (wwin->main_window != wwin->client_win) {
WApplication *wapp = wApplicationOf(panel->inspected->main_window); WApplication *wapp = wApplicationOf(wwin->main_window);
if (wapp) { if (wapp) {
char *instance = wapp->main_window_desc->wm_instance; char *instance = wapp->main_window_desc->wm_instance;

24
util/wsetfont
View File

@@ -25,8 +25,10 @@
# Luke Kendall <luke@research.canon.com.au> # Luke Kendall <luke@research.canon.com.au>
# Bug fix info for Korean font section from: # Bug fix info for Korean font section from:
# CHOI Junho <junker@jazz.snu.ac.kr> # CHOI Junho <junker@jazz.snu.ac.kr>
# Ukrainian fontset info from:
# Bohdan Vlasyuk <bohdan@vstu.edu.ua>
VERSION="Version 0.5 1998/12/07" VERSION="Version 0.6 2002/01/12"
WDWRITE="wdwrite" WDWRITE="wdwrite"
WDREAD="wdread" WDREAD="wdread"
@@ -48,6 +50,7 @@ Usage: $VERSION
korean helvetica/-*-kodig(ksc5601) See *Note1. korean helvetica/-*-kodig(ksc5601) See *Note1.
korean2 helvetica/daewoo(ksc5601) Included in X11R6/XFree86("fnon" pkg) korean2 helvetica/daewoo(ksc5601) Included in X11R6/XFree86("fnon" pkg)
russian helvetica(koi8-r) Included in X11R6/XFree86("fcyr" pkg) russian helvetica(koi8-r) Included in X11R6/XFree86("fcyr" pkg)
ukrainian helvetica(koi8-u) See *Note1.
turkish unknown See *Note2. turkish unknown See *Note2.
----------------------------------------------------------------------- -----------------------------------------------------------------------
Latin1 Languages: Danish/Dutch/English/Finnish/French/Galician/German/ Latin1 Languages: Danish/Dutch/English/Finnish/French/Galician/German/
@@ -55,11 +58,12 @@ Latin1 Languages: Danish/Dutch/English/Finnish/French/Galician/German/
Latin2 Languages: Croatian/Czech/Polish/Romanian/Slovenian/... Latin2 Languages: Croatian/Czech/Polish/Romanian/Slovenian/...
*Note1: Not included in X11R6/XFree86. You can download them from ... *Note1: Not included in X11R6/XFree86. You can download them from ...
Latin2 X fonts packages: http://sizif.mf.uni-lj.si/linux/cee/iso8859-2.html Latin2 X fonts packages: http://sizif.mf.uni-lj.si/linux/cee/iso8859-2.html
Greek X fonts packages: ftp://argeas.argos.hol.gr/pub/unix/linux/GREEK/fonts/ Greek X fonts packages: ftp://argeas.argos.hol.gr/pub/unix/linux/GREEK/fonts/
ftp://ftp.ntua.gr/pub/fonts/X11/ ftp://ftp.ntua.gr/pub/fonts/X11/
Korean X fonts packages: ftp://linux.sarang.net (Linux RPM) Korean X fonts packages: ftp://linux.sarang.net (Linux RPM)
ftp://ftp.kaist.ac.kr/pub/hangul/fonts ftp://ftp.kaist.ac.kr/pub/hangul/fonts
Ukrainian X fonts packages: http://www.inp.nsk.su/~bolkhov/files/fonts/cyr-rfx/
*Note2: please let me know appropriate font setting for WMGLOBAL/WindowMaker, *Note2: please let me know appropriate font setting for WMGLOBAL/WindowMaker,
and the fonts' URL to download. mail-to: manome@itlb.te.noda.sut.ac.jp and the fonts' URL to download. mail-to: manome@itlb.te.noda.sut.ac.jp
EOF EOF
@@ -97,13 +101,14 @@ fi
# #
# For --auto and --locale= switch... # For --auto and --locale= switch...
# #
all_codings="latin1 latin2 greek japanese korean2 russian" all_codings="latin1 latin2 greek japanese korean2 russian ukrainian"
latin1="ca da de gl nl fi fr de is it no pt es sv se" latin1="ca da de gl nl fi fr de is it no pt es sv se"
latin2="hr cz cs hu pl ro sk sl" latin2="hr cz cs hu pl ro sk sl"
greek="el" greek="el"
japanese="ja" japanese="ja"
korean2="ko" korean2="ko"
russian="ru bg" russian="ru bg"
ukrainian="uk" # note that it's really uk, not ua.
# #
# These are lists of all domains and keys we're gonna change... # These are lists of all domains and keys we're gonna change...
@@ -127,7 +132,7 @@ NotFont="MultiByteText"
# of $NonedefAble will have changed only coding part of font name (if --nodef # of $NonedefAble will have changed only coding part of font name (if --nodef
# command line argument is used). # command line argument is used).
# #
NodefAble="default latin1 latin2 greek russian" NodefAble="default latin1 latin2 greek russian ukrainian"
NodefUnable="japanese korean korean2" NodefUnable="japanese korean korean2"
Supported="$NodefAble $NodefUnable" Supported="$NodefAble $NodefUnable"
@@ -136,12 +141,15 @@ defaultCoding="*-*"
latin2Coding="iso8859-2" latin2Coding="iso8859-2"
greekCoding="iso8859-7" greekCoding="iso8859-7"
russianCoding="koi8-r" russianCoding="koi8-r"
ukrainianCoding="koi8-u"
defaultMultiByteText="AUTO" defaultMultiByteText="AUTO"
latin1MultiByteText="NO" latin1MultiByteText="NO"
latin2MultiByteText="YES" latin2MultiByteText="YES"
greekMultiByteText="YES" greekMultiByteText="YES"
russianMultiByteText="YES" russianMultiByteText="YES"
ukrainianMultiByteText="YES"
# #
# Default WindowMaker fonts for NodefAble font families (part telling us # Default WindowMaker fonts for NodefAble font families (part telling us