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

limit VirtualEdgeThickness values to the 0..10 range

Browse Source
This commit is contained in:
dan
2004-10-24 21:39:56 +00:00
parent 897e75d554
commit 8bf6071c48
3 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -7,6 +7,7 @@ Changes since version 0.90.0:
is set to 0. is set to 0.
- fixed virtual desktop to resize the edge on the fly when edge thickness - fixed virtual desktop to resize the edge on the fly when edge thickness
changes. changes.
- limit VirtualEdgeThickness to values in the 0..10 range
Changes since version 0.80.2: Changes since version 0.80.2:

30
src/defaults.c
View File

@@ -947,11 +947,9 @@ readGlobalDomain(char *domainName, Bool requireDictionary)
} }
#if defined(GLOBAL_PREAMBLE_MENU_FILE) || defined(GLOBAL_EPILOGUE_MENU_FILE) #if defined(GLOBAL_PREAMBLE_MENU_FILE) || defined(GLOBAL_EPILOGUE_MENU_FILE)
static void prependMenu(WMPropList *destarr, WMPropList *array) static void
prependMenu(WMPropList *destarr, WMPropList *array)
{ {
WMPropList *item; WMPropList *item;
int i; int i;
@@ -963,7 +961,9 @@ static void prependMenu(WMPropList *destarr, WMPropList *array)
} }
} }
static void appendMenu(WMPropList *destarr, WMPropList *array)
static void
appendMenu(WMPropList *destarr, WMPropList *array)
{ {
WMPropList *item; WMPropList *item;
int i; int i;
@@ -977,7 +977,8 @@ static void appendMenu(WMPropList *destarr, WMPropList *array)
#endif #endif
void wDefaultsMergeGlobalMenus(WDDomain *menuDomain) void
wDefaultsMergeGlobalMenus(WDDomain *menuDomain)
{ {
WMPropList *menu = menuDomain->dictionary; WMPropList *menu = menuDomain->dictionary;
WMPropList *submenu; WMPropList *submenu;
@@ -1591,10 +1592,8 @@ again:
if (ret) if (ret)
*ret = &data; *ret = &data;
if (addr)
if (addr) {
*(char*)addr = data; *(char*)addr = data;
}
return True; return True;
} }
@@ -1622,10 +1621,9 @@ getInt(WScreen *scr, WDefaultEntry *entry, WMPropList *value, void *addr,
if (ret) if (ret)
*ret = &data; *ret = &data;
if (addr)
if (addr) {
*(int*)addr = data; *(int*)addr = data;
}
return True; return True;
} }
@@ -1705,10 +1703,8 @@ again:
if (ret) if (ret)
*ret = &data; *ret = &data;
if (addr)
if (addr) {
*(WCoord*)addr = data; *(WCoord*)addr = data;
}
return True; return True;
} }
@@ -1732,7 +1728,6 @@ getString(WScreen *scr, WDefaultEntry *entry, WMPropList *value, void *addr,
if (ret) if (ret)
*ret = &data; *ret = &data;
if (addr) if (addr)
*(char**)addr = wstrdup(data); *(char**)addr = wstrdup(data);
@@ -1822,7 +1817,6 @@ getEnum(WScreen *scr, WDefaultEntry *entry, WMPropList *value, void *addr,
if (ret) if (ret)
*ret = &data; *ret = &data;
if (addr) if (addr)
*(signed char*)addr = data; *(signed char*)addr = data;
@@ -3367,7 +3361,7 @@ setWorkspaceBack(WScreen *scr, WDefaultEntry *entry, WMPropList *value,
#ifdef VIRTUAL_DESKTOP #ifdef VIRTUAL_DESKTOP
static int static int
setVirtualEdgeThickness(WScreen *scr, WDefaultEntry *entry, XColor *color, long index) setVirtualEdgeThickness(WScreen *scr, WDefaultEntry *entry, int *value, void *dummy)
{ {
wWorkspaceUpdateEdge(scr); wWorkspaceUpdateEdge(scr);
return 0; return 0;

12
src/workspace.c
View File

@@ -1026,6 +1026,18 @@ destroyEdge(WScreen *scr)
void void
wWorkspaceUpdateEdge(WScreen *scr) wWorkspaceUpdateEdge(WScreen *scr)
{ {
static int thickness = -1;
if ((int)wPreferences.vedge_thickness < 0)
wPreferences.vedge_thickness = 0;
else if ((int)wPreferences.vedge_thickness > 10)
wPreferences.vedge_thickness = 10;
if (wPreferences.vedge_thickness == thickness)
return;
thickness = wPreferences.vedge_thickness;
if (wPreferences.vedge_thickness) { if (wPreferences.vedge_thickness) {
destroyEdge(scr); destroyEdge(scr);
wWorkspaceManageEdge(scr); wWorkspaceManageEdge(scr);