From 109b5d1f0227c0d20664597a4e529547b757677b Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 4 Sep 2015 09:27:58 -0400 Subject: Clean out all the old XLib functions which were commented out, and start adding new functions for the window manager (direct access/control - not requests). --- libLumina/LuminaX11.cpp | 728 +----------------------------------------------- 1 file changed, 9 insertions(+), 719 deletions(-) (limited to 'libLumina/LuminaX11.cpp') diff --git a/libLumina/LuminaX11.cpp b/libLumina/LuminaX11.cpp index 5f482821..f9e2208b 100644 --- a/libLumina/LuminaX11.cpp +++ b/libLumina/LuminaX11.cpp @@ -35,725 +35,6 @@ #define DEBUG 0 -//===== WindowList() ======== -/*QList LX11::WindowList(){ - QList output; - output << LX11::GetClientList(); - - - //Validate windows - int desk = LX11::GetCurrentDesktop(); - for(int i=0; i= 0 && LX11::WindowDesktop(output[i]) != desk){ remove = true; } - else if( name=="Lumina Desktop Environment" ){ remove = true; } - else if(name.startsWith("Lumina-")){ - //qDebug() << "Lumina Window:" << name << LX11::WindowName(output[i]); - if(LX11::WindowName(output[i]).toLower()==name.toLower() ){ remove=true; } - } - - if(remove){ - //qDebug() << "Skip Window:" << output[i]; - output.removeAt(i); - i--; - } - } - //qDebug() << output; - //Return the list - return output; -} - -// ===== GetClientList() ===== -QList LX11::GetClientList(){ - QList output; - //XLib - Atom a = XInternAtom(QX11Info::display(), "_NET_CLIENT_LIST", true); - Atom realType; - int format; - unsigned long num, bytes; - unsigned char *data = 0; - int status = XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), a, 0L, (~0L), - false, AnyPropertyType, &realType, &format, &num, &bytes, &data); - if( (status >= Success) && (num > 0) ){ - Window* array = (Window*) data; - for(unsigned int i=0; i LX11::GetClientStackingList(){ - QList output; - Atom a = XInternAtom(QX11Info::display(), "_NET_CLIENT_LIST_STACKING", true); - Atom realType; - int format; - unsigned long num, bytes; - unsigned char *data = 0; - int status = XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), a, 0L, (~0L), - false, AnyPropertyType, &realType, &format, &num, &bytes, &data); - if( (status >= Success) && (num > 0) ){ - Window* array = (Window*) data; - for(unsigned int i=0; i LX11::findChildren(WId parent, int levels){ - Window rootR, parentR; - Window *childrenR; - unsigned int num; - int stat = XQueryTree(QX11Info::display(), parent, &rootR, &parentR, &childrenR, &num); - QList output; - if(stat != 0 && num > 0){ - for(int i=0; i 0){ - output << LX11::findChildren(childrenR[i], levels-1); //call this recursively - } - } - XFree(childrenR); - } - return output; -} - -// ===== ActiveWindow() ===== -WId LX11::ActiveWindow(){ - Display *disp = QX11Info::display(); - Atom SA = XInternAtom(disp, "_NET_ACTIVE_WINDOW", false); - Atom type; - int format; - unsigned long num, bytes; - unsigned char *data = 0; - int status = XGetWindowProperty( disp, QX11Info::appRootWindow() , SA, 0, ~(0L), false, AnyPropertyType, - &type, &format, &num, &bytes, &data); - WId window=0; - if(status >= Success && data){ - Window *array = (Window*) data; - window = array[0]; - XFree(data); - } - return window; -} - -// ===== SetNumberOfDesktops() ===== -void LX11::SetNumberOfDesktops(int number){ - //XCB Library - - //XLib - Display *display = QX11Info::display(); - Window rootWindow = QX11Info::appRootWindow(); - - Atom atom = XInternAtom(display, "_NET_NUMBER_OF_DESKTOPS", False); - XEvent xevent; - xevent.type = ClientMessage; - xevent.xclient.type = ClientMessage; - xevent.xclient.display = display; - xevent.xclient.window = rootWindow; - xevent.xclient.message_type = atom; - xevent.xclient.format = 32; - xevent.xclient.data.l[0] = number; - xevent.xclient.data.l[1] = CurrentTime; - xevent.xclient.data.l[2] = 0; - xevent.xclient.data.l[3] = 0; - xevent.xclient.data.l[4] = 0; - XSendEvent(display, rootWindow, False, SubstructureNotifyMask | SubstructureRedirectMask, &xevent); - - XFlush(display); -} - -// ===== SetCurrentDesktop() ===== -void LX11::SetCurrentDesktop(int number){ - Display *display = QX11Info::display(); - Window rootWindow = QX11Info::appRootWindow(); - - Atom atom = XInternAtom(display, "_NET_CURRENT_DESKTOP", False); - XEvent xevent; - xevent.type = ClientMessage; - xevent.xclient.type = ClientMessage; - xevent.xclient.display = display; - xevent.xclient.window = rootWindow; - xevent.xclient.message_type = atom; - xevent.xclient.format = 32; - xevent.xclient.data.l[0] = number; - xevent.xclient.data.l[1] = CurrentTime; - xevent.xclient.data.l[2] = 0; - xevent.xclient.data.l[3] = 0; - xevent.xclient.data.l[4] = 0; - XSendEvent(display, rootWindow, False, SubstructureNotifyMask | SubstructureRedirectMask, &xevent); - - XFlush(display); -} - -// ===== GetNumberOfDesktops() ===== -int LX11::GetNumberOfDesktops(){ - int number = -1; - Atom a = XInternAtom(QX11Info::display(), "_NET_NUMBER_OF_DESKTOPS", true); - Atom realType; - int format; - unsigned long num, bytes; - unsigned char *data = 0; - int status = XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), a, 0L, (~0L), - false, AnyPropertyType, &realType, &format, &num, &bytes, &data); - if( (status >= Success) && (num > 0) ){ - number = *data; - XFree(data); - } - return number; -} - -// ===== GetCurrentDesktop ===== -int LX11::GetCurrentDesktop(){ - int number = -1; - Atom a = XInternAtom(QX11Info::display(), "_NET_CURRENT_DESKTOP", true); - Atom realType; - int format; - unsigned long num, bytes; - unsigned char *data = 0; - int status = XGetWindowProperty(QX11Info::display(), QX11Info::appRootWindow(), a, 0L, (~0L), - false, AnyPropertyType, &realType, &format, &num, &bytes, &data); - if( (status >= Success) && (num > 0) ){ - number = data[0]; - XFree(data); - } - return number; -} - -// ===== CloseWindow() ===== -void LX11::CloseWindow(WId win){ - Display *display = QX11Info::display(); - Window rootWindow = QX11Info::appRootWindow(); - - Atom atom = XInternAtom(display, "_NET_CLOSE_WINDOW", False); - XEvent xevent; - xevent.type = ClientMessage; - xevent.xclient.type = ClientMessage; - xevent.xclient.display = display; - xevent.xclient.window = win; - xevent.xclient.message_type = atom; - xevent.xclient.format = 32; - xevent.xclient.data.l[0] = CurrentTime; - xevent.xclient.data.l[1] = 2; - xevent.xclient.data.l[2] = 0; - xevent.xclient.data.l[3] = 0; - xevent.xclient.data.l[4] = 0; - XSendEvent(display, rootWindow, False, SubstructureNotifyMask | SubstructureRedirectMask, &xevent); - - XFlush(display); -} - -void LX11::KillWindow(WId win){ - XKillClient(QX11Info::display(),win); -} - -// ===== IconifyWindow() ===== -void LX11::IconifyWindow(WId win){ - XIconifyWindow(QX11Info::display(), win, QX11Info::appScreen()); -} - -// ===== RestoreWindow() ===== -void LX11::RestoreWindow(WId win){ - //XCB Library - uint32_t val = XCB_STACK_MODE_ABOVE; - xcb_configure_window(QX11Info::connection(), win, XCB_CONFIG_WINDOW_STACK_MODE, &val); //raise it - xcb_map_window(QX11Info::connection(), win); //map it - //XLib - //Display *disp = QX11Info::display(); - //XMapRaised(disp, win); //make it visible again and raise it to the top -} - -// ===== ActivateWindow() ===== -void LX11::ActivateWindow(WId win){ - Display *display = QX11Info::display(); - Window rootWindow = QX11Info::appRootWindow(); - - Atom atom = XInternAtom(display, "_NET_ACTIVE_WINDOW", False); - XEvent xevent; - xevent.type = ClientMessage; - xevent.xclient.type = ClientMessage; - xevent.xclient.display = display; - xevent.xclient.window = win; - xevent.xclient.message_type = atom; - xevent.xclient.format = 32; - xevent.xclient.data.l[0] = 2; - xevent.xclient.data.l[1] = CurrentTime; - xevent.xclient.data.l[2] = LX11::ActiveWindow(); - xevent.xclient.data.l[3] = 0; - xevent.xclient.data.l[4] = 0; - XSendEvent(display, rootWindow, False, SubstructureNotifyMask | SubstructureRedirectMask, &xevent); - - XFlush(display); -} - -// ===== ReservePanelLocation() ===== -void LX11::ReservePanelLocation(WId win, int xstart, int ystart, int width, int height, QString loc){ - unsigned long strut[12]; - for(int i=0; i<12; i++){ strut[i] = 0; } //initialize it to all zeros - if(loc=="top"){ - //top of screen - strut[2] = height; //top width - strut[8] = xstart; //top x start - strut[9] = xstart+width; //top x end - }else if(loc=="bottom"){ - //bottom of screen - strut[3] = height; //bottom width - strut[10] = xstart; //bottom x start - strut[11] = xstart+width; //bottom x end - }else if(loc=="left"){ - strut[0] = width; - strut[4]=ystart; - strut[5]=ystart+height; - }else{ //right - strut[1] = width; - strut[6]=ystart; - strut[7]=ystart+height; - } - Display *disp = QX11Info::display(); - Atom WTYPE = XInternAtom(disp, "_NET_WM_STRUT_PARTIAL", false); - XChangeProperty( disp, win, WTYPE, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) strut, 12); - - //Also set the _NET_WM_STRUT property, just in case the WM does not use the newer type - WTYPE = XInternAtom(disp, "_NET_WM_STRUT", false); - XChangeProperty( disp, win, WTYPE, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) strut, 4); -} - -// ===== SetAsSticky() ===== -void LX11::SetAsSticky(WId win){ - //make this window "stick" to all virtual desktops - - //XCB Library - // xcb_change_property(QX11Info::connection(), XCB_PROP_MODE_APPEND, win, _NET_WM_STATE, XCB_ATOM, 32, 1, _NET_WM_STATE_STICKY); - - //XLib - Display *disp = QX11Info::display(); - Atom stick = XInternAtom(disp, "_NET_WM_STATE_STICKY",false); - Atom state = XInternAtom(disp, "_NET_WM_STATE", false); - - XChangeProperty(disp, win, state, XA_ATOM, 32, PropModeAppend, (unsigned char*) &stick, 1L); -} - -// ===== SetAsPanel() ===== -void LX11::SetAsPanel(WId win){ - //Set this window as the "Dock" type (for showing on top of everthing else) - long data[1]; - Display *disp = QX11Info::display(); - Atom WTYPE = XInternAtom(disp, "_NET_WM_WINDOW_TYPE", false); - Atom DOCK = XInternAtom(disp, "_NET_WM_WINDOW_TYPE_DOCK",false); - data[0] = DOCK; - XChangeProperty( disp, win, WTYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &data, 1L); -} - -// ===== SetAsDesktop() ===== -void LX11::SetAsDesktop(WId win){ - //Set this window as the "Desktop" type (for showing below everthing else) - long data[1]; - Display *disp = QX11Info::display(); - Atom WTYPE = XInternAtom(disp, "_NET_WM_WINDOW_TYPE", false); - Atom DOCK = XInternAtom(disp, "_NET_WM_WINDOW_TYPE_DESKTOP",false); - data[0] = DOCK; - XChangeProperty( disp, win, WTYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &data, 1L); -} - -// ===== MoveResizeWindow() ===== -void LX11::MoveResizeWindow(WId win, QRect rect){ - //Note: rect needs to be in global coordinates!! - XMoveResizeWindow(QX11Info::display(), win, rect.x(), rect.y(), rect.width(), rect.height()); -} - -// ===== ResizeWindow() ===== -void LX11::ResizeWindow(WId win, int width, int height){ - XResizeWindow(QX11Info::display(), win, width, height); -} - -// ===== CreateWindow() ===== -WId LX11::CreateWindow(WId parent, QRect rect){ - if(parent==0){ parent = QX11Info::appRootWindow(); } - XWindowAttributes patt; - XSetWindowAttributes att; - att.background_pixel=0; - att.border_pixel=0; - //Try to set the same attributes as the parent - if( ! XGetWindowAttributes(QX11Info::display(), parent, &patt) ){ - //Use some simple defaults instead - att.colormap = None; - }else{ - att.colormap = patt.colormap; - } - return XCreateWindow( QX11Info::display(), parent, rect.x(), rect.y(), rect.width(), rect.height(), 0, - CopyFromParent, InputOutput, CopyFromParent, CWColormap|CWBackPixel|CWBorderPixel, &att); -} - -// ===== DestroyWindow() ===== -void LX11::DestroyWindow(WId win){ - XDestroyWindow( QX11Info::display(), win); -} - -// ===== EmbedWindow() ===== -bool LX11::EmbedWindow(WId win, WId container){ - Display *disp = QX11Info::display(); - if(win==0 || container==0){ return false; } - //Reparent the window - //XCompositeRedirectSubwindows(disp, container, CompositeRedirectAutomatic); //container/window should be aware of each other - //qDebug() << "Embed Window:" << win << container; - XReparentWindow(disp, win, container,0,0); - XSync(disp, false); - //Map the window - XMapRaised(disp, win); //make it visible again and raise it to the top - //Check that the window has _XEMBED_INFO - //qDebug() << " - check for _XEMBED_INFO"; - Atom embinfo = XInternAtom(disp, "_XEMBED_INFO",false); - uchar *data=0; - ulong num, bytes; - int fmt; - Atom junk; - if(Success != XGetWindowProperty(disp, win, embinfo, 0, 2, false, embinfo, &junk, &fmt, &num, &bytes, &data) ){ - return false; //Embedding error (no info?) - } - if(data){ XFree(data); } // clean up any data found - - //Now send the embed event to the app - //qDebug() << " - send _XEMBED event"; - XEvent ev; - ev.xclient.type=ClientMessage; - ev.xclient.serial=0; - ev.xclient.send_event=true; - ev.xclient.message_type = XInternAtom(disp, "_XEMBED", false); - ev.xclient.window = win; - ev.xclient.format = 32; - ev.xclient.data.l[0] = CurrentTime; - ev.xclient.data.l[1] = 0; //XEMBED_EMBEDDED_NOTIFY - ev.xclient.data.l[2] = 0; - ev.xclient.data.l[3] = container; - ev.xclient.data.l[4] = 0; - XSendEvent(disp, win, false, 0xFFFFFF, &ev); - //Now setup any redirects and return - //qDebug() << " - select Input"; - XSelectInput(disp, win, StructureNotifyMask); //Notify of structure changes - //qDebug() << " - Composite Redirect"; - XCompositeRedirectWindow(disp, win, CompositeRedirectManual); - //qDebug() << " - Done"; - return true; -} - -// ===== UnembedWindow() ===== -bool LX11::UnembedWindow(WId win){ - Display *disp = QX11Info::display(); - //Remove redirects - XSelectInput(disp, win, NoEventMask); - //Make sure it is invisible - XUnmapWindow(disp, win); - //Reparent the window back to the root window - XReparentWindow(disp, win, QX11Info::appRootWindow(),0,0); - XSync(disp, false); - return true; -} - -// ===== WindowClass() ===== -QString LX11::WindowClass(WId win){ - XClassHint hint; - QString clss; - if(0 != XGetClassHint(QX11Info::display(), win, &hint) ){ - clss = QString(hint.res_class); //class is often capitalized properly, while name is not - XFree(hint.res_name); - XFree(hint.res_class); - } - return clss; -} - -// ===== WindowName() ===== -QString LX11::WindowName(WId win){ - QString nm = LX11::getNetWMProp(win, "_NET_WM_NAME"); - if(nm.isEmpty()){ - char *txt; - if( XFetchName(QX11Info::display(), win, &txt) != 0){ - nm = QString(txt); - } - XFree(txt); - } - return nm; -} - -// ===== WindowVisibleName() ===== -QString LX11::WindowVisibleName(WId win){ - return LX11::getNetWMProp(win, "_NET_WM_VISIBLE_NAME"); -} - -// ===== WindowIconName() ===== -QString LX11::WindowIconName(WId win){ - return LX11::getNetWMProp(win, "_NET_WM_ICON_NAME"); -} - -// ===== WindowVisibleIconName() ===== -QString LX11::WindowVisibleIconName(WId win){ - return LX11::getNetWMProp(win, "_NET_WM_VISIBLE_ICON_NAME"); -} - -// ===== GetNumberOfDesktops() ===== -int LX11::WindowDesktop(WId win){ - int number = -1; - Atom a = XInternAtom(QX11Info::display(), "_NET_WM_DESKTOP", true); - Atom realType; - int format; - unsigned long num, bytes; - unsigned char *data = 0; - int status = XGetWindowProperty(QX11Info::display(), win, a, 0L, (~0L), - false, AnyPropertyType, &realType, &format, &num, &bytes, &data); - if( (status >= Success) && (num > 0) ){ - number = *data; - XFree(data); - } - return number; -} - -// ===== GetWindowState() ===== -LX11::WINDOWSTATE LX11::GetWindowState(WId win){ - LX11::WINDOWSTATE state = LX11::VISIBLE; - - //XCB Library (TO DO) - - - //XLib - Display *disp = QX11Info::display(); - Atom SA = XInternAtom(disp, "_NET_WM_STATE", true); - Atom ATTENTION = XInternAtom(disp, "_NET_WM_STATE_DEMANDS_ATTENTION", false); - Atom SKIPP = XInternAtom(disp, "_NET_WM_STATE_SKIP_PAGER", false); - Atom HIDDEN = XInternAtom(disp, "_NET_WM_STATE_HIDDEN", false); - Atom SKIPT = XInternAtom(disp, "_NET_WM_STATE_SKIP_TASKBAR", false); - //Atom MODAL = XInternAtom(disp, "_NET_WM_STATE_MODAL", false); - Atom type; - int format; - unsigned long num, bytes; - unsigned long *data = 0; - - int status = XGetWindowProperty( disp, win, SA, 0, ~(0L), false, AnyPropertyType, - &type, &format, &num, &bytes, (unsigned char**) &data); - - if(status >= Success && data){ - for(unsigned int i=0; iflags & URGENCYHINT){ - qDebug() << "Found Urgent Flag:"; - state = LX11::ATTENTION; - } - XFree(hints); - } - } - - return state; -} - -WId LX11::leaderWindow(WId win){ - //Get the client leader for this window if it has one - Display *disp = QX11Info::display(); - Atom SA = XInternAtom(disp, "WM_CLIENT_LEADER", false); - Atom type; - int format; - unsigned long num, bytes; - unsigned char *data = 0; - WId leader = 0; - int status = XGetWindowProperty( disp, win, SA, 0, ~(0L), false, AnyPropertyType, - &type, &format, &num, &bytes, &data); - if(status >= Success && data){ - Window *array = reinterpret_cast (data); - if(array!=0){ - leader = array[0]; - } - XFree(data); - } - return leader; -} - -// ===== isNormalWindow() ===== -bool LX11::isNormalWindow(WId win, bool includeDialogs){ - //Check to see if it is a "normal" window (as opposed to tooltips, popups, menus, etc) - Display *disp = QX11Info::display(); - Atom SA = XInternAtom(disp, "_NET_WM_WINDOW_TYPE", false); - Atom NORMAL = XInternAtom(disp, "_NET_WM_WINDOW_TYPE_NORMAL", false); - Atom DIALOG = XInternAtom(disp, "_NET_WM_WINDOW_TYPE_DIALOG", false); - Atom type; - int format; - unsigned long num, bytes; - unsigned char *data = 0; - int status = XGetWindowProperty( disp, win, SA, 0, ~(0L), false, AnyPropertyType, - &type, &format, &num, &bytes, &data); - - bool isNormal = true; //assume normal is true if unlisted (the standard use) - if(status >= Success && data){ - for(unsigned int i=0; iscreen = QX11Info::appScreen(); - XVI->depth = 32; - XVI->c_class = TrueColor; - int num; - XVI = XGetVisualInfo(disp, VisualScreenMask | VisualDepthMask | VisualClassMask , XVI, &num); - VisualID vis = 0; - if(XVI != 0){ - XRenderPictFormat *fmt; - for(int i=0; itype == PictTypeDirect) && (fmt->direct.alphaMask!=0) ){ - vis = XVI[i].visualid; - break; - } - } - } - XFree(XVI); //done with this - clean it up - //Now register the visual ID - if(vis!=0){ - XChangeProperty(disp, LuminaSessionTrayID, XInternAtom(disp,"_NET_SYSTEM_TRAY_VISUAL",true), - XA_VISUALID, 32, PropModeReplace, (unsigned char*) &vis, 1); - } - //Finally, send out an X event letting others know that the system tray is up and running - XClientMessageEvent msg; - msg.type = ClientMessage; - msg.window = root; - msg.message_type = XInternAtom(disp,"MANAGER",true); - msg.format = 32; - msg.data.l[0] = CurrentTime; - msg.data.l[1] = _NET_SYSTEM_TRAY_S; - msg.data.l[2] = LuminaSessionTrayID; - msg.data.l[3] = 0; - msg.data.l[4] = 0; - XSendEvent(disp, root, False, StructureNotifyMask, (XEvent*)&msg); - - //Success - return LuminaSessionTrayID; -} - -// ===== closeSystemTray() ===== -void LX11::closeSystemTray(WId trayID){ - XDestroyWindow(QX11Info::display(), trayID); -} - -// ===== findOrphanTrayWindows() ===== -QList LX11::findOrphanTrayWindows(){ - //Scan the first level of root windows and see if any of them - // are tray apps waiting to be embedded - Display *disp = QX11Info::display(); - QList wins = LX11::findChildren(QX11Info::appRootWindow(), 0); //only go one level deep - Atom embinfo = XInternAtom(disp, "_XEMBED_INFO",false); - for(int i=0; i= Success && data){ - property = QString::fromUtf8( (char *) data); - XFree(data); - } - return property; -} -*/ //=============================== //=============================== // XCB LIBRARY FUNCTIONS @@ -1697,3 +978,12 @@ void LXCB::closeSystemTray(WId trayID){ //Make sure to clear that reply xcb_ewmh_get_workarea_reply_wipe(&work); }*/ + +//============ +// WM Functions (directly changing properties/settings) +// - Using these directly may prevent the WM from seeing the change +//============ +void LXCB::WM_CloseWindow(WId win){ + xcb_destroy_window(QX11Info::connection(), win); +} + \ No newline at end of file -- cgit