[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeaccessibility/kbstateapplet
From:       Gunnar Schmidt <gunnar () schmi-dt ! de>
Date:       2005-09-02 12:23:30
Message-ID: 1125663810.213506.20583.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 456255 by gunnar:

My last commit was too quickly done. This fixes the problems created with it.

 M  +6 -5      kbstate.cpp  
 M  +6 -28     kbstate.h  


--- trunk/KDE/kdeaccessibility/kbstateapplet/kbstate.cpp #456254:456255
@@ -43,6 +43,7 @@
 #include "kdeexportfix.h"
 #include "kbstate.h"
 #include "kbstate.moc"
+#include <QX11Info>
 
 extern "C"
 {
@@ -104,10 +105,10 @@
 	slow   = new TimeoutIcon (instance, "", "kbstate_slowkeys", this, "slow");
 	bounce = new TimeoutIcon (instance, "", "", this, "bounce");
 
-	xkb = XkbGetMap(qt_xdisplay(), 0, XkbUseCoreKbd);
+	xkb = XkbGetMap(QX11Info::display(), 0, XkbUseCoreKbd);
 
 	if (xkb != 0) {
-		XkbGetControls (qt_xdisplay(), XkbAllControlsMask, xkb);
+		XkbGetControls (QX11Info::display(), XkbAllControlsMask, xkb);
 		if (xkb->ctrls != 0)
 			accessxFeatures = xkb->ctrls->enabled_ctrls;
 		else
@@ -121,8 +122,8 @@
    
    kapp->installX11EventFilter (this);
    int opcode_rtn, error_rtn;
-   XkbQueryExtension (this->x11Display(), &opcode_rtn, &xkb_base_event_type,  &error_rtn, NULL, NULL);
-   XkbSelectEvents (this->x11Display(), XkbUseCoreKbd, XkbAllEventsMask,
+	XkbQueryExtension (QX11Info::display(), &opcode_rtn, &xkb_base_event_type,  &error_rtn, NULL, NULL);
+	XkbSelectEvents (QX11Info::display(), XkbUseCoreKbd, XkbAllEventsMask,
 						  XkbAllEventsMask);
    
 	buildPopupMenu();
@@ -601,7 +602,7 @@
 				accessxFeatures = event->enabled_ctrls;
 				
 				if ((accessxFeatures & XkbMouseKeysMask) != 0) {
-					XkbGetControls (qt_xdisplay(), XkbMouseKeysMask, xkb);
+					XkbGetControls (QX11Info::display(), XkbMouseKeysMask, xkb);
 					if (xkb->ctrls->mk_dflt_btn < 1)
 						mouse->setActiveKey (1);
 					else if (xkb->ctrls->mk_dflt_btn > 3)
--- trunk/KDE/kdeaccessibility/kbstateapplet/kbstate.h #456254:456255
@@ -30,6 +30,12 @@
 #include <QGridLayout>
 #include <QResizeEvent>
      
+extern "C"
+{
+#include <X11/Xlib.h>
+#include <X11/XKBlib.h>
+}
+
 class QLabel;      
 class QGridLayout;
 class KPopupMenu;
@@ -129,34 +135,6 @@
 		KInstance *instance;
 };
 
-class MouseIcon : public StatusIcon {
-	Q_OBJECT
-	public:
-		MouseIcon (KInstance *instance, QWidget *parent, const char *name=0);
-		~MouseIcon ();
-		void setState (int state);
-		void setActiveKey (int activekey);
-		void drawButton (QPainter *p);
-		void updateImages ();
-
-	protected:
-		void resizeEvent(QResizeEvent*);
-
-	private:
-		QPixmap mouse;
-		QPixmap leftSelected;
-		QPixmap middleSelected;
-		QPixmap rightSelected;
-		QPixmap leftDot;
-		QPixmap middleDot;
-		QPixmap rightDot;
-		QPixmap leftDotSelected;
-		QPixmap middleDotSelected;
-		QPixmap rightDotSelected;
-		int state, activekey;
-		KInstance *instance;
-};
-
 class KbStateApplet : public KPanelApplet {
    Q_OBJECT
 
[prev in list] [next in list] [prev in thread] [next in thread]