From 40cbc1c33106eb9f432ecaf424a0f4264ee21c19 Mon Sep 17 00:00:00 2001 From: sabetts Date: Tue, 4 Apr 2006 01:16:35 +0000 Subject: * src/messages.h (MESSAGE_MAP_TRANSIENT_GROUP): new define (MESSAGE_MAP_WINDOW_GROUP): likewise * src/manage.c (map_window): call show_rudeness_msg * src/events.h (show_rudeness_msg): new prototype * src/events.c (show_rudeness_msg): renamed from show_rudeness_raise_msg. handle the MAP messages as well. all callers updated. --- src/events.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/events.c') diff --git a/src/events.c b/src/events.c index 084cf9c..9ea61a0 100644 --- a/src/events.c +++ b/src/events.c @@ -42,27 +42,28 @@ action.c which need to forward events to other windows. */ XEvent rp_current_event; +/* RAISED is non zero if a raised message should be used 0 for a map message. */ void -show_rudeness_raise_msg (rp_window *win) +show_rudeness_msg (rp_window *win, int raised) { rp_group *g = groups_find_group_by_window (win); rp_window_elem *elem = group_find_window (&g->mapped_windows, win); if (g == rp_current_group) { if (win->transient) - marked_message_printf (0, 0, MESSAGE_RAISE_TRANSIENT, + marked_message_printf (0, 0, raised ? MESSAGE_RAISE_TRANSIENT:MESSAGE_MAP_TRANSIENT, elem->number, window_name (win)); else - marked_message_printf (0, 0, MESSAGE_RAISE_WINDOW, + marked_message_printf (0, 0, raised ? MESSAGE_RAISE_WINDOW:MESSAGE_MAP_WINDOW, elem->number, window_name (win)); } else { if (win->transient) - marked_message_printf (0, 0, MESSAGE_RAISE_TRANSIENT_GROUP, + marked_message_printf (0, 0, raised ? MESSAGE_RAISE_TRANSIENT_GROUP:MESSAGE_MAP_TRANSIENT_GROUP, elem->number, window_name (win), g->name); else - marked_message_printf (0, 0, MESSAGE_RAISE_WINDOW_GROUP, + marked_message_printf (0, 0, raised ? MESSAGE_RAISE_WINDOW_GROUP:MESSAGE_MAP_WINDOW_GROUP, elem->number, window_name (win), g->name); } } @@ -196,7 +197,7 @@ map_request (XEvent *ev) || (rp_honour_normal_raise && !win->transient)) set_active_window (win); else - show_rudeness_raise_msg (win); + show_rudeness_msg (win, 1); } break; } @@ -268,7 +269,7 @@ configure_request (XConfigureRequestEvent *e) } else if (current_window() != win) { - show_rudeness_raise_msg (win); + show_rudeness_msg (win, 1); } } -- cgit v1.2.3