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

Removed unused WScreen argument

Browse Source 
The argument WScreen was not longer used, so can be removed.
This commit is contained in:
Rodolfo García Peñas (kix)
2013-10-12 12:40:21 +02:00
committed by Carlos R. Mafra
parent 3b85fca43c
commit 9c6e71ead0
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/defaults.h
View File

@@ -51,7 +51,7 @@ char *get_icon_filename(const char *winstance, const char *wclass, const char *c
Bool default_icon);
int wDefaultGetStartWorkspace(WScreen *scr, const char *instance, const char *class);
int wDefaultGetStartWorkspace(const char *instance, const char *class);
void wDefaultChangeIcon(WScreen *scr, const char *instance, const char* class, const char *file);
RImage *get_rimage_from_file(WScreen *scr, const char *file_name, int max_size);

2
src/session.c
View File

@@ -555,7 +555,7 @@ void wSessionRestoreLastWorkspace(WScreen * scr)
WMPLSetCaseSensitive(False);
/* Get the workspace number for the workspace name */
w = wGetWorkspaceNumber(scr, value);
w = wGetWorkspaceNumber(value);
if (w != w_global.workspace.current && w < w_global.workspace.count)
wWorkspaceChange(scr, w);

4
src/wdefaults.c
View File

@@ -479,7 +479,7 @@ RImage *get_icon_image(WScreen *scr, const char *winstance, const char *wclass,
return get_rimage_from_file(scr, file_name, max_size);
}
int wDefaultGetStartWorkspace(WScreen *scr, const char *instance, const char *class)
int wDefaultGetStartWorkspace(const char *instance, const char *class)
{
WMPropList *value;
int w;
@@ -502,7 +502,7 @@ int wDefaultGetStartWorkspace(WScreen *scr, const char *instance, const char *cl
return -1;
/* Get the workspace number for the workspace name */
w = wGetWorkspaceNumber(scr, tmp);
w = wGetWorkspaceNumber(tmp);
return w;
}

5
src/window.c
View File

@@ -833,8 +833,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
wwin->flags.miniaturized = win_state->state->miniaturized;
if (!IS_OMNIPRESENT(wwin)) {
int w = wDefaultGetStartWorkspace(scr, wwin->wm_instance,
wwin->wm_class);
int w = wDefaultGetStartWorkspace(wwin->wm_instance, wwin->wm_class);
if (w < 0 || w >= w_global.workspace.count) {
workspace = win_state->state->workspace;
if (workspace >= w_global.workspace.count)
@@ -911,7 +910,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
} else {
int w;
w = wDefaultGetStartWorkspace(scr, wwin->wm_instance, wwin->wm_class);
w = wDefaultGetStartWorkspace(wwin->wm_instance, wwin->wm_class);
if (w >= 0 && w < w_global.workspace.count && !(IS_OMNIPRESENT(wwin))) {
workspace = w;

4
src/winspector.c
View File

@@ -928,7 +928,7 @@ static void revertSettings(WMButton *button, InspectorPanel *panel)
showIconFor(WMWidgetScreen(panel->alwChk), panel, wm_instance, wm_class, REVERT_TO_DEFAULT);
n = wDefaultGetStartWorkspace(wwin->screen_ptr, wm_instance, wm_class);
n = wDefaultGetStartWorkspace(wm_instance, wm_class);
if (n >= 0 && n < w_global.workspace.count)
WMSetPopUpButtonSelectedItem(panel->wsP, n + 1);
@@ -1529,7 +1529,7 @@ static void create_tab_icon_workspace(WWindow *wwin, InspectorPanel *panel, int
for (i = 0; i < w_global.workspace.count; i++)
WMAddPopUpButtonItem(panel->wsP, w_global.workspace.array[i]->name);
i = wDefaultGetStartWorkspace(wwin->screen_ptr, wwin->wm_instance, wwin->wm_class);
i = wDefaultGetStartWorkspace(wwin->wm_instance, wwin->wm_class);
if (i >= 0 && i <= w_global.workspace.count)
WMSetPopUpButtonSelectedItem(panel->wsP, i + 1);
else

2
src/workspace.c
View File

@@ -913,7 +913,7 @@ void wWorkspaceRestoreState(WScreen *scr)
}
/* Returns the workspace number for a given workspace name */
int wGetWorkspaceNumber(WScreen *scr, const char *value)
int wGetWorkspaceNumber(const char *value)
{
int w, i;

2
src/workspace.h
View File

@@ -31,7 +31,7 @@ typedef struct WWorkspace {
void wWorkspaceMake(WScreen *scr, int count);
int wWorkspaceNew(WScreen *scr);
int wGetWorkspaceNumber(WScreen *scr, const char *value);
int wGetWorkspaceNumber(const char *value);
Bool wWorkspaceDelete(WScreen *scr, int workspace);
void wWorkspaceChange(WScreen *scr, int workspace);
void wWorkspaceForceChange(WScreen *scr, int workspace);