From 227c0da67ae7e8d1531d8091fa6a8c2046f61a52 Mon Sep 17 00:00:00 2001 From: sabetts Date: Fri, 21 Sep 2001 09:47:23 +0000 Subject: * src/split.h (find_frame_up): new prototype (find_frame_down): likewise (find_frame_left): likewise (find_frame_right): likewise * src/split.c (find_frame_up): new function (find_frame_down): likewise (find_frame_left): likewise (find_frame_right): likewise * src/manage.c (move_window): use x11 gravity constants to denote gravity. * src/main.c (ratpoison_longopts): remove --kill and --restart. Dependant code updated. (init_defaults): use x11 gravity constants to denote gravity. (main): only display the startup message if defaults.startup_message is on. * src/list.c (update_window_gravity): rename from update_window_position. dependant code updated * src/events.c (client_msg): don't test for restart or kill client messages. (client_msg): properly handle iconify requests. (get_event): kill and restart the process here. * src/data.h (TOP_LEFT): remove 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): rename field to position to gravity. (struct rp_defaults): rename win_pos to win_gravity, trans_pos to trans_gravity and maxsize_pos to maxsize_gravity. (rp_restart): remove global variable (rp_kill): likewise * src/communications.h (send_kill): remove prototype (send_restart): likewise * src/communications.c (send_restart): remove function. obsolete. (send_kill): likewise * src/bar.c (bar_x): Use X11 gravity constants to denote location. (bar_y): likewise * src/actions.h (cmd_focusup): new prototype (cmd_focusdown): likewise (cmd_focusleft): likewise (cmd_focusright): likewise (cmd_startup_message): likewise (cmd_restart): likewise * src/actions.c (cmd_quit): just set the kill_signalled variable. (parse_wingravity): use compass directions to describe the gravity (parse_wingravity): renamed from parse_winpos. dependant code updated. (cmd_gravity): renamed from cmd_pos. dependant code updated. (cmd_defwingravity): renamed from cmd_defwinpos. dependant code updated. (cmd_deftransgravity): renamed from cmd_deftranspos. dependant code updated. (cmd_defmaxsizegravity): renamed from cmd_defmaxsizepos. dependant code updated. (cmd_focusup): new function (cmd_focusdown): likewise (cmd_focusleft): likewise (cmd_focusright): likewise (cmd_restart): likewise (cmd_startup_message): likewise (user_commands): new commands "focusup" "focusdown" "focusright" "focusleft" "startup_message" "restart". --- src/main.c | 42 +++++++----------------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) (limited to 'src/main.c') diff --git a/src/main.c b/src/main.c index 72b1a02..9f43832 100644 --- a/src/main.c +++ b/src/main.c @@ -52,8 +52,6 @@ Atom wm_delete; Atom wm_take_focus; Atom wm_colormaps; -Atom rp_restart; -Atom rp_kill; Atom rp_command; Atom rp_command_request; Atom rp_command_result; @@ -82,8 +80,6 @@ int rp_honour_normal_map = 1; static struct option ratpoison_longopts[] = { {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'v'}, - {"restart", no_argument, 0, 'r'}, - {"kill", no_argument, 0, 'k'}, {"command", required_argument, 0, 'c'}, {0, 0, 0, 0} }; @@ -211,8 +207,6 @@ print_help () printf ("Help for %s %s\n\n", PACKAGE, VERSION); printf ("-h, --help Display this help screen\n"); printf ("-v, --version Display the version\n"); - printf ("-r, --restart Restart ratpoison\n"); - printf ("-k, --kill Kill ratpoison\n"); printf ("-c, --command Send ratpoison a colon-command\n\n"); printf ("Report bugs to ratpoison-devel@lists.sourceforge.net\n\n"); @@ -356,15 +350,15 @@ show_welcome_message () static void init_defaults () { - defaults.win_pos = TOP_LEFT; - defaults.trans_pos = CENTER_CENTER; - defaults.maxsize_pos = CENTER_CENTER; + defaults.win_gravity = NorthWestGravity; + defaults.trans_gravity = CenterGravity; + defaults.maxsize_gravity = CenterGravity; defaults.input_window_size = 200; defaults.window_border_width = 1; defaults.bar_x_padding = 0; defaults.bar_y_padding = 0; - defaults.bar_location = TOP_RIGHT; + defaults.bar_location = NorthEastGravity; defaults.bar_timeout = 5; defaults.frame_indicator_timeout = 1; @@ -386,6 +380,7 @@ init_defaults () defaults.window_fmt = xstrdup ("%n%s%t"); defaults.win_name = 0; + defaults.startup_message = 1; } int @@ -393,8 +388,6 @@ main (int argc, char *argv[]) { int i; int c; - int do_kill = 0; - int do_restart = 0; char **command = NULL; int cmd_count = 0; @@ -416,12 +409,6 @@ main (int argc, char *argv[]) case 'v': print_version (); break; - case 'k': - do_kill = 1; - break; - case 'r': - do_restart = 1; - break; case 'c': if (!command) { @@ -448,26 +435,10 @@ main (int argc, char *argv[]) } /* Set ratpoison specific Atoms. */ - rp_restart = XInternAtom (dpy, "RP_RESTART", False); - rp_kill = XInternAtom (dpy, "RP_KILL", False); rp_command = XInternAtom (dpy, "RP_COMMAND", False); rp_command_request = XInternAtom (dpy, "RP_COMMAND_REQUEST", False); rp_command_result = XInternAtom (dpy, "RP_COMMAND_RESULT", False); - if (do_kill) - { - send_kill (); - XSync (dpy, False); - XCloseDisplay (dpy); - return EXIT_SUCCESS; - } - if (do_restart) - { - send_restart (); - XSync (dpy, False); - XCloseDisplay (dpy); - return EXIT_SUCCESS; - } if (cmd_count > 0) { int i; @@ -520,7 +491,8 @@ main (int argc, char *argv[]) read_startup_files (); /* Indicate to the user that ratpoison has booted. */ - show_welcome_message(); + if (defaults.startup_message) + show_welcome_message(); /* If no window has focus, give the key_window focus. */ if (current_window() == NULL) -- cgit v1.2.3