Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 05:43:03 +01:00
Code Issues Projects Releases Wiki Activity

move some code inside _X11 ifdef

Browse Source
This commit is contained in:
Andriy Voskoboinyk 2014-09-04 01:38:08 +03:00
parent b18e6cff5a
commit a9b0028a15
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/notify.c
View File

@ -67,9 +67,9 @@ extern struct user_settings *user_settings_;
struct _Control { struct _Control {
time_t cooldown; time_t cooldown;
time_t notif_timeout; time_t notif_timeout;
unsigned long this_window;
#ifdef _X11 #ifdef _X11
Display *display; Display *display;
unsigned long this_window;
#endif /* _X11 */ #endif /* _X11 */
#if defined(_SOUND_NOTIFY) || defined(_BOX_NOTIFY) #if defined(_SOUND_NOTIFY) || defined(_BOX_NOTIFY)
@ -105,24 +105,26 @@ struct _ActiveNotifications {
/**********************************************************************************/ /**********************************************************************************/
/**********************************************************************************/ /**********************************************************************************/
#ifdef _X11
long unsigned int get_focused_window_id() long unsigned int get_focused_window_id()
{ {
#ifdef _X11
if (!Control.display) return 0; if (!Control.display) return 0;
Window focus; Window focus;
int revert; int revert;
XGetInputFocus(Control.display, &focus, &revert); XGetInputFocus(Control.display, &focus, &revert);
return focus; return focus;
#else
return 0;
#endif /* _X11 */
} }
#endif /* _X11 */
static _Bool notifications_are_disabled(const uint64_t flags) static _Bool notifications_are_disabled(const uint64_t flags)
{ {
return ( (flags & NT_RESTOL && Control.cooldown > time(NULL)) || return ( (flags & NT_RESTOL && Control.cooldown > time(NULL)) ||
#ifdef _X11
(flags & NT_NOFOCUS && Control.this_window == get_focused_window_id()) ); (flags & NT_NOFOCUS && Control.this_window == get_focused_window_id()) );
#else
0 );
#endif
} }
static void control_lock() static void control_lock()
@ -323,8 +325,6 @@ int init_notify(int login_cooldown, int notification_timeout)
#ifdef _X11 #ifdef _X11
Control.display = XOpenDisplay(NULL); Control.display = XOpenDisplay(NULL);
Control.this_window = get_focused_window_id(); Control.this_window = get_focused_window_id();
#else
Control.this_window = 1;
#endif /* _X11 */ #endif /* _X11 */