From 94fcf440050defa49d9f726302a62d327d377e84 Mon Sep 17 00:00:00 2001 From: Mathieu OTHACEHE Date: Wed, 7 Dec 2016 10:03:52 +0100 Subject: Remove useless argument from is_rp_window_for_screen function The screen argument is useless as this function operates on all screens. To find if a window belong to a specific ratpoison screen, function is_rp_window_for_given_screen may be used. --- src/events.c | 2 +- src/manage.c | 2 +- src/screen.c | 2 +- src/screen.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/events.c b/src/events.c index 5e1013a..e462d4f 100644 --- a/src/events.c +++ b/src/events.c @@ -82,7 +82,7 @@ new_window (XCreateWindowEvent *e) /* New windows belong to the current screen */ s = rp_current_screen; - if (is_rp_window_for_screen(e->window, s)) return; + if (is_rp_window_for_screen(e->window)) return; if (s && win == NULL && e->window != s->key_window diff --git a/src/manage.c b/src/manage.c index 2faab71..8b62a30 100644 --- a/src/manage.c +++ b/src/manage.c @@ -460,7 +460,7 @@ scanwins(rp_screen *s) for (i = 0; i < nwins; i++) { XGetWindowAttributes(dpy, wins[i], &attr); - if (is_rp_window_for_screen(wins[i], s) + if (is_rp_window_for_screen(wins[i]) || attr.override_redirect == True || unmanaged_window (wins[i])) continue; diff --git a/src/screen.c b/src/screen.c index fedddfa..b9bb696 100644 --- a/src/screen.c +++ b/src/screen.c @@ -468,7 +468,7 @@ is_rp_window_for_given_screen (Window w, rp_screen *s) } int -is_rp_window_for_screen(Window w, rp_screen *s) +is_rp_window_for_screen(Window w) { rp_screen *cur; diff --git a/src/screen.h b/src/screen.h index 0d5f68d..2072d36 100644 --- a/src/screen.h +++ b/src/screen.h @@ -39,7 +39,7 @@ void init_screens (void); void activate_screen (rp_screen *s); void deactivate_screen (rp_screen *s); -int is_rp_window_for_screen (Window w, rp_screen *s); +int is_rp_window_for_screen (Window w); int is_a_root_window (unsigned int w); char *screen_dump (rp_screen *screen); -- cgit v1.2.3