Remove GlobalContext class. Move all native code from EventHandler class to NativeWindowX11 and NativeWindowWin32 classes.

1 files changed, 8 insertions, 392 deletions

diff --git a/plugingui/eventhandler.cc b/plugingui/eventhandler.cc
index a7aff12..7eae827 100644
--- a/plugingui/eventhandler.cc
+++ b/plugingui/eventhandler.cc
@@ -26,392 +26,25 @@
  */
 #include "eventhandler.h"
 
-#include "globalcontext.h"
-
-#include <stdio.h>
-
-#ifdef X11
-#include <X11/Xutil.h>
-#endif/*X11*/
+#include "window.h"
 
-GUI::EventHandler::EventHandler(GlobalContext *gctx)
+GUI::EventHandler::EventHandler(GUI::NativeWindow *n, GUI::Window *w)
 {
-  this->gctx = gctx;
+  native = n;
+  window = w;
+
   last_click = 0;
   last_was_dbl_click = false;
-#ifdef WIN32
-  this->gctx->eventhandler = this;
-  event = NULL;
-#endif/*WIN32*/
 }
 
 bool GUI::EventHandler::hasEvent()
 {
-#ifdef X11
-  return XPending(gctx->display);
-#endif/*X11*/
-
-#ifdef WIN32
-	MSG		msg;
-  return PeekMessage(&msg, NULL, 0, 0, 0) != 0;
-#endif/*WIN32*/
-  return false;
+  return native->hasEvent();
 }
 
-#ifdef WIN32
-
-extern GUI::Window *gwindow;
-
-#include "window.h"
-LRESULT CALLBACK dialogProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp)
-{
-  GUI::EventHandler *handler =
-    (GUI::EventHandler *) GetWindowLong(hwnd, GWL_USERDATA);
-
-	switch(msg) {
-	case WM_SIZE:
-    {
-      static bool first = true;
-      if(!first) {
-        GUI::ResizeEvent *e = new GUI::ResizeEvent();
-        e->width = LOWORD(lp);
-        e->height = HIWORD(lp);
-        handler->event = e;
-        first = false;
-      }
-    }
-		break;
-
-	case WM_MOVE:
-    {
-//      GUI::MoveEvent *e = new GUI::MoveEvent();
-//      e->x = (int)(short) LOWORD(lp);
-//      e->y = (int)(short) HIWORD(lp);
-//      handler->event = e;
-    }
-		break;
-
-	case WM_CLOSE:
-    {
-      GUI::CloseEvent *e = new GUI::CloseEvent();
-      handler->event = e;
-    }
-    break;
-//		HWND child, old;
-//		old	= 0;
-
-//		numDialogs--;
-
-//		while(old != (child = GetNextDlgGroupItem(hwnd, hwnd, false))) {
-//			old = child;
-//			EndDialog(child, 0);
-//		}
-
-//		if(numDialogs) EndDialog(hwnd, 0);
-//		else PostQuitMessage(0);
-//		return 0;
-	case WM_MOUSEMOVE:
-    {
-      
-      GUI::MouseMoveEvent *e = new GUI::MouseMoveEvent();
-      e->x = (int)(short) LOWORD(lp);
-      e->y = (int)(short) HIWORD(lp);
-      handler->event = e;
-    }
-		break;
-
-	case WM_MOUSEWHEEL:
-    {
-      GUI::ScrollEvent *e = new GUI::ScrollEvent();
-
-      // NOTE: lp is coordinates in screen space, not client space.
-      POINT p;
-      p.x = (int)(short) LOWORD(lp);
-      p.y = (int)(short) HIWORD(lp);
-      ScreenToClient(hwnd, &p);
-
-      e->x = p.x;
-      e->y = p.y;
-      e->delta = -1 * (short)HIWORD(wp) / 60;
-      handler->event = e;
-    }
- 		break;
-
-	case WM_LBUTTONUP:
-	case WM_LBUTTONDBLCLK:
-	case WM_LBUTTONDOWN:
-	case WM_RBUTTONUP:
-	case WM_RBUTTONDBLCLK:
-	case WM_RBUTTONDOWN:
-	case WM_MBUTTONUP:
-	case WM_MBUTTONDBLCLK:
-	case WM_MBUTTONDOWN:
-    {
-      GUI::ButtonEvent *e = new GUI::ButtonEvent();
-      e->x = (int)(short) LOWORD(lp);
-      e->y = (int)(short) HIWORD(lp);
-
-      if(msg == WM_LBUTTONUP ||
-         msg == WM_LBUTTONDBLCLK ||
-         msg == WM_LBUTTONDOWN) e->button = 0;
-
-      if(msg == WM_RBUTTONUP ||
-         msg == WM_RBUTTONDBLCLK ||
-         msg == WM_RBUTTONDOWN) e->button = 1;
-
-      if(msg == WM_MBUTTONUP ||
-         msg == WM_MBUTTONDBLCLK ||
-         msg == WM_MBUTTONDOWN) e->button = 2;
-
-      e->direction = 0;
-      if(msg == WM_LBUTTONUP ||
-         msg == WM_RBUTTONUP ||
-         msg == WM_MBUTTONUP) e->direction = -1;
-
-      if(msg == WM_LBUTTONDOWN ||
-         msg == WM_RBUTTONDOWN ||
-         msg == WM_MBUTTONDOWN) e->direction = 1;
-
-      e->doubleclick = (msg == WM_LBUTTONDBLCLK ||
-                        msg == WM_RBUTTONDBLCLK ||
-                        msg == WM_MBUTTONDBLCLK);
-
-      handler->event = e;
-    }
-		break;
-
-	case WM_KEYDOWN:
-    {
-      GUI::KeyEvent *e = new GUI::KeyEvent();
-      //printf("wp: %d\n", wp);
-      switch(wp) {
-      case 37: e->keycode = GUI::KeyEvent::KEY_LEFT; break;
-      case 39: e->keycode = GUI::KeyEvent::KEY_RIGHT; break;
-      case 38: e->keycode = GUI::KeyEvent::KEY_UP; break;
-      case 40: e->keycode = GUI::KeyEvent::KEY_DOWN; break;
-      case 8: e->keycode = GUI::KeyEvent::KEY_BACKSPACE; break;
-      case 46: e->keycode = GUI::KeyEvent::KEY_DELETE; break;
-      case 36: e->keycode = GUI::KeyEvent::KEY_HOME; break;
-      case 35: e->keycode = GUI::KeyEvent::KEY_END; break;
-      case 33: e->keycode = GUI::KeyEvent::KEY_PGUP; break;
-      case 34: e->keycode = GUI::KeyEvent::KEY_PGDOWN; break;
-      case 13: e->keycode = GUI::KeyEvent::KEY_ENTER; break;
-      default: e->keycode = GUI::KeyEvent::KEY_UNKNOWN; break;
-      }
-      e->text = "";
-      e->direction = -1;
-      handler->event = e;
-    }
-		break;
-
-	case WM_CHAR:
-    {
-      //printf("WM_CHAR %d %d\n", (int)lp, (int)wp);
-      if(wp >= ' ') { // Filter control chars.
-        GUI::KeyEvent *e = new GUI::KeyEvent();
-        e->keycode = GUI::KeyEvent::KEY_CHARACTER;
-        e->text += (char)wp;
-        e->direction = -1;
-        handler->event = e;
-      }
-    }
-		break;
-
-	case WM_PAINT:
-    {
-      GUI::RepaintEvent *e = new GUI::RepaintEvent();
-      e->x = 0;
-      e->y = 0;
-      e->width = 100;
-      e->height = 100;
-      handler->event = e;
-
-      // Move to window.h (in class)
-      HDC pDC;
-      HBITMAP old;
-      HBITMAP ourbitmap;
-      int * framebuf;
-      GUI::PixelBuffer &px = gwindow->wpixbuf;
-
-      { // Create bitmap (move to window.cc)
-        HDC hDC;
-        BITMAPINFO bitmapinfo;
-        hDC = CreateCompatibleDC(NULL);
-        bitmapinfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-        bitmapinfo.bmiHeader.biWidth = px.width;
-        bitmapinfo.bmiHeader.biHeight = -px.height; /* top-down */
-        bitmapinfo.bmiHeader.biPlanes = 1;
-        bitmapinfo.bmiHeader.biBitCount = 32;
-        bitmapinfo.bmiHeader.biCompression = BI_RGB;
-        bitmapinfo.bmiHeader.biSizeImage = 0;
-        bitmapinfo.bmiHeader.biClrUsed = 256;
-        bitmapinfo.bmiHeader.biClrImportant = 256;
-        ourbitmap=CreateDIBSection(hDC, &bitmapinfo,
-                                   DIB_RGB_COLORS, (void**)&framebuf, 0, 0);
-        pDC=CreateCompatibleDC(NULL);
-        old = (HBITMAP__*)SelectObject(pDC, ourbitmap);
-        DeleteDC(hDC);
-      }
-
-      { // Copy GUI::PixelBuffer to framebuffer (move to window.cc)
-        int i,j,k;
-        for (k=0,i=0;i<(int)px.height;i++) {
-          for (j=0;j<(int)px.width;j++,k++) {
-            *(framebuf+k)=RGB(px.buf[(j + i * px.width) * 3 + 2],
-                              px.buf[(j + i * px.width) * 3 + 1],
-                              px.buf[(j + i * px.width) * 3 + 0]);
-          }
-        }
-      }
-      
-      PAINTSTRUCT	ps;
-      HDC	hdc = BeginPaint(handler->gctx->m_hwnd, &ps);
-      BitBlt(hdc,0,0,px.width,px.height,pDC,0,0,SRCCOPY);
-      EndPaint(handler->gctx->m_hwnd, &ps);
-
-      { // Destroy bitmap (move to window.cc)
-        SelectObject(pDC,old);
-        DeleteDC(pDC);
-        DeleteObject(ourbitmap);
-        
-      }
-    }
-		return DefWindowProc(hwnd, msg, wp, lp);
-	}
-
-	return DefWindowProc(hwnd, msg, wp, lp);
-}
-#endif/*WIN32*/
-
 GUI::Event *GUI::EventHandler::getNextEvent()
 {
-  Event *event = NULL;
-#ifdef X11
-  XEvent xe;
-  XNextEvent(gctx->display, &xe);
-
-  if(xe.type == MotionNotify) {
-    while(true) { // Hack to make sure only the last event is played.
-      if(!hasEvent()) break;
-      XEvent nxe;
-      XPeekEvent(gctx->display, &nxe);
-      if(nxe.type != MotionNotify) break;
-      XNextEvent(gctx->display, &xe);
-    }
-
-    MouseMoveEvent *e = new MouseMoveEvent();
-    e->window_id = xe.xmotion.window;
-    e->x = xe.xmotion.x;
-    e->y = xe.xmotion.y;
-    event = e;
-  }
-
-  if(xe.type == Expose && xe.xexpose.count == 0) {
-    RepaintEvent *e = new RepaintEvent();
-    e->window_id = xe.xexpose.window;
-    e->x = xe.xexpose.x;
-    e->y = xe.xexpose.y;
-    e->width = xe.xexpose.width;
-    e->height = xe.xexpose.height;
-    event = e;
-  }
-
-  if(xe.type == ConfigureNotify) {
-    ResizeEvent *e = new ResizeEvent();
-    e->window_id = xe.xconfigure.window;
-    //    e->x = xe.xconfigure.x;
-    //    e->y = xe.xconfigure.y;
-    e->width = xe.xconfigure.width;
-    e->height = xe.xconfigure.height;
-    event = e;
-  }
-
-  if(xe.type == ButtonPress || xe.type == ButtonRelease) {
-    if(xe.xbutton.button == 4 || xe.xbutton.button == 5) {
-      int scroll = 1;
-      while(true) { // Hack to make sure only the last event is played.
-        if(!hasEvent()) break;
-        XEvent nxe;
-        XPeekEvent(gctx->display, &nxe);
-        if(nxe.type != ButtonPress && nxe.type != ButtonRelease) break;
-        scroll += 1;
-        XNextEvent(gctx->display, &xe);
-      }
-      ScrollEvent *e = new ScrollEvent();
-      e->window_id = xe.xbutton.window;
-      e->x = xe.xbutton.x;
-      e->y = xe.xbutton.y;
-      e->delta = scroll * (xe.xbutton.button==4?-1:1);
-      event = e;
-    } else {
-      ButtonEvent *e = new ButtonEvent();
-      e->window_id = xe.xbutton.window;
-      e->x = xe.xbutton.x;
-      e->y = xe.xbutton.y;
-      e->button = 0;
-      e->direction = xe.type == ButtonPress?1:-1;
-      e->doubleclick =
-        xe.type == ButtonPress && (xe.xbutton.time - last_click) < 200;
-      
-      if(xe.type == ButtonPress) last_click = xe.xbutton.time;
-      event = e;
-    }
-  }
-
-  if(xe.type == KeyPress || xe.type == KeyRelease) {
-    //printf("key: %d\n", xe.xkey.keycode);
-    KeyEvent *e = new KeyEvent();
-    e->window_id = xe.xkey.window;
-
-    switch(xe.xkey.keycode) {
-    case 113: e->keycode = KeyEvent::KEY_LEFT; break;
-    case 114: e->keycode = KeyEvent::KEY_RIGHT; break;
-    case 111: e->keycode = KeyEvent::KEY_UP; break;
-    case 116: e->keycode = KeyEvent::KEY_DOWN; break;
-    case 119: e->keycode = KeyEvent::KEY_DELETE; break;
-    case 22: e->keycode = KeyEvent::KEY_BACKSPACE; break;
-    case 110: e->keycode = KeyEvent::KEY_HOME; break;
-    case 115: e->keycode = KeyEvent::KEY_END; break;
-    case 117: e->keycode = KeyEvent::KEY_PGDOWN; break;
-    case 112: e->keycode = KeyEvent::KEY_PGUP; break;
-    case 36: e->keycode = KeyEvent::KEY_ENTER; break;
-    default: e->keycode = KeyEvent::KEY_UNKNOWN; break;
-    }
-
-    char buf[1024];
-    int sz = XLookupString(&xe.xkey, buf, sizeof(buf),  NULL, NULL);
-    if(sz && e->keycode == KeyEvent::KEY_UNKNOWN) {
-      e->keycode = KeyEvent::KEY_CHARACTER;
-    }
-    e->text.append(buf, sz);
-
-    e->direction = xe.type == KeyPress?1:-1;
-    event = e;
-  }
-
-  if(xe.type == ClientMessage &&
-     (unsigned int)xe.xclient.data.l[0] == gctx->wmDeleteMessage) {
-    CloseEvent *e = new CloseEvent();
-    event = e;
-  }
-
-#endif/*X11*/
-
-#ifdef WIN32
-	MSG		msg;
-
-	if(GetMessage(&msg, NULL, 0, 0)) {
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-	}
-
-  //  printf("Got message: %p\n", this->event);
-
-  event = this->event;
-  this->event = NULL;
-#endif/*WIN32*/
-
-  return event;
+  return native->getNextEvent();
 }
 
 void GUI::EventHandler::registerCloseHandler(void (*handler)(void *), void *ptr)
@@ -420,7 +53,7 @@ void GUI::EventHandler::registerCloseHandler(void (*handler)(void *), void *ptr)
   this->closeHandlerPtr = ptr;
 }
 
-void GUI::EventHandler::processEvents(Window *window)
+void GUI::EventHandler::processEvents()
 {
   while(hasEvent()) {
     Event *event = getNextEvent();
@@ -556,20 +189,3 @@ void GUI::EventHandler::processEvents(Window *window)
     delete event;
   }
 }
-
-#ifdef TEST_EVENTHANDLER
-//Additional dependency files
-//deps:
-//Required cflags (autoconf vars may be used)
-//cflags:
-//Required link options (autoconf vars may be used)
-//libs:
-#include "test.h"
-
-TEST_BEGIN;
-
-// TODO: Put some testcode here (see test.h for usable macros).
-
-TEST_END;
-
-#endif/*TEST_EVENTHANDLER*/