TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix compositor startup failure

Browse Source 
Clean up build warnings
pull/2/head
Timothy Pearson 10 years ago
parent 01dcde0a04
commit ff6fa6e087
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File

44
twin/workspace.cpp
Unescape View File

@ -109,7 +109,10 @@ pid_t getCompositorPID() {
rewind (pFile); rewind (pFile);
size_t result = fread (buffer, 1, lSize, pFile); size_t result = fread (buffer, 1, lSize, pFile);
fclose(pFile); fclose(pFile);
kompmgrpid = atoi(buffer); if (result > 0)
{
kompmgrpid = atoi(buffer);
}
} }
free(filename); free(filename);
@ -1133,7 +1136,10 @@ void Workspace::slotReconfigure()
rewind (pFile); rewind (pFile);
size_t result = fread (buffer, 1, lSize, pFile); size_t result = fread (buffer, 1, lSize, pFile);
fclose(pFile); fclose(pFile);
kompmgrpid = atoi(buffer); if (result > 0)
{
kompmgrpid = atoi(buffer);
}
} }
free(filename); free(filename);
@ -1921,9 +1927,9 @@ void Workspace::killWindowId( Window window_to_kill )
client = findClient( FrameIdMatchPredicate( window )); client = findClient( FrameIdMatchPredicate( window ));
if( client != NULL ) // found the client if( client != NULL ) // found the client
break; break;
Window parent = NULL; Window parent = 0L;
Window root = NULL; Window root = 0L;
Window* children = NULL; Window* children = 0L;
unsigned int children_count; unsigned int children_count;
XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count ); XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count );
if( children != NULL ) if( children != NULL )
@ -1931,7 +1937,7 @@ void Workspace::killWindowId( Window window_to_kill )
if( window == root ) // we didn't find the client, probably an override-redirect window if( window == root ) // we didn't find the client, probably an override-redirect window
break; break;
window = parent; // go up window = parent; // go up
if( window == NULL ) if( window == 0L )
break; break;
} }
if( client != NULL ) if( client != NULL )
@ -1951,9 +1957,9 @@ void Workspace::suspendWindowId( Window window_to_suspend )
client = findClient( FrameIdMatchPredicate( window )); client = findClient( FrameIdMatchPredicate( window ));
if( client != NULL ) // found the client if( client != NULL ) // found the client
break; break;
Window parent = NULL; Window parent = 0L;
Window root = NULL; Window root = 0L;
Window* children = NULL; Window* children = 0L;
unsigned int children_count; unsigned int children_count;
XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count ); XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count );
if( children != NULL ) if( children != NULL )
@ -1961,7 +1967,7 @@ void Workspace::suspendWindowId( Window window_to_suspend )
if( window == root ) // we didn't find the client, probably an override-redirect window if( window == root ) // we didn't find the client, probably an override-redirect window
break; break;
window = parent; // go up window = parent; // go up
if( window == NULL ) if( window == 0L )
break; break;
} }
if( client != NULL ) if( client != NULL )
@ -1981,9 +1987,9 @@ void Workspace::resumeWindowId( Window window_to_resume )
client = findClient( FrameIdMatchPredicate( window )); client = findClient( FrameIdMatchPredicate( window ));
if( client != NULL ) // found the client if( client != NULL ) // found the client
break; break;
Window parent = NULL; Window parent = 0L;
Window root = NULL; Window root = 0L;
Window* children = NULL; Window* children = 0L;
unsigned int children_count; unsigned int children_count;
XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count ); XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count );
if( children != NULL ) if( children != NULL )
@ -1991,7 +1997,7 @@ void Workspace::resumeWindowId( Window window_to_resume )
if( window == root ) // we didn't find the client, probably an override-redirect window if( window == root ) // we didn't find the client, probably an override-redirect window
break; break;
window = parent; // go up window = parent; // go up
if( window == NULL ) if( window == 0L )
break; break;
} }
if( client != NULL ) if( client != NULL )
@ -2012,9 +2018,9 @@ bool Workspace::isResumeableWindowID( Window window_to_check )
client = findClient( FrameIdMatchPredicate( window )); client = findClient( FrameIdMatchPredicate( window ));
if( client != NULL ) // found the client if( client != NULL ) // found the client
break; break;
Window parent = NULL; Window parent = 0L;
Window root = NULL; Window root = 0L;
Window* children = NULL; Window* children = 0L;
unsigned int children_count; unsigned int children_count;
XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count ); XQueryTree( tqt_xdisplay(), window, &root, &parent, &children, &children_count );
if( children != NULL ) if( children != NULL )
@ -2022,7 +2028,7 @@ bool Workspace::isResumeableWindowID( Window window_to_check )
if( window == root ) // we didn't find the client, probably an override-redirect window if( window == root ) // we didn't find the client, probably an override-redirect window
break; break;
window = parent; // go up window = parent; // go up
if( window == NULL ) if( window == 0L )
break; break;
} }
if( client != NULL ) if( client != NULL )
@ -2824,7 +2830,7 @@ void Workspace::startKompmgr()
return; return;
} }
pid_t kompmgrpid = getCompositorPID(); pid_t kompmgrpid = getCompositorPID();
if (kill(kompmgrpid, 0) >= 0) if (kompmgrpid && kill(kompmgrpid, 0) >= 0)
{ {
// Active PID file detected; do not attempt to restart // Active PID file detected; do not attempt to restart
return; return;

Write Preview
Loading…
Cancel
Save