From 1b0ed30b9b77ad3c7bc3a2a4a4b79d8f817ba1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= Date: Sat, 14 Apr 2012 02:27:33 +0200 Subject: [PATCH] WindowMaker: Header files clean code Changes: - Spaces replaced by tabs in the structs - Removed unused variables: - has_titlebar, never used - Functions sort by return type --- src/defaults.h | 34 ++++++----------- src/funcs.h | 101 ++++++++++++++++--------------------------------- src/icon.h | 52 ++++++++++++------------- 3 files changed, 69 insertions(+), 118 deletions(-) diff --git a/src/defaults.h b/src/defaults.h index 9174e817..95ddff24 100644 --- a/src/defaults.h +++ b/src/defaults.h @@ -22,42 +22,32 @@ #define WMDEFAULTS_H_ typedef struct WDDomain { - char *domain_name; - WMPropList *dictionary; - char *path; - time_t timestamp; + char *domain_name; + WMPropList *dictionary; + char *path; + time_t timestamp; } WDDomain; -#if 0 -WMPropList* wDefaultsInit(int screen_number); -#endif - - -WDDomain* wDefaultsInitDomain(char *domain, Bool requireDictionary); +WDDomain * wDefaultsInitDomain(char *domain, Bool requireDictionary); void wDefaultsMergeGlobalMenus(WDDomain *menuDomain); void wReadDefaults(WScreen *scr, WMPropList *new_dict); - void wDefaultUpdateIcons(WScreen *scr); - void wReadStaticDefaults(WMPropList *dict); - void wDefaultsCheckDomains(void *arg); - void wSaveDefaults(WScreen *scr); - -char *wDefaultGetIconFile(WScreen *scr, char *instance, char *class, - Bool noDefault); - -RImage *wDefaultGetImage(WScreen *scr, char *winstance, char *wclass, int max_size); - void wDefaultFillAttributes(WScreen *scr, char *instance, char *class, WWindowAttributes *attr, WWindowAttributes *mask, Bool useGlobalDefault); + +char * wDefaultGetIconFile(WScreen *scr, char *instance, char *class, + Bool noDefault); + +RImage * wDefaultGetImage(WScreen *scr, char *winstance, char *wclass, int max_size); + + int wDefaultGetStartWorkspace(WScreen *scr, char *instance, char *class); - void wDefaultChangeIcon(WScreen *scr, char *instance, char* class, char *file); - #endif /* WMDEFAULTS_H_ */ diff --git a/src/funcs.h b/src/funcs.h index f64a40ff..e827504d 100644 --- a/src/funcs.h +++ b/src/funcs.h @@ -28,103 +28,75 @@ #include "defaults.h" typedef void (WCallBack)(void *cdata); - typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata); void Shutdown(WShutdownMode mode); - void RestoreDesktop(WScreen *scr); - void Exit(int status) __attribute__((noreturn)); - void Restart(char *manager, Bool abortOnFailure); - void SetupEnvironment(WScreen *scr); - void DispatchEvent(XEvent *event); - void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action); - -Bool wRootMenuPerformShortcut(XEvent *event); - void wRootMenuBindShortcuts(Window window); - void OpenRootMenu(WScreen *scr, int x, int y, int keyboard); - void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard); - void InitializeSwitchMenu(void); - void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard); - void OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard); - void OpenMiniwindowMenu(WWindow *wwin, int x, int y); - void CloseWindowMenu(WScreen *scr); - void DestroyWindowMenu(WScreen *scr); - -WMagicNumber wAddDeathHandler(pid_t pid, WDeathHandler *callback, void *cdata); - void wColormapInstallForWindow(WScreen *scr, WWindow *wwin); - void wColormapInstallRoot(WScreen *scr); - void wColormapUninstallRoot(WScreen *scr); - void wColormapAllowClientInstallation(WScreen *scr, Bool starting); - -Pixmap LoadIcon(WScreen *scr, char *path, char *mask, int title_height); - void PlaceIcon(WScreen *scr, int *x_ret, int *y_ret, int head); - -int calcIntersectionArea(int x1, int y1, int w1, int h1, - int x2, int y2, int w2, int h2); - +void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next, Bool class_only); +void SendHelperMessage(WScreen *scr, char type, int workspace, char *msg); +void UnescapeWM_CLASS(char *str, char **name, char **class); +void ExecuteShellCommand(WScreen *scr, char *command); +void ExecExitScript(); void PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, unsigned int width, unsigned int height); +void ParseWindowName(WMPropList *value, char **winstance, char **wclass, + char *where); -void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next, Bool class_only); +void wHackedGrabButton(unsigned int button, unsigned int modifiers, + Window grab_window, Bool owner_events, + unsigned int event_mask, int pointer_mode, + int keyboard_mode, Window confine_to, Cursor cursor); + +WMagicNumber wAddDeathHandler(pid_t pid, WDeathHandler *callback, void *cdata); + +Pixmap LoadIcon(WScreen *scr, char *path, char *mask, int title_height); + + +int calcIntersectionArea(int x1, int y1, int w1, int h1, + int x2, int y2, int w2, int h2); #ifdef USECPP char *MakeCPPArgs(char *path); #endif -char *StrConcatDot(char *a, char *b); - -char *ExpandOptions(WScreen *scr, char *cmdline); - -void ExecuteShellCommand(WScreen *scr, char *command); +char * StrConcatDot(char *a, char *b); +char * ExpandOptions(WScreen *scr, char *cmdline); +char * ShrinkString(WMFont *font, char *string, int width); +char * FindImage(char *paths, char *file); +char * GetShortcutString(char *text); +char * EscapeWM_CLASS(char *name, char *class); +Bool wRootMenuPerformShortcut(XEvent *event); Bool RelaunchWindow(WWindow *wwin); - Bool IsDoubleClick(WScreen *scr, XEvent *event); +Bool UpdateDomainFile(WDDomain *domain); -WWindow *NextToFocusAfter(WWindow *wwin); -WWindow *NextToFocusBefore(WWindow *wwin); +WWindow * NextToFocusAfter(WWindow *wwin); +WWindow * NextToFocusBefore(WWindow *wwin); void SlideWindow(Window win, int from_x, int from_y, int to_x, int to_y); -char *ShrinkString(WMFont *font, char *string, int width); - -char *FindImage(char *paths, char *file); - -RImage*wGetImageForWindowName(WScreen *scr, char *winstance, char *wclass); - -void ParseWindowName(WMPropList *value, char **winstance, char **wclass, - char *where); - -void SendHelperMessage(WScreen *scr, char type, int workspace, char *msg); - -char *GetShortcutString(char *text); - -char *EscapeWM_CLASS(char *name, char *class); - -void UnescapeWM_CLASS(char *str, char **name, char **class); - -Bool UpdateDomainFile(WDDomain *domain); +RImage * wGetImageForWindowName(WScreen *scr, char *winstance, char *wclass); #ifdef NUMLOCK_HACK void wHackedGrabKey(int keycode, unsigned int modifiers, @@ -132,25 +104,16 @@ void wHackedGrabKey(int keycode, unsigned int modifiers, int keyboard_mode); #endif -void wHackedGrabButton(unsigned int button, unsigned int modifiers, - Window grab_window, Bool owner_events, - unsigned int event_mask, int pointer_mode, - int keyboard_mode, Window confine_to, Cursor cursor); - - -void ExecExitScript(); - /****** I18N Wrapper for XFetchName,XGetIconName ******/ Bool wFetchName(Display *dpy, Window win, char **winname); Bool wGetIconName(Display *dpy, Window win, char **iconname); /* Free returned string it when done. (applies to the next 2 functions) */ -char* GetCommandForWindow(Window win); -char* GetProgramNameForWindow(Window win); +char * GetCommandForWindow(Window win); +char * GetProgramNameForWindow(Window win); Bool GetCommandForPid(int pid, char ***argv, int *argc); int getWVisualID(int screen); - #endif diff --git a/src/icon.h b/src/icon.h index 97869951..09b41903 100644 --- a/src/icon.h +++ b/src/icon.h @@ -26,52 +26,50 @@ #include "window.h" #include "funcs.h" - #define TILE_NORMAL 0 #define TILE_CLIP 1 - typedef struct WIcon { - WCoreWindow *core; - WWindow *owner; /* owner window */ - char *icon_name; /* the icon name hint */ + WCoreWindow *core; + WWindow *owner; /* owner window */ + char *icon_name; /* the icon name hint */ - Window icon_win; /* client suplied icon window */ + Window icon_win; /* client suplied icon window */ - char *file; /* the file with the icon image */ - RImage *file_image; /* the image from the file */ + char *file; /* the file with the icon image */ + RImage *file_image; /* the image from the file */ - unsigned int tile_type:4; - unsigned int show_title:1; - unsigned int has_titlebar:1; - unsigned int force_paint:1; /* True for icon update and repaint */ - unsigned int selected:1; - unsigned int step:3; /* selection cycle step */ - unsigned int shadowed:1; /* If the icon is to be blured */ - unsigned int mapped:1; - unsigned int highlighted:1; + unsigned int tile_type:4; + unsigned int show_title:1; + unsigned int force_paint:1; /* True for icon update and repaint */ + unsigned int selected:1; + unsigned int step:3; /* selection cycle step */ + unsigned int shadowed:1; /* If the icon is to be blured */ + unsigned int mapped:1; + unsigned int highlighted:1; - Pixmap pixmap; + Pixmap pixmap; - WMHandlerID handlerID; /* timer handler ID for cycling select - * color */ + WMHandlerID handlerID; /* timer handler ID for cycling select + * color */ } WIcon; -WIcon *wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile); -WIcon *wIconCreate(WWindow *wwin); +WIcon * wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile); +WIcon * wIconCreate(WWindow *wwin); + void wIconDestroy(WIcon *icon); void wIconPaint(WIcon *icon); void wIconUpdate(WIcon *icon); -void wIconChangeTitle(WIcon *icon, char *new_title); -Bool wIconChangeImageFile(WIcon *icon, char *file); void wIconSelect(WIcon *icon); +void wIconChangeTitle(WIcon *icon, char *new_title); -RImage *wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size); +Bool wIconChangeImageFile(WIcon *icon, char *file); -char *wIconStore(WIcon *icon); +RImage * wIconValidateIconSize(WScreen *scr, RImage *icon, int max_size); + +char * wIconStore(WIcon *icon); #ifdef NEWAPPICON void wIconSetHighlited(WIcon *icon, Bool flag); #endif /* NEWAPPICON */ - #endif /* WMICON_H_ */