Changeset 69399ee


Ignore:
Timestamp:
05/09/14 10:29:10 (7 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
e7fce9d
Parents:
f435093 (diff), 40d27fc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/port-files/pkg-plist

    r02233b8 r40d27fc  
    433433share/pcbsd/xorg-gui/bin/rundetect.sh 
    434434share/pcbsd/xorg-gui/bin/setupconf.sh 
    435 share/pcbsd/pc-systemupdatertray/images/autoupdateinstalling.png 
    436 share/pcbsd/pc-systemupdatertray/images/autoupdateready.png 
    437 share/pcbsd/pc-systemupdatertray/images/connecterror.png 
    438 share/pcbsd/pc-systemupdatertray/images/go-down.png 
    439 share/pcbsd/pc-systemupdatertray/images/appcafe.png 
    440 share/pcbsd/pc-systemupdatertray/images/pkgmanager.png 
    441 share/pcbsd/pc-systemupdatertray/images/pkgupdates.png 
    442 share/pcbsd/pc-systemupdatertray/images/pbiupdates.png 
    443 share/pcbsd/pc-systemupdatertray/images/restart.png 
    444 share/pcbsd/pc-systemupdatertray/images/sysupdater.png 
    445 share/pcbsd/pc-systemupdatertray/images/sysupdates.png 
    446 share/pcbsd/pc-systemupdatertray/images/tmp.tar 
    447 share/pcbsd/pc-systemupdatertray/images/updated.png 
    448 share/pcbsd/pc-systemupdatertray/images/updating.png 
    449 share/pcbsd/pc-systemupdatertray/images/warden.png 
    450 share/pcbsd/pc-systemupdatertray/images/working.png 
    451 share/pcbsd/pc-systemupdatertray/images/view-refresh.png 
    452435share/pcbsd/pc-hwdetect/agp.xml 
    453436share/pcbsd/pc-hwdetect/audio.xml 
     
    28622845@dirrm share/pcbsd/pc-hwdetect 
    28632846@dirrm share/pcbsd/splash-screens 
    2864 @dirrm share/pcbsd/pc-systemupdatertray/images 
    2865 @dirrm share/pcbsd/pc-systemupdatertray 
    28662847@dirrm share/pcbsd/xorg-gui/bin 
    28672848@dirrm share/pcbsd/xorg-gui/scripts 
  • lumina/libLumina/LuminaX11.cpp

    rc47b1152 r7e29143  
    147147  } 
    148148  return window;                 
     149} 
     150 
     151// ===== SetNumberOfDesktops() ===== 
     152void LX11::SetNumberOfDesktops(int number){ 
     153  Display *display = QX11Info::display(); 
     154  Window rootWindow = QX11Info::appRootWindow(); 
     155 
     156  Atom atom = XInternAtom(display, "_NET_NUMBER_OF_DESKTOPS", False); 
     157  XEvent xevent; 
     158  xevent.type                 = ClientMessage; 
     159  xevent.xclient.type         = ClientMessage;  
     160  xevent.xclient.display      = display; 
     161  xevent.xclient.window       = rootWindow; 
     162  xevent.xclient.message_type = atom; 
     163  xevent.xclient.format       = 32; 
     164  xevent.xclient.data.l[0]    = number; 
     165  xevent.xclient.data.l[1]    = CurrentTime; 
     166  xevent.xclient.data.l[2]    = 0; 
     167  xevent.xclient.data.l[3]    = 0; 
     168  xevent.xclient.data.l[4]    = 0; 
     169  XSendEvent(display, rootWindow, False, SubstructureNotifyMask | SubstructureRedirectMask, &xevent); 
     170 
     171  XFlush(display);       
     172} 
     173 
     174// ===== SetCurrentDesktop() ===== 
     175void LX11::SetCurrentDesktop(int number){ 
     176  Display *display = QX11Info::display(); 
     177  Window rootWindow = QX11Info::appRootWindow(); 
     178 
     179  Atom atom = XInternAtom(display, "_NET_CURRENT_DESKTOP", False); 
     180  XEvent xevent; 
     181  xevent.type                 = ClientMessage; 
     182  xevent.xclient.type         = ClientMessage;  
     183  xevent.xclient.display      = display; 
     184  xevent.xclient.window       = rootWindow; 
     185  xevent.xclient.message_type = atom; 
     186  xevent.xclient.format       = 32; 
     187  xevent.xclient.data.l[0]    = number; 
     188  xevent.xclient.data.l[1]    = CurrentTime; 
     189  xevent.xclient.data.l[2]    = 0; 
     190  xevent.xclient.data.l[3]    = 0; 
     191  xevent.xclient.data.l[4]    = 0; 
     192  XSendEvent(display, rootWindow, False, SubstructureNotifyMask | SubstructureRedirectMask, &xevent); 
     193 
     194  XFlush(display);       
     195} 
     196 
     197// ===== GetNumberOfDesktops() ===== 
     198int LX11::GetNumberOfDesktops(){ 
     199  int number = -1; 
     200  Atom a = XInternAtom(QX11Info::display(), "_NET_NUMBER_OF_DESKTOPS", true); 
     201  Atom realType; 
     202  int format; 
     203  unsigned long num, bytes; 
     204  unsigned char *data = 0; 
     205  int status = XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), a, 0L, (~0L), 
     206             false, AnyPropertyType, &realType, &format, &num, &bytes, &data); 
     207  if( (status >= Success) && (num > 0) ){ 
     208    number = *data; 
     209    XFree(data); 
     210  } 
     211  return number; 
     212} 
     213 
     214// ===== GetCurrentDesktop ===== 
     215int LX11::GetCurrentDesktop(){ 
     216  int number = -1; 
     217  Atom a = XInternAtom(QX11Info::display(), "_NET_CURRENT_DESKTOP", true); 
     218  Atom realType; 
     219  int format; 
     220  unsigned long num, bytes; 
     221  unsigned char *data = 0; 
     222  int status = XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), a, 0L, (~0L), 
     223             false, AnyPropertyType, &realType, &format, &num, &bytes, &data); 
     224  if( (status >= Success) && (num > 0) ){ 
     225    number = *data; 
     226    XFree(data); 
     227  } 
     228  return number;         
    149229} 
    150230 
  • lumina/libLumina/LuminaX11.h

    re02b72f9 r7e29143  
    5050        static WId ActiveWindow();                              //List the currently-active window 
    5151         
     52        //Window Manager Interaction 
     53        static void SetNumberOfDesktops(int);   // set number of virtual desktops 
     54        static void SetCurrentDesktop(int);             // set current virtual desktop 
     55        static int GetNumberOfDesktops();               // get number of virtual desktops 
     56        static int GetCurrentDesktop();                 // get current virtual desktop 
     57         
    5258        //Single Window Management 
    5359        static void CloseWindow(WId);                   // Close the Window 
  • lumina/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp

    r0b8acbb3 rf435093  
    2727LDesktopSwitcher::~LDesktopSwitcher(){ 
    2828} 
    29  
     29/*  MOVED THESE FUNCTIONS TO LIBLUMINA (LuminaX11.h) -- Ken Moore 5/9/14 
    3030void LDesktopSwitcher::setNumberOfDesktops(int number) { 
    3131  Display *display = QX11Info::display(); 
     
    102102  } 
    103103  return number; 
    104 } 
     104} */ 
    105105 
    106106QAction* LDesktopSwitcher::newAction(int what, QString name) { 
     
    111111 
    112112void LDesktopSwitcher::createMenu() { 
     113  int cur = LX11::GetCurrentDesktop(); //current desktop number 
     114  int tot = LX11::GetNumberOfDesktops(); //total number of desktops 
    113115  qDebug() << "-- vor getCurrentDesktop SWITCH"; 
    114   qDebug() << getCurrentDesktop(); 
     116  qDebug() << cur; 
    115117  menu->clear(); 
    116   for (int i = 0; i < getNumberOfDesktops(); i++) { 
     118  for (int i = 0; i < tot; i++) { 
    117119    menu->addAction(newAction(i, QString("Workspace %1").arg(i +1))); 
    118120  } 
     
    120122 
    121123void LDesktopSwitcher::menuActionTriggered(QAction* act) { 
    122   setCurrentDesktop(act->whatsThis().toInt()); 
     124  LX11::SetCurrentDesktop(act->whatsThis().toInt()); 
    123125  label->setToolTip(QString("Workspace %1").arg(act->whatsThis().toInt() +1)); 
    124126} 
  • lumina/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.h

    r7ae73d3 rf435093  
    1111#include <QWidget> 
    1212#include <QString> 
    13 #include <QX11Info> 
     13//#include <QX11Info> 
    1414#include <QMenu> 
    1515 
    1616#include <LuminaUtils.h> 
    1717#include <LuminaXDG.h> 
     18#include <LuminaX11.h> 
    1819 
    1920#include "../LTBWidget.h" 
    2021#include "../LPPlugin.h" 
    2122 
    22 #include <X11/Xlib.h> 
    23 #include <X11/Xutil.h> 
    24 #include <X11/Xatom.h> 
     23//#include <X11/Xlib.h> 
     24//#include <X11/Xutil.h> 
     25//#include <X11/Xatom.h> 
    2526 
    2627class LDesktopSwitcher : public LPPlugin{ 
     
    3637        int iconOld; 
    3738 
    38         void setNumberOfDesktops(int); 
    39         void setCurrentDesktop(int); 
    40         int getNumberOfDesktops(); 
    41         int getCurrentDesktop(); 
     39        //void setNumberOfDesktops(int); 
     40        //void setCurrentDesktop(int); 
     41        //int getNumberOfDesktops(); 
     42        //int getCurrentDesktop(); 
    4243 
    4344        void createMenu(); 
Note: See TracChangeset for help on using the changeset viewer.