yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn path=/trunk/KDE/kdebase/kwin/; revision=427984
This commit is contained in:
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 static
bool areKeySymXsDepressed( bool bAll, int nKeySyms, ... ) bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms )
{ {
va_list args;
char keymap[32]; char keymap[32];
kdDebug(125) << "areKeySymXsDepressed: " << (bAll ? "all of " : "any of ") << nKeySyms << endl; kdDebug(125) << "areKeySymXsDepressed: " << (bAll ? "all of " : "any of ") << nKeySyms << endl;
va_start( args, nKeySyms );
XQueryKeymap( qt_xdisplay(), keymap ); XQueryKeymap( qt_xdisplay(), keymap );
for( int iKeySym = 0; iKeySym < nKeySyms; iKeySym++ ) for( int iKeySym = 0; iKeySym < nKeySyms; iKeySym++ )
{ {
uint keySymX = va_arg( args, uint ); uint keySymX = keySyms[ iKeySym ];
uchar keyCodeX = XKeysymToKeycode( qt_xdisplay(), keySymX ); uchar keyCodeX = XKeysymToKeycode( qt_xdisplay(), keySymX );
int i = keyCodeX / 8; int i = keyCodeX / 8;
char mask = 1 << (keyCodeX - (i * 8)); char mask = 1 << (keyCodeX - (i * 8));
@ -699,10 +697,7 @@ static bool areModKeysDepressed( const KKeySequence& seq )
rgKeySyms[nKeySyms++] = XK_Meta_R; rgKeySyms[nKeySyms++] = XK_Meta_R;
} }
// Is there a better way to push all 8 integer onto the stack? return areKeySymXsDepressed( false, rgKeySyms, nKeySyms );
return areKeySymXsDepressed( false, nKeySyms,
rgKeySyms[0], rgKeySyms[1], rgKeySyms[2], rgKeySyms[3],
rgKeySyms[4], rgKeySyms[5], rgKeySyms[6], rgKeySyms[7] );
} }
static bool areModKeysDepressed( const KShortcut& cut ) static bool areModKeysDepressed( const KShortcut& cut )