ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC vs.
Revision 1.489 by root, Sun Nov 25 14:37:18 2012 UTC

1package CFPlus::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
6
7use Event; 7use AnyEvent ();
8use Guard ();
8 9
9use CFPlus; 10use DC;
10use CFPlus::Pod; 11use DC::Pod;
11use CFPlus::Texture; 12use DC::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
17our $TOOLTIP; 18our $TOOLTIP;
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
24 $_[0]->stop;
25
23 if (!$GRAB) { 26 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 27 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 28 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 29 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 30 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
… …
30 $TOOLTIP->{owner} = $widget; 33 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 34 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 35
33 return if $ENV{CFPLUS_DEBUG} & 8; 36 return if $ENV{CFPLUS_DEBUG} & 8;
34 37
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 38 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 39 $TOOLTIP->show;
41 } 40 }
42 41
43 return; 42 return;
… …
46 } 45 }
47 46
48 $TOOLTIP->hide; 47 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner}; 48 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 delete $TOOLTIP->{owner}; 49 delete $TOOLTIP->{owner};
51}); 50};
52 51
53sub get_layout { 52sub get_layout {
54 my $layout; 53 my $layout;
55 54
56 for (grep { $_->{name} } values %WIDGET) { 55 for (grep { $_->{name} } values %WIDGET) {
57 my $win = $layout->{$_->{name}} = { }; 56 my $win = $layout->{$_->{name}} = { };
58 57
59 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 58 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 59 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 60 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 61 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63 62
… …
72 71
73 $LAYOUT = $layout; 72 $LAYOUT = $layout;
74} 73}
75 74
76# class methods for events 75# class methods for events
77sub feed_sdl_key_down_event { 76sub feed_sdl_key_down_event {
78 $FOCUS->emit (key_down => $_[0]) 77 $FOCUS->emit (key_down => $_[0])
79 if $FOCUS; 78 if $FOCUS;
80} 79}
81 80
82sub feed_sdl_key_up_event { 81sub feed_sdl_key_up_event {
… …
91 my $hover = $HOVER; $HOVER = $widget; 90 my $hover = $HOVER; $HOVER = $widget;
92 91
93 $hover->update if $hover && $hover->{can_hover}; 92 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover}; 93 $HOVER->update if $HOVER && $HOVER->{can_hover};
95 94
96 $TOOLTIP_WATCHER->start; 95 $TOOLTIP_WATCHER->again;
97 } 96 }
98} 97}
99 98
100sub feed_sdl_button_down_event { 99sub feed_sdl_button_down_event {
101 my ($ev) = @_; 100 my ($ev) = @_;
… …
107 my $widget = $ROOT->find_widget ($x, $y); 106 my $widget = $ROOT->find_widget ($x, $y);
108 107
109 $GRAB = $widget; 108 $GRAB = $widget;
110 $GRAB->update if $GRAB; 109 $GRAB->update if $GRAB;
111 110
112 $TOOLTIP_WATCHER->cb->(); 111 $TOOLTIP_WATCHER->invoke;
113 } 112 }
114 113
115 if ($GRAB) { 114 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 115 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 116 # mousewheel
118 my $delta = $ev->{button} * 2 - 9; 117 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT; 118 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120 119
121 $ev->{dx} = $shift ? $delta : 0; 120 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta; 121 $ev->{dy} = $shift ? 0 : $delta;
123 122
124 $GRAB->emit (mouse_wheel => $ev); 123 $GRAB->emit (mouse_wheel => $ev);
… …
142 my $grab = $GRAB; undef $GRAB; 141 my $grab = $GRAB; undef $GRAB;
143 $grab->update if $grab; 142 $grab->update if $grab;
144 $GRAB->update if $GRAB; 143 $GRAB->update if $GRAB;
145 144
146 check_hover $widget; 145 check_hover $widget;
147 $TOOLTIP_WATCHER->cb->(); 146 $TOOLTIP_WATCHER->invoke;
148 } 147 }
149} 148}
150 149
151sub feed_sdl_motion_event { 150sub feed_sdl_motion_event {
152 my ($ev) = @_; 151 my ($ev) = @_;
… …
192# call when resolution changes etc. 191# call when resolution changes etc.
193sub rescale_widgets { 192sub rescale_widgets {
194 my ($sx, $sy) = @_; 193 my ($sx, $sy) = @_;
195 194
196 for my $widget (values %WIDGET) { 195 for my $widget (values %WIDGET) {
197 if ($widget->{is_toplevel}) { 196 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 197 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 198 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200 199
201 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 200 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 201 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
214 reconfigure_widgets; 213 reconfigure_widgets;
215} 214}
216 215
217############################################################################# 216#############################################################################
218 217
219package CFPlus::UI::Event; 218package DC::UI::Event;
220 219
221sub xy { 220sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y}) 221 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223} 222}
224 223
225############################################################################# 224#############################################################################
226 225
227package CFPlus::UI::Base; 226package DC::UI::Base;
228 227
229use strict; 228use common::sense;
230 229
231use CFPlus::OpenGL; 230use DC::OpenGL;
232 231
233sub new { 232sub new {
234 my $class = shift; 233 my $class = shift;
235 234
236 my $self = bless { 235 my $self = bless {
… …
241 h => undef, 240 h => undef,
242 can_events => 1, 241 can_events => 1,
243 @_ 242 @_
244 }, $class; 243 }, $class;
245 244
246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 245 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247 246
248 for (keys %$self) { 247 for (keys %$self) {
249 if (/^on_(.*)$/) { 248 if (/^on_(.*)$/) {
250 $self->connect ($1 => delete $self->{$_}); 249 $self->connect ($1 => delete $self->{$_});
251 } 250 }
252 } 251 }
253 252
254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) { 253 if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x}; 254 $self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y}; 255 $self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w}; 256 $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h}; 257 $self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259 258
260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 259 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 260 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262 261
263 $self->show if $layout->{show}; 262 $self->show if $layout->{show};
… …
273 $self->emit ("destroy"); 272 $self->emit ("destroy");
274 %$self = (); 273 %$self = ();
275} 274}
276 275
277sub TO_JSON { 276sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 277 { "\fw" => $_[0]{s_id} }
279} 278}
280 279
281sub show { 280sub show {
282 my ($self) = @_; 281 my ($self) = @_;
283 282
284 return if $self->{parent}; 283 return if $self->{parent};
285 284
286 $CFPlus::UI::ROOT->add ($self); 285 $DC::UI::ROOT->add ($self);
287} 286}
288 287
289sub set_visible { 288sub set_visible {
290 my ($self) = @_; 289 my ($self) = @_;
291 290
292 return if $self->{visible}; 291 return if $self->{visible};
292
293 $self->{parent} && $self->{parent}{root}#d#
294 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293 295
294 $self->{root} = $self->{parent}{root}; 296 $self->{root} = $self->{parent}{root};
295 $self->{visible} = $self->{parent}{visible} + 1; 297 $self->{visible} = $self->{parent}{visible} + 1;
296 298
297 $self->emit (visibility_change => 1); 299 $self->emit (visibility_change => 1);
298 300
299 $self->realloc if !exists $self->{req_w}; 301 $self->realloc if !exists $self->{req_w};
300 302
301 $_->set_visible for $self->children; 303 $_->set_visible for $self->visible_children;
302} 304}
303 305
304sub set_invisible { 306sub set_invisible {
305 my ($self) = @_; 307 my ($self) = @_;
306 308
… …
312 delete $self->{root}; 314 delete $self->{root};
313 315
314 undef $GRAB if $GRAB == $self; 316 undef $GRAB if $GRAB == $self;
315 undef $HOVER if $HOVER == $self; 317 undef $HOVER if $HOVER == $self;
316 318
317 $CFPlus::UI::TOOLTIP_WATCHER->cb->() 319 $DC::UI::TOOLTIP_WATCHER->invoke
318 if $TOOLTIP->{owner} == $self; 320 if $TOOLTIP->{owner} == $self;
319 321
320 $self->emit ("focus_out"); 322 $self->emit ("focus_out");
321 $self->emit (visibility_change => 0); 323 $self->emit (visibility_change => 0);
322} 324}
… …
341sub hide { 343sub hide {
342 my ($self) = @_; 344 my ($self) = @_;
343 345
344 $self->set_invisible; 346 $self->set_invisible;
345 347
348 # extra $parent copy for 5.8.8+ bug workaround
349 # (otherwise $_[0] in remove gets freed
350 if (my $parent = $self->{parent}) {
346 $self->{parent}->remove ($self) 351 $parent->remove ($self);
347 if $self->{parent}; 352 }
348} 353}
349 354
350sub move_abs { 355sub move_abs {
351 my ($self, $x, $y, $z) = @_; 356 my ($self, $x, $y, $z) = @_;
352 357
… …
358} 363}
359 364
360sub set_size { 365sub set_size {
361 my ($self, $w, $h) = @_; 366 my ($self, $w, $h) = @_;
362 367
363 $self->{force_w} = $w; 368 $self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH );
364 $self->{force_h} = $h; 369 $self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT);
365 370
366 $self->realloc; 371 $self->realloc;
367} 372}
373
374## traverse the widget chain up to find the maximum "physical" size constraints
375#sub get_max_wh {
376# my ($self) = @_;
377#
378# my ($w, $h) = @$self{qw(max_w max_h)};
379#
380# if ($w <= 0 || $h <= 0) {
381# my ($mw, $mh) = $self->{parent}
382# ? $self->{parent}->get_max_wh
383# : ($::WIDTH, $::HEIGHT);
384#
385# $w = $mw if $w <= 0;
386# $h = $mh if $h <= 0;
387# }
388#
389# ($w, $h)
390#}
368 391
369sub size_request { 392sub size_request {
370 require Carp; 393 require Carp;
371 Carp::confess "size_request is abstract"; 394 Carp::confess "size_request is abstract";
372} 395}
… …
379 my ($self, $x, $y, $w, $h) = @_; 402 my ($self, $x, $y, $w, $h) = @_;
380 403
381 if ($self->{aspect}) { 404 if ($self->{aspect}) {
382 my ($ow, $oh) = ($w, $h); 405 my ($ow, $oh) = ($w, $h);
383 406
384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect}; 407 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect}; 408 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386 409
387 # use alignment to adjust x, y 410 # use alignment to adjust x, y
388 411
389 $x += int 0.5 * ($ow - $w); 412 $x += int 0.5 * ($ow - $w);
390 $y += int 0.5 * ($oh - $h); 413 $y += int 0.5 * ($oh - $h);
… …
431 454
432 return if $self->{tooltip} eq $tooltip; 455 return if $self->{tooltip} eq $tooltip;
433 456
434 $self->{tooltip} = $tooltip; 457 $self->{tooltip} = $tooltip;
435 458
436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) { 459 if ($DC::UI::TOOLTIP->{owner} == $self) {
437 delete $CFPlus::UI::TOOLTIP->{owner}; 460 delete $DC::UI::TOOLTIP->{owner};
438 $CFPlus::UI::TOOLTIP_WATCHER->cb->(); 461 $DC::UI::TOOLTIP_WATCHER->invoke;
439 } 462 }
440} 463}
441 464
442# translate global coordinates to local coordinate system 465# translate global coordinates to local coordinate system
443sub coord2local { 466sub coord2local {
444 my ($self, $x, $y) = @_; 467 my ($self, $x, $y) = @_;
445 468
446 Carp::confess unless $self->{parent};#d# 469 return (undef, undef) unless $self->{parent};
447 470
448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 471 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449} 472}
450 473
451# translate local coordinates to global coordinate system 474# translate local coordinates to global coordinate system
452sub coord2global { 475sub coord2global {
453 my ($self, $x, $y) = @_; 476 my ($self, $x, $y) = @_;
454 477
455 Carp::confess unless $self->{parent};#d# 478 return (undef, undef) unless $self->{parent};
456 479
457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 480 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458} 481}
459 482
460sub invoke_focus_in { 483sub invoke_focus_in {
… …
509sub connect { 532sub connect {
510 my ($self, $signal, $cb) = @_; 533 my ($self, $signal, $cb) = @_;
511 534
512 push @{ $self->{signal_cb}{$signal} }, $cb; 535 push @{ $self->{signal_cb}{$signal} }, $cb;
513 536
514 defined wantarray and CFPlus::guard { 537 defined wantarray and Guard::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 538 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} }; 539 @{ $self->{signal_cb}{$signal} };
517 } 540 }
518} 541}
519 542
… …
557# in .xs 580# in .xs
558 581
559sub set_parent { 582sub set_parent {
560 my ($self, $parent) = @_; 583 my ($self, $parent) = @_;
561 584
562 CFPlus::weaken ($self->{parent} = $parent); 585 DC::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 586 $self->set_visible if $parent->{visible};
564} 587}
565 588
566sub realloc { 589sub realloc {
567 my ($self) = @_; 590 my ($self) = @_;
… …
593 616
594# using global variables seems a bit hacky, but passing through all drawing 617# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 618# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 619our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 620
598sub draw { 621#sub draw {
599 my ($self) = @_; 622#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 623
645sub _draw { 624sub _draw {
646 my ($self) = @_; 625 my ($self) = @_;
647 626
648 warn "no draw defined for $self\n"; 627 warn "no draw defined for $self\n";
649} 628}
650 629
651my $cntx;#d#
652sub DESTROY { 630sub DESTROY {
653 my ($self) = @_; 631 my ($self) = @_;
654 632
655 return if CFPlus::in_destruct; 633 return if DC::in_destruct;
656 634
635 local $@;
657 eval { $self->destroy }; 636 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 637 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 638
660 delete $WIDGET{$self+0}; 639 delete $WIDGET{$self+0};
661} 640}
662 641
663############################################################################# 642#############################################################################
664 643
665package CFPlus::UI::DrawBG; 644package DC::UI::DrawBG;
666 645
667our @ISA = CFPlus::UI::Base::; 646our @ISA = DC::UI::Base::;
668 647
669use strict; 648use common::sense;
649
670use CFPlus::OpenGL; 650use DC::OpenGL;
671 651
672sub new { 652sub new {
673 my $class = shift; 653 my $class = shift;
674
675 # range [value, low, high, page]
676 654
677 $class->SUPER::new ( 655 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 656 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 657 #active_bg => [1, 1, 1, 0.5],
680 @_ 658 @_
681 ) 659 )
682} 660}
683 661
662sub set_bg {
663 my ($self, $bg) = @_;
664
665 $self->{bg} = $bg;
666 $self->update;
667}
668
684sub _draw { 669sub _draw {
685 my ($self) = @_; 670 my ($self) = @_;
686 671
687 my $color = $FOCUS == $self && $self->{active_bg} 672 my $color = $FOCUS == $self
688 ? $self->{active_bg} 673 ? $self->{active_bg} || $self->{bg}
689 : $self->{bg}; 674 : $self->{bg};
690 675
691 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
692 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
693 678
694 glEnable GL_BLEND; 679 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 681 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 682 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 683 glDisable GL_BLEND;
706 } 684 }
707} 685}
708 686
709############################################################################# 687#############################################################################
710 688
711package CFPlus::UI::Empty; 689package DC::UI::Empty;
712 690
713our @ISA = CFPlus::UI::Base::; 691our @ISA = DC::UI::Base::;
714 692
715sub new { 693sub new {
716 my ($class, %arg) = @_; 694 my ($class, %arg) = @_;
717 $class->SUPER::new (can_events => 0, %arg); 695 $class->SUPER::new (can_events => 0, %arg);
718} 696}
… …
725 703
726sub draw { } 704sub draw { }
727 705
728############################################################################# 706#############################################################################
729 707
730package CFPlus::UI::Container; 708package DC::UI::Container;
731 709
732our @ISA = CFPlus::UI::Base::; 710our @ISA = DC::UI::Base::;
733 711
734sub new { 712sub new {
735 my ($class, %arg) = @_; 713 my ($class, %arg) = @_;
736 714
737 my $children = delete $arg{children}; 715 my $children = delete $arg{children};
… …
741 can_events => 0, 719 can_events => 0,
742 %arg, 720 %arg,
743 ); 721 );
744 722
745 $self->add (@$children) 723 $self->add (@$children)
746 if $children; 724 if $children && @$children;
747 725
748 $self 726 $self
749} 727}
750 728
751sub realloc { 729sub realloc {
… …
760 my ($self, @widgets) = @_; 738 my ($self, @widgets) = @_;
761 739
762 $_->set_parent ($self) 740 $_->set_parent ($self)
763 for @widgets; 741 for @widgets;
764 742
743 # TODO: only do this in widgets that need it, e.g. root, fixed
765 use sort 'stable'; 744 use sort 'stable';
766 745
767 $self->{children} = [ 746 $self->{children} = [
768 sort { $a->{z} <=> $b->{z} } 747 sort { $a->{z} <=> $b->{z} }
769 @{$self->{children}}, @widgets 748 @{$self->{children}}, @widgets
770 ]; 749 ];
771 750
772 $self->realloc; 751 $self->realloc;
752
753 $self->emit (c_add => \@widgets);
754
755 map $_+0, @widgets
773} 756}
774 757
775sub children { 758sub children {
776 @{ $_[0]{children} } 759 @{ $_[0]{children} }
777} 760}
778 761
779sub remove { 762sub remove {
780 my ($self, $child) = @_; 763 my ($self, @widgets) = @_;
781 764
765 $self->emit (c_remove => \@widgets);
766
767 for my $child (@widgets) {
782 delete $child->{parent}; 768 delete $child->{parent};
783 $child->hide; 769 $child->hide;
784
785 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
771 }
786 772
787 $self->realloc; 773 $self->realloc;
788} 774}
789 775
790sub clear { 776sub clear {
791 my ($self) = @_; 777 my ($self) = @_;
792 778
793 my $children = delete $self->{children}; 779 my $children = $self->{children};
794 $self->{children} = []; 780 $self->{children} = [];
795 781
796 for (@$children) { 782 for (@$children) {
797 delete $_->{parent}; 783 delete $_->{parent};
798 $_->hide; 784 $_->hide;
… …
818} 804}
819 805
820sub _draw { 806sub _draw {
821 my ($self) = @_; 807 my ($self) = @_;
822 808
823 $_->draw for @{$self->{children}}; 809 $_->draw for $self->visible_children;
824} 810}
825 811
826############################################################################# 812#############################################################################
827 813
828package CFPlus::UI::Bin; 814package DC::UI::Bin;
829 815
830our @ISA = CFPlus::UI::Container::; 816our @ISA = DC::UI::Container::;
831 817
832sub new { 818sub new {
833 my ($class, %arg) = @_; 819 my ($class, %arg) = @_;
834 820
835 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::; 821 my $child = (delete $arg{child}) || new DC::UI::Empty::;
836 822
837 $class->SUPER::new (children => [$child], %arg) 823 $class->SUPER::new (children => [$child], %arg)
838} 824}
839 825
840sub add { 826sub add {
841 my ($self, $child) = @_; 827 my ($self, $child) = @_;
842 828
843 $self->SUPER::remove ($_) for @{ $self->{children} }; 829 $self->clear;
844 $self->SUPER::add ($child); 830 $self->SUPER::add ($child);
845} 831}
846 832
847sub remove { 833sub remove {
848 my ($self, $widget) = @_; 834 my ($self, $widget) = @_;
849 835
850 $self->SUPER::remove ($widget); 836 $self->SUPER::remove ($widget);
851 837
852 $self->{children} = [new CFPlus::UI::Empty] 838 $self->{children} = [new DC::UI::Empty]
853 unless @{$self->{children}}; 839 unless @{$self->{children}};
854} 840}
855 841
856sub child { $_[0]->{children}[0] } 842sub child { $_[0]->{children}[0] }
857 843
… …
866 852
867 1 853 1
868} 854}
869 855
870############################################################################# 856#############################################################################
871
872# back-buffered drawing area 857# back-buffered drawing area
873 858
874package CFPlus::UI::Window; 859package DC::UI::Window;
875 860
876our @ISA = CFPlus::UI::Bin::; 861our @ISA = DC::UI::Bin::;
877 862
878use CFPlus::OpenGL; 863use DC::OpenGL;
879 864
880sub new { 865sub new {
881 my ($class, %arg) = @_; 866 my ($class, %arg) = @_;
882 867
883 my $self = $class->SUPER::new (%arg); 868 my $self = $class->SUPER::new (%arg);
… …
905} 890}
906 891
907sub render_child { 892sub render_child {
908 my ($self) = @_; 893 my ($self) = @_;
909 894
910 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub { 895 $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
911 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
912 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
913 898
914 { 899 {
915 package CFPlus::UI::Base; 900 package DC::UI::Base;
916 901
917 local ($draw_x, $draw_y, $draw_w, $draw_h) = 902 local ($draw_x, $draw_y, $draw_w, $draw_h) =
918 (0, 0, $self->{w}, $self->{h}); 903 (0, 0, $self->{w}, $self->{h});
919 904
920 $self->_render; 905 $self->_render;
… …
937 glDisable GL_TEXTURE_2D; 922 glDisable GL_TEXTURE_2D;
938} 923}
939 924
940############################################################################# 925#############################################################################
941 926
942package CFPlus::UI::ViewPort; 927package DC::UI::ViewPort;
943 928
944use List::Util qw(min max); 929use List::Util qw(min max);
945 930
946our @ISA = CFPlus::UI::Window::; 931our @ISA = DC::UI::Window::;
947 932
948sub new { 933sub new {
949 my $class = shift; 934 my $class = shift;
950 935
951 $class->SUPER::new ( 936 $class->SUPER::new (
… …
993 $self->emit (changed => $x, $y); 978 $self->emit (changed => $x, $y);
994 $self->update; 979 $self->update;
995 } 980 }
996} 981}
997 982
983sub set_center {
984 my ($self, $x, $y) = @_;
985
986 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
987}
988
989sub make_visible {
990 my ($self, $x, $y, $border) = @_;
991
992 if ( $x < $self->{view_x} + $self->{w} * $border
993 || $x > $self->{view_x} + $self->{w} * (1 - $border)
994 || $y < $self->{view_y} + $self->{h} * $border
995 || $y > $self->{view_y} + $self->{h} * (1 - $border)
996 ) {
997 $self->set_center ($x, $y);
998 }
999}
1000
998# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
999sub coord2local { 1002sub coord2local {
1000 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
1001 1004
1002 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 1005 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019 ) { 1022 ) {
1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1021 } else { 1024 } else {
1022 $self->CFPlus::UI::Base::find_widget ($x, $y) 1025 $self->DC::UI::Base::find_widget ($x, $y)
1023 } 1026 }
1024} 1027}
1025 1028
1026sub _render { 1029sub _render {
1027 my ($self) = @_; 1030 my ($self) = @_;
1028 1031
1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x}; 1032 local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y}; 1033 local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1031 1034
1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1033 1036
1034 $self->SUPER::_render; 1037 $self->SUPER::_render;
1035} 1038}
1036 1039
1037############################################################################# 1040#############################################################################
1038 1041
1039package CFPlus::UI::ScrolledWindow; 1042package DC::UI::ScrolledWindow;
1040 1043
1041our @ISA = CFPlus::UI::Table::; 1044our @ISA = DC::UI::Table::;
1042 1045
1043sub new { 1046sub new {
1044 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
1045 1048
1046 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
1047 1050
1048 my $self; 1051 my $self;
1049 1052
1050 my $hslider = new CFPlus::UI::Slider 1053 my $hslider = new DC::UI::Slider
1054 c_col => 0,
1055 c_row => 1,
1051 vertical => 0, 1056 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1058 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1059 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1061 },
1057 ; 1062 ;
1058 1063
1059 my $vslider = new CFPlus::UI::Slider 1064 my $vslider = new DC::UI::Slider
1065 c_col => 1,
1066 c_row => 0,
1060 vertical => 1, 1067 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1069 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1070 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1074 col_expand => [1, 0], 1081 col_expand => [1, 0],
1075 row_expand => [1, 0], 1082 row_expand => [1, 0],
1076 %arg, 1083 %arg,
1077 ); 1084 );
1078 1085
1079 $self->{vp} = new CFPlus::UI::ViewPort 1086 $self->{vp} = new DC::UI::ViewPort
1087 c_col => 0,
1088 c_row => 0,
1080 expand => 1, 1089 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1090 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1091 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1092 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1093 my ($vp, $x, $y) = @_;
… …
1086 $vp->{parent}{hslider}->set_value ($x); 1095 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y); 1096 $vp->{parent}{vslider}->set_value ($y);
1088 1097
1089 0 1098 0
1090 }, 1099 },
1100 on_size_allocate => sub {
1101 my ($vp, $w, $h) = @_;
1102 $vp->{parent}->update_slider;
1103 0
1104 },
1091 ; 1105 ;
1092 1106
1093 $self->SUPER::add_at (0, 0, $self->{vp}); 1107 $self->SUPER::add ($self->{vp});
1094 1108
1095 $self->add ($child) if $child; 1109 $self->add ($child) if $child;
1096 1110
1097 $self 1111 $self
1098} 1112}
1099
1100#TODO# update range on size_allocate depending on child
1101 1113
1102sub add { 1114sub add {
1103 my ($self, $widget) = @_; 1115 my ($self, $widget) = @_;
1104 1116
1105 $self->{vp}->add ($self->{child} = $widget); 1117 $self->{vp}->add ($self->{child} = $widget);
1106} 1118}
1107 1119
1120sub set_offset { shift->{vp}->set_offset (@_) }
1121sub set_center { shift->{vp}->set_center (@_) }
1122sub make_visible { shift->{vp}->make_visible (@_) }
1123
1108sub update_slider { 1124sub update_slider {
1109 my ($self) = @_; 1125 my ($self) = @_;
1110 1126
1111 my $child = ($self->{vp} or return)->child; 1127 my $child = ($self->{vp} or return)->child;
1112 1128
1129 if ($self->{scroll_x}) {
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1130 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1131 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115 1132
1116 my $visible = $w1 > $w2; 1133 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) { 1134 if ($visible != $self->{hslider_visible}) {
1135 $self->{hslider_visible} = $visible;
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1136 $visible ? $self->SUPER::add ($self->{hslider})
1119 : $self->{hslider}->hide; 1137 : $self->SUPER::remove ($self->{hslider});
1138 }
1120 } 1139 }
1121 1140
1141 if ($self->{scroll_y}) {
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1142 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1143 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124 1144
1125 my $visible = $h1 > $h2; 1145 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) { 1146 if ($visible != $self->{vslider_visible}) {
1147 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1148 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->{vslider}->hide; 1149 : $self->SUPER::remove ($self->{vslider});
1150 }
1151 }
1152}
1153
1154sub start_dragging {
1155 my ($self, $ev) = @_;
1156
1157 $self->grab_focus;
1158
1159 my $ox = $self->{vp}{view_x};
1160 my $oy = $self->{vp}{view_y};
1161
1162 $self->{motion} = sub {
1163 my ($ev, $x, $y) = @_;
1164
1165 $ox -= $ev->{xrel};
1166 $oy -= $ev->{yrel};
1167
1168 $self->{vp}->set_offset ($ox, $oy);
1129 } 1169 };
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->update_slider;
1136 $self->SUPER::update;
1137} 1170}
1138 1171
1139sub invoke_mouse_wheel { 1172sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1173 my ($self, $ev) = @_;
1141 1174
1142 $self->{vslider}->emit (mouse_wheel => $ev) 1175 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev) 1176 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146 if $ev->{dx};
1147 1177
1148 1 1178 1
1149} 1179}
1150 1180
1151sub invoke_button_down { 1181sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_; 1182 my ($self, $ev, $x, $y) = @_;
1153 1183
1154 if ($ev->{button} == 2) { 1184 if ($ev->{button} == 2) {
1155 $self->grab_focus; 1185 $self->start_dragging ($ev);
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1; 1186 return 1;
1168 } 1187 }
1169 1188
1170 0 1189 0
1171} 1190}
… …
1198 $self->SUPER::invoke_size_allocate ($w, $h) 1217 $self->SUPER::invoke_size_allocate ($w, $h)
1199} 1218}
1200 1219
1201############################################################################# 1220#############################################################################
1202 1221
1203package CFPlus::UI::Frame; 1222package DC::UI::Frame;
1204 1223
1205our @ISA = CFPlus::UI::Bin::; 1224our @ISA = DC::UI::Bin::;
1206 1225
1207use CFPlus::OpenGL; 1226use DC::OpenGL;
1208 1227
1209sub new { 1228sub new {
1210 my $class = shift; 1229 my $class = shift;
1211 1230
1212 $class->SUPER::new ( 1231 $class->SUPER::new (
… …
1222 my ($w, $h) = @$self{qw(w h)}; 1241 my ($w, $h) = @$self{qw(w h)};
1223 1242
1224 glEnable GL_BLEND; 1243 glEnable GL_BLEND;
1225 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1244 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1226 glColor_premultiply @{ $self->{bg} }; 1245 glColor_premultiply @{ $self->{bg} };
1227
1228 glBegin GL_QUADS;
1229 glVertex 0 , 0;
1230 glVertex 0 , $h;
1231 glVertex $w, $h; 1246 glRect 0, 0, $w, $h;
1232 glVertex $w, 0;
1233 glEnd;
1234
1235 glDisable GL_BLEND; 1247 glDisable GL_BLEND;
1236 } 1248 }
1237 1249
1238 $self->SUPER::_draw; 1250 $self->SUPER::_draw;
1239} 1251}
1240 1252
1241############################################################################# 1253#############################################################################
1242 1254
1243package CFPlus::UI::FancyFrame; 1255package DC::UI::FancyFrame;
1244 1256
1245our @ISA = CFPlus::UI::Bin::; 1257our @ISA = DC::UI::Bin::;
1246 1258
1247use CFPlus::OpenGL; 1259use DC::OpenGL;
1248 1260
1249sub new { 1261sub new {
1250 my ($class, %arg) = @_; 1262 my ($class, %arg) = @_;
1251 1263
1252 if ((exists $arg{label}) && !ref $arg{label}) { 1264 if ((exists $arg{label}) && !ref $arg{label}) {
1253 $arg{label} = new CFPlus::UI::Label 1265 $arg{label} = new DC::UI::Label
1254 align => 1, 1266 align => 1,
1255 valign => 0, 1267 valign => 0.5,
1256 text => $arg{label}, 1268 text => $arg{label},
1257 fontsize => ($arg{border} || 0.8) * 0.75; 1269 fontsize => ($arg{border} || 0.8) * 0.75;
1258 } 1270 }
1259 1271
1260 my $self = $class->SUPER::new ( 1272 my $self = $class->SUPER::new (
1261 # label => "", 1273 # label => "",
1262 fg => [0.6, 0.3, 0.1], 1274 fg => undef,
1263 border => 0.8, 1275 border => 0.8,
1264 style => 'single', 1276 style => 'single',
1265 %arg, 1277 %arg,
1266 ); 1278 );
1267 1279
… …
1270 1282
1271sub add { 1283sub add {
1272 my ($self, @widgets) = @_; 1284 my ($self, @widgets) = @_;
1273 1285
1274 $self->SUPER::add (@widgets); 1286 $self->SUPER::add (@widgets);
1275 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label}; 1287 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1276} 1288}
1277 1289
1278sub border { 1290sub border {
1279 int $_[0]{border} * $::FONTSIZE 1291 int $_[0]{border} * $::FONTSIZE
1280} 1292}
… …
1320 my $border = $self->border; 1332 my $border = $self->border;
1321 my ($w, $h) = ($self->{w}, $self->{h}); 1333 my ($w, $h) = ($self->{w}, $self->{h});
1322 1334
1323 $child->draw; 1335 $child->draw;
1324 1336
1325 glColor @{$self->{fg}}; 1337 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1326 glBegin GL_LINE_STRIP; 1338 glBegin GL_LINE_STRIP;
1327 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1339 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1340 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1341 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1342 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1338 } 1350 }
1339} 1351}
1340 1352
1341############################################################################# 1353#############################################################################
1342 1354
1343package CFPlus::UI::Toplevel; 1355package DC::UI::Toplevel;
1344 1356
1345our @ISA = CFPlus::UI::Bin::; 1357our @ISA = DC::UI::Bin::;
1346 1358
1347use CFPlus::OpenGL; 1359use DC::OpenGL;
1348 1360
1349my $bg = 1361my $bg =
1350 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png", 1362 new_from_resource DC::Texture "d1_bg.png",
1351 mipmap => 1, wrap => 1; 1363 mipmap => 1, wrap => 1;
1352 1364
1353my @border = 1365my @border =
1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1366 map { new_from_resource DC::Texture $_, mipmap => 1 }
1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1367 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1356 1368
1357my @icon = 1369my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1370 map { new_from_resource DC::Texture $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png); 1371 qw(x1_move.png x1_resize.png);
1360 1372
1361sub new { 1373sub new {
1362 my ($class, %arg) = @_; 1374 my ($class, %arg) = @_;
1363 1375
1364 my $self = $class->SUPER::new ( 1376 my $self = $class->SUPER::new (
1365 bg => [1, 1, 1, 1], 1377 bg => [1, 1, 1, 1],
1366 border_bg => [1, 1, 1, 1], 1378 border_bg => [1, 1, 1, 1],
1367 border => 0.6, 1379 border => 0.8,
1368 can_events => 1, 1380 can_events => 1,
1369 min_w => 64, 1381 min_w => 64,
1370 min_h => 32, 1382 min_h => 32,
1371 %arg, 1383 %arg,
1372 ); 1384 );
1373 1385
1374 $self->{title_widget} = new CFPlus::UI::Label 1386 $self->{title_widget} = new DC::UI::Label
1375 align => 0, 1387 align => 0.5,
1376 valign => 1, 1388 valign => 1,
1377 text => $self->{title}, 1389 text => $self->{title},
1378 fontsize => $self->{border}, 1390 fontsize => $self->{border},
1379 if exists $self->{title}; 1391 if exists $self->{title};
1380 1392
1381 if ($self->{has_close_button}) { 1393 if ($self->{has_close_button}) {
1382 $self->{close_button} = 1394 $self->{close_button} =
1383 new CFPlus::UI::ImageButton 1395 new DC::UI::ImageButton
1384 path => 'x1_close.png', 1396 path => 'x1_close.png',
1385 on_activate => sub { $self->emit ("delete") }; 1397 on_activate => sub { $self->emit ("delete") };
1386 1398
1387 $self->CFPlus::UI::Container::add ($self->{close_button}); 1399 $self->DC::UI::Container::add ($self->{close_button});
1388 } 1400 }
1389 1401
1390 $self 1402 $self
1391} 1403}
1392 1404
1393sub add { 1405sub add {
1394 my ($self, @widgets) = @_; 1406 my ($self, @widgets) = @_;
1395 1407
1396 $self->SUPER::add (@widgets); 1408 $self->SUPER::add (@widgets);
1397 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1409 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1398 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1410 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1399} 1411}
1400 1412
1401sub border { 1413sub border {
1402 int $_[0]{border} * $::FONTSIZE 1414 int $_[0]{border} * $::FONTSIZE
1403} 1415}
1416
1417#sub get_max_wh {
1418# my ($self) = @_;
1419#
1420# return ($self->{w}, $self->{h})
1421# if $self->{visible} && $self->{w};
1422#
1423# $self->SUPER::get_max_wh
1424#}
1404 1425
1405sub size_request { 1426sub size_request {
1406 my ($self) = @_; 1427 my ($self) = @_;
1407 1428
1408 $self->{title_widget}->size_request 1429 $self->{title_widget}->size_request
… …
1443 1464
1444sub invoke_delete { 1465sub invoke_delete {
1445 my ($self) = @_; 1466 my ($self) = @_;
1446 1467
1447 $self->hide; 1468 $self->hide;
1448 1469
1449 1 1470 1
1450} 1471}
1451 1472
1452sub invoke_button_down { 1473sub invoke_button_down {
1453 my ($self, $ev, $x, $y) = @_; 1474 my ($self, $ev, $x, $y) = @_;
1454 1475
1455 my ($w, $h) = @$self{qw(w h)}; 1476 my ($w, $h) = @$self{qw(w h)};
1456 my $border = $self->border; 1477 my $border = $self->border;
1457 1478
1458 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); 1479 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right
1459 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); 1480 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down
1460 1481
1461 if ($lr & $td) { 1482 if ($lr & $td) { # corners
1462 my ($wx, $wy) = ($self->{x}, $self->{y}); 1483 my ($wx, $wy) = ($self->{x}, $self->{y});
1463 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1484 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1464 my ($bw, $bh) = ($self->{w}, $self->{h}); 1485 my ($bw, $bh) = ($self->{w}, $self->{h});
1465 1486
1466 my $mx = $x < $border; 1487 my $mx = $x < $border;
… …
1470 my ($ev, $x, $y) = @_; 1491 my ($ev, $x, $y) = @_;
1471 1492
1472 my $dx = $ev->{x} - $ox; 1493 my $dx = $ev->{x} - $ox;
1473 my $dy = $ev->{y} - $oy; 1494 my $dy = $ev->{y} - $oy;
1474 1495
1496 $self->set_size (
1475 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1497 $bw + $dx * ($mx ? -1 : 1),
1476 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1498 $bh + $dy * ($my ? -1 : 1),
1499 );
1477 1500
1478 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my); 1501 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1479 $self->realloc; 1502 $self->realloc;
1480 }; 1503 };
1481 1504
1482 } elsif ($lr ^ $td) { 1505 } elsif ($lr ^ $td) { # edges
1483 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1506 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1484 my ($bx, $by) = ($self->{x}, $self->{y}); 1507 my ($bx, $by) = ($self->{x}, $self->{y});
1485 1508
1486 $self->{motion} = sub { 1509 $self->{motion} = sub {
1487 my ($ev, $x, $y) = @_; 1510 my ($ev, $x, $y) = @_;
… …
1532 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1534 1557
1535 my $border = $self->border; 1558 my $border = $self->border;
1536 1559
1560 if ($border) {
1537 glColor @{ $self->{border_bg} }; 1561 glColor @{ $self->{border_bg} };
1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1562 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1563 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1564 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1565 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542 1566
1543 # move 1567 # move
1544 my $w2 = ($w - $border) * .5; 1568 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5; 1569 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1570 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1571 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1572 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549 1573
1550 # resize 1574 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1575 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1576 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button}; 1577 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1578 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1579 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1580 }
1556 1581
1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1582 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1558 glColor @{ $self->{bg} }; 1583 glColor @{ $self->{bg} };
1559 1584
1560 # TODO: repeat texture not scale 1585 # TODO: repeat texture not scale
… …
1579 if $self->{close_button}; 1604 if $self->{close_button};
1580} 1605}
1581 1606
1582############################################################################# 1607#############################################################################
1583 1608
1584package CFPlus::UI::Table; 1609package DC::UI::Table;
1585 1610
1586our @ISA = CFPlus::UI::Base::; 1611our @ISA = DC::UI::Container::;
1587 1612
1588use List::Util qw(max sum); 1613use List::Util qw(max sum);
1589 1614
1590use CFPlus::OpenGL; 1615use DC::OpenGL;
1591 1616
1592sub new { 1617sub new {
1593 my $class = shift; 1618 my $class = shift;
1594 1619
1595 $class->SUPER::new ( 1620 $class->SUPER::new (
1596 children => [],
1597 col_expand => [], 1621 col_expand => [],
1598 row_expand => [], 1622 row_expand => [],
1599 @_, 1623 @_,
1600 ) 1624 )
1601} 1625}
1602 1626
1603sub children {
1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1605}
1606
1607# TODO: store row/col info in child widget and use standard add/del
1608sub add { 1627sub add {
1609 my $self = shift; 1628 my ($self, @widgets) = @_;
1610 1629
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1630 for my $child (@widgets) {
1612 $self->add_at (@_); 1631 $child->{c_rowspan} ||= 1;
1632 $child->{c_colspan} ||= 1;
1633 }
1634
1635 $self->SUPER::add (@widgets);
1613} 1636}
1614 1637
1615sub add_at { 1638sub add_at {
1616 my $self = shift; 1639 my $self = shift;
1617 1640
1641 my @widgets;
1642
1618 while (@_) { 1643 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, (); 1644 my ($col, $row, $child) = splice @_, 0, 3, ();
1620 1645
1621 $child->{row} = $row; 1646 $child->{c_row} = $row;
1622 $child->{col} = $col; 1647 $child->{c_col} = $col;
1623 1648
1624 $child->{rowspan} ||= 1; 1649 push @widgets, $child;
1625 $child->{colspan} ||= 1;
1626
1627 $child->set_parent ($self);
1628 $self->{children}[$row][$col] = $child;
1629 } 1650 }
1630 1651
1631 $self->{force_realloc} = 1; 1652 $self->add (@widgets);
1632 $self->{force_size_alloc} = 1;
1633 $self->realloc;
1634} 1653}
1635 1654
1636sub remove { 1655sub get_wh {
1637 my ($self, $child) = @_; 1656 my ($self) = @_;
1638 1657
1639 for (@{ $self->{children} }) { 1658 my (@w, @h);
1640 for (@{ $_ || [] }) { 1659
1641 $_ = undef if $_ == $child; 1660 my @children = $self->children;
1661
1662 # first pass, columns
1663 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1664 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1665
1666 my $sw = sum @w[$c .. $c + $cs - 1];
1667
1668 if ($w > $sw) {
1669 $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1670 }
1643 } 1671 }
1644}
1645 1672
1646# TODO: move to container class maybe? send children a signal on removal? 1673 # second pass, rows
1647sub clear {
1648 my ($self) = @_;
1649
1650 my @children = $self->children;
1651 delete $self->{children};
1652
1653 for (@children) {
1654 delete $_->{parent};
1655 $_->hide;
1656 }
1657
1658 $self->realloc;
1659}
1660
1661sub get_wh {
1662 my ($self) = @_;
1663
1664 my (@w, @h);
1665
1666 my @children = $self->children;
1667
1668 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) { 1674 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1675 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1670 1676
1671 my $sw = sum @w[$c .. $c + $cs - 1];
1672 my $sh = sum @h[$r .. $r + $rs - 1]; 1677 my $sh = sum @h[$r .. $r + $rs - 1];
1673 1678
1674 if ($w > $sw) {
1675 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676 }
1677
1678 if ($h > $sh) { 1679 if ($h > $sh) {
1679 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1680 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1680 } 1681 }
1681 } 1682 }
1682 1683
1683 (\@w, \@h) 1684 (\@w, \@h)
1684} 1685}
… …
1707 @col_expand = (1) x @$ws unless @col_expand; 1708 @col_expand = (1) x @$ws unless @col_expand;
1708 my $col_expand = (sum @col_expand) || 1; 1709 my $col_expand = (sum @col_expand) || 1;
1709 1710
1710 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1711 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1711 1712
1712 CFPlus::UI::harmonize $ws; 1713 DC::UI::harmonize $ws;
1713 1714
1714 my @row_expand = @{$self->{row_expand}}; 1715 my @row_expand = @{$self->{row_expand}};
1715 @row_expand = (1) x @$ws unless @row_expand; 1716 @row_expand = (1) x @$ws unless @row_expand;
1716 my $row_expand = (sum @row_expand) || 1; 1717 my $row_expand = (sum @row_expand) || 1;
1717 1718
1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1719 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719 1720
1720 CFPlus::UI::harmonize $hs; 1721 DC::UI::harmonize $hs;
1721 1722
1722 my (@x, @y);
1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1723 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1724 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726 1725
1727 for my $widget ($self->children) { 1726 for my $widget ($self->children) {
1728 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1727 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1729 1728
1730 $widget->configure ( 1729 $widget->configure (
1731 $x[$c], $y[$r], 1730 $x[$c], $y[$r],
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1731 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1733 ); 1732 );
1734 } 1733 }
1735 1734
1736 1 1735 1
1737} 1736}
1738 1737
1739sub find_widget {
1740 my ($self, $x, $y) = @_;
1741
1742 $x -= $self->{x};
1743 $y -= $self->{y};
1744
1745 my $res;
1746
1747 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1748 $res = $_->find_widget ($x, $y)
1749 and return $res;
1750 }
1751
1752 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1753}
1754
1755sub _draw {
1756 my ($self) = @_;
1757
1758 for (grep $_, @{$self->{children}}) {
1759 $_->draw for grep $_, @$_;
1760 }
1761}
1762
1763############################################################################# 1738#############################################################################
1764 1739
1765package CFPlus::UI::Fixed; 1740package DC::UI::Fixed;
1766 1741
1767use List::Util qw(min max); 1742use List::Util qw(min max);
1768 1743
1769our @ISA = CFPlus::UI::Container::; 1744our @ISA = DC::UI::Container::;
1770
1771sub add {
1772 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1773
1774 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1775 $self->SUPER::add ($child);
1776}
1777 1745
1778sub _scale($$$) { 1746sub _scale($$$) {
1779 my ($mode, $val, $max) = @_; 1747 my ($rel, $val, $max) = @_;
1780 1748
1781 $mode eq "abs" ? $val 1749 $rel ? $val * $max : $val
1782 : $mode eq "rel" ? $val * $max
1783 : 0
1784} 1750}
1785 1751
1786sub size_request { 1752sub size_request {
1787 my ($self) = @_; 1753 my ($self) = @_;
1788 1754
1789 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1755 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1790 1756
1791 # determine overall size by querying abs widgets 1757 # determine overall size by querying abs widgets
1792 for my $child ($self->visible_children) { 1758 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1759 unless ($child->{c_rel}) {
1760 my $x = $child->{c_x};
1761 my $y = $child->{c_y};
1794 1762
1795 if ($pos eq "abs") {
1796 $w = _scale $size, $w, $child->{req_w};
1797 $h = _scale $size, $h, $child->{req_h};
1798
1799 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1800 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1801 } 1765 }
1802 } 1766 }
1803 1767
1804 my $W = $x2 - $x1; 1768 my $W = $x2 - $x1;
1805 my $H = $y2 - $y1; 1769 my $H = $y2 - $y1;
1806 1770
1807 # now layout remaining widgets 1771 # now layout remaining widgets
1808 for my $child ($self->visible_children) { 1772 for my $child ($self->visible_children) {
1809 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1773 if ($child->{c_rel}) {
1774 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1775 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1810 1776
1811 if ($pos ne "abs") {
1812 $x = _scale $pos, $x, $W;
1813 $y = _scale $pos, $x, $H;
1814 $w = _scale $size, $w, $child->{req_w};
1815 $h = _scale $size, $h, $child->{req_h};
1816
1817 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1777 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1818 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1778 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1819 } 1779 }
1820 } 1780 }
1821 1781
1822 my $W = $x2 - $x1; 1782 my $W = $x2 - $x1;
1823 my $H = $y2 - $y1; 1783 my $H = $y2 - $y1;
… …
1827 1787
1828sub invoke_size_allocate { 1788sub invoke_size_allocate {
1829 my ($self, $W, $H) = @_; 1789 my ($self, $W, $H) = @_;
1830 1790
1831 for my $child ($self->visible_children) { 1791 for my $child ($self->visible_children) {
1832 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1792 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1793 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1833 1794
1834 $x = _scale $pos, $x, $W; 1795 $x += $child->{c_halign} * $child->{req_w};
1835 $y = _scale $pos, $x, $H; 1796 $y += $child->{c_valign} * $child->{req_h};
1836 $w = _scale $size, $w, $child->{req_w};
1837 $h = _scale $size, $h, $child->{req_h};
1838 1797
1839 $child->configure ($x, $y, $w, $h); 1798 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1840 } 1799 }
1841 1800
1842 1 1801 1
1843} 1802}
1844 1803
1845############################################################################# 1804#############################################################################
1846 1805
1847package CFPlus::UI::Box; 1806package DC::UI::Box;
1848 1807
1849our @ISA = CFPlus::UI::Container::; 1808our @ISA = DC::UI::Container::;
1850 1809
1851sub size_request { 1810sub size_request {
1852 my ($self) = @_; 1811 my ($self) = @_;
1812
1813 my @children = $self->visible_children;
1853 1814
1854 $self->{vertical} 1815 $self->{vertical}
1855 ? ( 1816 ? (
1856 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1817 (List::Util::max map $_->{req_w}, @children),
1857 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_h}, @children),
1858 ) 1819 )
1859 : ( 1820 : (
1860 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1821 (List::Util::sum map $_->{req_w}, @children),
1861 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1822 (List::Util::max map $_->{req_h}, @children),
1862 ) 1823 )
1863} 1824}
1864 1825
1865sub invoke_size_allocate { 1826sub invoke_size_allocate {
1866 my ($self, $w, $h) = @_; 1827 my ($self, $w, $h) = @_;
… …
1879 if ($req > $space) { 1840 if ($req > $space) {
1880 # ah well, not enough space 1841 # ah well, not enough space
1881 $_ *= $space / $req for @req; 1842 $_ *= $space / $req for @req;
1882 } else { 1843 } else {
1883 my $expand = (List::Util::sum map $_->{expand}, @children) || 1; 1844 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1884 1845
1885 $space = ($space - $req) / $expand; # remaining space to give away 1846 $space = ($space - $req) / $expand; # remaining space to give away
1886 1847
1887 $req[$_] += $space * $children[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1888 for 0 .. $#children; 1849 for 0 .. $#children;
1889 } 1850 }
1890 } 1851 }
1891 1852
1892 CFPlus::UI::harmonize \@req; 1853 DC::UI::harmonize \@req;
1893 1854
1894 my $pos = 0; 1855 my $pos = 0;
1895 for (0 .. $#children) { 1856 for (0 .. $#children) {
1896 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1897 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1902 1 1863 1
1903} 1864}
1904 1865
1905############################################################################# 1866#############################################################################
1906 1867
1907package CFPlus::UI::HBox; 1868package DC::UI::HBox;
1908 1869
1909our @ISA = CFPlus::UI::Box::; 1870our @ISA = DC::UI::Box::;
1910 1871
1911sub new { 1872sub new {
1912 my $class = shift; 1873 my $class = shift;
1913 1874
1914 $class->SUPER::new ( 1875 $class->SUPER::new (
… …
1917 ) 1878 )
1918} 1879}
1919 1880
1920############################################################################# 1881#############################################################################
1921 1882
1922package CFPlus::UI::VBox; 1883package DC::UI::VBox;
1923 1884
1924our @ISA = CFPlus::UI::Box::; 1885our @ISA = DC::UI::Box::;
1925 1886
1926sub new { 1887sub new {
1927 my $class = shift; 1888 my $class = shift;
1928 1889
1929 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1932 ) 1893 )
1933} 1894}
1934 1895
1935############################################################################# 1896#############################################################################
1936 1897
1937package CFPlus::UI::Label; 1898package DC::UI::Label;
1938 1899
1939our @ISA = CFPlus::UI::DrawBG::; 1900our @ISA = DC::UI::DrawBG::;
1940 1901
1941use CFPlus::OpenGL; 1902use DC::OpenGL;
1942 1903
1943sub new { 1904sub new {
1944 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1945 1906
1946 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
… …
1951 #text => initial text 1912 #text => initial text
1952 #markup => initial narkup 1913 #markup => initial narkup
1953 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1954 #style => 0, # render flags 1915 #style => 0, # render flags
1955 ellipsise => 3, # end 1916 ellipsise => 3, # end
1956 layout => (new CFPlus::Layout), 1917 layout => (new DC::Layout),
1957 fontsize => 1, 1918 fontsize => 1,
1958 align => -1, 1919 align => 0.5,
1959 valign => -1, 1920 valign => 0.5,
1960 padding_x => 2, 1921 padding_x => 4,
1961 padding_y => 2, 1922 padding_y => 2,
1962 can_events => 0, 1923 can_events => 0,
1963 %arg 1924 %arg
1964 ); 1925 );
1965 1926
1966 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1967 my $layout = new CFPlus::Layout; 1928 my $layout = new DC::Layout;
1968 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1969 $self->{template} = $layout; 1930 $self->{template} = $layout;
1970 } 1931 }
1971 1932
1972 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
… …
1990 1951
1991 delete $self->{ox}; 1952 delete $self->{ox};
1992 $self->SUPER::realloc; 1953 $self->SUPER::realloc;
1993} 1954}
1994 1955
1956sub clear {
1957 my ($self) = @_;
1958
1959 $self->set_text ("");
1960}
1961
1995sub set_text { 1962sub set_text {
1996 my ($self, $text) = @_; 1963 my ($self, $text) = @_;
1997 1964
1998 return if $self->{text} eq "T$text"; 1965 return if $self->{text} eq "T$text";
1999 $self->{text} = "T$text"; 1966 $self->{text} = "T$text";
… …
2022 1989
2023sub size_request { 1990sub size_request {
2024 my ($self) = @_; 1991 my ($self) = @_;
2025 1992
2026 $self->{size_req} ||= do { 1993 $self->{size_req} ||= do {
1994 my $max_w = $self->{w} || $self->{max_w} || $::WIDTH || 0x0fffffff; # actually 2**31-1 but allow for overflow inside pango
1995
2027 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1996 $self->{layout}->set_font ($self->{font}) if $self->{font};
2028 $self->{layout}->set_width ($self->{max_w} || -1); 1997 $self->{layout}->set_width ($max_w);
2029 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1998 $self->{layout}->set_ellipsise ($self->{ellipsise});
2030 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1999 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2031 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2000 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2032 2001
2033 my ($w, $h) = $self->{layout}->size; 2002 my ($w, $h) = $self->{layout}->size;
2034 2003
2035 if (exists $self->{template}) { 2004 if (exists $self->{template}) {
2036 $self->{template}->set_font ($self->{font}) if $self->{font}; 2005 $self->{template}->set_font ($self->{font}) if $self->{font};
2037 $self->{template}->set_width ($self->{max_w} || -1); 2006 $self->{template}->set_width ($max_w);
2038 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2007 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2039 2008
2040 my ($w2, $h2) = $self->{template}->size; 2009 my ($w2, $h2) = $self->{template}->size;
2041 2010
2042 $w = List::Util::max $w, $w2; 2011 $w = List::Util::max $w, $w2;
… …
2098 2067
2099 [$self->{layout}->size] 2068 [$self->{layout}->size]
2100 }; 2069 };
2101 2070
2102 unless (exists $self->{ox}) { 2071 unless (exists $self->{ox}) {
2103 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2072 $self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2104 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 2073 $self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2105 : ($self->{w} - $size->[0]) * 0.5);
2106 2074
2107 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2075 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2108 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2109 : ($self->{h} - $size->[1]) * 0.5);
2110 }; 2076 };
2111 2077
2112 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2078# unless ($self->{list}) {
2113 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2079# $self->{list} = DC::OpenGL::glGenList;
2114 2080# DC::OpenGL::glNewList $self->{list};
2115 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2081# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2082# DC::OpenGL::glEndList;
2083# }
2084#
2085# DC::OpenGL::glCallList $self->{list};
2086
2087 $self->{layout}->draw;
2116} 2088}
2089
2090#sub destroy {
2091# my ($self) = @_;
2092#
2093# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2094#
2095# $self->SUPER::destroy;
2096#}
2117 2097
2118############################################################################# 2098#############################################################################
2119 2099
2120package CFPlus::UI::EntryBase; 2100package DC::UI::EntryBase;
2121 2101
2122our @ISA = CFPlus::UI::Label::; 2102our @ISA = DC::UI::Label::;
2123 2103
2124use CFPlus::OpenGL; 2104use DC::OpenGL;
2125 2105
2126sub new { 2106sub new {
2127 my $class = shift; 2107 my $class = shift;
2128 2108
2129 $class->SUPER::new ( 2109 $class->SUPER::new (
2130 fg => [1, 1, 1], 2110 fg => [1, 1, 1],
2131 bg => [0, 0, 0, 0.2], 2111 bg => [0, 0, 0, 0.2],
2112 outline => undef,
2132 active_bg => [1, 1, 1, 0.5], 2113 active_bg => [0, 0, 1, .2],
2133 active_fg => [0, 0, 0], 2114 active_fg => [1, 1, 1],
2115 active_outline => [1, 1, 0],
2134 can_hover => 1, 2116 can_hover => 1,
2135 can_focus => 1, 2117 can_focus => 1,
2118 align => 0,
2136 valign => 0, 2119 valign => 0.5,
2137 can_events => 1, 2120 can_events => 1,
2138 ellipsise => 0, 2121 ellipsise => 0,
2122 padding_x => 4,
2123 padding_y => 2,
2139 #text => ... 2124 #text => ...
2140 #hidden => "*", 2125 #hidden => "*",
2141 @_ 2126 @_
2142 ) 2127 )
2143} 2128}
… …
2190 2175
2191 my $text = $self->get_text; 2176 my $text = $self->get_text;
2192 2177
2193 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text; 2178 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2194 2179
2195 if ($uni == 8) { 2180 if ($sym == DC::SDLK_BACKSPACE) {
2196 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2181 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2197 } elsif ($uni == 127) { 2182 } elsif ($sym == DC::SDLK_DELETE) {
2198 substr $text, $self->{cursor}, 1, ""; 2183 substr $text, $self->{cursor}, 1, "";
2199 } elsif ($sym == CFPlus::SDLK_LEFT) { 2184 } elsif ($sym == DC::SDLK_LEFT) {
2200 --$self->{cursor} if $self->{cursor}; 2185 --$self->{cursor} if $self->{cursor};
2201 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2186 } elsif ($sym == DC::SDLK_RIGHT) {
2202 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2187 ++$self->{cursor} if $self->{cursor} < length $self->{text};
2203 } elsif ($sym == CFPlus::SDLK_HOME) { 2188 } elsif ($sym == DC::SDLK_HOME) {
2204 # what a hack 2189 # what a hack
2205 $self->{cursor} = 2190 $self->{cursor} =
2206 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/ 2191 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2207 ? length $1 2192 ? length $1
2208 : 0; 2193 : 0;
2209 } elsif ($sym == CFPlus::SDLK_END) { 2194 } elsif ($sym == DC::SDLK_END) {
2210 # uh, again 2195 # uh, again
2211 $self->{cursor} = 2196 $self->{cursor} =
2212 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/ 2197 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2213 ? $self->{cursor} + length $1 2198 ? $self->{cursor} + length $1
2214 : length $self->{text}; 2199 : length $self->{text};
… …
2253 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text; 2238 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
2254 $self->{cursor} = length $text; 2239 $self->{cursor} = length $text;
2255 2240
2256 $self->_set_text ($self->{text}); 2241 $self->_set_text ($self->{text});
2257 $self->update; 2242 $self->update;
2258 2243
2259 1 2244 1
2260} 2245}
2261 2246
2262sub invoke_mouse_motion { 2247sub invoke_mouse_motion {
2263 my ($self, $ev, $x, $y) = @_; 2248 my ($self, $ev, $x, $y) = @_;
… …
2278 glColor_premultiply @{$self->{bg}}; 2263 glColor_premultiply @{$self->{bg}};
2279 } 2264 }
2280 2265
2281 glEnable GL_BLEND; 2266 glEnable GL_BLEND;
2282 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2267 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2283 glBegin GL_QUADS;
2284 glVertex 0 , 0;
2285 glVertex 0 , $self->{h};
2286 glVertex $self->{w}, $self->{h}; 2268 glRect 0, 0, $self->{w}, $self->{h};
2287 glVertex $self->{w}, 0;
2288 glEnd;
2289 glDisable GL_BLEND; 2269 glDisable GL_BLEND;
2290 2270
2291 $self->SUPER::_draw; 2271 $self->SUPER::_draw;
2292 2272
2293 #TODO: force update every cursor change :( 2273 #TODO: force update every cursor change :(
… …
2295 2275
2296 unless (exists $self->{cur_h}) { 2276 unless (exists $self->{cur_h}) {
2297 my $text = substr $self->{text}, 0, $self->{cursor}; 2277 my $text = substr $self->{text}, 0, $self->{cursor};
2298 utf8::encode $text; 2278 utf8::encode $text;
2299 2279
2300 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2280 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2301 } 2281 }
2302 2282
2283 glColor_premultiply @{$self->{active_fg}};
2303 glBegin GL_LINES; 2284 glBegin GL_LINES;
2304 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2285 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2305 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2286 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2306 glEnd; 2287 glEnd;
2288
2289 glLineWidth 3;
2290 glColor @{$self->{active_outline}};
2291 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2292 glLineWidth 1;
2293
2294 } else {
2295 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2296 glBegin GL_LINE_STRIP;
2297 glVertex .5, $self->{h} * .5;
2298 glVertex .5, $self->{h} - 2.5;
2299 glVertex $self->{w} - .5, $self->{h} - 2.5;
2300 glVertex $self->{w} - .5, $self->{h} * .5;
2301 glEnd;
2307 } 2302 }
2308} 2303}
2309 2304
2310############################################################################# 2305#############################################################################
2311 2306
2312package CFPlus::UI::Entry; 2307package DC::UI::Entry;
2313 2308
2314our @ISA = CFPlus::UI::EntryBase::; 2309our @ISA = DC::UI::EntryBase::;
2315 2310
2316use CFPlus::OpenGL; 2311use DC::OpenGL;
2312
2313sub new {
2314 my $class = shift;
2315
2316 $class->SUPER::new (
2317 history_pointer => -1,
2318 @_
2319 )
2320}
2321
2317 2322
2318sub invoke_key_down { 2323sub invoke_key_down {
2319 my ($self, $ev) = @_; 2324 my ($self, $ev) = @_;
2320 2325
2321 my $sym = $ev->{sym}; 2326 my $sym = $ev->{sym};
… …
2327 $self->{history_pointer} = -1; 2332 $self->{history_pointer} = -1;
2328 $self->{history_saveback} = ''; 2333 $self->{history_saveback} = '';
2329 $self->emit (activate => $txt); 2334 $self->emit (activate => $txt);
2330 $self->update; 2335 $self->update;
2331 2336
2332 } elsif ($sym == CFPlus::SDLK_UP) { 2337 } elsif ($sym == DC::SDLK_UP) {
2333 if ($self->{history_pointer} < 0) { 2338 if ($self->{history_pointer} < 0) {
2334 $self->{history_saveback} = $self->get_text; 2339 $self->{history_saveback} = $self->get_text;
2335 } 2340 }
2336 if (@{$self->{history} || []} > 0) { 2341 if (@{$self->{history} || []} > 0) {
2337 $self->{history_pointer}++; 2342 $self->{history_pointer}++;
… …
2339 $self->{history_pointer} = @{$self->{history} || []} - 1; 2344 $self->{history_pointer} = @{$self->{history} || []} - 1;
2340 } 2345 }
2341 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2346 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2342 } 2347 }
2343 2348
2344 } elsif ($sym == CFPlus::SDLK_DOWN) { 2349 } elsif ($sym == DC::SDLK_DOWN) {
2345 $self->{history_pointer}--; 2350 $self->{history_pointer}--;
2346 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2351 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2347 2352
2348 if ($self->{history_pointer} >= 0) { 2353 if ($self->{history_pointer} >= 0) {
2349 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2354 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2350 } else { 2355 } else {
2356 if (defined $self->{history_saveback}) {
2351 $self->set_text ($self->{history_saveback}); 2357 $self->set_text ($self->{history_saveback});
2358 $self->{history_saveback} = undef;
2359 }
2352 } 2360 }
2353 2361
2354 } else { 2362 } else {
2355 return $self->SUPER::invoke_key_down ($ev) 2363 return $self->SUPER::invoke_key_down ($ev)
2356 } 2364 }
… …
2358 1 2366 1
2359} 2367}
2360 2368
2361############################################################################# 2369#############################################################################
2362 2370
2363package CFPlus::UI::TextEdit; 2371package DC::UI::TextEdit;
2364 2372
2365our @ISA = CFPlus::UI::EntryBase::; 2373our @ISA = DC::UI::EntryBase::;
2366 2374
2367use CFPlus::OpenGL; 2375use DC::OpenGL;
2376
2377sub new {
2378 my $class = shift;
2379
2380 $class->SUPER::new (
2381 padding_y => 4,
2382
2383 @_
2384 )
2385}
2368 2386
2369sub move_cursor_ver { 2387sub move_cursor_ver {
2370 my ($self, $dy) = @_; 2388 my ($self, $dy) = @_;
2371 2389
2372 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2390 my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2373 2391
2374 $y += $dy; 2392 $line += $dy;
2375 2393
2376 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) { 2394 if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2377 $self->{cursor} = $index; 2395 $self->{cursor} = $index;
2378 delete $self->{cur_h}; 2396 delete $self->{cur_h};
2379 $self->update; 2397 $self->update;
2380 return; 2398 return;
2381 } 2399 }
… …
2384sub invoke_key_down { 2402sub invoke_key_down {
2385 my ($self, $ev) = @_; 2403 my ($self, $ev) = @_;
2386 2404
2387 my $sym = $ev->{sym}; 2405 my $sym = $ev->{sym};
2388 2406
2389 if ($sym == CFPlus::SDLK_UP) { 2407 if ($sym == DC::SDLK_UP) {
2390 $self->move_cursor_ver (-1); 2408 $self->move_cursor_ver (-1);
2391 } elsif ($sym == CFPlus::SDLK_DOWN) { 2409 } elsif ($sym == DC::SDLK_DOWN) {
2392 $self->move_cursor_ver (+1); 2410 $self->move_cursor_ver (+1);
2393 } else { 2411 } else {
2394 return $self->SUPER::invoke_key_down ($ev) 2412 return $self->SUPER::invoke_key_down ($ev)
2395 } 2413 }
2396 2414
2397 1 2415 1
2398} 2416}
2399 2417
2400############################################################################# 2418#############################################################################
2401 2419
2402package CFPlus::UI::Button; 2420package DC::UI::ButtonBin;
2403 2421
2404our @ISA = CFPlus::UI::Label::; 2422our @ISA = DC::UI::Bin::;
2405 2423
2406use CFPlus::OpenGL; 2424use DC::OpenGL;
2407 2425
2408my @tex = 2426my @tex =
2409 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2427 map { new_from_resource DC::Texture $_, mipmap => 1 }
2410 qw(b1_button_inactive.png b1_button_active.png); 2428 qw(b1_button_inactive.png b1_button_active.png);
2411 2429
2412sub new { 2430sub new {
2413 my $class = shift; 2431 my $class = shift;
2414 2432
2415 $class->SUPER::new ( 2433 $class->SUPER::new (
2434 can_hover => 1,
2435 align => 0.5,
2436 valign => 0.5,
2437 can_events => 1,
2438 @_
2439 )
2440}
2441
2442sub invoke_button_up {
2443 my ($self, $ev, $x, $y) = @_;
2444
2445 $self->emit ("activate")
2446 if $x >= 0 && $x < $self->{w}
2447 && $y >= 0 && $y < $self->{h};
2448
2449 1
2450}
2451
2452sub _draw {
2453 my ($self) = @_;
2454
2455 glEnable GL_TEXTURE_2D;
2456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2457 glColor 0, 0, 0, 1;
2458
2459 my $tex = $tex[$GRAB == $self];
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461
2462 glDisable GL_TEXTURE_2D;
2463
2464 $self->SUPER::_draw;
2465}
2466
2467#############################################################################
2468
2469package DC::UI::Button;
2470
2471our @ISA = DC::UI::Label::;
2472
2473use DC::OpenGL;
2474
2475my @tex =
2476 map { new_from_resource DC::Texture $_, mipmap => 1 }
2477 qw(b1_button_inactive.png b1_button_active.png);
2478
2479sub new {
2480 my $class = shift;
2481
2482 $class->SUPER::new (
2416 padding_x => 4, 2483 padding_x => 8,
2417 padding_y => 4, 2484 padding_y => 4,
2418 fg => [1.0, 1.0, 1.0], 2485 fg => [1.0, 1.0, 1.0],
2419 active_fg => [0.8, 0.8, 0.8], 2486 active_fg => [0.8, 0.8, 0.8],
2420 can_hover => 1, 2487 can_hover => 1,
2421 align => 0, 2488 align => 0.5,
2422 valign => 0, 2489 valign => 0.5,
2423 can_events => 1, 2490 can_events => 1,
2424 @_ 2491 @_
2425 ) 2492 )
2426} 2493}
2427 2494
… …
2452 $self->SUPER::_draw; 2519 $self->SUPER::_draw;
2453} 2520}
2454 2521
2455############################################################################# 2522#############################################################################
2456 2523
2457package CFPlus::UI::CheckBox; 2524package DC::UI::CheckBox;
2458 2525
2459our @ISA = CFPlus::UI::DrawBG::; 2526our @ISA = DC::UI::DrawBG::;
2460 2527
2461my @tex = 2528my @tex =
2462 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2529 map { new_from_resource DC::Texture $_, mipmap => 1 }
2463 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2530 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2464 2531
2465use CFPlus::OpenGL; 2532use DC::OpenGL;
2466 2533
2467sub new { 2534sub new {
2468 my $class = shift; 2535 my $class = shift;
2469 2536
2470 $class->SUPER::new ( 2537 $class->SUPER::new (
2538 fontsize => 1,
2471 padding_x => 2, 2539 padding_x => 2,
2472 padding_y => 2, 2540 padding_y => 2,
2473 fg => [1, 1, 1], 2541 fg => [1, 1, 1],
2474 active_fg => [1, 1, 0], 2542 active_fg => [1, 1, 0],
2475 bg => [0, 0, 0, 0.2], 2543 bg => [0, 0, 0, 0.2],
… …
2481} 2549}
2482 2550
2483sub size_request { 2551sub size_request {
2484 my ($self) = @_; 2552 my ($self) = @_;
2485 2553
2486 (6) x 2 2554 ($self->{fontsize} * $::FONTSIZE) x 2
2487} 2555}
2488 2556
2489sub toggle { 2557sub toggle {
2490 my ($self) = @_; 2558 my ($self) = @_;
2491 2559
… …
2510sub _draw { 2578sub _draw {
2511 my ($self) = @_; 2579 my ($self) = @_;
2512 2580
2513 $self->SUPER::_draw; 2581 $self->SUPER::_draw;
2514 2582
2515 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2583 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2516 2584
2517 my ($w, $h) = @$self{qw(w h)}; 2585 my ($w, $h) = @$self{qw(w h)};
2518 2586
2519 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2587 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2520 2588
… …
2527 glDisable GL_TEXTURE_2D; 2595 glDisable GL_TEXTURE_2D;
2528} 2596}
2529 2597
2530############################################################################# 2598#############################################################################
2531 2599
2532package CFPlus::UI::Image; 2600package DC::UI::Image;
2533 2601
2534our @ISA = CFPlus::UI::Base::; 2602our @ISA = DC::UI::DrawBG::;
2535 2603
2536use CFPlus::OpenGL; 2604use DC::OpenGL;
2537 2605
2538our %texture_cache; 2606our %texture_cache;
2539 2607
2540sub new { 2608sub new {
2541 my $class = shift; 2609 my $class = shift;
2542 2610
2543 my $self = $class->SUPER::new ( 2611 my $self = $class->SUPER::new (
2544 can_events => 0, 2612 can_events => 0,
2613 scale => 1,
2545 @_, 2614 @_,
2546 ); 2615 );
2547 2616
2548 $self->{path} || $self->{tex} 2617 $self->{path} || $self->{tex}
2549 or Carp::croak "'path' or 'tex' attributes required"; 2618 or Carp::croak "'path' or 'tex' attributes required";
2550 2619
2551 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2620 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2552 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2621 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2553 2622
2554 CFPlus::weaken $texture_cache{$self->{path}}; 2623 DC::weaken $texture_cache{$self->{path}};
2555 2624
2556 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2625 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2557 2626
2558 $self 2627 $self
2559} 2628}
2560 2629
2561sub STORABLE_freeze { 2630sub STORABLE_freeze {
2562 my ($self, $cloning) = @_; 2631 my ($self, $cloning) = @_;
2563 2632
2564 $self->{path} 2633 $self->{path}
2565 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n"; 2634 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2566 2635
2567 $self->{path} 2636 $self->{path}
2568} 2637}
2569 2638
2570sub STORABLE_attach { 2639sub STORABLE_attach {
2571 my ($self, $cloning, $path) = @_; 2640 my ($self, $cloning, $path) = @_;
2572 2641
2573 $self->new (path => $path) 2642 $self->new (path => $path)
2574} 2643}
2575 2644
2645sub set_texture {
2646 my ($self, $tex) = @_;
2647
2648 $self->{tex} = $tex;
2649 $self->update;
2650}
2651
2576sub size_request { 2652sub size_request {
2577 my ($self) = @_; 2653 my ($self) = @_;
2578 2654
2579 ($self->{tex}{w}, $self->{tex}{h}) 2655 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2580} 2656}
2581 2657
2582sub _draw { 2658sub _draw {
2583 my ($self) = @_; 2659 my ($self) = @_;
2660
2661 $self->SUPER::_draw;
2584 2662
2585 my $tex = $self->{tex}; 2663 my $tex = $self->{tex};
2586 2664
2587 my ($w, $h) = ($self->{w}, $self->{h}); 2665 my ($w, $h) = ($self->{w}, $self->{h});
2588 2666
… …
2594 } 2672 }
2595 2673
2596 glEnable GL_TEXTURE_2D; 2674 glEnable GL_TEXTURE_2D;
2597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2598 2676
2599 $tex->draw_quad (0, 0, $w, $h); 2677 $tex->draw_quad_alpha (0, 0, $w, $h);
2600 2678
2601 glDisable GL_TEXTURE_2D; 2679 glDisable GL_TEXTURE_2D;
2602} 2680}
2603 2681
2604############################################################################# 2682#############################################################################
2605 2683
2606package CFPlus::UI::ImageButton; 2684package DC::UI::ImageButton;
2607 2685
2608our @ISA = CFPlus::UI::Image::; 2686our @ISA = DC::UI::Image::;
2609 2687
2610use CFPlus::OpenGL; 2688use DC::OpenGL;
2611
2612my %textures;
2613 2689
2614sub new { 2690sub new {
2615 my $class = shift; 2691 my $class = shift;
2616 2692
2617 my $self = $class->SUPER::new ( 2693 my $self = $class->SUPER::new (
2618 padding_x => 4, 2694 padding_x => 4,
2619 padding_y => 4, 2695 padding_y => 4,
2620 fg => [1, 1, 1], 2696 fg => [1, 1, 1],
2621 active_fg => [0, 0, 1], 2697 active_fg => [0, 0, 1],
2622 can_hover => 1, 2698 can_hover => 1,
2623 align => 0, 2699 align => 0.5,
2624 valign => 0, 2700 valign => 0.5,
2625 can_events => 1, 2701 can_events => 1,
2626 @_ 2702 @_
2627 ); 2703 );
2628} 2704}
2629 2705
2706sub invoke_button_down {
2707 my ($self, $ev, $x, $y) = @_;
2708
2709 1
2710}
2711
2630sub invoke_button_up { 2712sub invoke_button_up {
2631 my ($self, $ev, $x, $y) = @_; 2713 my ($self, $ev, $x, $y) = @_;
2632 2714
2633 $self->emit ("activate") 2715 $self->emit ("activate")
2634 if $x >= 0 && $x < $self->{w} 2716 if $x >= 0 && $x < $self->{w}
… …
2637 1 2719 1
2638} 2720}
2639 2721
2640############################################################################# 2722#############################################################################
2641 2723
2642package CFPlus::UI::VGauge; 2724package DC::UI::VGauge;
2643 2725
2644our @ISA = CFPlus::UI::Base::; 2726our @ISA = DC::UI::Base::;
2645 2727
2646use List::Util qw(min max); 2728use List::Util qw(min max);
2647 2729
2648use CFPlus::OpenGL; 2730use DC::OpenGL;
2649 2731
2650my %tex = ( 2732my %tex = (
2651 food => [ 2733 food => [
2652 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2734 map { new_from_resource DC::Texture $_, mipmap => 1 }
2653 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2735 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2654 ], 2736 ],
2655 grace => [ 2737 grace => [
2656 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2738 map { new_from_resource DC::Texture $_, mipmap => 1 }
2657 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2739 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2658 ], 2740 ],
2659 hp => [ 2741 hp => [
2660 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2742 map { new_from_resource DC::Texture $_, mipmap => 1 }
2661 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2743 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2662 ], 2744 ],
2663 mana => [ 2745 mana => [
2664 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2746 map { new_from_resource DC::Texture $_, mipmap => 1 }
2665 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2747 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2666 ], 2748 ],
2667); 2749);
2668 2750
2669# eg. VGauge->new (gauge => 'food'), default gauge: food 2751# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2772 glDisable GL_TEXTURE_2D; 2854 glDisable GL_TEXTURE_2D;
2773} 2855}
2774 2856
2775############################################################################# 2857#############################################################################
2776 2858
2859package DC::UI::Progress;
2860
2861our @ISA = DC::UI::Label::;
2862
2863use DC::OpenGL;
2864
2865sub new {
2866 my ($class, %arg) = @_;
2867
2868 my $self = $class->SUPER::new (
2869 padding_x => 2,
2870 padding_y => 2,
2871 fg => [1, 1, 1],
2872 bg => [0, 0, 1, 0.2],
2873 bar => [0.7, 0.5, 0.1, 0.8],
2874 outline => [0.4, 0.3, 0],
2875 fontsize => 0.9,
2876 valign => 0.5,
2877 align => 0.5,
2878 can_events => 1,
2879 ellipsise => 1,
2880 label => "%d%%",
2881 %arg,
2882 );
2883
2884 $self->set_value ($arg{value} || -1);
2885
2886 $self
2887}
2888
2889sub set_label {
2890 my ($self, $label) = @_;
2891
2892 return if $self->{label} eq $label;
2893 $self->{label} = $label;
2894
2895 $self->DC::UI::Progress::set_value (0 + delete $self->{value});
2896}
2897
2898sub set_value {
2899 my ($self, $value) = @_;
2900
2901 if ($self->{value} ne $value) {
2902 $self->{value} = $value;
2903
2904 if ($value < 0) {
2905 $self->set_text ("-");
2906 } else {
2907 $self->set_text (sprintf $self->{label}, $value * 100);
2908 }
2909
2910 $self->update;
2911 }
2912}
2913
2914sub _draw {
2915 my ($self) = @_;
2916
2917 glEnable GL_BLEND;
2918 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2919
2920 my $px = $self->{padding_x};
2921 my $py = $self->{padding_y};
2922
2923 if ($self->{value} >= 0) {
2924 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2925
2926 glColor_premultiply @{$self->{bar}};
2927 glRect $px, $py, $s, $self->{h} - $py;
2928 glColor_premultiply @{$self->{bg}};
2929 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2930 }
2931
2932 glColor_premultiply @{$self->{outline}};
2933
2934 $px -= .5;
2935 $py -= .5;
2936
2937 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2938
2939 glDisable GL_BLEND;
2940
2941 {
2942 local $self->{bg}; # do not draw background
2943 $self->SUPER::_draw;
2944 }
2945}
2946
2947#############################################################################
2948
2949package DC::UI::ExperienceProgress;
2950
2951our @ISA = DC::UI::Progress::;
2952
2953sub new {
2954 my ($class, %arg) = @_;
2955
2956 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2957
2958 my $self = $class->SUPER::new (
2959 %arg,
2960 tooltip => sub {
2961 my ($self) = @_;
2962
2963 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2964 $tt,
2965 $self->{lvl},
2966 ::formsep ($self->{exp}),
2967 ::formsep ($self->{nxt}),
2968 ::formsep ($self->{nxt} - $self->{exp}),
2969 $self->_percent * 100,
2970 },
2971 );
2972
2973 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2974 if $::CONN;
2975
2976 $self
2977}
2978
2979sub DESTROY {
2980 my ($self) = @_;
2981
2982 delete $::CONN->{on_exp_update}{$self+0}
2983 if $::CONN;
2984
2985 $self->SUPER::DESTROY;
2986}
2987
2988sub _percent {
2989 my ($self) = @_;
2990
2991 my $table = $::CONN && $::CONN->{exp_table}
2992 or return -1;
2993
2994 my $l0 = $table->[$self->{lvl} - 1];
2995 my $l1 = $table->[$self->{lvl}];
2996
2997 $self->{nxt} = $l1;
2998
2999 ($self->{exp} - $l0) / ($l1 - $l0)
3000}
3001
3002sub set_value {
3003 my ($self, $lvl, $exp) = @_;
3004
3005 $self->{lvl} = $lvl;
3006 $self->{exp} = $exp;
3007
3008 $self->SUPER::set_value ($self->_percent);
3009}
3010
3011#############################################################################
3012
2777package CFPlus::UI::Gauge; 3013package DC::UI::Gauge;
2778 3014
2779our @ISA = CFPlus::UI::VBox::; 3015our @ISA = DC::UI::VBox::;
2780 3016
2781sub new { 3017sub new {
2782 my ($class, %arg) = @_; 3018 my ($class, %arg) = @_;
2783 3019
2784 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
… …
2786 can_hover => 1, 3022 can_hover => 1,
2787 can_events => 1, 3023 can_events => 1,
2788 %arg, 3024 %arg,
2789 ); 3025 );
2790 3026
2791 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999"); 3027 $self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2792 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 3028 $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2793 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999"); 3029 $self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2794 3030
2795 $self 3031 $self
2796} 3032}
2797 3033
2798sub set_fontsize { 3034sub set_fontsize {
… …
2819 $self->{value}->set_text ($val); 3055 $self->{value}->set_text ($val);
2820} 3056}
2821 3057
2822############################################################################# 3058#############################################################################
2823 3059
2824package CFPlus::UI::Slider; 3060package DC::UI::Slider;
2825 3061
2826use strict; 3062use common::sense;
2827 3063
2828use CFPlus::OpenGL; 3064use DC::OpenGL;
2829 3065
2830our @ISA = CFPlus::UI::DrawBG::; 3066our @ISA = DC::UI::DrawBG::;
2831 3067
2832my @tex = 3068my @tex =
2833 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ } 3069 map { new_from_resource DC::Texture $_ }
2834 qw(s1_slider.png s1_slider_bg.png); 3070 qw(s1_slider.png s1_slider_bg.png);
2835 3071
2836sub new { 3072sub new {
2837 my $class = shift; 3073 my $class = shift;
2838 3074
… …
2875sub set_value { 3111sub set_value {
2876 my ($self, $value) = @_; 3112 my ($self, $value) = @_;
2877 3113
2878 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3114 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2879 3115
2880 $hi = $lo + 1 if $hi <= $lo; 3116 $hi = $lo if $hi < $lo;
2881 3117
2882 $page = $hi - $lo if $page > $hi - $lo; 3118 $value = $hi - $page if $value > $hi - $page;
2883
2884 $value = $lo if $value < $lo; 3119 $value = $lo if $value < $lo;
2885 $value = $hi - $page if $value > $hi - $page;
2886 3120
2887 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3121 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2888 if $unit; 3122 if $unit;
2889 3123
2890 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3124 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2905 my ($self, $ev, $x, $y) = @_; 3139 my ($self, $ev, $x, $y) = @_;
2906 3140
2907 $self->SUPER::invoke_button_down ($ev, $x, $y); 3141 $self->SUPER::invoke_button_down ($ev, $x, $y);
2908 3142
2909 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3143 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2910 3144
2911 $self->invoke_mouse_motion ($ev, $x, $y) 3145 $self->invoke_mouse_motion ($ev, $x, $y);
3146
3147 1
2912} 3148}
2913 3149
2914sub invoke_mouse_motion { 3150sub invoke_mouse_motion {
2915 my ($self, $ev, $x, $y) = @_; 3151 my ($self, $ev, $x, $y) = @_;
2916 3152
2917 if ($GRAB == $self) { 3153 if ($GRAB == $self) {
2918 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3154 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2919 3155
2920 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3156 my (undef, $lo, $hi, $page) = @{$self->{range}};
2921 3157
2922 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3158 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2923 3159
2924 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3160 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2925 } else { 3161 } else {
2926 return 0; 3162 return 0;
2927 } 3163 }
… …
2932sub invoke_mouse_wheel { 3168sub invoke_mouse_wheel {
2933 my ($self, $ev) = @_; 3169 my ($self, $ev) = @_;
2934 3170
2935 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 3171 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2936 3172
2937 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3173 my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2938 3174
2939 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3175 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2940 3176
2941 ! ! $delta 3177 1
2942} 3178}
2943 3179
2944sub update { 3180sub update {
2945 my ($self) = @_; 3181 my ($self) = @_;
2946 3182
… …
2952 my ($self) = @_; 3188 my ($self) = @_;
2953 3189
2954 unless ($self->{knob_w}) { 3190 unless ($self->{knob_w}) {
2955 $self->set_value ($self->{range}[0]); 3191 $self->set_value ($self->{range}[0]);
2956 3192
2957 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3193 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2958 my $range = ($hi - $page - $lo) || 1e-100; 3194 my $range = ($hi - $page - $lo) || 1e-10;
2959 3195
2960 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3196 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2961 3197
2962 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3198 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2963 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3199 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2964 3200
2965 $value = ($value - $lo) / $range; 3201 $value = ($value - $lo) / $range;
… …
2973 3209
2974 glScale $self->{w}, $self->{h}; 3210 glScale $self->{w}, $self->{h};
2975 3211
2976 if ($self->{vertical}) { 3212 if ($self->{vertical}) {
2977 # draw a vertical slider like a rotated horizontal slider 3213 # draw a vertical slider like a rotated horizontal slider
2978 3214
2979 glTranslate 1, 0, 0; 3215 glTranslate 1, 0, 0;
2980 glRotate 90, 0, 0, 1; 3216 glRotate 90, 0, 0, 1;
2981 } 3217 }
2982 3218
2983 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 3219 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
… …
2995 glDisable GL_TEXTURE_2D; 3231 glDisable GL_TEXTURE_2D;
2996} 3232}
2997 3233
2998############################################################################# 3234#############################################################################
2999 3235
3000package CFPlus::UI::ValSlider; 3236package DC::UI::ValSlider;
3001 3237
3002our @ISA = CFPlus::UI::HBox::; 3238our @ISA = DC::UI::HBox::;
3003 3239
3004sub new { 3240sub new {
3005 my ($class, %arg) = @_; 3241 my ($class, %arg) = @_;
3006 3242
3007 my $range = delete $arg{range}; 3243 my $range = delete $arg{range};
3008 3244
3009 my $self = $class->SUPER::new ( 3245 my $self = $class->SUPER::new (
3010 slider => (new CFPlus::UI::Slider expand => 1, range => $range), 3246 slider => (new DC::UI::Slider expand => 1, range => $range),
3011 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}), 3247 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3012 to_value => sub { shift }, 3248 to_value => sub { shift },
3013 from_value => sub { shift }, 3249 from_value => sub { shift },
3014 %arg, 3250 %arg,
3015 ); 3251 );
3016 3252
… …
3036sub set_range { shift->{slider}->set_range (@_) } 3272sub set_range { shift->{slider}->set_range (@_) }
3037sub set_value { shift->{slider}->set_value (@_) } 3273sub set_value { shift->{slider}->set_value (@_) }
3038 3274
3039############################################################################# 3275#############################################################################
3040 3276
3041package CFPlus::UI::TextScroller; 3277package DC::UI::TextScroller;
3042 3278
3043our @ISA = CFPlus::UI::HBox::; 3279our @ISA = DC::UI::HBox::;
3044 3280
3045use CFPlus::OpenGL; 3281use DC::OpenGL;
3046 3282
3047sub new { 3283sub new {
3048 my $class = shift; 3284 my $class = shift;
3049 3285
3050 my $self = $class->SUPER::new ( 3286 my $self = $class->SUPER::new (
3051 fontsize => 1, 3287 fontsize => 1,
3052 can_events => 1, 3288 can_events => 1,
3053 indent => 0, 3289 indent => 0,
3054 #font => default_font 3290 #font => default_font
3055 @_, 3291 @_,
3056 3292
3057 layout => (new CFPlus::Layout), 3293 layout => (new DC::Layout),
3058 par => [],
3059 max_par => 0, 3294 max_par => 0,
3060 height => 0, 3295 height => 0,
3061 children => [ 3296 children => [
3062 (new CFPlus::UI::Empty expand => 1), 3297 (new DC::UI::Empty expand => 1),
3063 (new CFPlus::UI::Slider vertical => 1), 3298 (new DC::UI::Slider vertical => 1),
3064 ], 3299 ],
3065 ); 3300 );
3066 3301
3067 $self->{children}[1]->connect (changed => sub { $self->update }); 3302 $self->{children}[1]->connect (changed => sub { $self->update });
3068 3303
3304 $self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3305
3069 $self 3306 $self
3070} 3307}
3071 3308
3072sub set_fontsize { 3309sub set_fontsize {
3073 my ($self, $fontsize) = @_; 3310 my ($self, $fontsize) = @_;
… …
3077} 3314}
3078 3315
3079sub size_request { 3316sub size_request {
3080 my ($self) = @_; 3317 my ($self) = @_;
3081 3318
3082 my ($empty, $slider) = @{ $self->{children} }; 3319 my ($empty, $slider) = $self->visible_children;
3083 3320
3084 local $self->{children} = [$empty, $slider]; 3321 local $self->{children} = [$empty, $slider];
3085 $self->SUPER::size_request 3322 $self->SUPER::size_request
3086} 3323}
3087 3324
… …
3124 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3361 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3125 $layout->set_markup ($para->{markup}); 3362 $layout->set_markup ($para->{markup});
3126 3363
3127 $layout->set_shapes ( 3364 $layout->set_shapes (
3128 map 3365 map
3129 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3366 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3130 @{$para->{widget}} 3367 @{$para->{widget}}
3131 ); 3368 );
3132 3369
3133 $layout 3370 $layout
3134} 3371}
… …
3251 $ROOT->on_post_alloc ($self => sub { 3488 $ROOT->on_post_alloc ($self => sub {
3252 $self->force_uptodate; 3489 $self->force_uptodate;
3253 3490
3254 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3491 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3255 3492
3256 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3493 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3257 glClearColor 0, 0, 0, 0; 3494 glClearColor 0, 0, 0, 0;
3258 glClear GL_COLOR_BUFFER_BIT; 3495 glClear GL_COLOR_BUFFER_BIT;
3259 3496
3260 package CFPlus::UI::Base; 3497 package DC::UI::Base;
3261 local ($draw_x, $draw_y, $draw_w, $draw_h) = 3498 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3262 (0, 0, $self->{w}, $self->{h}); 3499 (0, 0, $self->{w}, $self->{h});
3263 3500
3264 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
3265 3502
… …
3276 3513
3277 if ($y0 < $y + $h && $y < $y1) { 3514 if ($y0 < $y + $h && $y < $y1) {
3278 my $layout = $self->get_layout ($para); 3515 my $layout = $self->get_layout ($para);
3279 3516
3280 $layout->render ($para->{indent}, $y - $y0); 3517 $layout->render ($para->{indent}, $y - $y0);
3518 $layout->draw;
3281 3519
3282 if (my @w = @{ $para->{widget} }) { 3520 if (my @w = @{ $para->{widget} }) {
3283 my @s = $layout->get_shapes; 3521 my @s = $layout->get_shapes;
3284 3522
3285 for (@w) { 3523 for (@w) {
… …
3323 $self->{children}[1]->draw; 3561 $self->{children}[1]->draw;
3324} 3562}
3325 3563
3326############################################################################# 3564#############################################################################
3327 3565
3328package CFPlus::UI::Animator; 3566package DC::UI::Animator;
3329 3567
3330use CFPlus::OpenGL; 3568use DC::OpenGL;
3331 3569
3332our @ISA = CFPlus::UI::Bin::; 3570our @ISA = DC::UI::Bin::;
3333 3571
3334sub moveto { 3572sub moveto {
3335 my ($self, $x, $y) = @_; 3573 my ($self, $x, $y) = @_;
3336 3574
3337 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3575 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3338 $self->{speed} = 0.001; 3576 $self->{speed} = 0.001;
3339 $self->{time} = 1; 3577 $self->{time} = 1;
3340 3578
3341 ::animation_start $self; 3579 ::animation_start $self;
3342} 3580}
3343 3581
3344sub animate { 3582sub animate {
3345 my ($self, $interval) = @_; 3583 my ($self, $interval) = @_;
… …
3349 $self->{time} = 0; 3587 $self->{time} = 0;
3350 ::animation_stop $self; 3588 ::animation_stop $self;
3351 } 3589 }
3352 3590
3353 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}}; 3591 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
3354 3592
3355 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time}); 3593 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
3356 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time}); 3594 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
3357} 3595}
3358 3596
3359sub _draw { 3597sub _draw {
… …
3365 glPopMatrix; 3603 glPopMatrix;
3366} 3604}
3367 3605
3368############################################################################# 3606#############################################################################
3369 3607
3370package CFPlus::UI::Flopper; 3608package DC::UI::Flopper;
3371 3609
3372our @ISA = CFPlus::UI::Button::; 3610our @ISA = DC::UI::Button::;
3373 3611
3374sub new { 3612sub new {
3375 my $class = shift; 3613 my $class = shift;
3376 3614
3377 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
… …
3389 $self->{other}->toggle_visibility; 3627 $self->{other}->toggle_visibility;
3390} 3628}
3391 3629
3392############################################################################# 3630#############################################################################
3393 3631
3394package CFPlus::UI::Tooltip; 3632package DC::UI::Tooltip;
3395 3633
3396our @ISA = CFPlus::UI::Bin::; 3634our @ISA = DC::UI::Bin::;
3397 3635
3398use CFPlus::OpenGL; 3636use DC::OpenGL;
3399 3637
3400sub new { 3638sub new {
3401 my $class = shift; 3639 my $class = shift;
3402 3640
3403 $class->SUPER::new ( 3641 $class->SUPER::new (
3404 @_, 3642 @_,
3405 can_events => 0, 3643 can_events => 0,
3406 ) 3644 )
3407} 3645}
3408 3646
3647# expand, as good as possible
3648sub _expand_doclets {
3649 my ($tip) = @_;
3650
3651 $tip =~ s{#\(([^)]+)\)}{
3652 if ($::CONN) {
3653 exists $::CONN->{doclet}{$1}
3654 ? $::CONN->{doclet}{$1}
3655 : "(waiting for server to show full text)"
3656 } else {
3657 "(unable to show full text without server connection)"
3658 }
3659 }ge;
3660
3661 $tip =~ s/^\n+//;
3662 $tip =~ s/\n+$//;
3663
3664 $tip
3665}
3666
3667# expands a tooltip, potentially multiple times remotely
3668# and returns a guard. clals the clalback each time the text changes.
3669sub expand_tooltip {
3670 my ($tip, $cb) = @_;
3671
3672 # first expand #name tooltips from local pod
3673 $tip = DC::Pod::section_label tooltip => $1
3674 if $tip =~ /^#([^(].*)$/;
3675
3676 my $active; # true if any remote requests outstanding
3677
3678 if ($::CONN && $::CONN->{addme_success}) {
3679 # now find all doclet references
3680 for my $doclet ($tip =~ /#\(([^)]+)\)/g) {
3681 unless (exists $::CONN->{doclet}{$doclet}) {
3682 # need to ask the server
3683 # we don't try to avoid duplicate requests
3684
3685 $active = 1;
3686 $::CONN->send_exti_req (doclet => (split /\//, $doclet, 2), sub {
3687 $::CONN->{doclet}{$doclet} = DC::sanitise_cfxml $_[0];
3688 $cb->(_expand_doclets $tip) if $active;
3689 });
3690 }
3691 }
3692 }
3693
3694 $cb->(_expand_doclets $tip);
3695
3696 $active and Guard::guard { undef $active }
3697}
3698
3409sub set_tooltip_from { 3699sub set_tooltip_from {
3410 my ($self, $widget) = @_; 3700 my ($self, $widget) = @_;
3411 3701
3412 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3413 if $widget->{tooltip} =~ /^#(.*)$/;
3414
3415 my $tooltip = $widget->{tooltip}; 3702 my $tip = $widget->{tooltip};
3703 $tip = $tip->($widget) if "CODE" eq ref $tip;
3416 3704
3417 if ($ENV{CFPLUS_DEBUG} & 2) {
3418 $tooltip .= "\n\n" . (ref $widget) . "\n"
3419 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3420 . "req $widget->{req_w} $widget->{req_h}\n"
3421 . "visible $widget->{visible}";
3422 }
3423
3424 $tooltip =~ s/^\n+//;
3425 $tooltip =~ s/\n+$//;
3426
3427 $self->add (new CFPlus::UI::Label 3705 $self->add (new DC::UI::Label
3428 markup => $tooltip, 3706 fg => $DC::THEME{tooltip_fg},
3429 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3707 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3708 align => 0,
3430 fontsize => 0.8, 3709 fontsize => 0.8,
3431 style => 1, # FLAG_INVERSE 3710 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3432 ellipsise => 0, 3711 ellipsise => 0,
3433 font => ($widget->{tooltip_font} || $::FONT_PROP), 3712 font => ($widget->{tooltip_font} || $::FONT_PROP),
3434 ); 3713 );
3714
3715 $self->{tooltip_expand} = expand_tooltip $tip, sub {
3716 my ($tip) = @_;
3717
3718 if ($ENV{CFPLUS_DEBUG} & 2) {
3719 $tip .= "\n\n" . (ref $widget) . "\n"
3720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3721 . "req $widget->{req_w} $widget->{req_h}\n"
3722 . "visible $widget->{visible}";
3723 }
3724
3725 $self->{children}[0]->set_markup ($tip);
3726 };
3435} 3727}
3436 3728
3437sub size_request { 3729sub size_request {
3438 my ($self) = @_; 3730 my ($self) = @_;
3439 3731
… …
3471} 3763}
3472 3764
3473sub _draw { 3765sub _draw {
3474 my ($self) = @_; 3766 my ($self) = @_;
3475 3767
3476 glTranslate 0.375, 0.375;
3477
3478 my ($w, $h) = @$self{qw(w h)}; 3768 my ($w, $h) = @$self{qw(w h)};
3479 3769
3480 glColor 1, 0.8, 0.4; 3770 glColor @{ $DC::THEME{tooltip_bg} };
3481 glBegin GL_QUADS; 3771 glRect 0, 0, $w, $h;
3482 glVertex 0 , 0; 3772
3483 glVertex 0 , $h; 3773 glColor @{ $DC::THEME{tooltip_border} };
3484 glVertex $w, $h; 3774 glRect_lineloop .5, .5, $w + .5, $h + .5;
3485 glVertex $w, 0; 3775
3486 glEnd; 3776 glTranslate 2, 2;
3487
3488 glColor 0, 0, 0;
3489 glBegin GL_LINE_LOOP;
3490 glVertex 0 , 0;
3491 glVertex 0 , $h;
3492 glVertex $w, $h;
3493 glVertex $w, 0;
3494 glEnd;
3495
3496 glTranslate 2 - 0.375, 2 - 0.375;
3497 3777
3498 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3499} 3779}
3500 3780
3501############################################################################# 3781#############################################################################
3502 3782
3503package CFPlus::UI::Face; 3783package DC::UI::Face;
3504 3784
3505our @ISA = CFPlus::UI::DrawBG::; 3785our @ISA = DC::UI::DrawBG::;
3506 3786
3507use CFPlus::OpenGL; 3787use DC::OpenGL;
3508 3788
3509sub new { 3789sub new {
3510 my $class = shift; 3790 my $class = shift;
3511 3791
3512 my $self = $class->SUPER::new ( 3792 my $self = $class->SUPER::new (
… …
3515 aspect => 1, 3795 aspect => 1,
3516 can_events => 0, 3796 can_events => 0,
3517 @_, 3797 @_,
3518 ); 3798 );
3519 3799
3520 if ($self->{anim} && $self->{animspeed}) {
3521 CFPlus::weaken (my $widget = $self);
3522
3523 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3525 $self->{timer} = Event->timer (
3526 parked => 1,
3527 cb => sub {
3528 return unless $::CONN && $widget;
3529
3530 ++$widget->{frame};
3531 $widget->update_face;
3532 $widget->update;
3533
3534 $widget->update_timer;
3535 },
3536 );
3537
3538 $self->update_face;
3539 $self->update_timer; 3800 $self->update_anim;
3540 } 3801
3541
3542 $self 3802 $self
3543} 3803}
3544 3804
3545sub update_timer { 3805sub update_timer {
3546 my ($self) = @_; 3806 my ($self) = @_;
3547 3807
3548 return unless $self->{timer}; 3808 return unless $self->{timer};
3549 3809
3550 if ($self->{visible}) { 3810 if ($self->{visible}) {
3551 $self->{timer}->at (
3552 $self->{anim_start}
3553 + $self->{animspeed}
3554 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3555 );
3556 $self->{timer}->start; 3811 $self->{timer}->start;
3557 } else { 3812 } else {
3558 $self->{timer}->stop; 3813 $self->{timer}->stop;
3559 } 3814 }
3560} 3815}
3561 3816
3562sub update_face { 3817sub update_face {
3563 my ($self) = @_; 3818 my ($self) = @_;
3564 3819
3565 return unless $::CONN;
3566
3567 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3568 if ($anim && @$anim) {
3569 delete $self->{wait_face};
3570 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3571 }
3572 }
3573}
3574
3575sub size_request {
3576 my ($self) = @_;
3577
3578 if ($::CONN) { 3820 if ($::CONN) {
3579 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3821 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3580 if (my $tex = $::CONN->{texture}[$faceid]) { 3822 if ($anim && @$anim) {
3581 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3823 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3582 } else { 3824 delete $self->{face_change_cb};
3583 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3825
3584 $self->realloc; 3826 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3827 unless ($tex->{name} || $tex->{loading}) {
3828 $tex->upload (sub { $self->reconfigure });
3829 }
3585 }); 3830 }
3586 } 3831 }
3587 } 3832 }
3588 } 3833 }
3834}
3835
3836sub update_anim {
3837 my ($self) = @_;
3838
3839 if ($self->{anim} && $self->{animspeed}) {
3840 DC::weaken (my $widget = $self);
3841
3842 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3843 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3844 return unless $::CONN;
3845
3846 my $w = $widget
3847 or return;
3848
3849 ++$w->{frame};
3850 $w->update_face;
3851
3852 # somehow, $widget can go away
3853 $w->update;
3854 $w->update_timer;
3855 };
3856
3857 $self->update_face;
3858 $self->update_timer;
3859 } else {
3860 delete $self->{timer};
3861 }
3862}
3863
3864sub size_request {
3865 my ($self) = @_;
3866
3867 if ($::CONN) {
3868 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3869 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3870 if ($tex->{name}) {
3871 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3872 } elsif (!$tex->{loading}) {
3873 $tex->upload (sub { $self->reconfigure });
3874 }
3875 }
3876
3877 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3878 }
3879 }
3589 3880
3590 ($self->{size_w} || 8, $self->{size_h} || 8) 3881 ($self->{size_w} || 8, $self->{size_h} || 8)
3591} 3882}
3592 3883
3593sub update { 3884sub update {
… …
3596 return unless $self->{visible}; 3887 return unless $self->{visible};
3597 3888
3598 $self->SUPER::update; 3889 $self->SUPER::update;
3599} 3890}
3600 3891
3892sub set_face {
3893 my ($self, $face) = @_;
3894
3895 $self->{face} = $face;
3896 $self->reconfigure;
3897}
3898
3899sub set_anim {
3900 my ($self, $anim) = @_;
3901
3902 $self->{anim} = $anim;
3903 $self->update_anim;
3904}
3905
3906sub set_animspeed {
3907 my ($self, $animspeed) = @_;
3908
3909 $self->{animspeed} = $animspeed;
3910 $self->update_anim;
3911}
3912
3601sub invoke_visibility_change { 3913sub invoke_visibility_change {
3602 my ($self) = @_; 3914 my ($self) = @_;
3603 3915
3604 $self->update_timer; 3916 $self->update_timer;
3605 3917
… …
3607} 3919}
3608 3920
3609sub _draw { 3921sub _draw {
3610 my ($self) = @_; 3922 my ($self) = @_;
3611 3923
3612 return unless $::CONN;
3613
3614 $self->SUPER::_draw; 3924 $self->SUPER::_draw;
3615 3925
3616 my $faceid = $::CONN->{faceid}[$self->{face}] 3926 if (my $tex = $self->{tex}) {
3617 or return;
3618
3619 my $tex = $::CONN->{texture}[$faceid];
3620
3621 if ($tex) {
3622 glEnable GL_TEXTURE_2D; 3927 glEnable GL_TEXTURE_2D;
3623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3624 glColor 0, 0, 0, 1; 3929 glColor 0, 0, 0, 1;
3625 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3930 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3626 glDisable GL_TEXTURE_2D; 3931 glDisable GL_TEXTURE_2D;
… …
3636 $self->SUPER::destroy; 3941 $self->SUPER::destroy;
3637} 3942}
3638 3943
3639############################################################################# 3944#############################################################################
3640 3945
3641package CFPlus::UI::Buttonbar; 3946package DC::UI::Buttonbar;
3642 3947
3643our @ISA = CFPlus::UI::HBox::; 3948our @ISA = DC::UI::HBox::;
3644 3949
3645# TODO: should actually wrap buttons and other goodies. 3950# TODO: should actually wrap buttons and other goodies.
3646 3951
3647############################################################################# 3952#############################################################################
3648 3953
3649package CFPlus::UI::Menu; 3954package DC::UI::Menu;
3650 3955
3651our @ISA = CFPlus::UI::Toplevel::; 3956our @ISA = DC::UI::Toplevel::;
3652 3957
3653use CFPlus::OpenGL; 3958use DC::OpenGL;
3654 3959
3655sub new { 3960sub new {
3656 my $class = shift; 3961 my $class = shift;
3657 3962
3658 my $self = $class->SUPER::new ( 3963 my $self = $class->SUPER::new (
3659 items => [], 3964 items => [],
3660 z => 100, 3965 z => 100,
3661 @_, 3966 @_,
3662 ); 3967 );
3663 3968
3664 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 3969 $self->add ($self->{vbox} = new DC::UI::VBox);
3665 3970
3666 for my $item (@{ $self->{items} }) { 3971 for my $item (@{ $self->{items} }) {
3667 my ($widget, $cb, $tooltip) = @$item; 3972 my ($widget, $cb, $tooltip) = @$item;
3668 3973
3669 # handle various types of items, only text for now 3974 # handle various types of items, only text for now
3670 if (!ref $widget) { 3975 if (!ref $widget) {
3671 if ($widget =~ /\t/) { 3976 if ($widget =~ /\t/) {
3672 my ($left, $right) = split /\t/, $widget, 2; 3977 my ($left, $right) = split /\t/, $widget, 2;
3673 3978
3674 $widget = new CFPlus::UI::HBox 3979 $widget = new DC::UI::HBox
3675 can_hover => 1, 3980 can_hover => 1,
3676 can_events => 1, 3981 can_events => 1,
3677 tooltip => $tooltip, 3982 tooltip => $tooltip,
3678 children => [ 3983 children => [
3679 (new CFPlus::UI::Label markup => $left, expand => 1), 3984 (new DC::UI::Label markup => $left , align => 0, expand => 1),
3680 (new CFPlus::UI::Label markup => $right, align => +1), 3985 (new DC::UI::Label markup => $right, align => 1),
3681 ], 3986 ],
3682 ; 3987 ;
3683 3988
3684 } else { 3989 } else {
3685 $widget = new CFPlus::UI::Label 3990 $widget = new DC::UI::Label
3686 can_hover => 1, 3991 can_hover => 1,
3687 can_events => 1, 3992 can_events => 1,
3993 align => 0,
3688 markup => $widget, 3994 markup => $widget,
3689 tooltip => $tooltip; 3995 tooltip => $tooltip;
3690 } 3996 }
3691 } 3997 }
3692 3998
… …
3707 # maybe save $GRAB? must be careful about events... 4013 # maybe save $GRAB? must be careful about events...
3708 $GRAB = $self; 4014 $GRAB = $self;
3709 $self->{button} = $ev->{button}; 4015 $self->{button} = $ev->{button};
3710 4016
3711 $self->show; 4017 $self->show;
3712 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 4018
4019 my $x = $ev->{x};
4020 my $y = $ev->{y};
4021
4022 $self->{root}->on_post_alloc ($self => sub {
4023 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
4024 });
4025
4026 1 # so it can be used inside event handlers
3713} 4027}
3714 4028
3715sub invoke_mouse_motion { 4029sub invoke_mouse_motion {
3716 my ($self, $ev, $x, $y) = @_; 4030 my ($self, $ev, $x, $y) = @_;
3717 4031
… …
3738 1 4052 1
3739} 4053}
3740 4054
3741############################################################################# 4055#############################################################################
3742 4056
3743package CFPlus::UI::Multiplexer; 4057package DC::UI::Multiplexer;
3744 4058
3745our @ISA = CFPlus::UI::Container::; 4059our @ISA = DC::UI::Container::;
3746 4060
3747sub new { 4061sub new {
3748 my $class = shift; 4062 my $class = shift;
3749 4063
3750 my $self = $class->SUPER::new ( 4064 my $self = $class->SUPER::new (
3751 @_, 4065 @_,
3752 ); 4066 );
3753 4067
3754 $self->{current} = $self->{children}[0] 4068 $self->set_current_page (0);
3755 if @{ $self->{children} };
3756 4069
3757 $self 4070 $self
3758} 4071}
3759 4072
3760sub add { 4073sub add {
3761 my ($self, @widgets) = @_; 4074 my ($self, @widgets) = @_;
3762 4075
3763 $self->SUPER::add (@widgets); 4076 $self->SUPER::add (@widgets);
3764 4077
3765 $self->{current} = $self->{children}[0] 4078 $self->set_current_page (0)
3766 if @{ $self->{children} }; 4079 if @widgets == @{ $self->{children} };
3767} 4080}
3768 4081
3769sub get_current_page { 4082sub get_current_page {
3770 my ($self) = @_; 4083 my ($self) = @_;
3771 4084
… …
3777 4090
3778 my $widget = ref $page_or_widget 4091 my $widget = ref $page_or_widget
3779 ? $page_or_widget 4092 ? $page_or_widget
3780 : $self->{children}[$page_or_widget]; 4093 : $self->{children}[$page_or_widget];
3781 4094
4095 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4096
3782 $self->{current} = $widget; 4097 if (($self->{current} = $widget)) {
4098 $self->{current}->set_visible if $self->{current} && $self->{visible};
3783 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4099 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3784 4100
3785 $self->emit (page_changed => $self->{current}); 4101 $self->emit (page_changed => $self->{current});
4102 }
3786 4103
3787 $self->realloc; 4104 $self->realloc;
3788} 4105}
3789 4106
3790sub visible_children { 4107sub visible_children {
3791 $_[0]{current} 4108 $_[0]{current} || ()
3792} 4109}
3793 4110
3794sub size_request { 4111sub size_request {
3795 my ($self) = @_; 4112 my ($self) = @_;
3796 4113
4114 $self->{current}
3797 $self->{current}->size_request 4115 ? $self->{current}->size_request
4116 : (0, 0)
3798} 4117}
3799 4118
3800sub invoke_size_allocate { 4119sub invoke_size_allocate {
3801 my ($self, $w, $h) = @_; 4120 my ($self, $w, $h) = @_;
3802 4121
3803 $self->{current}->configure (0, 0, $w, $h); 4122 $self->{current}->configure (0, 0, $w, $h)
4123 if $self->{current};
3804 4124
3805 1 4125 1
3806} 4126}
3807 4127
3808sub _draw { 4128sub _draw {
3809 my ($self) = @_; 4129 my ($self) = @_;
3810 4130
3811 $self->{current}->draw; 4131 $self->{current}->draw
4132 if $self->{current};
3812} 4133}
3813 4134
3814############################################################################# 4135#############################################################################
3815 4136
3816package CFPlus::UI::Notebook; 4137package DC::UI::Notebook;
3817 4138
4139use DC::OpenGL;
4140
3818our @ISA = CFPlus::UI::VBox::; 4141our @ISA = DC::UI::VBox::;
3819 4142
3820sub new { 4143sub new {
3821 my $class = shift; 4144 my $class = shift;
3822 4145
3823 my $self = $class->SUPER::new ( 4146 my $self = $class->SUPER::new (
3824 buttonbar => (new CFPlus::UI::Buttonbar), 4147 buttonbar => (new DC::UI::Buttonbar),
3825 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 4148 multiplexer => (new DC::UI::Multiplexer expand => 1),
4149 active_outline => [.7, .7, 0.2],
3826 # filter => # will be put between multiplexer and $self 4150 # filter => # will be put between multiplexer and $self
3827 @_, 4151 @_,
3828 ); 4152 );
3829 4153
3830 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4154 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3831 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4155 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3832 4156
4157 {
4158 Scalar::Util::weaken (my $wself = $self);
4159
4160 $self->{multiplexer}->connect (c_add => sub {
4161 my ($mplex, $widgets) = @_;
4162
4163 for my $child (@$widgets) {
4164 Scalar::Util::weaken $child;
4165 $child->{c_tab_} ||= do {
4166 my $tab =
4167 (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
4168 ? $child->{c_tab}
4169 : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4170
4171 $tab->connect (activate => sub {
4172 $wself->set_current_page ($child);
4173 });
4174
4175 $tab
4176 };
4177
4178 $self->{buttonbar}->add ($child->{c_tab_});
4179 }
4180 });
4181
4182 $self->{multiplexer}->connect (c_remove => sub {
4183 my ($mplex, $widgets) = @_;
4184
4185 for my $child (@$widgets) {
4186 $wself->{buttonbar}->remove ($child->{c_tab_});
4187 }
4188 });
4189 }
4190
3833 $self 4191 $self
3834} 4192}
3835 4193
3836sub add { 4194sub add {
4195 my ($self, @widgets) = @_;
4196
4197 $self->{multiplexer}->add (@widgets)
4198}
4199
4200sub remove {
4201 my ($self, @widgets) = @_;
4202
4203 $self->{multiplexer}->remove (@widgets)
4204}
4205
4206sub pages {
4207 my ($self) = @_;
4208 $self->{multiplexer}->children
4209}
4210
4211sub page_index {
4212 my ($self, $widget) = @_;
4213
4214 my $i = 0;
4215 for ($self->pages) {
4216 if ($_ eq $widget) { return $i };
4217 $i++;
4218 }
4219
4220 undef
4221}
4222
4223sub add_tab {
3837 my ($self, $title, $widget, $tooltip) = @_; 4224 my ($self, $title, $widget, $tooltip) = @_;
3838 4225
3839 CFPlus::weaken $self; 4226 $title = [$title, $tooltip] unless ref $title;
4227 $widget->{c_tab} = $title;
3840 4228
3841 $self->{buttonbar}->add (new CFPlus::UI::Button
3842 markup => $title,
3843 tooltip => $tooltip,
3844 on_activate => sub { $self->set_current_page ($widget) },
3845 );
3846
3847 $self->{multiplexer}->add ($widget); 4229 $self->add ($widget);
3848} 4230}
3849 4231
3850sub get_current_page { 4232sub get_current_page {
3851 my ($self) = @_; 4233 my ($self) = @_;
3852 4234
… …
3858 4240
3859 $self->{multiplexer}->set_current_page ($page); 4241 $self->{multiplexer}->set_current_page ($page);
3860 $self->emit (page_changed => $self->{multiplexer}{current}); 4242 $self->emit (page_changed => $self->{multiplexer}{current});
3861} 4243}
3862 4244
4245sub _draw {
4246 my ($self) = @_;
4247
4248 $self->SUPER::_draw ();
4249
4250 if (my $cur = $self->{multiplexer}{current}) {
4251 if ($cur = $cur->{c_tab_}) {
4252 glTranslate $self->{buttonbar}{x} + $cur->{x},
4253 $self->{buttonbar}{y} + $cur->{y};
4254 glLineWidth 3;
4255 #glEnable GL_BLEND;
4256 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4257 glColor @{$self->{active_outline}};
4258 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4259 glLineWidth 1;
4260 #glDisable GL_BLEND;
4261 }
4262 }
4263}
4264
3863############################################################################# 4265#############################################################################
3864 4266
3865package CFPlus::UI::Selector; 4267package DC::UI::Selector;
3866 4268
3867use utf8; 4269use utf8;
3868 4270
3869our @ISA = CFPlus::UI::Button::; 4271our @ISA = DC::UI::Button::;
3870 4272
3871sub new { 4273sub new {
3872 my $class = shift; 4274 my $class = shift;
3873 4275
3874 my $self = $class->SUPER::new ( 4276 my $self = $class->SUPER::new (
… …
3891 my ($value, $title, $tooltip) = @$_; 4293 my ($value, $title, $tooltip) = @$_;
3892 4294
3893 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4295 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3894 } 4296 }
3895 4297
3896 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev); 4298 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3897} 4299}
3898 4300
3899sub _set_value { 4301sub _set_value {
3900 my ($self, $value) = @_; 4302 my ($self, $value) = @_;
3901 4303
3902 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4304 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4305 $item ||= $self->{options}[0]
3903 or return; 4306 or return;
3904 4307
3905 $self->{value} = $item->[0]; 4308 $self->{value} = $item->[0];
3906 $self->set_markup ("$item->[1] ⇓"); 4309 $self->set_markup ("$item->[1] ⇓");
3907 $self->set_tooltip ($item->[2]); 4310# $self->set_tooltip ($item->[2]);
3908} 4311}
3909 4312
3910sub set_value { 4313sub set_value {
3911 my ($self, $value) = @_; 4314 my ($self, $value) = @_;
3912 4315
… …
3914 4317
3915 $self->_set_value ($value); 4318 $self->_set_value ($value);
3916 $self->emit (changed => $value); 4319 $self->emit (changed => $value);
3917} 4320}
3918 4321
4322sub set_options {
4323 my ($self, $options) = @_;
4324
4325 $self->{options} = $options;
4326 $self->_set_value ($self->{value});
4327}
4328
3919############################################################################# 4329#############################################################################
3920 4330
3921package CFPlus::UI::Statusbox; 4331package DC::UI::Statusbox;
3922 4332
3923our @ISA = CFPlus::UI::VBox::; 4333our @ISA = DC::UI::VBox::;
3924 4334
3925sub new { 4335sub new {
3926 my $class = shift; 4336 my $class = shift;
3927 4337
3928 my $self = $class->SUPER::new ( 4338 my $self = $class->SUPER::new (
3929 fontsize => 0.8, 4339 fontsize => 0.8,
3930 @_, 4340 @_,
3931 ); 4341 );
3932 4342
3933 CFPlus::weaken (my $this = $self); 4343 DC::weaken (my $this = $self);
3934 4344
3935 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4345 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3936 4346
3937 $self 4347 $self
3938} 4348}
3939 4349
3940sub reorder { 4350sub reorder {
3941 my ($self) = @_; 4351 my ($self) = @_;
3942 my $NOW = Time::HiRes::time; 4352 my $NOW = AE::time;
3943 4353
3944 # freeze display when hovering over any label 4354 # freeze display when hovering over any label
3945 return if $CFPlus::UI::TOOLTIP->{owner} 4355 return if $DC::UI::TOOLTIP->{owner}
3946 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label}, 4356 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3947 values %{ $self->{item} }; 4357 values %{ $self->{item} };
3948 4358
3949 while (my ($k, $v) = each %{ $self->{item} }) { 4359 while (my ($k, $v) = each %{ $self->{item} }) {
3950 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4360 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3951 } 4361 }
4362
4363 $self->{timer}->set (1, 1);
3952 4364
3953 my @widgets; 4365 my @widgets;
3954 4366
3955 my @items = sort { 4367 my @items = sort {
3956 $a->{pri} <=> $b->{pri} 4368 $a->{pri} <=> $b->{pri}
3957 or $b->{id} <=> $a->{id} 4369 or $b->{id} <=> $a->{id}
3958 } values %{ $self->{item} }; 4370 } values %{ $self->{item} };
3959
3960 $self->{timer}->interval (1);
3961 4371
3962 my $count = 10 + 1; 4372 my $count = 10 + 1;
3963 for my $item (@items) { 4373 for my $item (@items) {
3964 last unless --$count; 4374 last unless --$count;
3965 4375
… …
3972 for ($short) { 4382 for ($short) {
3973 s/^\s+//; 4383 s/^\s+//;
3974 s/\s+/ /g; 4384 s/\s+/ /g;
3975 } 4385 }
3976 4386
3977 new CFPlus::UI::Label 4387 new DC::UI::Label
3978 markup => $short, 4388 markup => $short,
3979 tooltip => $item->{tooltip}, 4389 tooltip => $item->{tooltip},
3980 tooltip_font => $::FONT_PROP, 4390 tooltip_font => $::FONT_PROP,
3981 tooltip_width => 0.67, 4391 tooltip_width => 0.67,
3982 fontsize => $item->{fontsize} || $self->{fontsize}, 4392 fontsize => $item->{fontsize} || $self->{fontsize},
3983 max_w => $::WIDTH * 0.44, 4393 max_w => $::WIDTH * 0.44,
4394 align => 0,
3984 fg => [@{ $item->{fg} }], 4395 fg => [@{ $item->{fg} }],
3985 can_events => 1, 4396 can_events => 1,
3986 can_hover => 1 4397 can_hover => 1
3987 }; 4398 };
3988 4399
3989 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4400 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3990 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4401 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3991 $label->update; 4402 $label->update;
3992 $label->set_max_size (undef, $label->{req_h} * $diff) 4403 $label->set_max_size (undef, $label->{req_h} * $diff)
3993 if $diff < 1; 4404 if $diff < 1;
3994 $self->{timer}->interval (1/30); 4405 $self->{timer}->set (1/30, 1/30);
3995 } else { 4406 } else {
3996 $label->{fg}[3] = $item->{fg}[3] || 1; 4407 $label->{fg}[3] = $item->{fg}[3] || 1;
3997 } 4408 }
3998 4409
3999 push @widgets, $label; 4410 push @widgets, $label;
4000 } 4411 }
4412
4413 my $hash = join ",", @widgets;
4414 return if $hash eq $self->{last_widget_hash};
4415 $self->{last_widget_hash} = $hash;
4001 4416
4002 $self->clear; 4417 $self->clear;
4003 $self->SUPER::add (reverse @widgets); 4418 $self->SUPER::add (reverse @widgets);
4004} 4419}
4005 4420
… …
4041 $ROOT->on_refresh (reorder => sub { 4456 $ROOT->on_refresh (reorder => sub {
4042 $self->reorder; 4457 $self->reorder;
4043 }); 4458 });
4044} 4459}
4045 4460
4461sub clr_group {
4462 my ($self, $group) = @_;
4463
4464 if (delete $self->{item}{$group}) {
4465 $ROOT->on_refresh (reorder => sub {
4466 $self->reorder;
4467 });
4468 }
4469}
4470
4046sub reconfigure { 4471sub reconfigure {
4047 my ($self) = @_; 4472 my ($self) = @_;
4048 4473
4049 delete $_->{label} 4474 delete $_->{label}
4050 for values %{ $self->{item} || {} }; 4475 for values %{ $self->{item} || {} };
… …
4061 $self->SUPER::destroy; 4486 $self->SUPER::destroy;
4062} 4487}
4063 4488
4064############################################################################# 4489#############################################################################
4065 4490
4066package CFPlus::UI::Root; 4491package DC::UI::Root;
4067 4492
4068our @ISA = CFPlus::UI::Container::; 4493our @ISA = DC::UI::Container::;
4069 4494
4070use List::Util qw(min max); 4495use List::Util qw(min max);
4071 4496
4072use CFPlus::OpenGL; 4497use DC::OpenGL;
4073 4498
4074sub new { 4499sub new {
4075 my $class = shift; 4500 my $class = shift;
4076 4501
4077 my $self = $class->SUPER::new ( 4502 my $self = $class->SUPER::new (
4078 visible => 1, 4503 visible => 1,
4079 @_, 4504 @_,
4080 ); 4505 );
4081 4506
4082 CFPlus::weaken ($self->{root} = $self); 4507 DC::weaken ($self->{root} = $self);
4083 4508
4084 $self 4509 $self
4085} 4510}
4086 4511
4087sub size_request { 4512sub size_request {
… …
4135} 4560}
4136 4561
4137sub update { 4562sub update {
4138 my ($self) = @_; 4563 my ($self) = @_;
4139 4564
4140 $::WANT_REFRESH++; 4565 $::WANT_REFRESH = 1;
4141} 4566}
4142 4567
4143sub add { 4568sub add {
4144 my ($self, @children) = @_; 4569 my ($self, @children) = @_;
4145 4570
… …
4182 while ($self->{refresh_hook}) { 4607 while ($self->{refresh_hook}) {
4183 $_->() 4608 $_->()
4184 for values %{delete $self->{refresh_hook}}; 4609 for values %{delete $self->{refresh_hook}};
4185 } 4610 }
4186 4611
4187 if ($self->{realloc}) { 4612 while ($self->{realloc}) {
4188 my %queue; 4613 my %queue;
4189 my @queue; 4614 my @queue;
4190 my $widget; 4615 my $widget;
4191 4616
4192 outer: 4617 outer:
… …
4204 while () { 4629 while () {
4205 @queue or last outer; 4630 @queue or last outer;
4206 4631
4207 $widget = pop @{ $queue[-1] || [] } 4632 $widget = pop @{ $queue[-1] || [] }
4208 and last; 4633 and last;
4209 4634
4210 pop @queue; 4635 pop @queue;
4211 } 4636 }
4212 4637
4213 delete $queue{$widget+0}; 4638 delete $queue{$widget+0};
4214 4639
4215 my ($w, $h) = $widget->size_request; 4640 my ($w, $h) = $widget->size_request;
4216 4641
4217 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4642 $w += $widget->{padding_x} * 2;
4218 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4643 $h += $widget->{padding_y} * 2;
4644
4645 $w = max $widget->{min_w}, $w;
4646 $h = max $widget->{min_h}, $h;
4219 4647
4220 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4648 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4221 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4649 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4222 4650
4223 $w = $widget->{force_w} if exists $widget->{force_w}; 4651 $w = $widget->{force_w} if exists $widget->{force_w};
… …
4239 } 4667 }
4240 } 4668 }
4241 4669
4242 delete $self->{realloc}{$widget+0}; 4670 delete $self->{realloc}{$widget+0};
4243 } 4671 }
4244 }
4245 4672
4246 while (my $size_alloc = delete $self->{size_alloc}) { 4673 while (my $size_alloc = delete $self->{size_alloc}) {
4247 my @queue = sort { $b->{visible} <=> $a->{visible} } 4674 my @queue = sort { $a->{visible} <=> $b->{visible} }
4248 values %$size_alloc; 4675 values %$size_alloc;
4249 4676
4250 while () { 4677 while () {
4251 my $widget = pop @queue || last; 4678 my $widget = pop @queue || last;
4252 4679
4253 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4680 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4254 4681
4255 $w = 0 if $w < 0;
4256 $h = 0 if $h < 0;
4257
4258 $w = max $widget->{min_w}, $w; 4682 $w = max $widget->{min_w}, $w;
4259 $h = max $widget->{min_h}, $h; 4683 $h = max $widget->{min_h}, $h;
4260 4684
4261# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4685# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4262# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4686# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4263 4687
4264 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4688 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4265 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4689 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4266 4690
4267 $w = int $w + 0.5; 4691 $w = int $w + 0.5;
4268 $h = int $h + 0.5; 4692 $h = int $h + 0.5;
4269 4693
4270 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4694 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4271 $widget->{old_w} = $widget->{w}; 4695 $widget->{old_w} = $widget->{w};
4272 $widget->{old_h} = $widget->{h}; 4696 $widget->{old_h} = $widget->{h};
4273 4697
4274 $widget->{w} = $w; 4698 $widget->{w} = $w;
4275 $widget->{h} = $h; 4699 $widget->{h} = $h;
4276 4700
4277 $widget->emit (size_allocate => $w, $h); 4701 $widget->emit (size_allocate => $w, $h);
4702 }
4278 } 4703 }
4279 } 4704 }
4280 } 4705 }
4281 4706
4282 while ($self->{post_alloc_hook}) { 4707 while ($self->{post_alloc_hook}) {
… …
4293 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4718 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4294 glMatrixMode GL_MODELVIEW; 4719 glMatrixMode GL_MODELVIEW;
4295 glLoadIdentity; 4720 glLoadIdentity;
4296 4721
4297 { 4722 {
4298 package CFPlus::UI::Base; 4723 package DC::UI::Base;
4299 4724
4300 local ($draw_x, $draw_y, $draw_w, $draw_h) = 4725 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4301 (0, 0, $self->{w}, $self->{h}); 4726 (0, 0, $self->{w}, $self->{h});
4302 4727
4303 $self->_draw; 4728 $self->_draw;
4304 } 4729 }
4305} 4730}
4306 4731
4307############################################################################# 4732#############################################################################
4308 4733
4309package CFPlus::UI; 4734package DC::UI;
4310 4735
4311$ROOT = new CFPlus::UI::Root; 4736$ROOT = new DC::UI::Root;
4312$TOOLTIP = new CFPlus::UI::Tooltip z => 900; 4737$TOOLTIP = new DC::UI::Tooltip z => 900;
4313 4738
43141 47391
4315

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines