August 2008 - macruby-changes - lists.macosforge.org

[489] MacRuby/trunk/sample-macruby/Scripts/jumpy.rb
by source_changes＠macosforge.org 27 Aug '08

27 Aug '08

Revision: 489 http://trac.macosforge.org/projects/ruby/changeset/489 Author: lsansonetti(a)apple.com Date: 2008-08-26 18:01:51 -0700 (Tue, 26 Aug 2008) Log Message: ----------- adding jumpy.rb sample Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/jumpy.rb Added: MacRuby/trunk/sample-macruby/Scripts/jumpy.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/jumpy.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/jumpy.rb 2008-08-27 01:01:51 UTC (rev 489) @@ -0,0 +1,110 @@ +# This script is based on Jumpy.app, a CoreAnimation sample written by Lucas Newman, +# of Delicious Monster Software. + +framework 'Cocoa' +framework 'QuartzCore' +framework 'ApplicationServices' + +class JumpyController + + ANIMATION_DURATION = 4.0 + + def applicationDidFinishLaunching(notification) + # create a window the size of the screen and set it to solid black + displayBounds = NSScreen.mainScreen.frame + @mainWindow = NSWindow.alloc.initWithContentRect displayBounds, styleMask:NSBorderlessWindowMask, backing:NSBackingStoreRetained, defer:false, screen:NSScreen.mainScreen + contentView = @mainWindow.contentView + contentView.wantsLayer = true + #contentView.layer.backgroundColor = CGColorCreateGenericGray(0.0, 1.0) + + # create a snapshot of the screen + image = CGWindowListCreateImage(CGRectInfinite, KCGWindowListOptionOnScreenOnly, KCGNullWindowID, KCGWindowImageDefault) + + # create a layer for the current screen + screenLayer = CALayer.layer + screenLayer.frame = [0, 0, CGImageGetWidth(image), CGImageGetHeight(image)] + screenLayer.contents = image + + # add a container which will hold our screen and reflection layers + containerLayer = CALayer.layer + containerLayer.frame = screenLayer.frame + containerLayer.addSublayer screenLayer + + # create the reflection layer + reflectionLayer = CALayer.layer + reflectionLayer.contents = screenLayer.contents # share the contents image with the screen layer + reflectionLayer.opacity = 0.4 + reflectionLayer.frame = CGRectOffset(screenLayer.frame, 0.5, -NSHeight(displayBounds) + 0.5) + reflectionLayer.transform = CATransform3DMakeScale(1.0, -1.0, 1.0) # flip the y-axis + reflectionLayer.sublayerTransform = reflectionLayer.transform + containerLayer.addSublayer reflectionLayer + + # create a shadow layer which lies on top of the reflection layer + shadowLayer = CALayer.layer + shadowLayer.frame = reflectionLayer.bounds + shadowLayer.delegate = self + shadowLayer.setNeedsDisplay # this invokes -drawLayer:inContext: below, since we are the delegate + reflectionLayer.addSublayer shadowLayer + + # add the container layer to the window's content view's layer + contentView.layer.addSublayer containerLayer + + # place the window on top of everything + @mainWindow.level = CGShieldingWindowLevel() + @mainWindow.makeKeyAndOrderFront nil + + # animate the screen away + CATransaction.begin + CATransaction.setValue ANIMATION_DURATION, forKey:KCATransactionAnimationDuration + + # scale it down + shrinkAnimation = CABasicAnimation.animationWithKeyPath "transform.scale" + shrinkAnimation.timingFunction = CAMediaTimingFunction.functionWithName KCAMediaTimingFunctionEaseIn + shrinkAnimation.toValue = 0.0 + containerLayer.addAnimation shrinkAnimation, forKey:"shrinkAnimation" + + # fade it out + fadeAnimation = CABasicAnimation.animationWithKeyPath "opacity" + fadeAnimation.toValue = 0.0 + fadeAnimation.timingFunction = CAMediaTimingFunction.functionWithName KCAMediaTimingFunctionEaseIn + containerLayer.addAnimation fadeAnimation, forKey:"fadeAnimation" + + # make it jump a couple of times + positionAnimation = CAKeyframeAnimation.animationWithKeyPath "position" + + positionPath = CGPathCreateMutable() + CGPathMoveToPoint(positionPath, nil, containerLayer.position.x, containerLayer.position.y) + CGPathAddQuadCurveToPoint(positionPath, nil, containerLayer.position.x, containerLayer.position.y, containerLayer.position.x, containerLayer.position.y) + CGPathAddQuadCurveToPoint(positionPath, nil, containerLayer.position.x, containerLayer.position.y * 2, containerLayer.position.x, containerLayer.position.y) + CGPathAddQuadCurveToPoint(positionPath, nil, containerLayer.position.x, containerLayer.position.y * 3, containerLayer.position.x, containerLayer.position.y) + + positionAnimation.path = positionPath + positionAnimation.timingFunction = CAMediaTimingFunction.functionWithName KCAMediaTimingFunctionEaseIn + containerLayer.addAnimation positionAnimation, forKey:"positionAnimation" + + CATransaction.commit + + # quit after animating + NSApp.performSelector :"terminate:", withObject:nil, afterDelay:ANIMATION_DURATION + end + + def applicationWillTerminate(notification) + @mainWindow.orderOut self + end + + def drawLayer(layer, inContext:context) + NSGraphicsContext.saveGraphicsState + NSGraphicsContext.currentContext = NSGraphicsContext.graphicsContextWithGraphicsPort context, flipped:false + + shadowGradient = NSGradient.alloc.initWithColors [NSColor.clearColor, NSColor.blackColor] + layerRect = CGContextGetClipBoundingBox(context) + shadowGradient.drawFromPoint NSPoint.new(0, layerRect.origin.y + layerRect.size.height), toPoint:NSPoint.new(0, layerRect.origin.y), options:NSGradientDrawsAfterEndingLocation + + NSGraphicsContext.restoreGraphicsState + end + +end + +app = NSApplication.sharedApplication +app.delegate = JumpyController.new +app.run

1 0

[488] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 27 Aug '08

27 Aug '08

Revision: 488 http://trac.macosforge.org/projects/ruby/changeset/488 Author: lsansonetti(a)apple.com Date: 2008-08-26 18:01:33 -0700 (Tue, 26 Aug 2008) Log Message: ----------- pass ruby objects as ^v Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-26 20:18:29 UTC (rev 487) +++ MacRuby/trunk/objc.m 2008-08-27 01:01:33 UTC (rev 488) @@ -743,7 +743,15 @@ } break; default: - if (st_lookup(bs_boxeds, (st_data_t)octype + 1, + if (strcmp(octype, "^v") == 0) { + if (SPECIAL_CONST_P(rval)) { + ok = false; + } + else { + *(void **)ocval = (void *)rval; + } + } + else if (st_lookup(bs_boxeds, (st_data_t)octype + 1, (st_data_t *)&bs_boxed)) { void *data;

1 0

[487] MacRuby/trunk/vm_method.c
by source_changes＠macosforge.org 26 Aug '08

26 Aug '08

Revision: 487 http://trac.macosforge.org/projects/ruby/changeset/487 Author: lsansonetti(a)apple.com Date: 2008-08-26 13:18:29 -0700 (Tue, 26 Aug 2008) Log Message: ----------- do not call method_added if enable_method_added is false (for better performance during bs parsing) Modified Paths: -------------- MacRuby/trunk/vm_method.c Modified: MacRuby/trunk/vm_method.c =================================================================== --- MacRuby/trunk/vm_method.c 2008-08-26 20:17:59 UTC (rev 486) +++ MacRuby/trunk/vm_method.c 2008-08-26 20:18:29 UTC (rev 487) @@ -25,6 +25,7 @@ static struct cache_entry cache[CACHE_SIZE]; #define ruby_running (GET_VM()->running) /* int ruby_running = 0; */ +VALUE enable_method_added; void rb_clear_cache(void) @@ -186,7 +187,7 @@ st_insert(RCLASS_M_TBL(klass), mid, (st_data_t) body); #endif - if (node && mid != ID_ALLOCATOR && ruby_running) { + if (node && mid != ID_ALLOCATOR && ruby_running && enable_method_added == Qtrue) { if (RCLASS_SINGLETON(klass)) { rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid)); @@ -1228,6 +1229,8 @@ void Init_eval_method(void) { + enable_method_added = Qtrue; + rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1); basic_respond_to = rb_method_node(rb_cObject, idRespond_to); rb_register_mark_object((VALUE)basic_respond_to);

1 0

[486] MacRuby/trunk/compile.c
by source_changes＠macosforge.org 26 Aug '08

26 Aug '08

Revision: 486 http://trac.macosforge.org/projects/ruby/changeset/486 Author: lsansonetti(a)apple.com Date: 2008-08-26 13:17:59 -0700 (Tue, 26 Aug 2008) Log Message: ----------- adding missing write barriers Modified Paths: -------------- MacRuby/trunk/compile.c Modified: MacRuby/trunk/compile.c =================================================================== --- MacRuby/trunk/compile.c 2008-08-26 20:17:30 UTC (rev 485) +++ MacRuby/trunk/compile.c 2008-08-26 20:17:59 UTC (rev 486) @@ -657,7 +657,7 @@ iobj->link.next = 0; iobj->insn_id = insn_id; iobj->line_no = line_no; - iobj->operands = argv; + GC_WB(&iobj->operands, argv); iobj->operand_size = argc; iobj->sc_state = 0; return iobj; @@ -1301,9 +1301,9 @@ } #endif - iseq->iseq = (void *)generated_iseq; + GC_WB(&iseq->iseq, generated_iseq); iseq->iseq_size = pos; - iseq->insn_info_table = insn_info_table; + GC_WB(&iseq->insn_info_table, insn_info_table); iseq->insn_info_size = k; iseq->stack_max = stack_max;

1 0

[485] MacRuby/trunk
by source_changes＠macosforge.org 26 Aug '08

26 Aug '08

Revision: 485 http://trac.macosforge.org/projects/ruby/changeset/485 Author: lsansonetti(a)apple.com Date: 2008-08-26 13:17:30 -0700 (Tue, 26 Aug 2008) Log Message: ----------- introduce bs_parser_t so that we never parse the same file twice Modified Paths: -------------- MacRuby/trunk/bs.c MacRuby/trunk/bs.h MacRuby/trunk/objc.m Modified: MacRuby/trunk/bs.c =================================================================== --- MacRuby/trunk/bs.c 2008-08-26 03:23:42 UTC (rev 484) +++ MacRuby/trunk/bs.c 2008-08-26 20:17:30 UTC (rev 485) @@ -358,11 +358,34 @@ return false; } -static bool -_bs_parse(const char *path, char **loaded_paths, - bs_parse_options_t options, bs_parse_callback_t callback, - void *context, char **error) +struct _bs_parser { + CFMutableArrayRef loaded_paths; +}; + +bs_parser_t * +bs_parser_new(void) { + struct _bs_parser *parser; + + parser = (struct _bs_parser *)malloc(sizeof(struct _bs_parser)); + parser->loaded_paths = + CFArrayCreateMutable(kCFAllocatorMalloc, 0, &kCFTypeArrayCallBacks); + + return parser; +} + +void +bs_parser_free(bs_parser_t *parser) +{ + CFRelease(parser->loaded_paths); + free(parser); +} + +bool +bs_parser_parse(bs_parser_t *parser, const char *path, + bs_parse_options_t options, bs_parse_callback_t callback, + void *context, char **error) +{ xmlTextReaderPtr reader; bs_element_function_t *func; bs_element_class_t *klass; @@ -374,22 +397,19 @@ int func_ptr_arg_depth; bs_element_function_pointer_t *func_ptr; bool success; + CFStringRef cf_path; if (callback == NULL) return false; - for (i = 0; i < PATH_MAX; i++) { - char *p = loaded_paths[i]; - if (p == NULL) { - loaded_paths[i] = strdup(path); - break; - } - else if (strcmp(p, path) == 0) { - /* already loaded */ - return true; - } - } - + cf_path = CFStringCreateWithFileSystemRepresentation(kCFAllocatorMalloc, + path); + if (CFArrayContainsValue(parser->loaded_paths, CFRangeMake(0, CFArrayGetCount(parser->loaded_paths)), cf_path)) { + /* already loaded */ + CFRelease(cf_path); + return true; + } + //printf("parsing %s\n", path); #define BAIL(fmt, args...) \ @@ -483,8 +503,8 @@ sizeof bs_path); free(depends_on_path); if (bs_path_found) { - if (!_bs_parse(bs_path, loaded_paths, options, callback, context, - error)) + if (!bs_parser_parse(parser, bs_path, options, callback, context, + error)) return false; } break; @@ -1087,7 +1107,7 @@ } if (bs_element != NULL) - (*callback)(path, bs_element_type, bs_element, context); + (*callback)(parser, path, bs_element_type, bs_element, context); } success = true; @@ -1098,6 +1118,11 @@ xmlFreeTextReader(reader); + if (success) { + CFArrayAppendValue(parser->loaded_paths, cf_path); + } + CFRelease(cf_path); + if (success && options == BS_PARSE_OPTIONS_LOAD_DYLIBS) { char *p, buf[PATH_MAX]; strncpy(buf, path, sizeof buf); @@ -1115,26 +1140,6 @@ return success; } -bool -bs_parse(const char *path, bs_parse_options_t options, - bs_parse_callback_t callback, void *context, char **error) -{ - char **loaded_paths; - bool status; - unsigned i; - - loaded_paths = (char **)alloca(sizeof(char *) * PATH_MAX); - ASSERT_ALLOC(loaded_paths); - memset(loaded_paths, 0, PATH_MAX); - - status = _bs_parse(path, loaded_paths, options, callback, context, error); - - for (i = 0; i < PATH_MAX && loaded_paths[i] != NULL; i++) - free(loaded_paths[i]); - - return status; -} - #define SAFE_FREE(x) do { if ((x) != NULL) free(x); } while (0) static void bs_free_retval(bs_element_retval_t *bs_retval); @@ -1295,55 +1300,3 @@ } free(value); } - -#if 0 -struct bs_register_entry { - bs_parse_callback_t *callback; - void *context; -}; - -static struct bs_register_entry **bs_register_entries = NULL; -static unsigned bs_register_entries_count = 0; -static bs_register_token_t tokens = 0; - -bs_register_token_t -bs_register(bs_parse_callback_t *callback, void *context) -{ - struct bs_register_entry *entry; - - entry = (struct bs_register_entry *)malloc(sizeof(struct bs_register_entry)); - ASSERT_ALLOC(entry); - - entry->callback = callback; - entry->context = context; - - if (bs_register_entries == NULL) { - assert(bs_register_entries_count == 0); - bs_register_entries = (struct bs_register_entry **) - malloc(sizeof(struct bs_register_entry *)); - } - else { - assert(bs_register_entries_count > 0); - - } -} -#endif - -bs_register_token_t -bs_register(bs_parse_callback_t *callback, void *context) -{ - /* TODO */ - return 1; -} - -void -bs_unregister(bs_register_token_t token) -{ - /* TODO */ -} - -void -bs_notify(bs_element_type_t type, void *value) -{ - /* TODO */ -} Modified: MacRuby/trunk/bs.h =================================================================== --- MacRuby/trunk/bs.h 2008-08-26 03:23:42 UTC (rev 484) +++ MacRuby/trunk/bs.h 2008-08-26 20:17:30 UTC (rev 485) @@ -198,8 +198,23 @@ */ bool bs_find_path(const char *framework_path, char *path, const size_t path_len); +/* bs_parser_new() + * + * Creates and returns a parser object, required for bs_parser_parse(). + * Use bs_parser_free() when you're done. + */ +typedef struct _bs_parser bs_parser_t; +bs_parser_t *bs_parser_new(void); + +/* bs_parser_free() + * + * Frees a previously-created parser object. + */ +void bs_parser_free(bs_parser_t *parser); + typedef void (*bs_parse_callback_t) - (const char *path, bs_element_type_t type, void *value, void *context); + (bs_parser_t *parser, const char *path, bs_element_type_t type, void *value, + void *context); typedef enum { /* Default option: parse bridge support files. */ @@ -215,6 +230,7 @@ * to the callback function, using bs_element_free(). * Returns true on success, otherwise false. * + * parser: the parser object. * path: the full path of the bridge support file to parse. * options: parsing options. * callback: a callback function pointer. @@ -224,8 +240,9 @@ * allocated error message. You are responsible to free it. Pass NULL if you * don't need it. */ -bool bs_parse(const char *path, bs_parse_options_t options, - bs_parse_callback_t callback, void *context, char **error); +bool bs_parser_parse(bs_parser_t *parser, const char *path, + bs_parse_options_t options, bs_parse_callback_t callback, void *context, + char **error); /* bs_element_free() * @@ -237,42 +254,4 @@ */ void bs_element_free(bs_element_type_t type, void *value); -typedef unsigned bs_register_token_t; - -/* bs_register() - * - * Registers an asynchronous callback that will be called by bs_notify(). - * This function is meant to be called by scripting language bridges, to - * register themselves for future notifications by frameworks that dynamically - * generate APIs. You are responsible to free every element passed to the - * callback function, using bs_element_free(). - * Returns a token identifier that can be passed to bs_unregister() to - * unregister the callback. - * - * callback: a callback function pointer. - * context: a contextual data pointer that will be passed to the callback - * function. -*/ -bs_register_token_t bs_register(bs_parse_callback_t *callback, void *context); - -/* bs_unregister() - * - * Unregisters a previously-registered callback. - * - * token: a token that was returned by bs_register(). - */ -void bs_unregister(bs_register_token_t token); - -/* bs_notify() - * - * Notifies all clients registered through bs_register() that a new bridge - * support element is available. This function is meant to be called by - * frameworks that generate APIs at runtime. - * - * type: the type of the bridge support element. - * value: a pointer to the bridge support element. The element should be - * entierely composed of memory allocated by malloc(3). - */ -void bs_notify(bs_element_type_t type, void *value); - #endif /* __BS_H_ */ Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-08-26 03:23:42 UTC (rev 484) +++ MacRuby/trunk/objc.m 2008-08-26 20:17:30 UTC (rev 485) @@ -2169,16 +2169,12 @@ } static void -bs_parse_cb(const char *path, bs_element_type_t type, void *value, void *ctx) +bs_parse_cb(bs_parser_t *parser, const char *path, bs_element_type_t type, + void *value, void *ctx) { bool do_not_free = false; - static CFMutableDictionaryRef rb_cObject_dict = NULL; + CFMutableDictionaryRef rb_cObject_dict = (CFMutableDictionaryRef)ctx; - if (rb_cObject_dict == NULL) { - rb_cObject_dict = rb_class_ivar_dict(rb_cObject); - assert(rb_cObject_dict != NULL); - } - switch (type) { case BS_ELEMENT_ENUM: { @@ -2359,27 +2355,47 @@ bs_element_free(type, value); } -static VALUE -rb_objc_load_bs(VALUE recv, VALUE path) +extern VALUE enable_method_added; + +static bs_parser_t *bs_parser = NULL; + +static void +rb_objc_load_bridge_support(const char *path, int options) { char *error; + bool ok; + CFMutableDictionaryRef rb_cObject_dict; - if (!bs_parse(StringValuePtr(path), 0, bs_parse_cb, NULL, &error)) + if (bs_parser == NULL) { + bs_parser = bs_parser_new(); + } + + rb_cObject_dict = rb_class_ivar_dict(rb_cObject); + assert(rb_cObject_dict != NULL); + + enable_method_added = Qfalse; + ok = bs_parser_parse(bs_parser, path, options, + bs_parse_cb, rb_cObject_dict, &error); + enable_method_added = Qtrue; + if (!ok) { rb_raise(rb_eRuntimeError, error); + } +} +static VALUE +rb_objc_load_bs(VALUE recv, VALUE path) +{ + rb_objc_load_bridge_support(StringValuePtr(path), 0); return recv; } static void -load_bridge_support(const char *framework_path) +rb_objc_search_and_load_bridge_support(const char *framework_path) { char path[PATH_MAX]; - char *error; if (bs_find_path(framework_path, path, sizeof path)) { - if (!bs_parse(path, BS_PARSE_OPTIONS_LOAD_DYLIBS, bs_parse_cb, NULL, - &error)) - rb_raise(rb_eRuntimeError, error); + rb_objc_load_bridge_support(path, BS_PARSE_OPTIONS_LOAD_DYLIBS); } } @@ -2505,7 +2521,7 @@ [[error description] UTF8String]); } - load_bridge_support(cstr); + rb_objc_search_and_load_bridge_support(cstr); reload_class_constants(); return Qtrue;

1 0

[484] MacRuby/trunk/sample-macruby/HotCocoa
by source_changes＠macosforge.org 26 Aug '08

26 Aug '08

Revision: 484 http://trac.macosforge.org/projects/ruby/changeset/484 Author: rich(a)infoether.com Date: 2008-08-25 20:23:42 -0700 (Mon, 25 Aug 2008) Log Message: ----------- fix layout stuff Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/calculator/config/build.yml MacRuby/trunk/sample-macruby/HotCocoa/collection_view.rb MacRuby/trunk/sample-macruby/HotCocoa/layout_view.rb MacRuby/trunk/sample-macruby/HotCocoa/web_view.rb Modified: MacRuby/trunk/sample-macruby/HotCocoa/calculator/config/build.yml =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/calculator/config/build.yml 2008-08-26 03:22:46 UTC (rev 483) +++ MacRuby/trunk/sample-macruby/HotCocoa/calculator/config/build.yml 2008-08-26 03:23:42 UTC (rev 484) @@ -1,5 +1,6 @@ name: Calculator load: lib/application.rb +secure: true version: "1.0" icon: /Applications/Calculator.app/Contents/Resources/Calculator.icns sources: Modified: MacRuby/trunk/sample-macruby/HotCocoa/collection_view.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/collection_view.rb 2008-08-26 03:22:46 UTC (rev 483) +++ MacRuby/trunk/sample-macruby/HotCocoa/collection_view.rb 2008-08-26 03:23:42 UTC (rev 484) @@ -47,7 +47,7 @@ application :name => "Collection View" do |app| window :frame => [100, 100, 500, 500], :title => "HotCocoa!" do |win| - win << scroll_view(:layout => {:expand => true, :other => :fill}) do |scroll| + win << scroll_view(:layout => {:expand => [:width, :height]}) do |scroll| cv = collection_view :content => {icons => "arrangedObjects"}, :selection_indexes => {icons => "selectionIndexes"}, :item_view => MyIconView.create, Modified: MacRuby/trunk/sample-macruby/HotCocoa/layout_view.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/layout_view.rb 2008-08-26 03:22:46 UTC (rev 483) +++ MacRuby/trunk/sample-macruby/HotCocoa/layout_view.rb 2008-08-26 03:23:42 UTC (rev 484) @@ -41,9 +41,9 @@ end def create_slider_layout(label, &block) - layout_view :mode => :horizontal, :frame => [0, 0, 0, 24], :layout => {:other => :fill} do |view| - view << label(:text => label, :layout => {:other => :align_center}) - s = slider :min => 0, :max => 50, :tic_marks => 20, :on_action => block, :layout => {:expand => true, :other => :align_center} + layout_view :mode => :horizontal, :frame => [0, 0, 0, 24], :layout => {:expand => :width} do |view| + view << label(:text => label, :layout => {:align => :center}) + s = slider :min => 0, :max => 50, :tic_marks => 20, :on_action => block, :layout => {:expand => :width, :align => :center} s.setFrameSize([0, 24]) # TODO sizeToFit doesn't set the height for us view << s end @@ -71,22 +71,23 @@ selected_view = nil expand_b = nil + expand_h = nil left_padding_s = right_padding_s = top_padding_s = bottom_padding_s = nil other_p = nil - views_p = popup :items => ['No View'], :layout => {:other => :fill} + views_p = popup :items => ['No View'], :layout => {:expand => :width} views_p.on_action do |p| selected_view = views[p.items.selected_index] options = selected_view.layout - expand_b.state = options.expand? ? :on : :off + expand_b.state = options.expand_width? + expand_h.state = options.expand_height? left_padding_s.intValue = options.left_padding right_padding_s.intValue = options.right_padding top_padding_s.intValue = options.top_padding bottom_padding_s.intValue = options.bottom_padding - other_p.items.selected = case options.other - when :align_head then 0 - when :align_center then 1 - when :align_tail then 2 - when :fill then 3 + other_p.items.selected = case options.align + when :left then 0 + when :center then 1 + when :right then 2 end end @@ -101,12 +102,38 @@ end pane.view << add_b pane.view << views_p - expand_b = button :title => "Expand", :type => :switch, :state => :off + expand_b = button :title => "Expand width", :type => :switch, :state => :off + expand_h = button :title => "Expand height", :type => :switch, :state => :off expand_b.on_action do |b| - selected_view.reset_size unless b.on? - selected_view.layout.expand = b.on? + selected_view.reset_size + selected_view.layout.expand = if expand_b.on? + if expand_h.on? + [:width, :height] + else + :width + end + elsif expand_h.on? + :height + else + nil + end end + expand_h.on_action do |b| + selected_view.reset_size + selected_view.layout.expand = if expand_b.on? + if expand_h.on? + [:width, :height] + else + :width + end + elsif expand_h.on? + :height + else + nil + end + end pane.view << expand_b + pane.view << expand_h v = create_slider_layout('Left') { |x| selected_view.layout.left_padding = x.to_i } left_padding_s = v.subviews[1] @@ -124,12 +151,12 @@ bottom_padding_s = v.subviews[1] pane.view << v - pane.view << layout_view(:mode => :horizontal, :frame => [0, 0, 0, 24], :layout => {:other => :fill}) do |view| - view << label(:text => 'Other', :layout => {:other => :align_center}) - view << popup(:items => ['Align Head', 'Align Center', 'Align Tail', 'Fill'], :layout => {:expand => true, :other => :align_center}) do |p| + pane.view << layout_view(:mode => :horizontal, :frame => [0, 0, 0, 24], :layout => {:expand => :width}) do |view| + view << label(:text => 'Align', :layout => {:align => :center}) + view << popup(:items => ['Left/Bottom', 'Center', 'Right/Top'], :layout => {:expand => :width, :align => :center}) do |p| p.on_action do |x| selected_view.reset_size - selected_view.layout.other = x.items.selected.downcase.tr(' ', '_').intern + selected_view.layout.align = [:left, :center, :right][p.items.selected_index-1] end other_p = p end Modified: MacRuby/trunk/sample-macruby/HotCocoa/web_view.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/web_view.rb 2008-08-26 03:22:46 UTC (rev 483) +++ MacRuby/trunk/sample-macruby/HotCocoa/web_view.rb 2008-08-26 03:23:42 UTC (rev 484) @@ -10,4 +10,3 @@ win << web end end -

1 0

[483] MacRuby/trunk/lib/hotcocoa/layout_view.rb
by source_changes＠macosforge.org 26 Aug '08

26 Aug '08

Revision: 483 http://trac.macosforge.org/projects/ruby/changeset/483 Author: rich(a)infoether.com Date: 2008-08-25 20:22:46 -0700 (Mon, 25 Aug 2008) Log Message: ----------- changed the layout class a lot to simplify the use of it Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/layout_view.rb Modified: MacRuby/trunk/lib/hotcocoa/layout_view.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/layout_view.rb 2008-08-26 02:25:45 UTC (rev 482) +++ MacRuby/trunk/lib/hotcocoa/layout_view.rb 2008-08-26 03:22:46 UTC (rev 483) @@ -14,6 +14,8 @@ end class LayoutOptions + + VALID_EXPANSIONS = [nil, :height, :width, [:height, :width], [:width, :height]] attr_accessor :defaults_view attr_reader :view @@ -24,11 +26,11 @@ # Whether the view is packed at the start or the end of the packing view. # Default value is true. # - # :expand -> bool + # :expand -> :vertical, :horizontal, [:vertical, :horizontal] # Whether the view's first dimension (width for horizontal and height for vertical) # should be expanded to the maximum possible size, and should be variable according # to the packing view frame. - # Default value is false. + # Default value is nil. # # :padding -> float # :left_padding -> float @@ -40,27 +42,29 @@ # padding flags are ignored. # Default value is 0.0 for all flags. # - # :other -> mode - # Controls the view's second dimension (height for horizontal and width for vertical). + # :align -> mode + # Controls the view's alignment if its not expanded in the other dimension # Modes can be: - # :align_head - # Will be aligned to the head (start) of the packing area. - # :align_center - # Will be centered inside the packing area. - # :align_tail - # Will be aligned to the tail (end) of the packing area. - # :fill - # Will be filled to the maximum size. + # :left + # For horizontal layouts, align left + # :center + # Align center for horizontal or vertical layouts + # :right + # For horizontal layouts, align right + # :top + # For vertical layouts, align top + # :bottom + # For vertical layouts, align bottom def initialize(view, options={}) @view = view @start = options[:start] @expand = options[:expand] @padding = options[:padding] - @left_padding = options[:left_padding] || @padding - @right_padding = options[:right_padding] || @padding - @top_padding = options[:top_padding] || @padding - @bottom_padding = options[:bottom_padding] || @padding - @other = options[:other] + @left_padding = @padding || options[:left_padding] + @right_padding = @padding || options[:right_padding] + @top_padding = @padding || options[:top_padding] + @bottom_padding = @padding || options[:bottom_padding] + @align = options[:align] @defaults_view = options[:defaults_view] end @@ -81,18 +85,31 @@ def expand=(value) return if value == @expand + unless VALID_EXPANSIONS.include?(value) + raise ArgumentError, "Expand must be nil, :height, :width or [:width, :height] not #{value.inspect}" + end @expand = value update_layout_views! end - def expand? + def expand return @expand unless @expand.nil? if in_layout_view? - @view.superview.default_layout.expand? + @view.superview.default_layout.expand else false end end + + def expand_width? + e = self.expand + e == :width || (e.respond_to?(:include?) && e.include?(:width)) + end + + def expand_height? + e = self.expand + e == :height || (e.respond_to?(:include?) && e.include?(:height)) + end def left_padding=(value) return if value == @left_padding @@ -158,18 +175,18 @@ end end - def other - return @other unless @other.nil? + def align + return @align unless @align.nil? if in_layout_view? - @view.superview.default_layout.other + @view.superview.default_layout.align else - :align_head + :left end end - def other=(value) - return if value == @other - @other = value + def align=(value) + return if value == @align + @align = value update_layout_views! end @@ -185,7 +202,7 @@ end def inspect - "#<#{self.class} start=#{start?}, expand=#{expand?}, left_padding=#{left_padding}, right_padding=#{right_padding}, top_padding=#{top_padding}, bottom_padding=#{bottom_padding}, other=#{other.inspect}, view=#{view.inspect}>" + "#<#{self.class} start=#{start?}, expand=#{expand.inspect}, left_padding=#{left_padding}, right_padding=#{right_padding}, top_padding=#{top_padding}, bottom_padding=#{bottom_padding}, align=#{align.inspect}, view=#{view.inspect}>" end def update_layout_views! @@ -322,7 +339,7 @@ expandable_views = 0 subviews.each do |view| next if !view.respond_to?(:layout) || view.layout.nil? - if view.layout.expand? + if (vertical ? view.layout.expand_height? : view.layout.expand_width?) expandable_views += 1 else expandable_size -= vertical ? view.frameSize.height : view.frameSize.width @@ -354,7 +371,7 @@ view_frame.origin.y = @margin end - if options.expand? + if (vertical ? options.expand_height? : options.expand_width?) if vertical view_frame.size.height = expandable_size else @@ -362,31 +379,32 @@ end subview_dimension = expandable_size end - - case options.other - when :fill + + if (vertical ? options.expand_width? : options.expand_height?) if vertical view_frame.size.width = view_size.width - (2 * @margin) else view_frame.size.height = view_size.height - (2 * @margin) - end + end + else + case options.align + when :left, :bottom + # Nothing to do - when :align_head - # Nothing to do + when :center + if vertical + view_frame.origin.x = (view_size.width / 2.0) - (subview_size.width / 2.0) + else + view_frame.origin.y = (view_size.height / 2.0) - (subview_size.height / 2.0) + end - when :align_center - if vertical - view_frame.origin.x = (view_size.width / 2.0) - (subview_size.width / 2.0) - else - view_frame.origin.y = (view_size.height / 2.0) - (subview_size.height / 2.0) + when :right, :top + if vertical + view_frame.origin.x = view_size.width - subview_size.width - @margin + else + view_frame.origin.y = view_size.height - subview_size.height - @margin + end end - - when :align_tail - if vertical - view_frame.origin.x = view_size.width - subview_size.width - @margin - else - view_frame.origin.y = view_size.height - subview_size.height - @margin - end end puts "view #{view} options #{options} final frame #{view_frame}" if $DEBUG

1 0

[482] MacRuby/trunk/sample-macruby/About MacRuby Examples.rtf
by source_changes＠macosforge.org 26 Aug '08

26 Aug '08

Revision: 482 http://trac.macosforge.org/projects/ruby/changeset/482 Author: lsansonetti(a)apple.com Date: 2008-08-25 19:25:45 -0700 (Mon, 25 Aug 2008) Log Message: ----------- mention the hotcocoa examples Modified Paths: -------------- MacRuby/trunk/sample-macruby/About MacRuby Examples.rtf Modified: MacRuby/trunk/sample-macruby/About MacRuby Examples.rtf =================================================================== --- MacRuby/trunk/sample-macruby/About MacRuby Examples.rtf 2008-08-26 02:20:19 UTC (rev 481) +++ MacRuby/trunk/sample-macruby/About MacRuby Examples.rtf 2008-08-26 02:25:45 UTC (rev 482) @@ -2,7 +2,7 @@ {\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaGrande;\f2\froman\fcharset0 Times-Roman; } {\colortbl;\red255\green255\blue255;} -\vieww18720\viewh16000\viewkind0 +\vieww18720\viewh15940\viewkind0 \pard\tx960\tx1920\tx2880\tx3840\tx4800\tx5760\tx6720\tx7680\tx8640\tx9600\li1120\fi-400\ri140\ql\qnatural \f0\fs30 \cf0 \ @@ -49,6 +49,12 @@ \b ViewModelDemo \b0 NSView, NSTimer\ \ +The +\b HotCocoa +\b0 directory contains examples for the MacRuby's HotCocoa\ +library, which aims at making Cocoa development easier for Ruby\ +developers. \ +\ You will also find some standalone scripts in the \b Scripts \b0 directory. These \ @@ -56,6 +62,6 @@ \pard\tx960\tx4320\tx5760\tx6720\tx7680\tx8640\tx9600\li4300\fi-3360\ri-1180\ql\qnatural \cf0 \ \pard\tx960\tx1920\tx2880\tx3840\tx4800\tx5760\tx6720\tx7680\tx8640\tx9600\li960\fi-20\ri-1180\ql\qnatural -\cf0 The source code of all MacRuby examples, unless specified, is covered by the Ruby license, which can be found online at: {\field{\*\fldinst{HYPERLINK "http://www.ruby-lang.org/en/LICENSE.txt"}}{\fldrslt http://www.ruby-lang.org/en/LICENSE.txt}}\ -\ -} \ No newline at end of file +\cf0 The source code of all MacRuby examples, unless specified, is covered by the Ruby license, which can be found online at: \ +\pard\tx960\tx1920\tx2880\tx3840\tx4800\tx5760\tx6720\tx7680\tx8640\tx9600\li960\fi-20\ri-1180\ql\qnatural +{\field{\*\fldinst{HYPERLINK "http://www.ruby-lang.org/en/LICENSE.txt"}}{\fldrslt \cf0 http://www.ruby-lang.org/en/LICENSE.txt}}} \ No newline at end of file

1 0

[481] MacRuby/trunk/insns.def
by source_changes＠macosforge.org 26 Aug '08

26 Aug '08

Revision: 481 http://trac.macosforge.org/projects/ruby/changeset/481 Author: lsansonetti(a)apple.com Date: 2008-08-25 19:20:19 -0700 (Mon, 25 Aug 2008) Log Message: ----------- fixed faster aref/aset code paths Modified Paths: -------------- MacRuby/trunk/insns.def Modified: MacRuby/trunk/insns.def =================================================================== --- MacRuby/trunk/insns.def 2008-08-26 01:29:51 UTC (rev 480) +++ MacRuby/trunk/insns.def 2008-08-26 02:20:19 UTC (rev 481) @@ -1886,10 +1886,10 @@ (VALUE val) { if (!SPECIAL_CONST_P(recv) && BASIC_OP_UNREDEFINED_P(BOP_AREF)) { - if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) { + if (HEAP_CLASS_OF(recv) == rb_cCFArray && FIXNUM_P(obj)) { val = rb_ary_entry(recv, FIX2LONG(obj)); } - else if (HEAP_CLASS_OF(recv) == rb_cHash) { + else if (HEAP_CLASS_OF(recv) == rb_cCFHash) { val = rb_hash_aref(recv, obj); } else { @@ -1917,11 +1917,11 @@ { if (!SPECIAL_CONST_P(recv) && BASIC_OP_UNREDEFINED_P(BOP_ASET)) { - if (HEAP_CLASS_OF(recv) == rb_cArray && FIXNUM_P(obj)) { + if (HEAP_CLASS_OF(recv) == rb_cCFArray && FIXNUM_P(obj)) { rb_ary_store(recv, FIX2LONG(obj), set); val = set; } - else if (HEAP_CLASS_OF(recv) == rb_cHash) { + else if (HEAP_CLASS_OF(recv) == rb_cCFHash) { rb_hash_aset(recv, obj, set); val = set; }

1 0

[480] MacRuby/trunk/objc.h
by source_changes＠macosforge.org 26 Aug '08

26 Aug '08

Revision: 480 http://trac.macosforge.org/projects/ruby/changeset/480 Author: lsansonetti(a)apple.com Date: 2008-08-25 18:29:51 -0700 (Mon, 25 Aug 2008) Log Message: ----------- forgot to add this file Added Paths: ----------- MacRuby/trunk/objc.h Added: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h (rev 0) +++ MacRuby/trunk/objc.h 2008-08-26 01:29:51 UTC (rev 480) @@ -0,0 +1,27 @@ +#ifndef __OBJC_H_ +#define __OBJC_H_ + +static inline void +rb_objc_install_method(Class klass, SEL sel, IMP imp) +{ + Method method, method2; + + method = class_getInstanceMethod(klass, sel); + assert(method != NULL); + + method2 = class_getInstanceMethod((Class)RCLASS_SUPER(klass), sel); + if (method == method2) { + assert(class_addMethod(klass, sel, imp, method_getTypeEncoding(method))); + } + else { + method_setImplementation(method, imp); + } +} + +static inline void +rb_objc_install_method2(Class klass, const char *selname, IMP imp) +{ + rb_objc_install_method(klass, sel_registerName(selname), imp); +} + +#endif /* __OBJC_H_ */ Property changes on: MacRuby/trunk/objc.h ___________________________________________________________________ Name: svn:eol-style + native

1 0