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

Cleanup xtra.c

Browse Source 
Privatise some functions that don't need to be public
Fix struct names starting with _ char
Remove unnecessary memset of Xtra struct in init_xtra()
This commit is contained in:
jfreegman 2018-09-27 03:41:58 -04:00
parent d62902ffb3
commit e7c5fbc873
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/xtra.c
View File

@ -47,7 +47,7 @@ static Atom XdndTypeList;
static Atom XdndActionCopy; static Atom XdndActionCopy;
static Atom XdndFinished; static Atom XdndFinished;
struct _Xtra { struct Xtra {
drop_callback on_drop; drop_callback on_drop;
Display *display; Display *display;
Window terminal_window; Window terminal_window;
@ -57,14 +57,14 @@ struct _Xtra {
Atom expecting_type; Atom expecting_type;
} Xtra; } Xtra;
typedef struct _Property { typedef struct Property {
unsigned char *data; unsigned char *data;
int read_format; int read_format;
unsigned long read_num; unsigned long read_num;
Atom read_type; Atom read_type;
} Property; } Property;
Property read_property(Window s, Atom p) static Property read_property(Window s, Atom p)
{ {
Atom read_type; Atom read_type;
int read_format; int read_format;
@ -95,7 +95,7 @@ Property read_property(Window s, Atom p)
return property; return property;
} }
Atom get_dnd_type(long *a, int l) static Atom get_dnd_type(long *a, int l)
{ {
int i = 0; int i = 0;
@ -281,10 +281,27 @@ void *event_loop(void *p)
return (Xtra.display = NULL); return (Xtra.display = NULL);
} }
static long unsigned int focused_window_id(void)
{
if (!Xtra.display) {
return 0;
}
Window focus;
int revert;
XLockDisplay(Xtra.display);
XGetInputFocus(Xtra.display, &focus, &revert);
XUnlockDisplay(Xtra.display);
return focus;
}
int is_focused(void)
{
return Xtra.proxy_window == focused_window_id() || Xtra.terminal_window == focused_window_id();
}
int init_xtra(drop_callback d) int init_xtra(drop_callback d)
{ {
memset(&Xtra, 0, sizeof(Xtra));
if (!d) { if (!d) {
return -1; return -1;
} else { } else {
@ -399,22 +416,3 @@ void terminate_xtra(void)
while (Xtra.display); /* Wait for termination */ while (Xtra.display); /* Wait for termination */
} }
long unsigned int focused_window_id(void)
{
if (!Xtra.display) {
return 0;
}
Window focus;
int revert;
XLockDisplay(Xtra.display);
XGetInputFocus(Xtra.display, &focus, &revert);
XUnlockDisplay(Xtra.display);
return focus;
}
int is_focused(void)
{
return Xtra.proxy_window == focused_window_id() || Xtra.terminal_window == focused_window_id();
}

1
src/xtra.h
View File

@ -35,7 +35,6 @@ typedef void (*drop_callback)(const char *, DropType);
int init_xtra(drop_callback d); int init_xtra(drop_callback d);
void terminate_xtra(void); void terminate_xtra(void);
long unsigned int focused_window_id(void);
int is_focused(void); /* returns bool */ int is_focused(void); /* returns bool */
#endif /* XTRA_H */ #endif /* XTRA_H */