Changeset 456

Timestamp:

03/04/2008 22:29:38 (6 months ago)

Author:

why

Message:

• shoes/canvas.c: new owner method for getting the parent window of a newly launched window. also, dialog for creating dialog style windows (still working on modal) and dialog_plain for getting the background color for dialogs on a platform.
  

Location:

trunk/shoes

Files:

• app.c (modified) (10 diffs)
• app.h (modified) (1 diff)
• canvas.c (modified) (4 diffs)
• canvas.h (modified) (3 diffs)
• ruby.c (modified) (3 diffs)
• ruby.h (modified) (2 diffs)

trunk/shoes/app.c

@@ -27 +27 @@
   rb_gc_mark_maybe(app->timers);
   rb_gc_mark_maybe(app->styles);
+  rb_gc_mark_maybe(app->owner);
 }
 
@@ -41 +42 @@
   SHOE_MEMZERO(app, shoes_app, 1);
   app->started = FALSE;
+  app->owner = Qnil;
   app->location = Qnil;
   app->canvas = shoes_canvas_new(cShoes, app);
@@ -61 +63 @@
 
 VALUE
-shoes_app_new()
-{
-  VALUE app = shoes_app_alloc(cApp);
+shoes_app_new(VALUE klass)
+{
+  VALUE app = shoes_app_alloc(klass);
   rb_ary_push(shoes_world->apps, app);
   return app;
@@ -1356 +1358 @@
 
 VALUE
-shoes_app_main(int argc, VALUE *argv, VALUE self)
+shoes_app_window(int argc, VALUE *argv, VALUE self, VALUE owner)
 {
   VALUE attr, block;
-  VALUE app = shoes_app_new();
+  VALUE app = shoes_app_new(self == cDialog ? cDialog : cApp);
   shoes_app *app_t;
   Data_Get_Struct(app, shoes_app, app_t);
@@ -1366 +1368 @@
   rb_iv_set(app, "@main_app", block);
 
+  app_t->owner = owner;
   app_t->title = ATTR(attr, title);
   app_t->resizable = (ATTR(attr, resizable) != Qfalse);
@@ -1374 +1377 @@
     shoes_app_open(app_t, "/");
   return self;
+}
+
+VALUE
+shoes_app_main(int argc, VALUE *argv, VALUE self)
+{
+  return shoes_app_window(argc, argv, self, Qnil);
 }
 
@@ -1477 +1486 @@
 {
   shoes_code code = SHOES_OK;
+  int dialog = (rb_obj_class(app->self) == cDialog);
 
 #ifdef SHOES_GTK
@@ -1586 +1596 @@
 
   app->slot.window = CreateWindowEx(
-    WS_EX_CLIENTEDGE, SHOES_SHORTNAME, SHOES_APPNAME,
+    dialog ? WS_EX_WINDOWEDGE : WS_EX_CLIENTEDGE,
+    SHOES_SHORTNAME, SHOES_APPNAME,
     WINDOW_STYLE | WS_CLIPCHILDREN |
       (app->resizable ? (WS_THICKFRAME | WS_MAXIMIZEBOX) : WS_DLGFRAME) |
@@ -1624 +1635 @@
   {
 #ifdef SHOES_WIN32
+    // TODO: disable parent windows of dialogs
+    // if (dialog && !NIL_P(app->owner))
+    // {
+    //   shoes_app *owner;
+    //   Data_Get_Struct(app->owner, shoes_app, owner);
+    //   EnableWindow(owner->slot.window, FALSE);
+    // }
     ShowWindow(app->slot.window, SW_SHOWNORMAL);
 #endif
@@ -2018 +2036 @@
 
 VALUE
+shoes_app_contents(VALUE self)
+{
+  shoes_app *app;
+  Data_Get_Struct(self, shoes_app, app);
+  return shoes_canvas_contents(app->canvas);
+}
+
+VALUE
 shoes_app_quit(VALUE self)
 {

trunk/shoes/app.h

@@ -41 +41 @@
   VALUE title;
   VALUE location;
+  VALUE owner;
 } shoes_app;
 

trunk/shoes/canvas.c

@@ -158 +158 @@
   cairo_save(cr);
   return cr;
+}
+
+VALUE
+shoes_canvas_owner(VALUE self)
+{
+  SETUP();
+  return canvas->app->owner;
 }
 
@@ -2198 +2205 @@
 
   if (rb_block_given_p())
-    return shoes_app_main(argc, argv, self);
+    return shoes_app_window(argc, argv, cApp, self);
 
   rb_scan_args(argc, argv, "02&", &uri, &attr, &block);
@@ -2212 +2219 @@
   // TODO: do I send back an array of created App objects I guess?
   return Qnil;
+}
+
+VALUE
+shoes_canvas_dialog(int argc, VALUE *argv, VALUE self)
+{
+  return shoes_app_window(argc, argv, cDialog, self);
 }
 
@@ -2235 +2248 @@
 #endif
 }
+
+VALUE
+shoes_canvas_dialog_plain(VALUE self)
+{
+  SETUP();
+#ifdef SHOES_GTK
+  GtkStyle *style = gtk_widget_get_style(GTK_WIDGET(APP_WINDOW(canvas->app)));
+  GdkColor bg = style->bg[GTK_STATE_NORMAL];
+  return shoes_color_new(bg.red / 257, bg.green / 257, bg.blue / 257 , SHOES_COLOR_OPAQUE);
+#endif
+#ifdef SHOES_QUARTZ
+  ThemeBrush bg;
+  RGBColor _color;
+  HIWindowGetThemeBackground(canvas->app->os.window, &bg);
+  GetThemeBrushAsColor(bg, 32, true, &_color);
+  return shoes_color_new(_color.red/256, _color.green/256, _color.blue/256, SHOES_COLOR_OPAQUE);
+#endif
+#ifdef SHOES_WIN32
+  DWORD winc = GetSysColor(COLOR_3DFACE);
+  return shoes_color_new(GetRValue(winc), GetGValue(winc), GetBValue(winc), SHOES_COLOR_OPAQUE);
+#endif
+}

trunk/shoes/canvas.h

@@ -244 +244 @@
 
 VALUE shoes_app_main(int, VALUE *, VALUE);
+VALUE shoes_app_window(int, VALUE *, VALUE, VALUE);
+VALUE shoes_app_contents(VALUE);
+
 VALUE shoes_canvas_alloc(VALUE);
 VALUE shoes_canvas_new(VALUE, struct _shoes_app *);
@@ -251 +254 @@
 void shoes_canvas_shape_do(shoes_canvas *, double, double, double, double, unsigned char);
 VALUE shoes_canvas_style(int, VALUE *, VALUE);
+VALUE shoes_canvas_owner(VALUE);
 VALUE shoes_canvas_close(VALUE);
 VALUE shoes_canvas_get_top(VALUE);
@@ -348 +352 @@
 VALUE shoes_canvas_set_clipboard(VALUE, VALUE);
 VALUE shoes_canvas_window(int, VALUE *, VALUE);
+VALUE shoes_canvas_dialog(int, VALUE *, VALUE);
 VALUE shoes_canvas_window_plain(VALUE);
+VALUE shoes_canvas_dialog_plain(VALUE);
 
 VALUE shoes_slot_new(VALUE, VALUE, VALUE);

trunk/shoes/ruby.c

@@ -12 +12 @@
 #include <math.h>
 
-VALUE cShoes, cApp, cShoesWindow, cMouse, cCanvas, cFlow, cStack, cMask, cShape, cImage, cVideo, cTimerBase, cTimer, cEvery, cAnim, cPattern, cBorder, cBackground, cTextBlock, cPara, cBanner, cTitle, cSubtitle, cTagline, cCaption, cInscription, cTextClass, cSpan, cDel, cStrong, cSub, cSup, cCode, cEm, cIns, cLinkUrl, cNative, cButton, cCheck, cRadio, cEditLine, cEditBox, cListBox, cProgress, cColor, cColors, cLink, cLinkHover;
+VALUE cShoes, cApp, cDialog, cShoesWindow, cMouse, cCanvas, cFlow, cStack, cMask, cShape, cImage, cVideo, cTimerBase, cTimer, cEvery, cAnim, cPattern, cBorder, cBackground, cTextBlock, cPara, cBanner, cTitle, cSubtitle, cTagline, cCaption, cInscription, cTextClass, cSpan, cDel, cStrong, cSub, cSup, cCode, cEm, cIns, cLinkUrl, cNative, cButton, cCheck, cRadio, cEditLine, cEditBox, cListBox, cProgress, cColor, cColors, cLink, cLinkHover;
 VALUE eVlcError, eImageError, eNotImpl;
 VALUE reHEX_SOURCE, reHEX3_SOURCE, reRGB_SOURCE, reRGBA_SOURCE, reGRAY_SOURCE, reGRAYA_SOURCE;
@@ -3803 +3803 @@
   s_secret = rb_intern("secret");
 
-  cApp = rb_define_class("App", rb_cObject);
-  rb_define_alloc_func(cApp, shoes_app_alloc);
-  rb_define_method(cApp, "location", CASTHOOK(shoes_app_location), 0);
-
   cShoesWindow = rb_define_class("Window", rb_cObject);
   cMouse = rb_define_class("Mouse", rb_cObject);
@@ -3818 +3814 @@
   rb_const_set(cShoes, rb_intern("RELEASE_ID"), INT2NUM(SHOES_RELEASE_ID));
   rb_const_set(cShoes, rb_intern("REVISION"), INT2NUM(SHOES_REVISION));
+
+  cApp = rb_define_class_under(cShoes, "App", rb_cObject);
+  rb_define_alloc_func(cApp, shoes_app_alloc);
+  rb_define_method(cApp, "location", CASTHOOK(shoes_app_location), 0);
+  rb_define_method(cApp, "children", CASTHOOK(shoes_app_contents), 0);
+  cDialog = rb_define_class_under(cShoes, "Dialog", cApp);
 
   eNotImpl = rb_define_class_under(cShoes, "NotImplementedError", rb_eStandardError);

trunk/shoes/ruby.h

@@ -24 +24 @@
 #endif
 
-extern VALUE cShoes, cApp, cShoesWindow, cMouse, cCanvas, cFlow, cStack, cMask, cNative, cShape, cVideo, cImage, cEvery, cTimer, cAnim, cPattern, cBorder, cBackground, cPara, cBanner, cTitle, cSubtitle, cTagline, cCaption, cInscription, cLinkText, cTextBlock, cTextClass, cSpan, cStrong, cSub, cSup, cCode, cDel, cEm, cIns, cButton, cEditLine, cEditBox, cListBox, cProgress, cCheck, cRadio, cColor, cColors, cLink, cLinkHover;
+extern VALUE cShoes, cApp, cDialog, cShoesWindow, cMouse, cCanvas, cFlow, cStack, cMask, cNative, cShape, cVideo, cImage, cEvery, cTimer, cAnim, cPattern, cBorder, cBackground, cPara, cBanner, cTitle, cSubtitle, cTagline, cCaption, cInscription, cLinkText, cTextBlock, cTextClass, cSpan, cStrong, cSub, cSup, cCode, cDel, cEm, cIns, cButton, cEditLine, cEditBox, cListBox, cProgress, cCheck, cRadio, cColor, cColors, cLink, cLinkHover;
 extern VALUE eNotImpl, eImageError;
 extern VALUE reHEX_SOURCE, reHEX3_SOURCE, reRGB_SOURCE, reRGBA_SOURCE, reGRAY_SOURCE, reGRAYA_SOURCE;
@@ -190 +190 @@
   f("clipboard", get_clipboard, 0); \
   f("clipboard=", set_clipboard, 1); \
+  f("owner", owner, 0); \
   f("window", window, -1); \
-  f("window_plain", window_plain, 0)
+  f("dialog", dialog, -1); \
+  f("window_plain", window_plain, 0); \
+  f("dialog_plain", dialog_plain, 0)
 
 #endif