From cb18ad741b27057cef04d3dee81c4f753a38970f Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sun, 22 Mar 2026 07:35:56 +0300 Subject: tqdesktopwidget: cleanup indents Signed-off-by: Alexander Golubev --- src/kernel/tqdesktopwidget_x11.cpp | 172 +++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 85 deletions(-) diff --git a/src/kernel/tqdesktopwidget_x11.cpp b/src/kernel/tqdesktopwidget_x11.cpp index ed17b48e..706063b1 100644 --- a/src/kernel/tqdesktopwidget_x11.cpp +++ b/src/kernel/tqdesktopwidget_x11.cpp @@ -102,13 +102,13 @@ TQDesktopWidgetPrivate::TQDesktopWidgetPrivate() TQDesktopWidgetPrivate::~TQDesktopWidgetPrivate() { if ( screens ) { - for ( int i = 0; i < screenCount; ++i ) { - if (i == defaultScreen) continue; - delete screens[i]; - screens[i] = 0; - } + for ( int i = 0; i < screenCount; ++i ) { + if (i == defaultScreen) continue; + delete screens[i]; + screens[i] = 0; + } - free(screens); + free(screens); } if ( rects ) delete [] rects; @@ -124,20 +124,20 @@ void TQDesktopWidgetPrivate::init() XineramaScreenInfo *xinerama_screeninfo = 0; int unused; use_xinerama = (XineramaQueryExtension(TQPaintDevice::x11AppDisplay(), - &unused, &unused) && - XineramaIsActive(TQPaintDevice::x11AppDisplay())); + &unused, &unused) && + XineramaIsActive(TQPaintDevice::x11AppDisplay())); if (use_xinerama) { - xinerama_screeninfo = - XineramaQueryScreens(TQPaintDevice::x11AppDisplay(), &newScreenCount); + xinerama_screeninfo = + XineramaQueryScreens(TQPaintDevice::x11AppDisplay(), &newScreenCount); if (xinerama_screeninfo) - defaultScreen = 0; + defaultScreen = 0; } else #endif // TQT_NO_XINERAMA { - defaultScreen = DefaultScreen(TQPaintDevice::x11AppDisplay()); - newScreenCount = ScreenCount(TQPaintDevice::x11AppDisplay()); + defaultScreen = DefaultScreen(TQPaintDevice::x11AppDisplay()); + newScreenCount = ScreenCount(TQPaintDevice::x11AppDisplay()); use_xinerama = false; } @@ -151,22 +151,22 @@ void TQDesktopWidgetPrivate::init() for ( i = 0, j = 0; i < newScreenCount; i++ ) { #ifndef TQT_NO_XINERAMA - if (use_xinerama) { - x = xinerama_screeninfo[i].x_org; - y = xinerama_screeninfo[i].y_org; - w = xinerama_screeninfo[i].width; - h = xinerama_screeninfo[i].height; - } else + if (use_xinerama) { + x = xinerama_screeninfo[i].x_org; + y = xinerama_screeninfo[i].y_org; + w = xinerama_screeninfo[i].width; + h = xinerama_screeninfo[i].height; + } else #endif // TQT_NO_XINERAMA - { - x = 0; - y = 0; - w = WidthOfScreen(ScreenOfDisplay(TQPaintDevice::x11AppDisplay(), i)); - h = HeightOfScreen(ScreenOfDisplay(TQPaintDevice::x11AppDisplay(), i)); - } + { + x = 0; + y = 0; + w = WidthOfScreen(ScreenOfDisplay(TQPaintDevice::x11AppDisplay(), i)); + h = HeightOfScreen(ScreenOfDisplay(TQPaintDevice::x11AppDisplay(), i)); + } - workareas[i] = TQRect(); - rects[j].setRect(x, y, w, h); + workareas[i] = TQRect(); + rects[j].setRect(x, y, w, h); // overlapping? if (j > 0 && rects[j-1].intersects(rects[j])) { @@ -193,7 +193,7 @@ void TQDesktopWidgetPrivate::init() use_xinerama = false; if (xinerama_screeninfo) - XFree(xinerama_screeninfo); + XFree(xinerama_screeninfo); #endif // TQT_NO_XINERAMA } @@ -238,21 +238,22 @@ int TQDesktopWidget::numScreens() const TQWidget *TQDesktopWidget::screen( int screen ) { if (d->use_xinerama) - return this; + return this; if ( screen < 0 || screen >= d->screenCount ) - screen = d->defaultScreen; + screen = d->defaultScreen; if ( ! d->screens ) { - d->screens = (TQWidget**) calloc( d->screenCount, sizeof(TQWidget*)); - d->screens[ d->defaultScreen ] = this; + d->screens = (TQWidget**) calloc( d->screenCount, sizeof(TQWidget*)); + d->screens[ d->defaultScreen ] = this; } - if ( ! d->screens[screen] || // not created yet - ! d->screens[screen]->isDesktop() ) { // reparented away - qt_x11_create_desktop_on_screen = screen; - d->screens[screen] = new TQSingleDesktopWidget; - qt_x11_create_desktop_on_screen = -1; + if ( ! d->screens[screen] || // not created yet + ! d->screens[screen]->isDesktop() // reparented away + ) { + qt_x11_create_desktop_on_screen = screen; + d->screens[screen] = new TQSingleDesktopWidget; + qt_x11_create_desktop_on_screen = -1; } return d->screens[screen]; @@ -261,41 +262,42 @@ TQWidget *TQDesktopWidget::screen( int screen ) const TQRect& TQDesktopWidget::availableGeometry( int screen ) const { if ( qt_desktopwidget_workarea_dirty ) { - // the workareas are dirty, invalidate them - for ( int i = 0; i < d->screenCount; ++i ) - d->workareas[i] = TQRect(); - qt_desktopwidget_workarea_dirty = false; + // the workareas are dirty, invalidate them + for ( int i = 0; i < d->screenCount; ++i ) + d->workareas[i] = TQRect(); + qt_desktopwidget_workarea_dirty = false; } if ( screen < 0 || screen >= d->screenCount ) - screen = d->defaultScreen; + screen = d->defaultScreen; if ( d->workareas[screen].isValid() ) - return d->workareas[screen]; + return d->workareas[screen]; if ( ! isVirtualDesktop() && qt_net_supports( qt_net_workarea ) ) { - Atom ret; - int format, e; - unsigned char *data = 0; - unsigned long nitems, after; - - e = XGetWindowProperty( TQPaintDevice::x11AppDisplay(), - TQPaintDevice::x11AppRootWindow( screen ), - qt_net_workarea, 0, 4, False, XA_CARDINAL, - &ret, &format, &nitems, &after, &data ); - - if (e == Success && ret == XA_CARDINAL && - format == 32 && nitems == 4) { - long *workarea = (long *) data; - d->workareas[screen].setRect( workarea[0], workarea[1], - workarea[2], workarea[3] ); - } else { - d->workareas[screen] = screenGeometry(screen); - } - if ( data ) - XFree( data ); + Atom ret; + int format, e; + unsigned char *data = 0; + unsigned long nitems, after; + + e = XGetWindowProperty( TQPaintDevice::x11AppDisplay(), + TQPaintDevice::x11AppRootWindow( screen ), + qt_net_workarea, 0, 4, False, XA_CARDINAL, + &ret, &format, &nitems, &after, &data ); + + if ( e == Success && ret == XA_CARDINAL && + format == 32 && nitems == 4 + ) { + long *workarea = (long *) data; + d->workareas[screen].setRect( workarea[0], workarea[1], + workarea[2], workarea[3] ); + } else { + d->workareas[screen] = screenGeometry(screen); + } + if ( data ) + XFree( data ); } else { - d->workareas[screen] = screenGeometry(screen); + d->workareas[screen] = screenGeometry(screen); } return d->workareas[screen]; @@ -304,7 +306,7 @@ const TQRect& TQDesktopWidget::availableGeometry( int screen ) const const TQRect& TQDesktopWidget::screenGeometry( int screen ) const { if ( screen < 0 || screen >= d->screenCount ) - screen = d->defaultScreen; + screen = d->defaultScreen; return d->rects[ screen ]; } @@ -312,27 +314,27 @@ const TQRect& TQDesktopWidget::screenGeometry( int screen ) const int TQDesktopWidget::screenNumber( TQWidget *widget ) const { if ( !widget ) - return d->defaultScreen; + return d->defaultScreen; #ifndef TQT_NO_XINERAMA if (d->use_xinerama) { - // this is how we do it for xinerama - TQRect frame = widget->frameGeometry(); - if ( !widget->isTopLevel() ) - frame.moveTopLeft( widget->mapToGlobal( TQPoint( 0, 0 ) ) ); - - int maxSize = -1; - int maxScreen = -1; - - for ( int i = 0; i < d->screenCount; ++i ) { - TQRect sect = d->rects[i].intersect( frame ); - int size = sect.width() * sect.height(); - if ( size > maxSize && sect.width() > 0 && sect.height() > 0 ) { - maxSize = size; - maxScreen = i; - } - } - return maxScreen; + // this is how we do it for xinerama + TQRect frame = widget->frameGeometry(); + if ( !widget->isTopLevel() ) + frame.moveTopLeft( widget->mapToGlobal( TQPoint( 0, 0 ) ) ); + + int maxSize = -1; + int maxScreen = -1; + + for ( int i = 0; i < d->screenCount; ++i ) { + TQRect sect = d->rects[i].intersect( frame ); + int size = sect.width() * sect.height(); + if ( size > maxSize && sect.width() > 0 && sect.height() > 0 ) { + maxSize = size; + maxScreen = i; + } + } + return maxScreen; } #endif // TQT_NO_XINERAMA @@ -342,8 +344,8 @@ int TQDesktopWidget::screenNumber( TQWidget *widget ) const int TQDesktopWidget::screenNumber( const TQPoint &point ) const { for ( int i = 0; i < d->screenCount; ++i ) { - if ( d->rects[i].contains( point ) ) - return i; + if ( d->rects[i].contains( point ) ) + return i; } return -1; } -- cgit v1.2.3