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/split.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/split.c') diff --git a/src/split.c b/src/split.c index 7820a36..b915714 100644 --- a/src/split.c +++ b/src/split.c @@ -68,12 +68,12 @@ delete_frame_from_list (rp_window_frame *frame) static void maximize_frame (rp_window_frame *frame) { - frame->x = PADDING_LEFT; - frame->y = PADDING_TOP; + frame->x = defaults.padding_left; + frame->y = defaults.padding_top; /* FIXME: what about multiple screens? */ - frame->width = DisplayWidth (dpy, 0) - PADDING_RIGHT - PADDING_LEFT; - frame->height = DisplayHeight (dpy, 0) - PADDING_BOTTOM - PADDING_TOP; + frame->width = DisplayWidth (dpy, 0) - defaults.padding_right - defaults.padding_left; + frame->height = DisplayHeight (dpy, 0) - defaults.padding_bottom - defaults.padding_top; } /* Create a full screen frame */ @@ -560,8 +560,8 @@ show_frame_indicator () screen_info *s = current_screen (); int width, height; - width = BAR_X_PADDING * 2 + XTextWidth (s->font, FRAME_STRING, strlen (FRAME_STRING)); - height = (FONT_HEIGHT (s->font) + BAR_Y_PADDING * 2); + width = defaults.bar_x_padding * 2 + XTextWidth (defaults.font, MESSAGE_FRAME_STRING, strlen (MESSAGE_FRAME_STRING)); + height = (FONT_HEIGHT (defaults.font) + defaults.bar_y_padding * 2); XMoveResizeWindow (dpy, current_screen()->frame_window, rp_current_frame->x + rp_current_frame->width / 2 - width / 2, @@ -572,9 +572,9 @@ show_frame_indicator () XClearWindow (dpy, s->frame_window); XDrawString (dpy, s->frame_window, s->normal_gc, - BAR_X_PADDING, - BAR_Y_PADDING + s->font->max_bounds.ascent, - FRAME_STRING, strlen (FRAME_STRING)); + defaults.bar_x_padding, + defaults.bar_y_padding + defaults.font->max_bounds.ascent, + MESSAGE_FRAME_STRING, strlen (MESSAGE_FRAME_STRING)); - alarm (FRAME_INDICATOR_TIMEOUT); + alarm (defaults.frame_indicator_timeout); } -- cgit v1.2.3