From 1bd2211aa5c392d9873c74ffc998bea744007a29 Mon Sep 17 00:00:00 2001 From: sabetts Date: Sun, 9 Sep 2001 02:59:23 +0000 Subject: * src/list.h (update_window_position): new prototype (window_name): new prototype (get_window_list): update prototype * src/events.c (grab_rat): Don't wrap in an #ifdef (ungrab_rat): likewise (handle_key): record if the rat is grabbed and only ungrab it at the end if it was first grabbed. * src/actions.h (cmd_pos): new prototype (cmd_defwinpos): new prototype (cmd_deftranspos): new prototype (cmd_defmaxsizepos): new prototype (cmd_defbartimeout): new prototype (cmd_defbarloc): new prototype (cmd_deffont): new prototype (cmd_defpadding): new prototype (cmd_defborder): new prototype (cmd_definputwidth): new prototype (cmd_defwaitcursor): new prototype (cmd_defwinfmt): new prototype (cmd_defwinname): new prototype * src/messages.h (MESSAGE_FRAME_STRING): new message * src/manage.c (get_wmname): renamed from get_window_name (get_class_hints): new function (get_res_name): likewise (get_res_class): likewise (update_window_name): update the window's wm_name, res_name, and res_class fields. (update_window_name): calls functions get_wmname, get_res_name, get_res_class. (update_window_name): Don't crop the window name. (update_window_information): call update_window_position. (move_window): new function (maximize_transient): only set the window's width and height fields. (maximize_normal): likewise (maximize): call move_window (force_maximize): likewise (force_maximize): if the window has resize hints, resize it 1 resize unit. * src/main.c: new global variable, defaults. remove static variable, font, and move to defaults. Dependant code updated. (init_defaults): new function (main): call init_defaults. (init_screen): initialize the screen's fg_color to black and bg_color to white. * src/list.c (free_window): free the fields user_name, res_name, res_class, and wm_name. (update_window_position): new function (window_name): new function. Code accessing a window's name uses this function. All code updated. (add_to_window_list): call update_window_position (add_to_window_list): initialize wm_name, res_name, and res_class for the new window. (format_window_name): new function (get_window_list): Add parameter fmt. All callers updated. (get_window_list): call format_window_name. * src/conf.h: move Configuration variables to the global variable, defaults. Dependant code updated. * src/data.h (TOP_LEFT): new define (TOP_CENTER): likewise (TOP_RIGHT): likewise (CENTER_LEFT): likewise (CENTER_CENTER): likewise (CENTER_RIGHT): likewise (BOTTOM_LEFT): likewise (BOTTOM_CENTER): likewise (BOTTOM_RIGHT): likewise (struct rp_window): new fields user_name, wm_name, res_name, res_class, position. (struct rp_window): remove field name. Replaced with user_name. Dependant code updated. (struct screen_info): remove field font. dependant code updated. (struct screen_info): new fields fg_color, bg_color. (struct rp_defaults): new struct (defaults): new global * src/actions.c (parse_winpos): new function (cmd_pos): likewise (cmd_defwinpos): likewise (cmd_deftranspos): likewise (cmd_defmaxsizepos): likewise (cmd_defbartimeout): likewise (cmd_defbarloc): likewise (cmd_deffont): likewise (cmd_defpadding): likewise (cmd_defborder): likewise (cmd_definputwidth): likewise (cmd_defwaitcursor): likewise (cmd_defwinfmt): likewise (cmd_defwinname): likewise (user_commands): New commands defbarloc, defbartimeout, defborder, deffont, defintputwidth, defmaxsizepos, defpadding, deftranspos, defwaitcursor, defwinfmt, defwinname, defwinpos. --- src/messages.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'src/messages.h') diff --git a/src/messages.h b/src/messages.h index 1d8a94b..fd56dc4 100644 --- a/src/messages.h +++ b/src/messages.h @@ -24,24 +24,25 @@ #include "config.h" -#define MESSAGE_NO_OTHER_WINDOW " No other window " -#define MESSAGE_NO_OTHER_FRAME " No other frame " -#define MESSAGE_NO_MANAGED_WINDOWS " No managed windows " -#define MESSAGE_UNKNOWN_COMMAND ": unknown command '%s' " -#define MESSAGE_WINDOW_INFORMATION " This is window %d (%s) " +#define MESSAGE_NO_OTHER_WINDOW " No other window " +#define MESSAGE_NO_OTHER_FRAME " No other frame " +#define MESSAGE_NO_MANAGED_WINDOWS " No managed windows " +#define MESSAGE_UNKNOWN_COMMAND ": unknown command '%s' " +#define MESSAGE_WINDOW_INFORMATION " This is window %d (%s) " #define MESSAGE_RAISE_TRANSIENT " Raise request from transient window %d (%s) " -#define MESSAGE_RAISE_WINDOW " Raise request from window %d (%s) " -#define MESSAGE_MAP_TRANSIENT " New transient window %d (%s) " -#define MESSAGE_MAP_WINDOW " New window %d (%s) " +#define MESSAGE_RAISE_WINDOW " Raise request from window %d (%s) " +#define MESSAGE_MAP_TRANSIENT " New transient window %d (%s) " +#define MESSAGE_MAP_WINDOW " New window %d (%s) " #define MESSAGE_PROMPT_SWITCH_TO_WINDOW " Switch to window: " -#define MESSAGE_PROMPT_NEW_WINDOW_NAME " Set window's title to: " -#define MESSAGE_PROMPT_SHELL_COMMAND "/bin/sh -c " -#define MESSAGE_PROMPT_COMMAND ":" -#define MESSAGE_PROMPT_SWITCH_WM " Switch to wm: " -#define MESSAGE_PROMPT_XTERM_COMMAND MESSAGE_PROMPT_SHELL_COMMAND TERM_PROG " -e " +#define MESSAGE_PROMPT_NEW_WINDOW_NAME " Set window's title to: " +#define MESSAGE_PROMPT_SHELL_COMMAND "/bin/sh -c " +#define MESSAGE_PROMPT_COMMAND ":" +#define MESSAGE_PROMPT_SWITCH_WM " Switch to wm: " +#define MESSAGE_PROMPT_XTERM_COMMAND MESSAGE_PROMPT_SHELL_COMMAND TERM_PROG " -e " -#define MESSAGE_WELCOME " Welcome to ratpoison! Hit `%s %s' for help. " +#define MESSAGE_WELCOME " Welcome to ratpoison! Hit `%s %s' for help. " +#define MESSAGE_FRAME_STRING "Current Frame" #endif /* ! _RATPOISON_MESSAGES_H */ -- cgit v1.2.3