From: Christophe CURIS <[email protected]>
Signed-off-by: Christophe CURIS <[email protected]> --- src/defaults.h | 10 +++++----- src/dialog.c | 10 +++++----- src/dialog.h | 14 +++++++------- src/framewin.c | 2 +- src/framewin.h | 2 +- src/main.c | 2 +- src/main.h | 2 +- src/menu.c | 6 +++--- src/menu.h | 8 ++++---- src/misc.c | 12 ++++++------ src/misc.h | 12 ++++++------ src/resources.c | 4 ++-- src/resources.h | 4 ++-- src/texture.c | 6 +++--- src/texture.h | 4 ++-- src/wdefaults.c | 10 +++++----- src/window.c | 5 +++-- src/window.h | 4 ++-- src/workspace.c | 4 ++-- src/workspace.h | 4 ++-- src/xmodifier.c | 2 +- src/xmodifier.h | 2 +- 22 files changed, 65 insertions(+), 64 deletions(-) diff --git a/src/defaults.h b/src/defaults.h index dbba9c9..fc07f1c 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -37,24 +37,24 @@ void wDefaultUpdateIcons(WScreen *scr); void wReadStaticDefaults(WMPropList *dict); void wDefaultsCheckDomains(void *arg); void wSaveDefaults(WScreen *scr); -void wDefaultFillAttributes(char *instance, char *class, +void wDefaultFillAttributes(const char *instance, const char *class, WWindowAttributes *attr, WWindowAttributes *mask, Bool useGlobalDefault); char *get_default_image_path(void); RImage *get_default_image(WScreen *scr); -char *wDefaultGetIconFile(char *instance, char *class, Bool default_icon); +char *wDefaultGetIconFile(const char *instance, const char *class, Bool default_icon); RImage *get_icon_image(WScreen *scr, char *winstance, char *wclass, int max_size); char *get_icon_filename(WScreen *scr, char *winstance, char *wclass, char *command, Bool default_icon); -int wDefaultGetStartWorkspace(WScreen *scr, char *instance, char *class); -void wDefaultChangeIcon(WScreen *scr, char *instance, char* class, char *file); +int wDefaultGetStartWorkspace(WScreen *scr, 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, char *file_name, int max_size); -void wDefaultPurgeInfo(WScreen *scr, char *instance, char *class); +void wDefaultPurgeInfo(WScreen *scr, const char *instance, const char *class); #endif /* WMDEFAULTS_H_ */ diff --git a/src/dialog.c b/src/dialog.c index 213d085..2936cf1 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -67,7 +67,7 @@ static WMPoint getCenter(WScreen * scr, int width, int height) return wGetPointToCenterRectInHead(scr, wGetHeadForPointerLocation(scr), width, height); } -int wMessageDialog(WScreen * scr, char *title, char *message, char *defBtn, char *altBtn, char *othBtn) +int wMessageDialog(WScreen * scr, const char *title, const char *message, const char *defBtn, const char *altBtn, const char *othBtn) { WMAlertPanel *panel; Window parent; @@ -109,7 +109,7 @@ static void toggleSaveSession(WMWidget *w, void *data) wPreferences.save_session_on_exit = WMGetButtonSelected((WMButton *) w); } -int wExitDialog(WScreen * scr, char *title, char *message, char *defBtn, char *altBtn, char *othBtn) +int wExitDialog(WScreen * scr, const char *title, const char *message, const char *defBtn, const char *altBtn, const char *othBtn) { WMAlertPanel *panel; WMButton *saveSessionBtn; @@ -407,7 +407,7 @@ static void handleHistoryKeyPress(XEvent * event, void *clientData) } } -int wAdvancedInputDialog(WScreen * scr, char *title, char *message, char *name, char **text) +int wAdvancedInputDialog(WScreen * scr, const char *title, const char *message, const char *name, char **text) { WWindow *wwin; Window parent; @@ -471,7 +471,7 @@ int wAdvancedInputDialog(WScreen * scr, char *title, char *message, char *name, } } -int wInputDialog(WScreen * scr, char *title, char *message, char **text) +int wInputDialog(WScreen * scr, const char *title, const char *message, char **text) { WWindow *wwin; Window parent; @@ -891,7 +891,7 @@ static void keyPressHandler(XEvent * event, void *data) } } -Bool wIconChooserDialog(WScreen * scr, char **file, char *instance, char *class) +Bool wIconChooserDialog(WScreen * scr, char **file, const char *instance, const char *class) { WWindow *wwin; Window parent; diff --git a/src/dialog.h b/src/dialog.h index 530bd26..69093f1 100644 --- a/src/dialog.h +++ b/src/dialog.h @@ -30,15 +30,15 @@ enum { }; -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 wMessageDialog(WScreen *scr, const char *title, const char *message, + const char *defBtn, const char *altBtn, const char *othBtn); +int wAdvancedInputDialog(WScreen *scr, const char *title, const char *message, const char *name, char **text); +int wInputDialog(WScreen *scr, const char *title, const char *message, char **text); -int wExitDialog(WScreen *scr, char *title, char *message, char *defBtn, - char *altBtn, char *othBtn); +int wExitDialog(WScreen *scr, const char *title, const char *message, const char *defBtn, + const char *altBtn, const char *othBtn); -Bool wIconChooserDialog(WScreen *scr, char **file, char *instance, char *class); +Bool wIconChooserDialog(WScreen *scr, char **file, const char *instance, const char *class); void wShowInfoPanel(WScreen *scr); void wShowLegalPanel(WScreen *scr); diff --git a/src/framewin.c b/src/framewin.c index 7304da7..b846c89 100644 --- a/src/framewin.c +++ b/src/framewin.c @@ -1191,7 +1191,7 @@ void wFrameWindowResize(WFrameWindow * fwin, int width, int height) reconfigure(fwin, 0, 0, width, height, True); } -int wFrameWindowChangeTitle(WFrameWindow * fwin, char *new_title) +int wFrameWindowChangeTitle(WFrameWindow * fwin, const char *new_title) { /* check if the title is the same as before */ if (fwin->title) { diff --git a/src/framewin.h b/src/framewin.h index b87845b..22e0edf 100644 --- a/src/framewin.h +++ b/src/framewin.h @@ -181,7 +181,7 @@ void wFrameWindowShowButton(WFrameWindow *fwin, int flags); void wFrameWindowHideButton(WFrameWindow *fwin, int flags); -int wFrameWindowChangeTitle(WFrameWindow *fwin, char *new_title); +int wFrameWindowChangeTitle(WFrameWindow *fwin, const char *new_title); #ifdef XKB_BUTTON_HINT void wFrameWindowUpdateLanguageButton(WFrameWindow *fwin); diff --git a/src/main.c b/src/main.c index 5497e53..cac1228 100644 --- a/src/main.c +++ b/src/main.c @@ -353,7 +353,7 @@ static void shellCommandHandler(pid_t pid, unsigned char status, _tuple * data) wfree(data); } -void ExecuteShellCommand(WScreen * scr, char *command) +void ExecuteShellCommand(WScreen * scr, const char *command) { static char *shell = NULL; pid_t pid; diff --git a/src/main.h b/src/main.h index 585ea34..cf61bc4 100644 --- a/src/main.h +++ b/src/main.h @@ -31,7 +31,7 @@ noreturn void Exit(int status); void Restart(char *manager, Bool abortOnFailure); void SetupEnvironment(WScreen *scr); -void ExecuteShellCommand(WScreen *scr, char *command); +void ExecuteShellCommand(WScreen *scr, const char *command); Bool RelaunchWindow(WWindow *wwin); noreturn void wAbort(Bool dumpCore); void ExecExitScript(void); diff --git a/src/menu.c b/src/menu.c index 2cd2841..9c8e119 100644 --- a/src/menu.c +++ b/src/menu.c @@ -140,7 +140,7 @@ static void appearanceObserver(void *self, WMNotification * notif) * The created menu. *---------------------------------------------------------------------- */ -WMenu *wMenuCreate(WScreen * screen, char *title, int main_menu) +WMenu *wMenuCreate(WScreen * screen, const char *title, int main_menu) { WMenu *menu; static int brother = 0; @@ -230,7 +230,7 @@ WMenu *wMenuCreate(WScreen * screen, char *title, int main_menu) return menu; } -WMenu *wMenuCreateForApp(WScreen * screen, char *title, int main_menu) +WMenu *wMenuCreateForApp(WScreen * screen, const char *title, int main_menu) { WMenu *menu; @@ -254,7 +254,7 @@ static void insertEntry(WMenu * menu, WMenuEntry * entry, int index) menu->entries[index] = entry; } -WMenuEntry *wMenuInsertCallback(WMenu * menu, int index, char *text, +WMenuEntry *wMenuInsertCallback(WMenu * menu, int index, const char *text, void (*callback) (WMenu * menu, WMenuEntry * entry), void *clientdata) { WMenuEntry *entry; diff --git a/src/menu.h b/src/menu.h index 3922bcb..9df9f65 100644 --- a/src/menu.h +++ b/src/menu.h @@ -106,9 +106,9 @@ typedef struct WMenu { void wMenuPaint(WMenu *menu); void wMenuDestroy(WMenu *menu, int recurse); void wMenuRealize(WMenu *menu); -WMenuEntry *wMenuInsertCascade(WMenu *menu, int index, char *text, +WMenuEntry *wMenuInsertCascade(WMenu *menu, int index, const char *text, WMenu *cascade); -WMenuEntry *wMenuInsertCallback(WMenu *menu, int index, char *text, +WMenuEntry *wMenuInsertCallback(WMenu *menu, int index, const char *text, void (*callback)(WMenu *menu, WMenuEntry *entry), void *clientdata); @@ -119,8 +119,8 @@ void wMenuEntrySetCascade(WMenu *menu, WMenuEntry *entry, WMenu *cascade); void wMenuRemoveItem(WMenu *menu, int index); -WMenu *wMenuCreate(WScreen *screen, char *title, int main_menu); -WMenu *wMenuCreateForApp(WScreen *screen, char *title, int main_menu); +WMenu *wMenuCreate(WScreen *screen, const char *title, int main_menu); +WMenu *wMenuCreateForApp(WScreen *screen, const char *title, int main_menu); void wMenuMap(WMenu *menu); void wMenuMapAt(WMenu *menu, int x, int y, int keyboard); #define wMenuMapCopyAt(menu, x, y) wMenuMapAt((menu)->brother, (x), (y), False) diff --git a/src/misc.c b/src/misc.c index 3d76bc8..6753d14 100644 --- a/src/misc.c +++ b/src/misc.c @@ -316,7 +316,7 @@ char *ShrinkString(WMFont * font, const char *string, int width) return text; } -char *FindImage(char *paths, char *file) +char *FindImage(const char *paths, const char *file) { char *tmp, *path = NULL; @@ -507,7 +507,7 @@ getuserinput(WScreen *scr, const char *line, int *ptr, Bool advanced) * OPTION etc. NORMAL %<input> */ #define TMPBUFSIZE 64 -char *ExpandOptions(WScreen * scr, char *cmdline) +char *ExpandOptions(WScreen * scr, const char *cmdline) { int ptr, optr, state, len, olen; char *out, *nout; @@ -688,7 +688,7 @@ char *ExpandOptions(WScreen * scr, char *cmdline) return NULL; } -void ParseWindowName(WMPropList * value, char **winstance, char **wclass, char *where) +void ParseWindowName(WMPropList * value, char **winstance, char **wclass, const char *where) { char *name; @@ -815,7 +815,7 @@ char *GetShortcutKey(WShortKey key) return GetShortcutString(tmp); } -char *EscapeWM_CLASS(char *name, char *class) +char *EscapeWM_CLASS(const char *name, const char *class) { char *ret; char *ename = NULL, *eclass = NULL; @@ -921,7 +921,7 @@ static void UnescapeWM_CLASS(const char *str, char **name, char **class) } } -void SendHelperMessage(WScreen * scr, char type, int workspace, char *msg) +void SendHelperMessage(WScreen * scr, char type, int workspace, const char *msg) { char *buffer; int len; @@ -986,7 +986,7 @@ Bool UpdateDomainFile(WDDomain * domain) return result; } -char *StrConcatDot(char *a, char *b) +char *StrConcatDot(const char *a, const char *b) { int len; char *str; diff --git a/src/misc.h b/src/misc.h index 1d5479d..819f2bd 100644 --- a/src/misc.h +++ b/src/misc.h @@ -32,15 +32,15 @@ Bool UpdateDomainFile(WDDomain * domain); void move_window(Window win, int from_x, int from_y, int to_x, int to_y); void SlideWindow(Window win, int from_x, int from_y, int to_x, int to_y); void SlideWindows(Window *wins[], int n, int from_x, int from_y, int to_x, int to_y); -void ParseWindowName(WMPropList * value, char **winstance, char **wclass, char *where); -void SendHelperMessage(WScreen * scr, char type, int workspace, char *msg); +void ParseWindowName(WMPropList * value, char **winstance, char **wclass, const char *where); +void SendHelperMessage(WScreen * scr, char type, int workspace, const char *msg); char *ShrinkString(WMFont * font, const char *string, int width); -char *FindImage(char *paths, char *file); -char *ExpandOptions(WScreen * scr, char *cmdline); +char *FindImage(const char *paths, const char *file); +char *ExpandOptions(WScreen * scr, const char *cmdline); char *GetShortcutString(const char *text); char *GetShortcutKey(WShortKey key); -char *EscapeWM_CLASS(char *name, char *class); -char *StrConcatDot(char *a, char *b); +char *EscapeWM_CLASS(const char *name, const char *class); +char *StrConcatDot(const char *a, const char *b); char *GetCommandForWindow(Window win); #endif diff --git a/src/resources.c b/src/resources.c index 3d7ba65..68d85bb 100644 --- a/src/resources.c +++ b/src/resources.c @@ -35,7 +35,7 @@ #include "resources.h" #include "screen.h" -int wGetColorForColormap(Colormap colormap, char *color_name, XColor * color) +int wGetColorForColormap(Colormap colormap, const char *color_name, XColor * color) { if (!XParseColor(dpy, colormap, color_name, color)) { wwarning(_("could not parse color \"%s\""), color_name); @@ -48,7 +48,7 @@ int wGetColorForColormap(Colormap colormap, char *color_name, XColor * color) return True; } -int wGetColor(WScreen * scr, char *color_name, XColor * color) +int wGetColor(WScreen * scr, const char *color_name, XColor * color) { return wGetColorForColormap(scr->w_colormap, color_name, color); } diff --git a/src/resources.h b/src/resources.h index bbc9278..a310c60 100644 --- a/src/resources.h +++ b/src/resources.h @@ -21,8 +21,8 @@ #ifndef WMRESOURCES_H_ #define WMRESOURCES_H_ -int wGetColorForColormap(Colormap colormap, char *color_name, XColor *color); -int wGetColor(WScreen *scr, char *color_name, XColor *color); +int wGetColorForColormap(Colormap colormap, const char *color_name, XColor *color); +int wGetColor(WScreen *scr, const char *color_name, XColor *color); void wFreeColor(WScreen *scr, unsigned long pixel); #endif diff --git a/src/texture.c b/src/texture.c index b7ddf89..b759fbc 100644 --- a/src/texture.c +++ b/src/texture.c @@ -175,7 +175,7 @@ void wTextureDestroy(WScreen * scr, WTexture * texture) #undef CANFREE } -WTexGradient *wTextureMakeGradient(WScreen * scr, int style, RColor * from, RColor * to) +WTexGradient *wTextureMakeGradient(WScreen * scr, int style, const RColor * from, const RColor * to) { WTexGradient *texture; XGCValues gcv; @@ -199,8 +199,8 @@ WTexGradient *wTextureMakeGradient(WScreen * scr, int style, RColor * from, RCol return texture; } -WTexIGradient *wTextureMakeIGradient(WScreen * scr, int thickness1, RColor colors1[2], - int thickness2, RColor colors2[2]) +WTexIGradient *wTextureMakeIGradient(WScreen * scr, int thickness1, const RColor colors1[2], + int thickness2, const RColor colors2[2]) { WTexIGradient *texture; XGCValues gcv; diff --git a/src/texture.h b/src/texture.h index 1dbe6db..c0ed42d 100644 --- a/src/texture.h +++ b/src/texture.h @@ -159,10 +159,10 @@ typedef union WTexture { WTexSolid *wTextureMakeSolid(WScreen*, XColor*); -WTexGradient *wTextureMakeGradient(WScreen*, int, RColor*, RColor*); +WTexGradient *wTextureMakeGradient(WScreen*, int, const RColor*, const RColor*); WTexMGradient *wTextureMakeMGradient(WScreen*, int, RColor**); WTexTGradient *wTextureMakeTGradient(WScreen*, int, RColor*, RColor*, char *, int); -WTexIGradient *wTextureMakeIGradient(WScreen*, int, RColor[], int, RColor[]); +WTexIGradient *wTextureMakeIGradient(WScreen*, int, const RColor[], int, const RColor[]); WTexPixmap *wTextureMakePixmap(WScreen *scr, int style, char *pixmap_file, XColor *color); void wTextureDestroy(WScreen*, WTexture*); diff --git a/src/wdefaults.c b/src/wdefaults.c index 1fffd70..48f4113 100644 --- a/src/wdefaults.c +++ b/src/wdefaults.c @@ -200,7 +200,7 @@ static WMPropList *get_value_from_instanceclass(const char *value) * *---------------------------------------------------------------------- */ -void wDefaultFillAttributes(char *instance, char *class, +void wDefaultFillAttributes(const char *instance, const char *class, WWindowAttributes *attr, WWindowAttributes *mask, Bool useGlobalDefault) { @@ -483,7 +483,7 @@ RImage *get_icon_image(WScreen *scr, char *winstance, char *wclass, int max_size return get_rimage_from_file(scr, file_name, max_size); } -int wDefaultGetStartWorkspace(WScreen * scr, char *instance, char *class) +int wDefaultGetStartWorkspace(WScreen * scr, const char *instance, const char *class) { WMPropList *value; int w; @@ -512,7 +512,7 @@ int wDefaultGetStartWorkspace(WScreen * scr, char *instance, char *class) } /* Get the name of the Icon File. If default_icon is True, then, default value included */ -char *wDefaultGetIconFile(char *instance, char *class, Bool default_icon) +char *wDefaultGetIconFile(const char *instance, const char *class, Bool default_icon) { WMPropList *value; char *tmp; @@ -533,7 +533,7 @@ char *wDefaultGetIconFile(char *instance, char *class, Bool default_icon) return tmp; } -void wDefaultChangeIcon(WScreen * scr, char *instance, char *class, char *file) +void wDefaultChangeIcon(WScreen * scr, const char *instance, const char *class, const char *file) { WDDomain *db = WDWindowAttributes; WMPropList *icon_value = NULL, *value, *attr, *key, *def_win, *def_icon = NULL; @@ -597,7 +597,7 @@ void wDefaultChangeIcon(WScreen * scr, char *instance, char *class, char *file) WMPLSetCaseSensitive(False); } -void wDefaultPurgeInfo(WScreen *scr, char *instance, char *class) +void wDefaultPurgeInfo(WScreen *scr, const char *instance, const char *class) { WMPropList *value, *key, *dict; char *buffer; diff --git a/src/window.c b/src/window.c index eb72223..0a92793 100644 --- a/src/window.c +++ b/src/window.c @@ -1324,7 +1324,7 @@ WWindow *wManageWindow(WScreen *scr, Window window) } WWindow *wManageInternalWindow(WScreen *scr, Window window, Window owner, - char *title, int x, int y, int width, int height) + const char *title, int x, int y, int width, int height) { WWindow *wwin; int foo; @@ -2548,7 +2548,8 @@ void wWindowUpdateGNUstepAttr(WWindow * wwin, GNUstepWMAttributes * attr) } } -WMagicNumber wWindowAddSavedState(char *instance, char *class, char *command, pid_t pid, WSavedState * state) +WMagicNumber wWindowAddSavedState(const char *instance, const char *class, + const char *command, pid_t pid, WSavedState * state) { WWindowState *wstate; diff --git a/src/window.h b/src/window.h index ec032c0..94744b4 100644 --- a/src/window.h +++ b/src/window.h @@ -370,7 +370,7 @@ void wWindowSetKeyGrabs(WWindow *wwin); void wWindowResetMouseGrabs(WWindow *wwin); WWindow *wManageInternalWindow(WScreen *scr, Window window, Window owner, - char *title, int x, int y, + const char *title, int x, int y, int width, int height); void wWindowSetupInitialAttributes(WWindow *wwin, int *level, int *workspace); @@ -383,7 +383,7 @@ void wWindowUnmap(WWindow *wwin); void wWindowDeleteSavedStatesForPID(pid_t pid); -WMagicNumber wWindowAddSavedState(char *instance, char *class, char *command, +WMagicNumber wWindowAddSavedState(const char *instance, const char *class, const char * command, pid_t pid, WSavedState *state); WMagicNumber wWindowGetSavedState(Window win); diff --git a/src/workspace.c b/src/workspace.c index a48fe90..5c44a61 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -667,7 +667,7 @@ static void newWSCommand(WMenu *menu, WMenuEntry *foo) wWorkspaceChange(menu->frame->screen_ptr, ws); } -void wWorkspaceRename(WScreen * scr, int workspace, char *name) +void wWorkspaceRename(WScreen * scr, int workspace, const char *name) { char buf[MAX_WORKSPACENAME_WIDTH + 1]; char *tmp; @@ -923,7 +923,7 @@ void wWorkspaceRestoreState(WScreen *scr) } /* Returns the workspace number for a given workspace name */ -int wGetWorkspaceNumber(WScreen * scr, char * value) +int wGetWorkspaceNumber(WScreen * scr, const char * value) { int w, i; diff --git a/src/workspace.h b/src/workspace.h index e28c5c2..9801c57 100644 --- a/src/workspace.h +++ b/src/workspace.h @@ -31,7 +31,7 @@ typedef struct WWorkspace { void wWorkspaceMake(WScreen *scr, int count); int wWorkspaceNew(WScreen *scr); -int wGetWorkspaceNumber(WScreen * scr, char * value); +int wGetWorkspaceNumber(WScreen * scr, const char * value); Bool wWorkspaceDelete(WScreen *scr, int workspace); void wWorkspaceChange(WScreen *scr, int workspace); void wWorkspaceForceChange(WScreen *scr, int workspace); @@ -40,7 +40,7 @@ void wWorkspaceMenuUpdate(WScreen *scr, WMenu *menu); void wWorkspaceMenuEdit(WScreen *scr); void wWorkspaceSaveState(WScreen *scr, WMPropList *old_state); void wWorkspaceRestoreState(WScreen *scr); -void wWorkspaceRename(WScreen *scr, int workspace, char *name); +void wWorkspaceRename(WScreen *scr, int workspace, const char *name); void wWorkspaceRelativeChange(WScreen *scr, int amount); #endif diff --git a/src/xmodifier.c b/src/xmodifier.c index 7642443..30f5a88 100644 --- a/src/xmodifier.c +++ b/src/xmodifier.c @@ -262,7 +262,7 @@ static void x_reset_modifier_mapping(Display * display) XFreeModifiermap(x_modifier_keymap); } -int wXModifierFromKey(char *key) +int wXModifierFromKey(const char *key) { if (strcasecmp(key, "SHIFT") == 0 && ShiftMask != 0) return ShiftMask; diff --git a/src/xmodifier.h b/src/xmodifier.h index f8ac1c6..89e6757 100644 --- a/src/xmodifier.h +++ b/src/xmodifier.h @@ -21,6 +21,6 @@ #define _XMODIFIER_H_INCLUDED void wXModifierInitialize(void); -int wXModifierFromKey(char *key); +int wXModifierFromKey(const char *key); #endif /* _XMODIFIER_H_INCLUDED */ -- 1.7.10.4 -- To unsubscribe, send mail to [email protected].
