From e33d6cae8097a2e563aafea6572d0b21e6a70fe6 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 11 Apr 2008 11:22:09 +0200 Subject: [PATCH] [uicb] Rename Uicb type to uicb_t Signed-off-by: Julien Danjou --- awesome.h | 2 +- build-utils/uicbgen.sh | 2 +- client.h | 28 ++++++++++++++-------------- focus.h | 4 ++-- layout.h | 2 +- layouts/tile.h | 6 +++--- mouse.h | 4 ++-- screen.h | 4 ++-- statusbar.h | 2 +- structs.h | 4 ++-- tag.h | 16 ++++++++-------- titlebar.h | 2 +- uicb.c | 2 +- uicb.h | 8 ++++---- widget.h | 2 +- 15 files changed, 44 insertions(+), 44 deletions(-) diff --git a/awesome.h b/awesome.h index a970bb34..85cc528a 100644 --- a/awesome.h +++ b/awesome.h @@ -24,7 +24,7 @@ #include "uicb.h" -Uicb uicb_quit; +uicb_t uicb_quit; #endif // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/build-utils/uicbgen.sh b/build-utils/uicbgen.sh index 4710768d..6c44b19b 100755 --- a/build-utils/uicbgen.sh +++ b/build-utils/uicbgen.sh @@ -7,7 +7,7 @@ echo "{" for file in ${top_srcdir}/*.h ${top_srcdir}/layouts/*.h do echo " /* $file */" - grep '^Uicb uicb_' $file | cut -d' ' -f2 | cut -d\; -f1 | while read uicb + grep '^uicb_t uicb_' $file | cut -d' ' -f2 | cut -d\; -f1 | while read uicb do shortname=$(echo $uicb | cut -d _ -f2-) echo " {\"$shortname\", $uicb}," diff --git a/client.h b/client.h index 86af0fb5..43462db7 100644 --- a/client.h +++ b/client.h @@ -43,20 +43,20 @@ void client_saveprops(Client *); void client_kill(Client *); void client_setfloating(Client *, bool, layer_t); -Uicb uicb_client_kill; -Uicb uicb_client_moveresize; -Uicb uicb_client_settrans; -Uicb uicb_client_swapnext; -Uicb uicb_client_swapprev; -Uicb uicb_client_togglemax; -Uicb uicb_client_toggleverticalmax; -Uicb uicb_client_togglehorizontalmax; -Uicb uicb_client_zoom; -Uicb uicb_client_focusnext; -Uicb uicb_client_focusprev; -Uicb uicb_client_togglefloating; -Uicb uicb_client_togglescratch; -Uicb uicb_client_setscratch; +uicb_t uicb_client_kill; +uicb_t uicb_client_moveresize; +uicb_t uicb_client_settrans; +uicb_t uicb_client_swapnext; +uicb_t uicb_client_swapprev; +uicb_t uicb_client_togglemax; +uicb_t uicb_client_toggleverticalmax; +uicb_t uicb_client_togglehorizontalmax; +uicb_t uicb_client_zoom; +uicb_t uicb_client_focusnext; +uicb_t uicb_client_focusprev; +uicb_t uicb_client_togglefloating; +uicb_t uicb_client_togglescratch; +uicb_t uicb_client_setscratch; DO_SLIST(Client, client, p_delete) diff --git a/focus.h b/focus.h index 4e99d849..ac16b51a 100644 --- a/focus.h +++ b/focus.h @@ -28,8 +28,8 @@ void focus_add_client(Client *); void focus_delete_client(Client *); Client * focus_get_current_client(int); -Uicb uicb_focus_history; -Uicb uicb_focus_client_byname; +uicb_t uicb_focus_history; +uicb_t uicb_focus_client_byname; DO_SLIST(client_node_t, client_node, p_delete) diff --git a/layout.h b/layout.h index 3ec973b6..427d2cec 100644 --- a/layout.h +++ b/layout.h @@ -41,7 +41,7 @@ DO_SLIST(Layout, layout, p_delete) int layout_refresh(void); Layout * layout_get_current(int); -Uicb uicb_tag_setlayout; +uicb_t uicb_tag_setlayout; #endif // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/layouts/tile.h b/layouts/tile.h index c221b9f9..6280f56c 100644 --- a/layouts/tile.h +++ b/layouts/tile.h @@ -30,9 +30,9 @@ LayoutArrange layout_tileleft; LayoutArrange layout_tilebottom; LayoutArrange layout_tiletop; -Uicb uicb_tag_setnmaster; -Uicb uicb_tag_setncol; -Uicb uicb_tag_setmwfact; +uicb_t uicb_tag_setnmaster; +uicb_t uicb_tag_setncol; +uicb_t uicb_tag_setmwfact; #endif // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/mouse.h b/mouse.h index a099f3f0..95a11b90 100644 --- a/mouse.h +++ b/mouse.h @@ -24,8 +24,8 @@ #include "uicb.h" -Uicb uicb_client_movemouse; -Uicb uicb_client_resizemouse; +uicb_t uicb_client_movemouse; +uicb_t uicb_client_resizemouse; #endif // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/screen.h b/screen.h index 3c67d7da..40558c93 100644 --- a/screen.h +++ b/screen.h @@ -29,8 +29,8 @@ area_t get_display_area(int, Statusbar *, Padding *); int screen_virttophys(int); void move_client_to_screen(Client *, int, bool); -Uicb uicb_screen_focus; -Uicb uicb_client_movetoscreen; +uicb_t uicb_screen_focus; +uicb_t uicb_client_movetoscreen; #endif // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/statusbar.h b/statusbar.h index 28013ca7..b2433fe1 100644 --- a/statusbar.h +++ b/statusbar.h @@ -29,7 +29,7 @@ void statusbar_preinit(Statusbar *); void statusbar_init(Statusbar *); Statusbar * statusbar_getbyname(int, const char *); -Uicb uicb_statusbar_toggle; +uicb_t uicb_statusbar_toggle; DO_SLIST(Statusbar, statusbar, p_delete) diff --git a/structs.h b/structs.h index b7499d57..48a304c5 100644 --- a/structs.h +++ b/structs.h @@ -87,7 +87,7 @@ struct Key unsigned long mod; xcb_keysym_t keysym; xcb_keycode_t keycode; - Uicb *func; + uicb_t *func; char *arg; /** Next and previous keys */ Key *prev, *next; @@ -99,7 +99,7 @@ struct Button { unsigned long mod; unsigned int button; - Uicb *func; + uicb_t *func; char *arg; /** Next and previous buttons */ Button *prev, *next; diff --git a/tag.h b/tag.h index c1d457ed..10c77249 100644 --- a/tag.h +++ b/tag.h @@ -40,14 +40,14 @@ void tag_client_with_current_selected(Client *); void tag_view_only_byindex(int, int); void tag_append_to_screen(Tag *, int); -Uicb uicb_client_tag; -Uicb uicb_client_toggletag; -Uicb uicb_tag_toggleview; -Uicb uicb_tag_view; -Uicb uicb_tag_prev_selected; -Uicb uicb_tag_viewnext; -Uicb uicb_tag_viewprev; -Uicb uicb_tag_create; +uicb_t uicb_client_tag; +uicb_t uicb_client_toggletag; +uicb_t uicb_tag_toggleview; +uicb_t uicb_tag_view; +uicb_t uicb_tag_prev_selected; +uicb_t uicb_tag_viewnext; +uicb_t uicb_tag_viewprev; +uicb_t uicb_tag_create; DO_SLIST(Tag, tag, p_delete) DO_SLIST(tag_client_node_t, tag_client_node, p_delete) diff --git a/titlebar.h b/titlebar.h index 11414bc7..3b3e0bd4 100644 --- a/titlebar.h +++ b/titlebar.h @@ -32,7 +32,7 @@ area_t titlebar_geometry_add(titlebar_t *, area_t); area_t titlebar_geometry_remove(titlebar_t *, area_t); void titlebar_position_set(titlebar_t *, position_t); -Uicb uicb_client_toggletitlebar; +uicb_t uicb_client_toggletitlebar; #endif // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/uicb.c b/uicb.c index d6583816..725e2c47 100644 --- a/uicb.c +++ b/uicb.c @@ -148,7 +148,7 @@ __uicb_run(char *cmd) const char *arg; int screen; ssize_t len; - Uicb *uicb; + uicb_t *uicb; len = a_strlen(cmd); p = strtok(cmd, " "); diff --git a/uicb.h b/uicb.h index f6442537..766f28b4 100644 --- a/uicb.h +++ b/uicb.h @@ -22,13 +22,13 @@ #ifndef AWESOME_UICB_H #define AWESOME_UICB_H -typedef void (Uicb)(int, char *); +typedef void (uicb_t)(int, char *); int __uicb_parsecmd(char *); -Uicb uicb_restart; -Uicb uicb_exec; -Uicb uicb_spawn; +uicb_t uicb_restart; +uicb_t uicb_exec; +uicb_t uicb_spawn; #endif // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/widget.h b/widget.h index c7c1f4bf..617b6b57 100644 --- a/widget.h +++ b/widget.h @@ -49,7 +49,7 @@ WidgetConstructor progressbar_new; WidgetConstructor graph_new; WidgetConstructor tasklist_new; -Uicb uicb_widget_tell; +uicb_t uicb_widget_tell; DO_SLIST(Widget, widget, p_delete)