|
|
|
|
61
|
m_screen = ScreenOfDisplay( m_display, DefaultScreen( m_display ) );
|
61
|
m_screen = ScreenOfDisplay( m_display, DefaultScreen( m_display ) );
|
62
|
m_visual = DefaultVisual ( m_display, XScreenNumberOfScreen( m_screen ) );
|
62
|
m_visual = DefaultVisual ( m_display, XScreenNumberOfScreen( m_screen ) );
|
63
|
m_colormap = DefaultColormap( m_display, XScreenNumberOfScreen( m_screen ) );
|
63
|
m_colormap = DefaultColormap( m_display, XScreenNumberOfScreen( m_screen ) );
|
64
|
- m_root = RootWindow ( m_display, XScreenNumberOfScreen( m_screen ) );
|
|
|
|
|
64
|
+ //m_root = RootWindow ( m_display, XScreenNumberOfScreen( m_screen ) );
|
|
|
65
|
+ m_root = DefaultRootWindow( m_display );
|
65
|
|
66
|
|
66
|
m_good = true;
|
67
|
m_good = true;
|
67
|
return 0;
|
68
|
return 0;
|
|
|
|
|
71
|
if ( !m_good ) {
|
72
|
if ( !m_good ) {
|
72
|
return 1;
|
73
|
return 1;
|
73
|
}
|
74
|
}
|
74
|
- int err = XGrabKeyboard( m_display, m_root, False,
|
|
|
|
|
75
|
+ XGrabKey( m_display, AnyKey, AnyModifier, m_root, False, GrabModeAsync, GrabModeAsync );
|
|
|
76
|
+ // For whatever we fail to grab the keyboard 100% of the time if slop is launched in the background.
|
|
|
77
|
+ /*int err = XGrabKeyboard( m_display, m_root, False,
|
75
|
GrabModeAsync, GrabModeAsync, CurrentTime );
|
78
|
GrabModeAsync, GrabModeAsync, CurrentTime );
|
76
|
if ( err != GrabSuccess ) {
|
79
|
if ( err != GrabSuccess ) {
|
77
|
fprintf( stderr, "Error: Failed to grab X keyboard.\n" );
|
80
|
fprintf( stderr, "Error: Failed to grab X keyboard.\n" );
|
78
|
fprintf( stderr, "This can be caused by launching slop incorrectly.\n" );
|
81
|
fprintf( stderr, "This can be caused by launching slop incorrectly.\n" );
|
79
|
fprintf( stderr, "gnome-session launches it fine from keyboard binds.\n" );
|
82
|
fprintf( stderr, "gnome-session launches it fine from keyboard binds.\n" );
|
80
|
return 1;
|
83
|
return 1;
|
81
|
- }
|
|
|
|
|
84
|
+ }*/
|
|
|
85
|
+ return 0;
|
82
|
}
|
86
|
}
|
83
|
|
87
|
|
84
|
int slop::XEngine::releaseKeyboard() {
|
88
|
int slop::XEngine::releaseKeyboard() {
|