diff options
author | Dave Davenport <qball@gmpclient.org> | 2016-07-06 08:34:47 +0200 |
---|---|---|
committer | Dave Davenport <qball@gmpclient.org> | 2016-07-06 08:34:47 +0200 |
commit | 342192b4ede8d4b63853ca28218d56a2fdfa3d8a (patch) | |
tree | 602b8af174881545087f5a355cd0d1909fd4dfe2 /source/dialogs | |
parent | dfc952f5709420fe873c163c00a6848b9c822aa9 (diff) |
Remove work-around for older i3 version (< 4.9)
- I3 got ewhm support in Feb. 2015.
Diffstat (limited to 'source/dialogs')
-rw-r--r-- | source/dialogs/window.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/source/dialogs/window.c b/source/dialogs/window.c index 5fda3561..737c5e52 100644 --- a/source/dialogs/window.c +++ b/source/dialogs/window.c @@ -49,7 +49,6 @@ #include "helper.h" #include "textbox.h" #include "x11-helper.h" -#include "i3-support.h" #include "dialogs/window.h" #define WINLIST 32 @@ -89,7 +88,6 @@ typedef struct { unsigned int id; winlist *ids; - int config_i3_mode; // Current window. unsigned int index; char *cache; @@ -366,7 +364,7 @@ static unsigned int window_mode_get_num_entries ( const Mode *sw ) { const ModeModePrivateData *pd = (const ModeModePrivateData *) mode_get_private_data ( sw ); - return pd->ids?pd->ids->len:0; + return pd->ids ? pd->ids->len : 0; } /** * Small helper function to find the right entry in the ewmh reply. @@ -394,8 +392,6 @@ static void _window_mode_load_data ( Mode *sw, unsigned int cd ) // Create cache x11_cache_create (); - // Check for i3 - pd->config_i3_mode = i3_support_initialize ( xcb ); xcb_get_property_cookie_t c = xcb_ewmh_get_active_window ( &( xcb->ewmh ), xcb->screen_nbr ); if ( !xcb_ewmh_get_active_window_reply ( &xcb->ewmh, c, &curr_win_id, NULL ) ) { curr_win_id = 0; @@ -559,10 +555,6 @@ static ModeMode window_mode_result ( Mode *sw, int mretv, G_GNUC_UNUSED char **i if ( mretv & MENU_CUSTOM_ACTION ) { act_on_window ( rmpd->ids->array[selected_line] ); } - else if ( rmpd->config_i3_mode ) { - // Hack for i3. - i3_support_focus_window ( rmpd->ids->array[selected_line] ); - } else { // Get the current desktop. unsigned int current_desktop = 0; @@ -609,7 +601,6 @@ static ModeMode window_mode_result ( Mode *sw, int mretv, G_GNUC_UNUSED char **i } } else if ( ( mretv & ( MENU_ENTRY_DELETE ) ) == MENU_ENTRY_DELETE ) { - /* TODO: WM_DELETE_WINDOW support, see i3 */ xcb_destroy_window ( xcb->connection, rmpd->ids->array[selected_line] ); xcb_flush ( xcb->connection ); } @@ -621,7 +612,6 @@ static void window_mode_destroy ( Mode *sw ) ModeModePrivateData *rmpd = (ModeModePrivateData *) mode_get_private_data ( sw ); if ( rmpd != NULL ) { winlist_free ( rmpd->ids ); - i3_support_free_internals (); x11_cache_free (); g_free ( rmpd->cache ); g_free ( rmpd ); |