Skip to content

Commit

Permalink
* [core]: fix some compile warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
beku committed Dec 6, 2016
1 parent 47214c7 commit 00ccdd4
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions src/XcmEvents.c
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ void XcmeSelectInput( XcmeContext_s * c )
int format = 0;
unsigned long left = 0, n = 0, i,j;

int r = XGetWindowProperty( c->display, c->root,
XGetWindowProperty( c->display, c->root,
XInternAtom( c->display, "_NET_CLIENT_LIST", False), 0, ~0, False, XA_WINDOW, &actual, &format,
&nWindow, &left, (unsigned char**)&windows );
n = (int)(nWindow + left);
Expand All @@ -539,7 +539,7 @@ void XcmeSelectInput( XcmeContext_s * c )
!found )
{
/* observe other windows */
r = XSelectInput( c->display, windows[i],
XSelectInput( c->display, windows[i],
PropertyChangeMask | /* Xcolor properties */
ExposureMask ); /* Xcolor client messages */
}
Expand Down Expand Up @@ -731,7 +731,6 @@ int XcmeContext_Setup ( XcmeContext_s * c,
const char * display_name )
{
/* Open the display and create our window. */
Status status = 0;

XcmeContext_Setup2(c, display_name, 0);

Expand All @@ -740,12 +739,12 @@ int XcmeContext_Setup ( XcmeContext_s * c,
"libXcm based X11 colour management system events observer%s", "");
M( XCME_MSG_COPYRIGHT, 0,
"(c) 2009-2013 - Kai-Uwe Behrmann License: MIT%s", "" );
DS( "atom: \""XCM_COLOR_PROFILES"\": %d", (int)c->aProfile );
DS( "atom: \""XCM_COLOR_OUTPUTS"\": %d", (int)c->aOutputs );
DS( "atom: \"" XCM_COLOR_PROFILES "\": %d", (int)c->aProfile );
DS( "atom: \"" XCM_COLOR_OUTPUTS "\": %d", (int)c->aOutputs );
DS( "atom: \"_ICC_COLOR_MANAGEMENT\": %d", (int)c->aCM );
DS( "atom: \""XCM_COLOR_REGIONS"\": %d", (int)c->aRegion );
DS( "atom: \""XCM_COLOUR_DESKTOP_ADVANCED"\": %d", (int)c->aAdvanced );
DS( "atom: \""XCM_COLOR_DESKTOP"\": %d %s", (int)c->aDesktop,
DS( "atom: \"" XCM_COLOR_REGIONS "\": %d", (int)c->aRegion );
DS( "atom: \"" XCM_COLOUR_DESKTOP_ADVANCED "\": %d", (int)c->aAdvanced );
DS( "atom: \"" XCM_COLOR_DESKTOP "\": %d %s", (int)c->aDesktop,
printfNetColorDesktop(c, 0) );


Expand Down Expand Up @@ -786,7 +785,7 @@ int XcmeContext_Setup ( XcmeContext_s * c,
XWindowAttributes window_attributes_return;

XSync( c->display, 0 );
status = XQueryTree( c->display, c->root,
XQueryTree( c->display, c->root,
&root_return, &parent_return,
&children_return, &nchildren_return );
wins = (Window*)malloc(sizeof(Window) * nchildren_return );
Expand All @@ -797,10 +796,10 @@ int XcmeContext_Setup ( XcmeContext_s * c,
for(i = nchildren_return - 1; i >= 0; --i)
{
root_return = 0;
status = XQueryTree( c->display, children_return[i],
XQueryTree( c->display, children_return[i],
&root_return, &parent_return,
&wins, &wins_n );
status = XGetWindowAttributes( c->display, children_return[i],
XGetWindowAttributes( c->display, children_return[i],
&window_attributes_return );
if(window_attributes_return.map_state == IsViewable &&
parent_return == c->root)
Expand Down Expand Up @@ -990,15 +989,15 @@ int XcmeContext_InLoop ( XcmeContext_s * c,

} else if( event->type == PropertyNotify )
{
int r;
Atom atom = event->xproperty.atom;

actual_name = XGetAtomName( display, atom );

if(display != c->display)
{ int result = 1;
{
DE( "PropertyNotify : event and context displays are different: %s",
actual_name );
result = 1;
}

actual = 0;
Expand All @@ -1017,14 +1016,14 @@ int XcmeContext_InLoop ( XcmeContext_s * c,
strstr( actual_name, XCM_ICC_COLOUR_SERVER_TARGET_PROFILE_IN_X_BASE) != 0 ||
strstr( actual_name, XCM_ICC_V0_3_TARGET_PROFILE_IN_X_BASE) != 0 ||
strstr( actual_name, "EDID") != 0)
r = XGetWindowProperty( display, event->xany.window,
XGetWindowProperty( display, event->xany.window,
event->xproperty.atom, 0, ~0, False, XA_CARDINAL,&actual,&format,
&n, &left, &data );
n += left;

if(event->xproperty.atom == c->aAdvanced)
{
r = XGetWindowProperty( display, event->xany.window,
XGetWindowProperty( display, event->xany.window,
event->xproperty.atom, 0, ~0, False, XA_STRING,&actual,&format,
&n, &left, &data );
result = 0;
Expand All @@ -1035,7 +1034,7 @@ int XcmeContext_InLoop ( XcmeContext_s * c,
{
char * text;

r = XGetWindowProperty( display, event->xany.window,
XGetWindowProperty( display, event->xany.window,
event->xproperty.atom, 0, ~0, False, XA_STRING, &actual, &format,
&n, &left, &data );
n += left;
Expand Down

0 comments on commit 00ccdd4

Please sign in to comment.