uh 2.0.0.pre2 → 2.0.0.pre3

data/ext/uh/event.c

@@ -1,168 +0,0 @@
-#include "uh.h"
-
-
-#define SET_XEV(x) \
-  XEvent *xev;\
-  Data_Get_Struct(x, XEvent, xev);
-
-
-VALUE event_make_event(VALUE klass, XEvent *xev);
-void event_make_configure_request(VALUE self);
-void event_make_key_any(VALUE self);
-void event_make_win_any(VALUE self);
-
-
-VALUE event_make(XEvent *xev) {
-  typedef struct {
-    int   type;
-    VALUE klass;
-    void  (*function)(VALUE self);
-  } EvClass;
-  EvClass       ev_classes[] = {
-    {ConfigureRequest,  cConfigureRequest,  event_make_configure_request},
-    {DestroyNotify,     cDestroyNotify,     NULL},
-    {Expose,            cExpose,            NULL},
-    {KeyPress,          cKeyPress,          event_make_key_any},
-    {KeyRelease,        cKeyRelease,        event_make_key_any},
-    {MapRequest,        cMapRequest,        NULL},
-    {PropertyNotify,    cPropertyNotify,    NULL},
-    {UnmapNotify,       cUnmapNotify,       NULL}
-  };
-  unsigned int  i;
-  VALUE         event;
-
-  for (i = 0; i < (sizeof ev_classes / sizeof ev_classes[0]); i++) {
-    if (ev_classes[i].type == xev->type) {
-      event = event_make_event(ev_classes[i].klass, xev);
-      event_make_win_any(event);
-      if (ev_classes[i].function)
-        ev_classes[i].function(event);
-
-      return event;
-    }
-  }
-
-  return event_make_event(cEvent, xev);
-}
-
-VALUE event_make_event(VALUE klass, XEvent *xev) {
-  const char  *type_descs[LASTEvent];
-  VALUE       event;
-
-  type_descs[KeyPress]          = "key_press";
-  type_descs[KeyRelease]        = "key_release";
-  type_descs[ButtonPress]       = "button_press";
-  type_descs[ButtonRelease]     = "button_release";
-  type_descs[MotionNotify]      = "motion_notify";
-  type_descs[EnterNotify]       = "enter_notify";
-  type_descs[LeaveNotify]       = "leave_notify";
-  type_descs[FocusIn]           = "focus_in";
-  type_descs[FocusOut]          = "focus_out";
-  type_descs[KeymapNotify]      = "keymap_notify";
-  type_descs[Expose]            = "expose";
-  type_descs[GraphicsExpose]    = "graphics_expose";
-  type_descs[NoExpose]          = "no_expose";
-  type_descs[VisibilityNotify]  = "visibility_notify";
-  type_descs[CreateNotify]      = "create_notify";
-  type_descs[DestroyNotify]     = "destroy_notify";
-  type_descs[UnmapNotify]       = "unmap_notify";
-  type_descs[MapNotify]         = "map_notify";
-  type_descs[MapRequest]        = "map_request";
-  type_descs[ReparentNotify]    = "reparent_notify";
-  type_descs[ConfigureNotify]   = "configure_notify";
-  type_descs[ConfigureRequest]  = "configure_request";
-  type_descs[GravityNotify]     = "gravity_notify";
-  type_descs[ResizeRequest]     = "resize_request";
-  type_descs[CirculateNotify]   = "circulate_notify";
-  type_descs[CirculateRequest]  = "circulate_request";
-  type_descs[PropertyNotify]    = "property_notify";
-  type_descs[SelectionClear]    = "selection_clear";
-  type_descs[SelectionRequest]  = "selection_request";
-  type_descs[SelectionNotify]   = "selection_notify";
-  type_descs[ColormapNotify]    = "colormap_notify";
-  type_descs[ClientMessage]     = "client_message";
-  type_descs[MappingNotify]     = "mapping_notify";
-  type_descs[GenericEvent]      = "generic";
-
-  event = Data_Wrap_Struct(klass, 0, 0, xev);
-  rb_ivar_set(event, rb_intern("@type"),
-    ID2SYM(rb_intern(type_descs[xev->type])));
-  rb_ivar_set(event, rb_intern("@send_event"),
-    xev->xany.send_event ? Qtrue : Qfalse);
-
-  return event;
-}
-
-void event_make_configure_request(VALUE self) {
-  SET_XEV(self);
-
-  if (xev->xconfigurerequest.value_mask & CWX)
-    rb_ivar_set(self, rb_intern("@x"), INT2FIX(xev->xconfigurerequest.x));
-
-  if (xev->xconfigurerequest.value_mask & CWY)
-    rb_ivar_set(self, rb_intern("@y"), INT2FIX(xev->xconfigurerequest.y));
-
-  if (xev->xconfigurerequest.value_mask & CWWidth)
-    rb_ivar_set(self, rb_intern("@width"),
-      INT2FIX(xev->xconfigurerequest.width));
-
-  if (xev->xconfigurerequest.value_mask & CWHeight)
-    rb_ivar_set(self, rb_intern("@height"),
-      INT2FIX(xev->xconfigurerequest.height));
-
-  rb_ivar_set(self, rb_intern("@above_window_id"),
-    LONG2NUM(xev->xconfigurerequest.above));
-  rb_ivar_set(self, rb_intern("@detail"),
-    INT2FIX(xev->xconfigurerequest.detail));
-  rb_ivar_set(self, rb_intern("@value_mask"),
-    LONG2NUM(xev->xconfigurerequest.detail));
-}
-
-void event_make_key_any(VALUE self) {
-  KeySym ks;
-  SET_XEV(self);
-
-  ks = XkbKeycodeToKeysym(xev->xany.display, xev->xkey.keycode, 0, 0);
-  if (ks == NoSymbol)
-    return;
-
-  rb_ivar_set(self, rb_intern("@key"), rb_str_new_cstr(XKeysymToString(ks)));
-  rb_ivar_set(self, rb_intern("@modifier_mask"), INT2FIX(xev->xkey.state));
-}
-
-void event_make_win_any(VALUE self) {
-  Window window;
-  SET_XEV(self);
-
-  switch (xev->type) {
-    case ConfigureRequest:
-      window = xev->xconfigurerequest.window;
-      break;
-    case DestroyNotify:
-      window = xev->xdestroywindow.window;
-      break;
-    case Expose:
-      window = xev->xexpose.window;
-      break;
-    case KeyPress:
-      window = xev->xkey.window;
-      break;
-    case MapRequest:
-      window = xev->xmaprequest.window;
-      break;
-    case PropertyNotify:
-      window = xev->xproperty.window;
-      break;
-    case UnmapNotify:
-      rb_ivar_set(self, rb_intern("@event_window"),
-        window_make(xev->xany.display, xev->xunmap.event));
-      window = xev->xunmap.window;
-      break;
-    default:
-      window = xev->xany.window;
-      break;
-  }
-
-  rb_ivar_set(self, rb_intern("@window"),
-    window_make(xev->xany.display, window));
-}

data/ext/uh/font.c

@@ -1,14 +0,0 @@
-#include "uh.h"
-
-
-VALUE font_make(int width, int ascent, int descent) {
-  VALUE obj;
-  VALUE args[0];
-
-  obj = rb_class_new_instance(0, args, cFont);
-  rb_ivar_set(obj, rb_intern("@width"), INT2FIX(width));
-  rb_ivar_set(obj, rb_intern("@ascent"), INT2FIX(ascent));
-  rb_ivar_set(obj, rb_intern("@descent"), INT2FIX(descent));
-
-  return obj;
-}

data/ext/uh/pixmap.c

@@ -1,92 +0,0 @@
-#include "uh.h"
-
-
-#define SET_PIXMAP(x) \
-  UhPixmap *pixmap;\
-  Data_Get_Struct(x, UhPixmap, pixmap);
-
-#define DPY     pixmap->dpy
-#define PIXMAP  pixmap->pixmap
-#define GC      pixmap->gc
-
-
-void pixmap_deallocate(UhPixmap *p);
-
-
-VALUE pixmap_draw_rect(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h) {
-  SET_PIXMAP(self)
-
-  XFillRectangle(DPY, PIXMAP, GC,
-    FIX2INT(x), FIX2INT(y), FIX2INT(w), FIX2INT(h)
-  );
-
-  return Qnil;
-}
-
-VALUE pixmap_draw_string(VALUE self, VALUE x, VALUE y, VALUE str) {
-  SET_PIXMAP(self)
-
-  XDrawString(DPY, PIXMAP, GC,
-    FIX2INT(x), FIX2INT(y), RSTRING_PTR(str), RSTRING_LEN(str)
-  );
-
-  return Qnil;
-}
-
-VALUE pixmap_gc_black(VALUE self) {
-  SET_PIXMAP(self)
-
-  XSetForeground(DPY, GC, BlackPixel(DPY, SCREEN_DEFAULT));
-
-  return Qnil;
-}
-
-VALUE pixmap_gc_color(VALUE self, VALUE rcolor) {
-  SET_PIXMAP(self)
-
-  XSetForeground(DPY, GC, NUM2LONG(rb_ivar_get(rcolor, rb_intern("@pixel"))));
-
-  return Qnil;
-}
-
-VALUE pixmap_gc_white(VALUE self) {
-  SET_PIXMAP(self)
-
-  XSetForeground(DPY, GC, WhitePixel(DPY, SCREEN_DEFAULT));
-
-  return Qnil;
-}
-
-
-VALUE pixmap__copy(VALUE self, VALUE rwindow_id, VALUE rwidth, VALUE rheight) {
-  SET_PIXMAP(self)
-
-  XCopyArea(DPY, PIXMAP, FIX2INT(rwindow_id), GC,
-    0, 0, FIX2INT(rwidth), FIX2INT(rheight), 0, 0
-  );
-
-  return Qnil;
-}
-
-
-VALUE pixmap_make(Display *display, Pixmap xpixmap, VALUE width, VALUE height) {
-  UhPixmap  *pixmap;
-  VALUE     obj;
-
-  obj = Data_Make_Struct(cPixmap, UhPixmap, 0, pixmap_deallocate, pixmap);
-  pixmap->dpy     = display;
-  pixmap->pixmap  = xpixmap;
-  pixmap->gc      = XCreateGC(display, DefaultRootWindow(display), 0, NULL);
-
-  rb_ivar_set(obj, rb_intern("@width"), width);
-  rb_ivar_set(obj, rb_intern("@height"), height);
-
-  return obj;
-}
-
-
-void pixmap_deallocate(UhPixmap *pixmap) {
-  XFreePixmap(DPY, PIXMAP);
-  XFreeGC(DPY, GC);
-  free(pixmap);
-}

data/ext/uh/screen.c

@@ -1,12 +0,0 @@
-#include "uh.h"
-
-
-VALUE screen_init(VALUE self, VALUE id, VALUE x, VALUE y, VALUE w, VALUE h) {
-  rb_ivar_set(self, rb_intern("@id"), id);
-  rb_ivar_set(self, rb_intern("@x"), x);
-  rb_ivar_set(self, rb_intern("@y"), y);
-  rb_ivar_set(self, rb_intern("@width"), w);
-  rb_ivar_set(self, rb_intern("@height"), h);
-
-  return self;
-}

data/ext/uh/uh.c

@@ -1,143 +0,0 @@
-#include "uh.h"
-
-
-void uh_color();
-void uh_display();
-void uh_events();
-void uh_font();
-void uh_pixmap();
-void uh_screen();
-void uh_window();
-
-
-void Init_uh(void) {
-  mUh = rb_define_module("Uh");
-
-  eDisplayError = rb_define_class_under(
-    mUh, "DisplayError", rb_eStandardError
-  );
-
-  uh_color();
-  uh_display();
-  uh_events();
-  uh_font();
-  uh_pixmap();
-  uh_screen();
-  uh_window();
-}
-
-void uh_color() {
-  cColor = rb_define_class_under(mUh, "Color", rb_cObject);
-  rb_define_attr(cColor, "pixel", 1, 0);
-}
-
-void uh_display() {
-  cDisplay = rb_define_class_under(mUh, "Display", rb_cObject);
-  rb_define_singleton_method(cDisplay, "on_error", display_s_on_error, 0);
-  rb_define_alloc_func(cDisplay, display_alloc);
-  rb_define_attr(cDisplay, "name", 1, 0);
-  rb_define_method(cDisplay, "close", display_close, 0);
-  rb_define_method(cDisplay, "color_by_name", display_color_by_name, 1);
-  rb_define_method(cDisplay, "create_pixmap", display_create_pixmap, 2);
-  rb_define_method(cDisplay, "fileno", display_fileno, 0);
-  rb_define_method(cDisplay, "flush", display_flush, 0);
-  rb_define_method(cDisplay, "grab_key", display_grab_key, 2);
-  rb_define_method(cDisplay, "listen_events", display_listen_events, -1);
-  rb_define_method(cDisplay, "each_event", display_each_event, 0);
-  rb_define_method(cDisplay, "next_event", display_next_event, 0);
-  rb_define_method(cDisplay, "open", display_open, 0);
-  rb_define_method(cDisplay, "pending", display_pending, 0);
-  rb_define_method(cDisplay, "query_font", display_query_font, 0);
-  rb_define_method(cDisplay, "root", display_root, 0);
-  rb_define_method(cDisplay, "screens", display_screens, 0);
-  rb_define_method(cDisplay, "sync", display_sync, 1);
-}
-
-void uh_events() {
-  mEvents = rb_define_module_under(mUh, "Events");
-
-  cEvent = rb_define_class_under(mEvents, "Event", rb_cObject);
-  rb_define_attr(cEvent, "type", 1, 0);
-  rb_define_attr(cEvent, "window", 1, 0);
-
-  cConfigureRequest = rb_define_class_under(mEvents, "ConfigureRequest", cEvent);
-  rb_define_attr(cConfigureRequest, "x", 1, 0);
-  rb_define_attr(cConfigureRequest, "y", 1, 0);
-  rb_define_attr(cConfigureRequest, "width", 1, 0);
-  rb_define_attr(cConfigureRequest, "height", 1, 0);
-  rb_define_attr(cConfigureRequest, "above_window_id", 1, 0);
-  rb_define_attr(cConfigureRequest, "detail", 1, 0);
-  rb_define_attr(cConfigureRequest, "value_mask", 1, 0);
-
-  cDestroyNotify = rb_define_class_under(mEvents, "DestroyNotify", cEvent);
-
-  cExpose = rb_define_class_under(mEvents, "Expose", cEvent);
-
-  cKeyPress = rb_define_class_under(mEvents, "KeyPress", cEvent);
-  rb_define_attr(cKeyPress, "key", 1, 0);
-  rb_define_attr(cKeyPress, "modifier_mask", 1, 0);
-
-  cKeyRelease = rb_define_class_under(mEvents, "KeyRelease", cEvent);
-  rb_define_attr(cKeyRelease, "key", 1, 0);
-  rb_define_attr(cKeyRelease, "modifier_mask", 1, 0);
-
-  cMapRequest = rb_define_class_under(mEvents, "MapRequest", cEvent);
-
-  cPropertyNotify = rb_define_class_under(mEvents, "PropertyNotify", cEvent);
-
-  cUnmapNotify = rb_define_class_under(mEvents, "UnmapNotify", cEvent);
-}
-
-void uh_font() {
-  cFont = rb_define_class_under(mUh, "Font", rb_cObject);
-  rb_define_attr(cFont, "width", 1, 0);
-  rb_define_attr(cFont, "ascent", 1, 0);
-  rb_define_attr(cFont, "descent", 1, 0);
-}
-
-void uh_pixmap() {
-  cPixmap = rb_define_class_under(mUh, "Pixmap", rb_cObject);
-  rb_define_attr(cPixmap, "width", 1, 0);
-  rb_define_attr(cPixmap, "height", 1, 0);
-  rb_define_method(cPixmap, "draw_rect", pixmap_draw_rect, 4);
-  rb_define_method(cPixmap, "draw_string", pixmap_draw_string, 3);
-  rb_define_method(cPixmap, "gc_black", pixmap_gc_black, 0);
-  rb_define_method(cPixmap, "gc_color", pixmap_gc_color, 1);
-  rb_define_method(cPixmap, "gc_white", pixmap_gc_white, 0);
-  rb_define_private_method(cPixmap, "_copy", pixmap__copy, 3);
-}
-
-void uh_screen() {
-  cScreen = rb_define_class_under(mUh, "Screen", rb_cObject);
-  rb_define_method(cScreen, "initialize", screen_init, 5);
-  rb_define_attr(cScreen, "id", 1, 0);
-  rb_define_attr(cScreen, "x", 1, 0);
-  rb_define_attr(cScreen, "y", 1, 0);
-  rb_define_attr(cScreen, "width", 1, 0);
-  rb_define_attr(cScreen, "height", 1, 0);
-}
-
-void uh_window() {
-  cWindow = rb_define_class_under(mUh, "Window", rb_cObject);
-  rb_define_attr(cWindow, "id", 1, 0);
-  rb_define_method(cWindow, "destroy", window_destroy, 0);
-  rb_define_method(cWindow, "focus", window_focus, 0);
-  rb_define_method(cWindow, "kill", window_kill, 0);
-  rb_define_method(cWindow, "map", window_map, 0);
-  rb_define_method(cWindow, "mask", window_mask, 0);
-  rb_define_method(cWindow, "mask=", window_mask_set, 1);
-  rb_define_method(cWindow, "name", window_name, 0);
-  rb_define_method(cWindow, "name=", window_name_set, 1);
-  rb_define_method(cWindow, "override_redirect?", window_override_redirect, 0);
-  rb_define_method(cWindow, "raise", window_raise, 0);
-  rb_define_method(cWindow, "unmap", window_unmap, 0);
-  rb_define_method(cWindow, "wclass", window_wclass, 0);
-  rb_define_method(cWindow, "icccm_wm_delete", window_icccm_wm_delete, 0);
-  rb_define_method(cWindow, "icccm_wm_protocols", window_icccm_wm_protocols, 0);
-  rb_define_private_method(cWindow, "_configure", window__configure, 4);
-  rb_define_private_method(cWindow, "_configure_event",
-    window__configure_event, 4);
-  rb_define_private_method(cWindow, "_create", window__create, 4);
-  rb_define_private_method(cWindow, "_create_sub", window__create_sub, 4);
-  rb_define_private_method(cWindow, "_moveresize", window__moveresize, 4);
-}

data/ext/uh/uh.h

@@ -1,106 +0,0 @@
-#ifndef RUBY_UH
-#define RUBY_UH
-
-#include <ruby.h>
-
-#include <X11/Xlib.h>
-#include <X11/XKBlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xinerama.h>
-
-
-#define ROOT_DEFAULT    DefaultRootWindow(DPY)
-#define SCREEN_DEFAULT  DefaultScreen(DPY)
-
-
-typedef struct s_display  UhDisplay;
-typedef struct s_pixmap   UhPixmap;
-typedef struct s_window   UhWindow;
-
-struct s_display {
-  Display *dpy;
-};
-
-struct s_pixmap {
-  Display *dpy;
-  Pixmap  pixmap;
-  GC      gc;
-};
-
-struct s_window {
-  Display *dpy;
-  Window  id;
-};
-
-
-VALUE mUh, mEvents,
-  cColor,
-  cDisplay,
-  cEvent, cConfigureRequest, cDestroyNotify, cExpose, cKeyPress, cKeyRelease,
-    cMapRequest, cPropertyNotify, cUnmapNotify,
-  cFont,
-  cPixmap,
-  cScreen,
-  cWindow,
-  eDisplayError;
-
-
-VALUE color_make(unsigned long pixel);
-
-VALUE display_s_on_error(VALUE klass);
-VALUE display_alloc(VALUE klass);
-VALUE display_close(VALUE self);
-VALUE display_color_by_name(VALUE self, VALUE rcolor);
-VALUE display_create_pixmap(VALUE self, VALUE w, VALUE h);
-VALUE display_each_event(VALUE self);
-VALUE display_fileno(VALUE self);
-VALUE display_flush(VALUE self);
-VALUE display_grab_key(VALUE self, VALUE key, VALUE modifier);
-VALUE display_listen_events(int argc, VALUE *argv, VALUE self);
-VALUE display_next_event(VALUE self);
-VALUE display_open(VALUE self);
-VALUE display_pending(VALUE self);
-VALUE display_query_font(VALUE self);
-VALUE display_root(VALUE self);
-VALUE display_root_change_attributes(VALUE self, VALUE mask);
-VALUE display_screens(VALUE self);
-VALUE display_sync(VALUE self, VALUE discard);
-
-VALUE event_make(XEvent *xev);
-
-VALUE font_make(int width, int ascent, int descent);
-
-VALUE pixmap__copy(VALUE self, VALUE rwindow_id, VALUE rwidth, VALUE rheight);
-VALUE pixmap_draw_rect(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h);
-VALUE pixmap_draw_string(VALUE self, VALUE x, VALUE y, VALUE str);
-VALUE pixmap_gc_black(VALUE self);
-VALUE pixmap_gc_color(VALUE self, VALUE rcolor);
-VALUE pixmap_gc_white(VALUE self);
-VALUE pixmap_make(Display *display, Pixmap xpixmap, VALUE width, VALUE height);
-
-VALUE screen_init(VALUE self, VALUE id, VALUE x, VALUE y, VALUE w, VALUE h);
-
-VALUE window_destroy(VALUE self);
-VALUE window_focus(VALUE self);
-VALUE window_icccm_wm_delete(VALUE self);
-VALUE window_icccm_wm_protocols(VALUE self);
-VALUE window_kill(VALUE self);
-VALUE window_map(VALUE self);
-VALUE window_mask(VALUE self);
-VALUE window_mask_set(VALUE self, VALUE mask);
-VALUE window_name(VALUE self);
-VALUE window_name_set(VALUE self, VALUE name);
-VALUE window_override_redirect(VALUE self);
-VALUE window_raise(VALUE self);
-VALUE window_unmap(VALUE self);
-VALUE window_wclass(VALUE self);
-VALUE window__configure(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh);
-VALUE window__configure_event(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh);
-VALUE window__create(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h);
-VALUE window__create_sub(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h);
-VALUE window__moveresize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height);
-int window_id(VALUE window);
-VALUE window_make(Display *display, Window window_id);
-
-
-#endif