vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Gee ... indeed there is a better way to pass 8 integers to a function. 

svn path=/trunk/KDE/kdebase/kwin/; revision=427984
icc-effect-5.14.5
Luboš Luňák 2005-06-22 15:16:31 +00:00
parent 3d52b0e4c7
commit cf7679b7cd
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tabbox.cpp
View File

@ -622,19 +622,17 @@ void TabBox::handleMouseEvent( XEvent* e )
*/
static
bool areKeySymXsDepressed( bool bAll, int nKeySyms, ... )
bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms )
{
va_list args;
char keymap[32];
kdDebug(125) << "areKeySymXsDepressed: " << (bAll ? "all of " : "any of ") << nKeySyms << endl;
va_start( args, nKeySyms );
XQueryKeymap( qt_xdisplay(), keymap );
for( int iKeySym = 0; iKeySym < nKeySyms; iKeySym++ )
{
uint keySymX = va_arg( args, uint );
uint keySymX = keySyms[ iKeySym ];
uchar keyCodeX = XKeysymToKeycode( qt_xdisplay(), keySymX );
int i = keyCodeX / 8;
char mask = 1 << (keyCodeX - (i * 8));
@ -699,10 +697,7 @@ static bool areModKeysDepressed( const KKeySequence& seq )
rgKeySyms[nKeySyms++] = XK_Meta_R;
}
// Is there a better way to push all 8 integer onto the stack?
return areKeySymXsDepressed( false, nKeySyms,
rgKeySyms[0], rgKeySyms[1], rgKeySyms[2], rgKeySyms[3],
rgKeySyms[4], rgKeySyms[5], rgKeySyms[6], rgKeySyms[7] );
return areKeySymXsDepressed( false, rgKeySyms, nKeySyms );
}
static bool areModKeysDepressed( const KShortcut& cut )