diff options
Diffstat (limited to 'twin')
| -rw-r--r-- | twin/client.cpp | 74 | ||||
| -rw-r--r-- | twin/client.h | 2 | ||||
| -rw-r--r-- | twin/clients/b2/b2client.cpp | 4 | ||||
| -rw-r--r-- | twin/clients/keramik/keramik.cpp | 6 | ||||
| -rw-r--r-- | twin/data/update_window_settings.cpp | 16 | ||||
| -rw-r--r-- | twin/events.cpp | 44 | ||||
| -rw-r--r-- | twin/geometry.cpp | 2 | ||||
| -rw-r--r-- | twin/kcmtwin/twindecoration/buttons.cpp | 6 | ||||
| -rw-r--r-- | twin/kcmtwin/twindecoration/twindecoration.cpp | 4 | ||||
| -rw-r--r-- | twin/kcmtwin/twinoptions/windows.cpp | 48 | ||||
| -rw-r--r-- | twin/killwindow.cpp | 2 | ||||
| -rw-r--r-- | twin/lib/kcommondecoration.cpp | 4 | ||||
| -rw-r--r-- | twin/main.cpp | 10 | ||||
| -rw-r--r-- | twin/manage.cpp | 10 | ||||
| -rw-r--r-- | twin/notifications.cpp | 2 | ||||
| -rw-r--r-- | twin/options.cpp | 18 | ||||
| -rw-r--r-- | twin/popupinfo.cpp | 2 | ||||
| -rw-r--r-- | twin/sm.cpp | 20 | ||||
| -rw-r--r-- | twin/tabbox.cpp | 16 | ||||
| -rw-r--r-- | twin/tabbox.h | 2 | ||||
| -rw-r--r-- | twin/useractions.cpp | 28 | ||||
| -rw-r--r-- | twin/utils.cpp | 2 | ||||
| -rw-r--r-- | twin/workspace.cpp | 52 | ||||
| -rw-r--r-- | twin/workspace.h | 6 |
24 files changed, 190 insertions, 190 deletions
diff --git a/twin/client.cpp b/twin/client.cpp index b8f00746e..89aa574e5 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -144,23 +144,23 @@ Client::Client( Workspace *ws ) desk = 0; // no desktop yet mode = PositionCenter; - buttonDown = FALSE; - moveResizeMode = FALSE; + buttonDown = false; + moveResizeMode = false; info = NULL; shade_mode = ShadeNone; - active = FALSE; + active = false; deleting = false; - keep_above = FALSE; - keep_below = FALSE; - is_shape = FALSE; + keep_above = false; + keep_below = false; + is_shape = false; motif_noborder = false; - motif_may_move = TRUE; - motif_may_resize = TRUE; - motif_may_close = TRUE; + motif_may_move = true; + motif_may_resize = true; + motif_may_close = true; fullscreen_mode = FullScreenNone; - skip_taskbar = FALSE; + skip_taskbar = false; original_skip_taskbar = false; minimized = false; hidden = false; @@ -177,8 +177,8 @@ Client::Client( Workspace *ws ) Ptakeactivity = 0; Pcontexthelp = 0; Pping = 0; - input = FALSE; - skip_pager = FALSE; + input = false; + skip_pager = false; max_mode = MaximizeRestore; maxmode_restore = MaximizeRestore; @@ -224,7 +224,7 @@ void Client::releaseWindow( bool on_shutdown ) deleting = true; workspace()->discardUsedWindowRules( this, true ); // remove ForceTemporarily rules StackingUpdatesBlocker blocker( workspace()); - if (!custom_opacity) setOpacity(FALSE); + if (!custom_opacity) setOpacity(false); if (moveResizeMode) leaveMoveResize(); removeShadow(); @@ -445,7 +445,7 @@ void Client::detectShapable() case NET::Menu : case NET::Dialog : case NET::Utility : - setShapable(FALSE); + setShapable(false); break; default: assert( false ); @@ -522,9 +522,9 @@ bool Client::isModalSystemNotification() const result = XGetWindowProperty(tqt_xdisplay(), window(), atoms->net_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void Client::updateShape() @@ -541,7 +541,7 @@ void Client::updateShape() XShapeCombineShape(tqt_xdisplay(), frameId(), ShapeBounding, clientPos().x(), clientPos().y(), window(), ShapeBounding, ShapeSet); - setShapable(TRUE); + setShapable(true); } // !shape() mask setting is done in setMask() when the decoration // calls it or when the decoration is created/destroyed @@ -709,7 +709,7 @@ void Client::unminimize( bool avoid_animation ) if( isOnCurrentDesktop() && isShown( true )) { if( mainClients().isEmpty() && !avoid_animation ) - animateMinimizeOrUnminimize( FALSE ); + animateMinimizeOrUnminimize( false ); } updateVisibility(); updateAllowedActions(); @@ -778,7 +778,7 @@ void Client::animateMinimizeOrUnminimize( bool minimize ) float diff; TQPainter p ( workspace()->desktopWidget() ); - bool need_to_clear = FALSE; + bool need_to_clear = false; TQPixmap pm3; do { @@ -790,7 +790,7 @@ void Client::animateMinimizeOrUnminimize( bool minimize ) if ( need_to_clear ) { p.drawPixmap( area2.x(), area2.y(), pm3 ); - need_to_clear = FALSE; + need_to_clear = false; } area2 = area; } @@ -810,7 +810,7 @@ void Client::animateMinimizeOrUnminimize( bool minimize ) else { // no overlap, we can clear later to avoid flicker pm3 = pm2; - need_to_clear = TRUE; + need_to_clear = true; } } } while ( t.elapsed() < step); @@ -897,7 +897,7 @@ void Client::setShade( ShadeMode mode ) XSelectInput( tqt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it //done xcompmgr workaround -// FRAME repaint( FALSE ); +// FRAME repaint( false ); // bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); int step = TQMAX( 4, TQABS( h - s.height() ) / as )+1; @@ -938,7 +938,7 @@ void Client::setShade( ShadeMode mode ) resizeDecoration( TQSize( s.width(), h )); // assume a border // we do not have time to wait for X to send us paint events -// FRAME repaint( 0, h - step-5, width(), step+5, TRUE); +// FRAME repaint( 0, h - step-5, width(), step+5, true); TQApplication::syncX(); } while ( h < s.height() - step ); // if ( !wasStaticContents ) @@ -946,7 +946,7 @@ void Client::setShade( ShadeMode mode ) shade_geometry_change = false; plainResize( s ); if( shade_mode == ShadeHover || shade_mode == ShadeActivated ) - setActive( TRUE ); + setActive( true ); XMapWindow( tqt_xdisplay(), wrapperId()); XMapWindow( tqt_xdisplay(), window()); XDeleteProperty (tqt_xdisplay(), client, atoms->net_wm_window_shade); @@ -1897,7 +1897,7 @@ bool Client::isSuspendable() const tcomm = basename(tbuf); #else /* default */ TQString statString(statRaw); - TQStringList statFields = TQStringList::split(" ", statString, TRUE); + TQStringList statFields = TQStringList::split(" ", statString, true); TQString tcomm = statFields[1]; TQString state = statFields[2]; #endif /* default */ @@ -1967,7 +1967,7 @@ bool Client::isResumeable() const TQString state(TQChar(inf->pr_sname)); #else /* default */ TQString statString(statRaw); - TQStringList statFields = TQStringList::split(" ", statString, TRUE); + TQStringList statFields = TQStringList::split(" ", statString, true); TQString tcomm = statFields[1]; TQString state = statFields[2]; #endif /* default */ @@ -2422,11 +2422,11 @@ void Client::readIcons( Window win, TQPixmap* icon, TQPixmap* miniicon ) { // get the icons, allow scaling if( icon != NULL ) - *icon = KWin::icon( win, 32, 32, TRUE, KWin::NETWM | KWin::WMHints ); + *icon = KWin::icon( win, 32, 32, true, KWin::NETWM | KWin::WMHints ); if( miniicon != NULL ) { if( icon == NULL || !icon->isNull()) - *miniicon = KWin::icon( win, 16, 16, TRUE, KWin::NETWM | KWin::WMHints ); + *miniicon = KWin::icon( win, 16, 16, true, KWin::NETWM | KWin::WMHints ); else *miniicon = TQPixmap(); } @@ -2454,8 +2454,8 @@ void Client::getIcons() } if( icon_pix.isNull()) { // and if nothing else, load icon from classhint or xapp icon - icon_pix = KWin::icon( window(), 32, 32, TRUE, KWin::ClassHint | KWin::XApp ); - miniicon_pix = KWin::icon( window(), 16, 16, TRUE, KWin::ClassHint | KWin::XApp ); + icon_pix = KWin::icon( window(), 32, 32, true, KWin::ClassHint | KWin::XApp ); + miniicon_pix = KWin::icon( window(), 16, 16, true, KWin::ClassHint | KWin::XApp ); } if( isManaged() && decoration != NULL ) decoration->iconChange(); @@ -3022,9 +3022,9 @@ bool Client::getWindowOpacity() //query translucency settings from X, returns tr custom_opacity = true; // setOpacity(opacity_ < 0xFFFFFFFF, opacity_); XFree ((char*)data); - return TRUE; + return true; } - return FALSE; + return false; } void Client::setCustomOpacityFlag(bool custom) @@ -3046,14 +3046,14 @@ bool Client::touches(const Client* c) // checks if this client borders c, needed to test beep media player window state { if (y() == c->y() + c->height()) // this bottom to c - return TRUE; + return true; if (y() + height() == c->y()) // this top to c - return TRUE; + return true; if (x() == c->x() + c->width()) // this right to c - return TRUE; + return true; if (x() + width() == c->x()) // this left to c - return TRUE; - return FALSE; + return true; + return false; } void Client::setDecoHashProperty(uint topHeight, uint rightWidth, uint bottomHeight, uint leftWidth) diff --git a/twin/client.h b/twin/client.h index dbe6f65c2..178c718c4 100644 --- a/twin/client.h +++ b/twin/client.h @@ -761,7 +761,7 @@ inline bool Client::isOnAllDesktops() const } /*! Returns whether the client is on the virtual desktop \a d. - This is always TRUE for onAllDesktops clients. + This is always true for onAllDesktops clients. */ inline bool Client::isOnDesktop( int d ) const { diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 032065602..571b16909 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -444,9 +444,9 @@ bool B2Client::isModalSystemNotification() result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void B2Client::addButtons(const TQString& s, const TQString tips[], diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 576d2d97b..d5c441a26 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -1035,9 +1035,9 @@ bool KeramikClient::isModalSystemNotification() result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) @@ -1662,7 +1662,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, titlebar->geometry().bottom() ) ) ); // Titlebar needs no paint event - TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), FALSE ) ); + TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), false ) ); } } } diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index e52f8c760..422bb30c5 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -82,14 +82,14 @@ void loadFakeSessionInfo( TDEConfig* config ) info->maximized = config->readNumEntry( TQString("maximize")+n, 0 ); info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 ); info->desktop = config->readNumEntry( TQString("desktop")+n, 0 ); - info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE ); - info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE ); - info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE ); - info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE ); - info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE ); - info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE ); - info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE ); - info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE ); + info->minimized = config->readBoolEntry( TQString("iconified")+n, false ); + info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, false ); + info->shaded = config->readBoolEntry( TQString("shaded")+n, false ); + info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, false ); + info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, false ); + info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, false ); + info->skipPager = config->readBoolEntry( TQString("skipPager")+n, false ); + info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, false ); info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1()); info->active = false; info->fake = true; diff --git a/twin/events.cpp b/twin/events.cpp index 3d3ba999c..5158df40b 100644 --- a/twin/events.cpp +++ b/twin/events.cpp @@ -196,7 +196,7 @@ bool Workspace::workspaceEvent( XEvent * e ) { if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease ) ) { - mouse_emulation = FALSE; + mouse_emulation = false; XUngrabKeyboard( tqt_xdisplay(), get_tqt_x_time() ); } @@ -221,7 +221,7 @@ bool Workspace::workspaceEvent( XEvent * e ) if ( tab_grab || control_grab ) { tab_box->handleMouseEvent( e ); - return TRUE; + return true; } break; case KeyPress: @@ -323,7 +323,7 @@ bool Workspace::workspaceEvent( XEvent * e ) addSystemTrayWin( w ); } } - return TRUE; + return true; } return ( e->xunmap.event != e->xunmap.window ); // hide wm typical event from Qt @@ -336,12 +336,12 @@ bool Workspace::workspaceEvent( XEvent * e ) { //do not confuse Qt with these events. After all, _we_ are the //window manager who does the reparenting. - return TRUE; + return true; } case DestroyNotify: { if ( removeSystemTrayWin( e->xdestroywindow.window, false ) ) - return TRUE; + return true; return false; } case MapRequest: @@ -362,7 +362,7 @@ bool Workspace::workspaceEvent( XEvent * e ) // this code doesn't check the parent to be root. // if ( e->xmaprequest.parent == root ) { //###TODO store previously destroyed client ids if ( addSystemTrayWin( e->xmaprequest.window ) ) - return TRUE; + return true; c = createClient( e->xmaprequest.window, false ); if ( c != NULL && root != tqt_xrootwin() ) { // TODO what is this? @@ -428,7 +428,7 @@ bool Workspace::workspaceEvent( XEvent * e ) break; case KeyRelease: if ( mouse_emulation ) - return FALSE; + return false; break; case FocusIn: if( e->xfocus.window == rootWin() && TQCString( getenv("TDE_MULTIHEAD")).lower() != "true" @@ -460,7 +460,7 @@ bool Workspace::workspaceEvent( XEvent * e ) default: break; } - return FALSE; + return false; } // Some events don't have the actual window which caused the event @@ -733,7 +733,7 @@ void Client::destroyNotifyEvent( XDestroyWindowEvent* e ) } -bool blockAnimation = FALSE; +bool blockAnimation = false; /*! Handles client messages for the client window @@ -887,7 +887,7 @@ void Client::enterNotifyEvent( XCrossingEvent* e ) delete shadeHoverTimer; shadeHoverTimer = new TQTimer( this ); connect( shadeHoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( shadeHover() )); - shadeHoverTimer->start( options->shadeHoverInterval, TRUE ); + shadeHoverTimer->start( options->shadeHoverInterval, true ); } if ( options->focusPolicy == Options::ClickToFocus ) @@ -900,7 +900,7 @@ void Client::enterNotifyEvent( XCrossingEvent* e ) delete autoRaiseTimer; autoRaiseTimer = new TQTimer( this ); connect( autoRaiseTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoRaise() ) ); - autoRaiseTimer->start( options->autoRaiseInterval, TRUE ); + autoRaiseTimer->start( options->autoRaiseInterval, true ); } TQPoint currentPos( e->x_root, e->y_root ); @@ -979,7 +979,7 @@ void Client::grabButton( int modifier ) ++i ) XGrabButton( tqt_xdisplay(), AnyButton, modifier | mods[ i ], - wrapperId(), FALSE, ButtonPressMask, + wrapperId(), false, ButtonPressMask, GrabModeSync, GrabModeAsync, None, None ); } @@ -1425,7 +1425,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in bool replay = performMouseCommand( com, TQPoint( x_root, y_root), perform_handled ); if ( isSpecialWindow()) - replay = TRUE; + replay = true; if( w == wrapperId()) // these can come only from a grab XAllowEvents(tqt_xdisplay(), replay? ReplayPointer : SyncPointer, CurrentTime ); //tqt_x_time); @@ -1453,7 +1453,7 @@ void Client::processDecorationButtonPress( int button, int /*state*/, int x, int Options::MouseCommand com = Options::MouseNothing; bool active = isActive(); if ( !wantsInput() ) // we cannot be active, use it anyway - active = TRUE; + active = true; if ( button == Button1 ) com = active ? options->commandActiveTitlebar1() : options->commandInactiveTitlebar1(); @@ -1466,7 +1466,7 @@ void Client::processDecorationButtonPress( int button, int /*state*/, int x, int && com != Options::MouseMinimize ) // mouse release event { mode = mousePosition( TQPoint( x, y )); - buttonDown = TRUE; + buttonDown = true; moveOffset = TQPoint( x, y ); invertedMoveOffset = rect().bottomRight() - moveOffset; unrestrictedMoveResize = false; @@ -1517,7 +1517,7 @@ bool Client::buttonReleaseEvent( Window w, int /*button*/, int state, int x, int y = this->y(); if ( (state & ( Button1Mask & Button2Mask & Button3Mask )) == 0 ) { - buttonDown = FALSE; + buttonDown = false; if ( moveResizeMode ) { finishMoveResize( false ); @@ -1604,7 +1604,7 @@ void Client::focusInEvent( XFocusInEvent* e ) bool activate = workspace()->allowClientActivation( this, -1U, true ); workspace()->gotFocusIn( this ); // remove from should_get_focus list if( activate ) - setActive( TRUE ); + setActive( true ); else { workspace()->restoreFocus(); @@ -1673,7 +1673,7 @@ void Client::focusOutEvent( XFocusOutEvent* e ) if ( TQApplication::activePopupWidget() ) return; if( !check_follows_focusin( this )) - setActive( FALSE ); + setActive( false ); } // performs _NET_WM_MOVERESIZE @@ -1684,7 +1684,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction ) else if( moveResizeMode && direction == NET::MoveResizeCancel ) { finishMoveResize( true ); - buttonDown = FALSE; + buttonDown = false; setCursor( mode ); } else if( direction >= NET::TopLeft && direction <= NET::Left ) @@ -1704,7 +1704,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction ) return; if( moveResizeMode ) finishMoveResize( false ); - buttonDown = TRUE; + buttonDown = true; moveOffset = TQPoint( x_root - x(), y_root - y()); // map from global invertedMoveOffset = rect().bottomRight() - moveOffset; unrestrictedMoveResize = false; @@ -1756,12 +1756,12 @@ void Client::keyPressEvent( uint key_code ) case Key_Return: case Key_Enter: finishMoveResize( false ); - buttonDown = FALSE; + buttonDown = false; setCursor( mode ); break; case Key_Escape: finishMoveResize( true ); - buttonDown = FALSE; + buttonDown = false; setCursor( mode ); break; default: diff --git a/twin/geometry.cpp b/twin/geometry.cpp index 0c0f4f97b..88d0ba8cd 100644 --- a/twin/geometry.cpp +++ b/twin/geometry.cpp @@ -1692,7 +1692,7 @@ bool Client::isMaximizable() const return false; } if ( maximizeMode() != MaximizeRestore ) - return TRUE; + return true; TQSize max = maxSize(); #if 0 if( max.width() < 32767 || max.height() < 32767 ) // sizes are 16bit with X diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index 0a3c6331e..36534f806 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -84,9 +84,9 @@ bool ButtonDrag::decode( TQDropEvent* e, Button& btn ) int supported; stream >> supported; btn.supported = supported; - return TRUE; + return true; } - return FALSE; + return false; } @@ -267,7 +267,7 @@ ButtonDropSite::ButtonDropSite( TQWidget* parent, const char* name ) : TQFrame( parent, name ), m_selected(0) { - setAcceptDrops( TRUE ); + setAcceptDrops( true ); setFrameShape( WinPanel ); setFrameShadow( Raised ); setMinimumHeight( 26 ); diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 6ef02147a..63c3adb61 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -753,11 +753,11 @@ void KWinDecorationModule::readConfig( TDEConfig* conf ) int swm; for ( swm = 0; swm < thirdpartyWMList->count(); ++swm ) { if ( thirdpartyWMList->text( swm ).startsWith(selectedWM + " ") ) { - found = TRUE; + found = true; break; } } - if (found == FALSE) { + if (found == false) { thirdpartyWMList->setCurrentItem(0); } else { diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index fd37e554b..8eb2ee135 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -1436,7 +1436,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, : TDECModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { kompmgr = 0L; - resetKompmgr_ = FALSE; + resetKompmgr_ = false; TQVBoxLayout *lay = new TQVBoxLayout (this); kompmgrAvailable_ = kompmgrAvailable(); if (!kompmgrAvailable_){ @@ -1523,7 +1523,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, tabW->addTab(tGroup, i18n("Opacity")); TQWidget *sGroup = new TQWidget(tabW); -// sGroup->setCheckable(TRUE); +// sGroup->setCheckable(true); TQVBoxLayout *vLay2 = new TQVBoxLayout (sGroup,11,6); vLay2->addSpacing(11); // to get the proper gb top offset useShadows = new TQCheckBox(i18n("Use shadows on windows (standard effects should be disabled in the Styles module if this is checked)"),sGroup); @@ -1738,7 +1738,7 @@ void KTranslucencyConfig::processShadowLockouts() void KTranslucencyConfig::resetKompmgr() { - resetKompmgr_ = TRUE; + resetKompmgr_ = true; } void KTranslucencyConfig::load( void ) @@ -1778,17 +1778,17 @@ void KTranslucencyConfig::load( void ) TDEConfig conf_(TQDir::homeDirPath() + "/.xcompmgrrc"); conf_.setGroup("xcompmgr"); - disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",FALSE)); - useOpenGL->setChecked(conf_.readBoolEntry("useOpenGL",FALSE)); - blurBackground->setChecked(conf_.readBoolEntry("blurBackground",FALSE)); + disableARGB->setChecked(conf_.readBoolEntry("DisableARGB",false)); + useOpenGL->setChecked(conf_.readBoolEntry("useOpenGL",false)); + blurBackground->setChecked(conf_.readBoolEntry("blurBackground",false)); blurBackground->setEnabled(useOpenGL->isChecked()); - greyscaleBackground->setChecked(conf_.readBoolEntry("greyscaleBackground",FALSE)); + greyscaleBackground->setChecked(conf_.readBoolEntry("greyscaleBackground",false)); greyscaleBackground->setEnabled(useOpenGL->isChecked()); useShadows->setChecked(conf_.readEntry("Compmode","").compare("CompClientShadows") == 0); - useShadowsOnMenuWindows->setChecked(conf_.readBoolEntry("ShadowsOnMenuWindows",TRUE)); - useShadowsOnToolTipWindows->setChecked(conf_.readBoolEntry("ShadowsOnToolTipWindows",TRUE)); - useShadowsOnDockWindows->setChecked(conf_.readBoolEntry("ShadowsOnDockWindows",FALSE)); + useShadowsOnMenuWindows->setChecked(conf_.readBoolEntry("ShadowsOnMenuWindows",true)); + useShadowsOnToolTipWindows->setChecked(conf_.readBoolEntry("ShadowsOnToolTipWindows",true)); + useShadowsOnDockWindows->setChecked(conf_.readBoolEntry("ShadowsOnDockWindows",false)); shadowTopOffset->setValue(-1*(conf_.readNumEntry("ShadowOffsetY",0))); shadowLeftOffset->setValue(-1*(conf_.readNumEntry("ShadowOffsetX",0))); @@ -1808,10 +1808,10 @@ void KTranslucencyConfig::load( void ) else shadowColor->setColor(TQColor(r,g,b)); - fadeInWindows->setChecked(conf_.readBoolEntry("FadeWindows",FALSE)); - fadeInMenuWindows->setChecked(conf_.readBoolEntry("FadeMenuWindows",TRUE)); - fadeInToolTipWindows->setChecked(conf_.readBoolEntry("FadeToolTipWindows",TRUE)); - fadeOnOpacityChange->setChecked(conf_.readBoolEntry("FadeTrans",FALSE)); + fadeInWindows->setChecked(conf_.readBoolEntry("FadeWindows",false)); + fadeInMenuWindows->setChecked(conf_.readBoolEntry("FadeMenuWindows",true)); + fadeInToolTipWindows->setChecked(conf_.readBoolEntry("FadeToolTipWindows",true)); + fadeOnOpacityChange->setChecked(conf_.readBoolEntry("FadeTrans",false)); fadeInSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeInStep",0.070)*1000.0)); fadeOutSpeed->setValue((int)(conf_.readDoubleNumEntry("FadeOutStep",0.070)*1000.0)); @@ -2006,17 +2006,17 @@ void KTranslucencyConfig::defaults() inactiveWindowOpacity->setEnabled(false); movingWindowOpacity->setEnabled(false); dockWindowOpacity->setEnabled(false); - useShadows->setChecked(FALSE); - useShadowsOnMenuWindows->setChecked(TRUE); - useShadowsOnToolTipWindows->setChecked(TRUE); - useShadowsOnDockWindows->setChecked(FALSE); - removeShadowsOnMove->setChecked(FALSE); - removeShadowsOnResize->setChecked(FALSE); + useShadows->setChecked(false); + useShadowsOnMenuWindows->setChecked(true); + useShadowsOnToolTipWindows->setChecked(true); + useShadowsOnDockWindows->setChecked(false); + removeShadowsOnMove->setChecked(false); + removeShadowsOnResize->setChecked(false); shadowColor->setColor(TQt::black); - fadeInWindows->setChecked(FALSE); - fadeInMenuWindows->setChecked(TRUE); - fadeInToolTipWindows->setChecked(TRUE); - fadeOnOpacityChange->setChecked(FALSE); + fadeInWindows->setChecked(false); + fadeInMenuWindows->setChecked(true); + fadeInToolTipWindows->setChecked(true); + fadeOnOpacityChange->setChecked(false); fadeInSpeed->setValue(70); fadeOutSpeed->setValue(70); emit TDECModule::changed(true); diff --git a/twin/killwindow.cpp b/twin/killwindow.cpp index c67ab50a0..8bc1abb57 100644 --- a/twin/killwindow.cpp +++ b/twin/killwindow.cpp @@ -81,7 +81,7 @@ void KillWindow::start() button_released = (ev.xbutton.button == Button1); if ( ev.xbutton.button == Button3 ) { - escape_pressed = TRUE; + escape_pressed = true; break; } if( ev.xbutton.button == Button1 || ev.xbutton.button == Button2 ) diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index d8a22458b..a31471611 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -332,9 +332,9 @@ bool KCommonDecoration::isModalSystemNotification() result = XGetWindowProperty(tqt_xdisplay(), windowId(), kde_wm_system_modal_notification, 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left, /*(unsigned char **)*/ &data); if (result == Success && data != None && format == 32 ) { - return TRUE; + return true; } - return FALSE; + return false; } void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString& s, bool isLeft) diff --git a/twin/main.cpp b/twin/main.cpp index 540595a1b..c988b53f2 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -45,13 +45,13 @@ Atoms* atoms; int screen_number = -1; bool disable_twin_composition_manager = false; -static bool initting = FALSE; +static bool initting = false; static int x11ErrorHandler(Display *d, XErrorEvent *e) { char msg[80], req[80], number[80]; - bool ignore_badwindow = TRUE; //maybe temporary + bool ignore_badwindow = true; //maybe temporary if (initting && ( @@ -151,7 +151,7 @@ Application::Application( ) // if there was already twin running, it saved its configuration after loosing the selection -> reread config()->reparseConfiguration(); - initting = TRUE; // startup.... + initting = true; // startup.... // install X11 error handler XSetErrorHandler( x11ErrorHandler ); @@ -176,7 +176,7 @@ Application::Application( ) DCOPRef ref( "kded", "kded" ); ref.send( "unloadModule", TQCString( "kdetrayproxy" )); - initting = FALSE; // startup done, we are up and running now. + initting = false; // startup done, we are up and running now. dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("wm started")); XEvent e; @@ -216,7 +216,7 @@ void Application::lostSelection() bool Application::x11EventFilter( XEvent *e ) { if ( Workspace::self()->workspaceEvent( e ) ) - return TRUE; + return true; return TDEApplication::x11EventFilter( e ); } diff --git a/twin/manage.cpp b/twin/manage.cpp index 8b96c070e..394d7fc20 100644 --- a/twin/manage.cpp +++ b/twin/manage.cpp @@ -190,7 +190,7 @@ bool Client::manage( Window w, bool isMapped ) // onAllDesktopsChange(); decoration doesn't exist here yet TQRect geom( attr.x, attr.y, attr.width, attr.height ); - bool placementDone = FALSE; + bool placementDone = false; if ( session ) geom = session->geometry; @@ -269,7 +269,7 @@ bool Client::manage( Window w, bool isMapped ) if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) || (xSizeHint.flags & USPosition) ) { - placementDone = TRUE; + placementDone = true; // disobey xinerama placement option for now (#70943) area = workspace()->clientArea( PlacementArea, geom.center(), desktop()); } @@ -290,7 +290,7 @@ bool Client::manage( Window w, bool isMapped ) if( isMovable()) { if( geom.x() > area.right() || geom.y() > area.bottom()) - placementDone = FALSE; // weird, do not trust. + placementDone = false; // weird, do not trust. } if ( placementDone ) @@ -312,7 +312,7 @@ bool Client::manage( Window w, bool isMapped ) if( !placementDone ) { // placement needs to be after setting size workspace()->place( this, area ); - placementDone = TRUE; + placementDone = true; } if(( !isSpecialWindow() || isToolbar()) && isMovable()) @@ -358,7 +358,7 @@ bool Client::manage( Window w, bool isMapped ) // probably should be replaced by something better bool doNotShow = false; if ( workspace()->isNotManaged( caption() ) ) - doNotShow = TRUE; + doNotShow = true; // other settings from the previous session if ( session ) diff --git a/twin/notifications.cpp b/twin/notifications.cpp index 5a83e9bce..43ae37cdf 100644 --- a/twin/notifications.cpp +++ b/twin/notifications.cpp @@ -92,7 +92,7 @@ TQString Notify::eventToName( Event e ) return event; } -static bool forgetIt = FALSE; +static bool forgetIt = false; TQValueList< Notify::EventData > Notify::pending_events; bool Notify::raise( Event e, const TQString& message, Client* c ) diff --git a/twin/options.cpp b/twin/options.cpp index 46c557b4a..c9411f6de 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -77,7 +77,7 @@ unsigned long Options::updateSettings() separateScreenFocus = config->readBoolEntry( "SeparateScreenFocus", false ); activeMouseScreen = config->readBoolEntry( "ActiveMouseScreen", focusPolicy != ClickToFocus ); - rollOverDesktops = config->readBoolEntry("RollOverDesktops", TRUE); + rollOverDesktops = config->readBoolEntry("RollOverDesktops", true); // focusStealingPreventionLevel = config->readNumEntry( "FocusStealingPreventionLevel", 2 ); // TODO use low level for now @@ -99,8 +99,8 @@ unsigned long Options::updateSettings() xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ), -1, tqApp->desktop()->numScreens() - 1 ); - animateShade = config->readBoolEntry("AnimateShade", TRUE ); - animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); + animateShade = config->readBoolEntry("AnimateShade", true ); + animateMinimize = config->readBoolEntry("AnimateMinimize", true ); animateMinimizeSpeed = config->readNumEntry("AnimateMinimizeSpeed", 5 ); if( focusPolicy == ClickToFocus ) @@ -112,21 +112,21 @@ unsigned long Options::updateSettings() } else { - autoRaise = config->readBoolEntry("AutoRaise", FALSE ); + autoRaise = config->readBoolEntry("AutoRaise", false ); autoRaiseInterval = config->readNumEntry("AutoRaiseInterval", 0 ); - delayFocus = config->readBoolEntry("DelayFocus", FALSE ); + delayFocus = config->readBoolEntry("DelayFocus", false ); delayFocusInterval = config->readNumEntry("DelayFocusInterval", 0 ); } - shadeHover = config->readBoolEntry("ShadeHover", FALSE ); + shadeHover = config->readBoolEntry("ShadeHover", false ); shadeHoverInterval = config->readNumEntry("ShadeHoverInterval", 250 ); // important: autoRaise implies ClickRaise - clickRaise = autoRaise || config->readBoolEntry("ClickRaise", TRUE ); + clickRaise = autoRaise || config->readBoolEntry("ClickRaise", true ); borderSnapZone = config->readNumEntry("BorderSnapZone", 10); windowSnapZone = config->readNumEntry("WindowSnapZone", 10); - snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",FALSE); + snapOnlyWhenOverlapping=config->readBoolEntry("SnapOnlyWhenOverlapping",false); // active borders: compatibility with old option names (Electric*) active_borders = config->readNumEntry("ActiveBorders", -1); @@ -205,7 +205,7 @@ unsigned long Options::updateSettings() onlyDecoTranslucent = config->readBoolEntry("OnlyDecoTranslucent",false); resetKompmgr = config->readBoolEntry("ResetKompmgr", false); if (resetKompmgr) - config->writeEntry("ResetKompmgr",FALSE); + config->writeEntry("ResetKompmgr",false); // window drop shadows config->setGroup("Style"); diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index d86037a84..324b8a782 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -42,7 +42,7 @@ PopupInfo::PopupInfo( Workspace* ws, const char *name ) connect(&m_delayedHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hide())); TQFont f = font(); - f.setBold( TRUE ); + f.setBold( true ); f.setPointSize( 14 ); setFont( f ); diff --git a/twin/sm.cpp b/twin/sm.cpp index 00cdb6a22..2cd9afd6a 100644 --- a/twin/sm.cpp +++ b/twin/sm.cpp @@ -94,7 +94,7 @@ void Workspace::storeSession( TDEConfig* config, SMSavePhase phase ) config->writeEntry( TQString("wmClientMachine")+n, c->wmClientMachine( true ).data() ); config->writeEntry( TQString("resourceName")+n, c->resourceName().data() ); config->writeEntry( TQString("resourceClass")+n, c->resourceClass().data() ); - config->writeEntry( TQString("geometry")+n, TQRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME + config->writeEntry( TQString("geometry")+n, TQRect( c->calculateGravitation(true), c->clientSize() ) ); // FRAME config->writeEntry( TQString("restore")+n, c->geometryRestore() ); config->writeEntry( TQString("fsrestore")+n, c->geometryFSRestore() ); config->writeEntry( TQString("maximize")+n, (int) c->maximizeMode() ); @@ -170,15 +170,15 @@ void Workspace::loadSessionInfo() info->maximized = config->readNumEntry( TQString("maximize")+n, 0 ); info->fullscreen = config->readNumEntry( TQString("fullscreen")+n, 0 ); info->desktop = config->readNumEntry( TQString("desktop")+n, 0 ); - info->minimized = config->readBoolEntry( TQString("iconified")+n, FALSE ); - info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, FALSE ); - info->shaded = config->readBoolEntry( TQString("shaded")+n, FALSE ); - info->shadowed = config->readBoolEntry( TQString("shadowed")+n, TRUE ); - info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, FALSE ); - info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, FALSE ); - info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, FALSE ); - info->skipPager = config->readBoolEntry( TQString("skipPager")+n, FALSE ); - info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, FALSE ); + info->minimized = config->readBoolEntry( TQString("iconified")+n, false ); + info->onAllDesktops = config->readBoolEntry( TQString("sticky")+n, false ); + info->shaded = config->readBoolEntry( TQString("shaded")+n, false ); + info->shadowed = config->readBoolEntry( TQString("shadowed")+n, true ); + info->keepAbove = config->readBoolEntry( TQString("staysOnTop")+n, false ); + info->keepBelow = config->readBoolEntry( TQString("keepBelow")+n, false ); + info->skipTaskbar = config->readBoolEntry( TQString("skipTaskbar")+n, false ); + info->skipPager = config->readBoolEntry( TQString("skipPager")+n, false ); + info->userNoBorder = config->readBoolEntry( TQString("userNoBorder")+n, false ); info->windowType = txtToWindowType( config->readEntry( TQString("windowType")+n ).latin1()); info->shortcut = config->readEntry( TQString("shortcut")+n ); info->active = ( active_client == i ); diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index feca2d77d..3829d6c02 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -203,7 +203,7 @@ void TabBox::reset() if ( clients.count() == 0 ) // height for the "not tasks" text { TQFont f = font(); - f.setBold( TRUE ); + f.setBold( true ); f.setPointSize( 14 ); h = TQFontMetrics(f).height()*4; @@ -401,7 +401,7 @@ void TabBox::drawContents( TQPainter * ) if ( !currentClient() ) { TQFont f = font(); - f.setBold( TRUE ); + f.setBold( true ); f.setPointSize( 14 ); p.setFont(f); @@ -993,26 +993,26 @@ bool Workspace::startKDEWalkThroughWindows() { if( !establishTabBoxGrab()) return false; - tab_grab = TRUE; + tab_grab = true; keys->suspend( true ); disable_shortcuts_keys->suspend( true ); client_keys->suspend( true ); tab_box->setMode( TabBox::WindowsMode ); tab_box->reset(); - return TRUE; + return true; } bool Workspace::startWalkThroughDesktops( int mode ) { if( !establishTabBoxGrab()) return false; - control_grab = TRUE; + control_grab = true; keys->suspend( true ); disable_shortcuts_keys->suspend( true ); client_keys->suspend( true ); tab_box->setMode( (TabBox::Mode) mode ); tab_box->reset(); - return TRUE; + return true; } bool Workspace::startWalkThroughDesktops() @@ -1195,8 +1195,8 @@ void Workspace::closeTabBox() keys->suspend( false ); disable_shortcuts_keys->suspend( false ); client_keys->suspend( false ); - tab_grab = FALSE; - control_grab = FALSE; + tab_grab = false; + control_grab = false; } /*! diff --git a/twin/tabbox.h b/twin/tabbox.h index 3fd419ad7..0f07b019c 100644 --- a/twin/tabbox.h +++ b/twin/tabbox.h @@ -46,7 +46,7 @@ class TabBox : public TQFrame bool isAppsOnly() const; void reset(); - void nextPrev( bool next = TRUE); + void nextPrev( bool next = true); void delayedShow(); void hide(); diff --git a/twin/useractions.cpp b/twin/useractions.cpp index 821828e19..c75b94f0a 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -76,13 +76,13 @@ TQPopupMenu* Workspace::clientPopup() if ( !popup ) { popup = new TQPopupMenu; - popup->setCheckable( TRUE ); + popup->setCheckable( true ); popup->setFont(TDEGlobalSettings::menuFont()); connect( popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( clientPopupAboutToShow() ) ); connect( popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) ); advanced_popup = new TQPopupMenu( popup ); - advanced_popup->setCheckable( TRUE ); + advanced_popup->setCheckable( true ); advanced_popup->setFont(TDEGlobalSettings::menuFont()); connect( advanced_popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) ); advanced_popup->insertItem( SmallIconSet( "go-up" ), @@ -228,7 +228,7 @@ void Workspace::initDesktopPopup() return; desk_popup = new TQPopupMenu( popup ); - desk_popup->setCheckable( TRUE ); + desk_popup->setCheckable( true ); desk_popup->setFont(TDEGlobalSettings::menuFont()); connect( desk_popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotSendToDesktop(int) ) ); @@ -250,7 +250,7 @@ void Workspace::desktopPopupAboutToShow() desk_popup->clear(); desk_popup->insertItem( i18n("&All Desktops"), 0 ); if ( active_popup_client && active_popup_client->isOnAllDesktops() ) - desk_popup->setItemChecked( 0, TRUE ); + desk_popup->setItemChecked( 0, true ); desk_popup->insertSeparator( -1 ); int id; const int BASE = 10; @@ -268,7 +268,7 @@ void Workspace::desktopPopupAboutToShow() i ); if ( active_popup_client && !active_popup_client->isOnAllDesktops() && active_popup_client->desktop() == i ) - desk_popup->setItemChecked( id, TRUE ); + desk_popup->setItemChecked( id, true ); } } @@ -501,7 +501,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op ) */ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalPos, bool handled ) { - bool replay = FALSE; + bool replay = false; switch (command) { case Options::MouseRaise: @@ -548,12 +548,12 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP case Options::MouseActivateRaiseAndPassClick: workspace()->takeActivity( this, ActivityFocus | ActivityRaise, handled ); workspace()->setActiveScreenMouse( globalPos ); - replay = TRUE; + replay = true; break; case Options::MouseActivateAndPassClick: workspace()->takeActivity( this, ActivityFocus, handled ); workspace()->setActiveScreenMouse( globalPos ); - replay = TRUE; + replay = true; break; case Options::MouseActivateRaiseAndMove: case Options::MouseActivateRaiseAndUnrestrictedMove: @@ -571,7 +571,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP if( moveResizeMode ) finishMoveResize( false ); mode = PositionCenter; - buttonDown = TRUE; + buttonDown = true; moveOffset = TQPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global invertedMoveOffset = rect().bottomRight() - moveOffset; unrestrictedMoveResize = ( command == Options::MouseActivateRaiseAndUnrestrictedMove @@ -591,7 +591,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP break; if( moveResizeMode ) finishMoveResize( false ); - buttonDown = TRUE; + buttonDown = true; moveOffset = TQPoint( globalPos.x() - x(), globalPos.y() - y()); // map from global int x = moveOffset.x(), y = moveOffset.y(); bool left = x < width() / 3; @@ -652,12 +652,12 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP { if (opacity_ < 0xF3333333) { - setOpacity(TRUE, opacity_ + 0xCCCCCCC); + setOpacity(true, opacity_ + 0xCCCCCCC); custom_opacity = true; } else { - setOpacity(FALSE, 0xFFFFFFFF); + setOpacity(false, 0xFFFFFFFF); custom_opacity = false; } } @@ -665,12 +665,12 @@ bool Client::performMouseCommand( Options::MouseCommand command, TQPoint globalP case Options::MouseOpacityLess: if (opacity_ > 0) { - setOpacity(TRUE, (opacity_ > 0xCCCCCCC) ? opacity_ - 0xCCCCCCC : 0); + setOpacity(true, (opacity_ > 0xCCCCCCC) ? opacity_ - 0xCCCCCCC : 0); custom_opacity = true; } break; case Options::MouseNothing: - replay = TRUE; + replay = true; break; } return replay; diff --git a/twin/utils.cpp b/twin/utils.cpp index bc44eee56..d21393d2e 100644 --- a/twin/utils.cpp +++ b/twin/utils.cpp @@ -57,7 +57,7 @@ bool Shape::hasShape( WId w) unsigned int wws, hws, wbs, hbs; int boundingShaped = 0, clipShaped = 0; if (!available()) - return FALSE; + return false; XShapeQueryExtents(tqt_xdisplay(), w, &boundingShaped, &xws, &yws, &wws, &hws, &clipShaped, &xbs, &ybs, &wbs, &hbs); diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 7c1a79e16..a98ade101 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -58,7 +58,7 @@ Workspace *Workspace::_self = 0; TDEProcess* kompmgr = 0; TDESelectionOwner* kompmgr_selection; -bool allowKompmgrRestart = TRUE; +bool allowKompmgrRestart = true; extern bool disable_twin_composition_manager; bool supportsCompMgr() @@ -187,7 +187,7 @@ Workspace::Workspace( bool restore ) root = tqt_xrootwin(); default_colormap = DefaultColormap(tqt_xdisplay(), tqt_xscreen() ); installed_colormap = default_colormap; - session.setAutoDelete( TRUE ); + session.setAutoDelete( true ); for (int i = 0; i < ACTIVE_BORDER_COUNT; ++i) { @@ -1306,10 +1306,10 @@ bool Workspace::isNotManaged( const TQString& title ) if (r.search(title) != -1) { doNotManageList.remove( it ); - return TRUE; + return true; } } - return FALSE; + return false; } /*! @@ -1875,19 +1875,19 @@ void Workspace::calcDesktopLayout(int &x, int &y) const bool Workspace::addSystemTrayWin( WId w ) { if ( systemTrayWins.contains( w ) ) - return TRUE; + return true; NETWinInfo ni( tqt_xdisplay(), w, root, NET::WMKDESystemTrayWinFor ); WId trayWinFor = ni.kdeSystemTrayWinFor(); if ( !trayWinFor ) - return FALSE; + return false; systemTrayWins.append( SystemTrayWindow( w, trayWinFor ) ); XSelectInput( tqt_xdisplay(), w, StructureNotifyMask ); XAddToSaveSet( tqt_xdisplay(), w ); propagateSystemTrayWins(); - return TRUE; + return true; } /*! @@ -1897,7 +1897,7 @@ bool Workspace::addSystemTrayWin( WId w ) bool Workspace::removeSystemTrayWin( WId w, bool check ) { if ( !systemTrayWins.contains( w ) ) - return FALSE; + return false; if( check ) { // When getting UnmapNotify, it's not clear if it's the systray @@ -1925,7 +1925,7 @@ bool Workspace::removeSystemTrayWin( WId w, bool check ) systemTrayWins.remove( w ); XRemoveFromSaveSet (tqt_xdisplay (), w); propagateSystemTrayWins(); - return TRUE; + return true; } @@ -2155,16 +2155,16 @@ void Workspace::slotMouseEmulation() if ( mouse_emulation ) { XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time()); - mouse_emulation = FALSE; + mouse_emulation = false; return; } if ( XGrabKeyboard(tqt_xdisplay(), - root, FALSE, + root, false, GrabModeAsync, GrabModeAsync, get_tqt_x_time()) == GrabSuccess ) { - mouse_emulation = TRUE; + mouse_emulation = true; mouse_emulation_state = 0; mouse_emulation_window = 0; } @@ -2284,7 +2284,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation bool Workspace::keyPressMouseEmulation( XKeyEvent& ev ) { if ( root != tqt_xrootwin() ) - return FALSE; + return false; int kc = XkbKeycodeToKeysym(tqt_xdisplay(), ev.keycode, 0, 0); int km = ev.state & (ControlMask | Mod1Mask | ShiftMask); @@ -2361,16 +2361,16 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev ) // fall through case XK_Escape: XUngrabKeyboard(tqt_xdisplay(), get_tqt_x_time()); - mouse_emulation = FALSE; - return TRUE; + mouse_emulation = false; + return true; default: - return FALSE; + return false; } TQCursor::setPos( pos ); if ( mouse_emulation_state ) mouse_emulation_state = sendFakedMouseEvent( pos, mouse_emulation_window, EmuMove, 0, mouse_emulation_state ); - return TRUE; + return true; } @@ -2397,7 +2397,7 @@ void Workspace::requestDelayFocus( Client* c ) delete delayFocusTimer; delayFocusTimer = new TQTimer( this ); connect( delayFocusTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( delayFocus() ) ); - delayFocusTimer->start( options->delayFocusInterval, TRUE ); + delayFocusTimer->start( options->delayFocusInterval, true ); } void Workspace::cancelDelayFocus() @@ -2981,7 +2981,7 @@ void Workspace::startKompmgr() } if (!kompmgr->start(TDEProcess::OwnGroup, TDEProcess::Stderr)) { - options->useTranslucency = FALSE; + options->useTranslucency = false; TDEProcess proc; proc << "kdialog" << "--error" << i18n("The Composite Manager could not be started.\\nMake sure you have \"" TDE_COMPOSITOR_BINARY "\" in a $PATH directory.") @@ -2997,8 +2997,8 @@ void Workspace::startKompmgr() connect( kompmgr_selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( stopKompmgr())); kompmgr_selection->claim( true ); connect(kompmgr, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(restartKompmgr(TDEProcess*))); - options->useTranslucency = TRUE; - //allowKompmgrRestart = FALSE; + options->useTranslucency = true; + //allowKompmgrRestart = false; //TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) ); TQByteArray ba; TQDataStream arg(ba, IO_WriteOnly); @@ -3016,7 +3016,7 @@ void Workspace::stopKompmgr() delete kompmgr_selection; kompmgr_selection = NULL; kompmgr->disconnect(this, TQ_SLOT(restartKompmgr(TDEProcess*))); - options->useTranslucency = FALSE; + options->useTranslucency = false; if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider kompmgr->kill(SIGKILL); TQByteArray ba; @@ -3040,7 +3040,7 @@ bool Workspace::kompmgrIsRunning() void Workspace::unblockKompmgrRestart() { - allowKompmgrRestart = TRUE; + allowKompmgrRestart = true; } void Workspace::restartKompmgr( TDEProcess *proc ) @@ -3059,7 +3059,7 @@ void Workspace::restartKompmgr( TDEProcess *proc ) { delete kompmgr_selection; kompmgr_selection = NULL; - options->useTranslucency = FALSE; + options->useTranslucency = false; if (crashed) { TDEProcess proc; proc << "kdialog" << "--error" @@ -3083,7 +3083,7 @@ void Workspace::restartKompmgr( TDEProcess *proc ) { delete kompmgr_selection; kompmgr_selection = NULL; - options->useTranslucency = FALSE; + options->useTranslucency = false; TDEProcess proc; proc << "kdialog" << "--error" << i18n("The Composite Manager could not be started.\\nMake sure you have \"" TDE_COMPOSITOR_BINARY "\" in a $PATH directory.") @@ -3092,7 +3092,7 @@ void Workspace::restartKompmgr( TDEProcess *proc ) } else { - allowKompmgrRestart = FALSE; + allowKompmgrRestart = false; TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) ); } } diff --git a/twin/workspace.h b/twin/workspace.h index 28da82ff0..17ef0c0b3 100644 --- a/twin/workspace.h +++ b/twin/workspace.h @@ -74,7 +74,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin { TQ_OBJECT public: - Workspace( bool restore = FALSE ); + Workspace( bool restore = false ); virtual ~Workspace(); static Workspace * self() { return _self; } @@ -119,8 +119,8 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin // stealing prevention code. Client* mostRecentlyActivatedClient() const; - void activateClient( Client*, bool force = FALSE ); - void requestFocus( Client* c, bool force = FALSE ); + void activateClient( Client*, bool force = false ); + void requestFocus( Client* c, bool force = false ); void takeActivity( Client* c, int flags, bool handled ); // flags are ActivityFlags void handleTakeActivity( Client* c, Time timestamp, int flags ); // flags are ActivityFlags bool allowClientActivation( const Client* c, Time time = -1U, bool focus_in = false ); |
