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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.314 by root, Mon Jun 26 21:59:04 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop 376 # nop
377} 377}
378 378
379sub visible_children { 379sub visible_children {
… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
397 399
398 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
399 401
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 405 }
404} 406}
405 407
406# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
407sub coord2local { 409sub coord2local {
… …
415 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
416 418
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 420}
419 421
420sub focus_in { 422sub invoke_focus_in {
421 my ($self) = @_; 423 my ($self) = @_;
422 424
423 return if $FOCUS == $self; 425 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
425 427
426 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus);
429
430 $focus->update if $focus; 430 $focus->update if $focus;
431 $FOCUS->update; 431 $FOCUS->update;
432}
433 432
433 0
434}
435
434sub focus_out { 436sub invoke_focus_out {
435 my ($self) = @_; 437 my ($self) = @_;
436 438
437 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
438 440
439 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
440 442
441 $self->_emit (focus_out => $focus);
442
443 $focus->update if $focus; #? 443 $focus->update if $focus; #?
444 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 446 unless $FOCUS;
447}
448 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
449sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
450sub button_up { 0 } 458sub invoke_button_up { 1 }
451sub key_down { 0 } 459sub invoke_key_down { 1 }
452sub key_up { 0 } 460sub invoke_key_up { 1 }
453 461
454sub button_down { 462sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
456 464
457 $self->focus_in; 465 $self->grab_focus;
458 466
459 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 483}
461 484
462sub find_widget { 485sub find_widget {
463 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
464 487
… …
474sub set_parent { 497sub set_parent {
475 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
476 499
477 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 502}
503 503
504sub realloc { 504sub realloc {
505 my ($self) = @_; 505 my ($self) = @_;
506 506
… …
539 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540 540
541 # update screen rectangle 541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 544
547 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 548
… …
590 588
591sub DESTROY { 589sub DESTROY {
592 my ($self) = @_; 590 my ($self) = @_;
593 591
594 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
595 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 596}
597 597
598############################################################################# 598#############################################################################
599 599
600package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
765} 765}
766 766
767sub add { 767sub add {
768 my ($self, $child) = @_; 768 my ($self, $child) = @_;
769 769
770 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
773} 772}
774 773
775sub remove { 774sub remove {
776 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
785 784
786sub size_request { 785sub size_request {
787 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
788} 787}
789 788
790sub size_allocate { 789sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
792 791
793 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
794} 795}
795 796
796############################################################################# 797#############################################################################
797 798
798# back-buffered drawing area 799# back-buffered drawing area
… …
814 815
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 817 $self->SUPER::update;
817} 818}
818 819
819sub size_allocate { 820sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
821 822
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
824} 826}
825 827
826sub _render { 828sub _render {
827 my ($self) = @_; 829 my ($self) = @_;
828 830
… …
855 my $tex = $self->{texture} 857 my $tex = $self->{texture}
856 or return; 858 or return;
857 859
858 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862 glColor 0, 0, 0, 1; 862 glColor 0, 0, 0, 1;
863 863
864 $tex->draw_quad (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865 865
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
868} 867}
869 868
870############################################################################# 869#############################################################################
871 870
… …
892 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
893 892
894 ($w, $h) 893 ($w, $h)
895} 894}
896 895
897sub size_allocate { 896sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
899 898
900 my $child = $self->child; 899 my $child = $self->child;
901 900
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 903
905 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
906 $self->update; 905 $self->update;
906
907 1
907} 908}
908 909
909sub set_offset { 910sub set_offset {
910 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
911 912
… …
985 $self->add ($child) if $child; 986 $self->add ($child) if $child;
986 987
987 $self 988 $self
988} 989}
989 990
991#TODO# update range on size_allocate depending on child
992
990sub add { 993sub add {
991 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
992 995
993 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
994} 997}
995 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
996sub update { 1005sub update {
997 my ($self) = @_; 1006 my ($self) = @_;
998 1007
999 $self->SUPER::update; 1008 $self->SUPER::update;
1000 1009
1001 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1011}
1005 1012
1006sub size_allocate { 1013sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1008 1015
1016 $self->update_slider;
1017
1009 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1019}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1020
1018############################################################################# 1021#############################################################################
1019 1022
1020package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1021 1024
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1076
1074sub new { 1077sub new {
1075 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1079
1079 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1083 border => 0.6,
… …
1084 min_w => 16, 1085 min_w => 16,
1085 min_h => 16, 1086 min_h => 16,
1086 %arg, 1087 %arg,
1087 ); 1088 );
1088 1089
1089 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1091 align => 0,
1091 valign => 1, 1092 valign => 1,
1092 text => $title, 1093 text => $self->{title},
1093 fontsize => $self->{border} 1094 fontsize => $self->{border},
1094 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1095 1105
1096 $self 1106 $self
1097} 1107}
1098 1108
1099sub add { 1109sub add {
1100 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1101 1111
1102 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1115}
1105 1116
1106sub border { 1117sub border {
1107 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1108} 1119}
1109 1120
1110sub size_request { 1121sub size_request {
1111 my ($self) = @_; 1122 my ($self) = @_;
1112 1123
1113 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1114 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1115 1129
1116 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1117 1131
1118 ( 1132 (
1119 $w + $self->border * 2, 1133 $w + $self->border * 2,
1120 $h + $self->border * 2, 1134 $h + $self->border * 2,
1121 ) 1135 )
1122} 1136}
1123 1137
1124sub size_allocate { 1138sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1126 1140
1127 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1145 }
1132 1146
1133 my $border = $self->border; 1147 my $border = $self->border;
1134 1148
1135 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1137 1151
1138 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1139}
1140 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1141sub button_down { 1160sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1143 1162
1144 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1164 my $border = $self->border;
1146 1165
… …
1177 1196
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1198
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1200 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1202 };
1184 } else { 1203 } else {
1185 return 0; 1204 return 0;
1186 } 1205 }
1187 1206
1188 1 1207 1
1189} 1208}
1190 1209
1191sub button_up { 1210sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1193 1212
1194 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1195} 1214}
1196 1215
1197sub mouse_motion { 1216sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1199 1218
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1220
1202 !!$self->{motion} 1221 ! ! $self->{motion}
1203} 1222}
1204 1223
1205sub _draw { 1224sub _draw {
1206 my ($self) = @_; 1225 my ($self) = @_;
1207 1226
… …
1233 1252
1234 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1235 1254
1236 $child->draw; 1255 $child->draw;
1237 1256
1238 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1241 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1242} 1266}
1243 1267
1244############################################################################# 1268#############################################################################
1245 1269
1246package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1269 1293
1270 $child->set_parent ($self); 1294 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1272 1296
1273 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1274} 1304}
1275 1305
1276# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1307sub clear {
1278 my ($self) = @_; 1308 my ($self) = @_;
… …
1319 (sum @$ws), 1349 (sum @$ws),
1320 (sum @$hs), 1350 (sum @$hs),
1321 ) 1351 )
1322} 1352}
1323 1353
1324sub size_allocate { 1354sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1326 1356
1327 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1328 1358
1329 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1361 } 1391 }
1362 1392
1363 $y += $row_h; 1393 $y += $row_h;
1364 } 1394 }
1365 1395
1396 1
1366} 1397}
1367 1398
1368sub find_widget { 1399sub find_widget {
1369 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1370 1401
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1440 )
1410} 1441}
1411 1442
1412sub size_allocate { 1443sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1414 1445
1415 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1417 1448
1418 my @req; 1449 my @req;
1419 1450
1420 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1422 } else { 1453 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1425 1456
1426 if ($req > $space) { 1457 if ($req > $space) {
1427 # ah well, not enough space 1458 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1429 } else { 1460 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1462
1432 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1433 1464
1434 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1466 for 0 .. $#children;
1436 } 1467 }
1437 } 1468 }
1438 1469
1439 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1440 1471
1441 my $pos = 0; 1472 my $pos = 0;
1442 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1476
1446 $pos += $alloc; 1477 $pos += $alloc;
1447 } 1478 }
1448 1479
1449 1 1480 1
… …
1539 1570
1540 delete $self->{texture}; 1571 delete $self->{texture};
1541 $self->SUPER::update; 1572 $self->SUPER::update;
1542} 1573}
1543 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1544sub set_text { 1582sub set_text {
1545 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1546 1584
1547 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1549 1587
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1552 1590
1591 delete $self->{size_req};
1553 $self->realloc; 1592 $self->realloc;
1554 $self->update; 1593 $self->update;
1555} 1594}
1556 1595
1557sub set_markup { 1596sub set_markup {
… …
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1603
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1567 1606
1607 delete $self->{size_req};
1568 $self->realloc; 1608 $self->realloc;
1569 $self->update; 1609 $self->update;
1570} 1610}
1571 1611
1572sub size_request { 1612sub size_request {
1573 my ($self) = @_; 1613 my ($self) = @_;
1574 1614
1615 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1621
1581 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1582 1623
1583 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1627
1587 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1588 1629
1589 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1591 } 1635 };
1592 1636
1593 ($w, $h) 1637 @{ $self->{size_req} }
1594} 1638}
1595 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1596sub size_allocate { 1644sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1598 1646
1599 delete $self->{ox}; 1647 delete $self->{ox};
1600 1648
1601 delete $self->{texture} 1649 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1603} 1653}
1604 1654
1605sub set_fontsize { 1655sub set_fontsize {
1606 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1607 1657
1608 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1609 delete $self->{texture}; 1659 delete $self->{texture};
1610 1660
1611 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1612} 1670}
1613 1671
1614sub _draw { 1672sub _draw {
1615 my ($self) = @_; 1673 my ($self) = @_;
1616 1674
… …
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1638 }; 1696 };
1639 1697
1640 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1642 1702
1643 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1644 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1646 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1648 } 1710 }
1649 1711
1650 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1651} 1713}
1652 1714
… …
1669 can_hover => 1, 1731 can_hover => 1,
1670 can_focus => 1, 1732 can_focus => 1,
1671 valign => 0, 1733 valign => 0,
1672 can_events => 1, 1734 can_events => 1,
1673 #text => ... 1735 #text => ...
1736 #hidden => "*",
1674 @_ 1737 @_
1675 ) 1738 )
1676} 1739}
1677 1740
1678sub _set_text { 1741sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1749 $self->{text} = $text;
1687 1750
1688 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1690 1754
1691 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1692 $self->update; 1758 $self->update;
1693} 1759}
1694 1760
1695sub set_text { 1761sub set_text {
1696 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1697 1763
1698 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1765 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1766}
1703 1767
1704sub get_text { 1768sub get_text {
1705 $_[0]{text} 1769 $_[0]{text}
1706} 1770}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1712 1776
1713 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1714} 1778}
1715 1779
1716sub key_down { 1780sub invoke_key_down {
1717 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1718 1782
1719 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1733 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1734 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1736 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 1802 $self->emit ('escape');
1739 } elsif ($uni) { 1803 } elsif ($uni) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 1805 } else {
1742 return 0; 1806 return 0;
1743 } 1807 }
… …
1747 $self->realloc; 1811 $self->realloc;
1748 1812
1749 1 1813 1
1750} 1814}
1751 1815
1752sub focus_in { 1816sub invoke_focus_in {
1753 my ($self) = @_; 1817 my ($self) = @_;
1754 1818
1755 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1756 1820
1757 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1758} 1822}
1759 1823
1760sub button_down { 1824sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1762 1826
1763 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 1828
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 1830
1767 # byte-index to char-index 1831 # byte-index to char-index
1768 my $text = $self->{text}; 1832 my $text = $self->{text};
… …
1773 $self->update; 1837 $self->update;
1774 1838
1775 1 1839 1
1776} 1840}
1777 1841
1778sub mouse_motion { 1842sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 1845
1782 0 1846 1
1783} 1847}
1784 1848
1785sub _draw { 1849sub _draw {
1786 my ($self) = @_; 1850 my ($self) = @_;
1787 1851
… …
1828 1892
1829our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1830 1894
1831use CFClient::OpenGL; 1895use CFClient::OpenGL;
1832 1896
1833sub key_down { 1897sub invoke_key_down {
1834 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1835 1899
1836 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1837 1901
1838 if ($sym == 13) { 1902 if ($sym == 13) {
1839 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1841 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1844 $self->update; 1909 $self->update;
1845 1910
1846 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1864 } else { 1929 } else {
1865 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1866 } 1931 }
1867 1932
1868 } else { 1933 } else {
1869 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1870 } 1935 }
1871 1936
1872 1 1937 1
1873} 1938}
1874 1939
… …
1898 can_events => 1, 1963 can_events => 1,
1899 @_ 1964 @_
1900 ) 1965 )
1901} 1966}
1902 1967
1903sub activate { }
1904
1905sub button_up { 1968sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1907 1970
1908 $self->emit ("activate") 1971 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
… …
1913} 1976}
1914 1977
1915sub _draw { 1978sub _draw {
1916 my ($self) = @_; 1979 my ($self) = @_;
1917 1980
1918 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 1982
1924 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1927 1986
1928 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929 1988
1930 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1931 1990
1932 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1933} 2028}
1934 2029
1935############################################################################# 2030#############################################################################
1936 2031
1937package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1964 my ($self) = @_; 2059 my ($self) = @_;
1965 2060
1966 (6) x 2 2061 (6) x 2
1967} 2062}
1968 2063
1969sub button_down { 2064sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1971 2066
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1975 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
1976 } else { 2071 } else {
1977 return 0 2072 return 0
1978 } 2073 }
1979 2074
1980 1 2075 1
… …
2005package CFClient::UI::Image; 2100package CFClient::UI::Image;
2006 2101
2007our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
2008 2103
2009use CFClient::OpenGL; 2104use CFClient::OpenGL;
2010use Carp qw/confess/;
2011 2105
2012our %loaded_images; 2106our %texture_cache;
2013 2107
2014sub new { 2108sub new {
2015 my $class = shift; 2109 my $class = shift;
2016 2110
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2018 2115
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2020 2118
2021 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2023 2121
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2025 2123
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2125
2030 $self 2126 $self
2031} 2127}
2032 2128
2033sub size_request { 2129sub size_request {
2034 my ($self) = @_; 2130 my ($self) = @_;
2035 2131
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
2037} 2133}
2038 2134
2039sub _draw { 2135sub _draw {
2040 my ($self) = @_; 2136 my ($self) = @_;
2041 2137
… …
2277 $self->update; 2373 $self->update;
2278 2374
2279 $self 2375 $self
2280} 2376}
2281 2377
2282sub changed { }
2283
2284sub set_range { 2378sub set_range {
2285 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2286 2380
2287 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2288 2382
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2291} 2387}
2292 2388
2293sub set_value { 2389sub set_value {
2294 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2295 2391
… …
2306 if $unit; 2402 if $unit;
2307 2403
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2405
2310 if ($value != $old_value) { 2406 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2312 $self->update; 2408 $self->update;
2313 } 2409 }
2314} 2410}
2315 2411
2316sub size_request { 2412sub size_request {
2317 my ($self) = @_; 2413 my ($self) = @_;
2318 2414
2319 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2320} 2416}
2321 2417
2322sub button_down { 2418sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2324 2420
2325 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2422
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2424
2329 $self->mouse_motion ($ev, $x, $y) 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2426}
2331 2427
2332sub mouse_motion { 2428sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2334 2430
2335 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2433
… …
2442sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2444 2540
2445############################################################################# 2541#############################################################################
2446 2542
2447package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2448 2544
2449our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2450 2546
2451use CFClient::OpenGL; 2547use CFClient::OpenGL;
2452 2548
… …
2454 my $class = shift; 2550 my $class = shift;
2455 2551
2456 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2457 fontsize => 1, 2553 fontsize => 1,
2458 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2459 #font => default_font 2556 #font => default_font
2460 @_, 2557 @_,
2461 2558
2462 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2463 par => [], 2560 par => [],
… …
2478 2575
2479 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2480 $self->reflow; 2577 $self->reflow;
2481} 2578}
2482 2579
2580sub size_request {
2581 my ($self) = @_;
2582
2583 my ($empty, $slider) = @{ $self->{children} };
2584
2585 local $self->{children} = [$empty, $slider];
2586 $self->SUPER::size_request
2587}
2588
2483sub size_allocate { 2589sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 2590 my ($self, $w, $h) = @_;
2485 2591
2486 $self->SUPER::size_allocate ($w, $h); 2592 my ($empty, $slider, @other) = @{ $self->{children} };
2593 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 2594
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2595 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2596 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2597 $self->{layout}->set_width ($empty->{w});
2598 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2599
2492 $self->reflow; 2600 $self->reflow;
2493}
2494 2601
2495sub text_size { 2602 local $self->{children} = [$empty, $slider];
2496 my ($self, $text, $indent) = @_; 2603 $self->SUPER::invoke_size_allocate ($w, $h)
2604}
2605
2606sub get_layout {
2607 my ($self, $para) = @_;
2497 2608
2498 my $layout = $self->{layout}; 2609 my $layout = $self->{layout};
2499 2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2613 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2614 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2615 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2616 $layout->set_markup ($para->{markup});
2617
2618 $layout->set_shapes (
2619 map
2620 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2621 @{$para->{widget}}
2503 2622 );
2623
2504 $layout->size 2624 $layout
2505} 2625}
2506 2626
2507sub reflow { 2627sub reflow {
2508 my ($self) = @_; 2628 my ($self) = @_;
2509 2629
… …
2518 $self->{children}[1]->set_value ($offset); 2638 $self->{children}[1]->set_value ($offset);
2519} 2639}
2520 2640
2521sub clear { 2641sub clear {
2522 my ($self) = @_; 2642 my ($self) = @_;
2643
2644 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other;
2523 2646
2524 $self->{par} = []; 2647 $self->{par} = [];
2525 $self->{height} = 0; 2648 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 2650}
2528 2651
2529sub add_paragraph { 2652sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 2653 my ($self, $color, $para, $indent) = @_;
2531 2654
2532 for my $line (split /\n/, $text) { 2655 my ($text, @w) = ref $para ? @$para : $para;
2533 my ($w, $h) = $self->text_size ($line); 2656
2534 $self->{height} += $h; 2657 $para = {
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2658 w => 1e10,
2659 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2536 } 2664 };
2537 2665
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2666 $self->add (@w) if @w;
2667 push @{$self->{par}}, $para;
2668
2669 $self->{need_reflow}++;
2670 $self->update;
2671}
2672
2673sub scroll_to_bottom {
2674 my ($self) = @_;
2675
2676 $self->{scroll_to_bottom} = 1;
2677 $self->update;
2539} 2678}
2540 2679
2541sub update { 2680sub update {
2542 my ($self) = @_; 2681 my ($self) = @_;
2543 2682
… …
2545 2684
2546 return unless $self->{h} > 0; 2685 return unless $self->{h} > 0;
2547 2686
2548 delete $self->{texture}; 2687 delete $self->{texture};
2549 2688
2550 $ROOT->on_post_alloc ($self, sub { 2689 $ROOT->on_post_alloc ($self => sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2691
2553 if (delete $self->{need_reflow}) { 2692 if (delete $self->{need_reflow}) {
2554 my $height = 0; 2693 my $height = 0;
2555 2694
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) { 2695 for my $para (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2562 $layout->set_width ($W - $_->[3]); 2697 my $layout = $self->get_layout ($para);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2698 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2699
2566 $_->[1] = $h; 2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2567 } 2703 }
2568 2704
2569 $height += $_->[1]; 2705 $height += $para->{h};
2570 } 2706 }
2571 2707
2572 $self->{height} = $height; 2708 $self->{height} = $height;
2573 2709
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2575 2711
2576 delete $self->{texture}; 2712 delete $self->{texture};
2577 } 2713 }
2578 2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2720 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2721 glClear GL_COLOR_BUFFER_BIT;
2582 2722
2583 my $top = int $self->{children}[1]{range}[0]; 2723 my $top = int $self->{children}[1]{range}[0];
2584 2724
2585 my $y0 = $top; 2725 my $y0 = $top;
2586 my $y1 = $top + $H; 2726 my $y1 = $top + $H;
2587 2727
2588 my $y = 0; 2728 my $y = 0;
2589
2590 my $layout = $self->{layout};
2591
2592 $layout->set_font ($self->{font}) if $self->{font};
2593 2729
2594 glEnable GL_BLEND; 2730 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off 2731 #TODO# not correct in windows where rgba is forced off
2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597 2733
2598 for my $par (@{$self->{par}}) { 2734 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 2735 my $h = $para->{h};
2600 2736
2601 if ($y0 < $y + $h && $y < $y1) { 2737 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] }); 2738
2603 $layout->set_width ($W - $par->[3]); 2739 my $layout = $self->get_layout ($para);
2604 $layout->set_markup ($par->[4]);
2605 2740
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2607 2742
2608 glRasterPos $par->[3], $y - $y0; 2743 glRasterPos $para->{indent}, $y - $y0;
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 glDisable GL_BLEND;
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 }
2610 } 2761 }
2611 2762
2612 $y += $h; 2763 $y += $h;
2613 } 2764 }
2614 2765
2615 glDisable GL_BLEND; 2766 glDisable GL_BLEND;
2616 }; 2767 };
2617 }); 2768 });
2618} 2769}
2619 2770
2771sub reconfigure {
2772 my ($self) = @_;
2773
2774 $self->SUPER::reconfigure;
2775
2776 $_->{w} = 1e10 for @{ $self->{par} };
2777 $self->reflow;
2778}
2779
2620sub _draw { 2780sub _draw {
2621 my ($self) = @_; 2781 my ($self) = @_;
2622 2782
2623 glEnable GL_TEXTURE_2D; 2783 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2785 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2786 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2787 glDisable GL_TEXTURE_2D;
2628 2788
2629 $self->{children}[1]->draw; 2789 $self->{children}[1]->draw;
2630
2631} 2790}
2632 2791
2633############################################################################# 2792#############################################################################
2634 2793
2635package CFClient::UI::Animator; 2794package CFClient::UI::Animator;
… …
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 2881 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2882 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 2883 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 2884 . "visible $widget->{visible}";
2726 } 2885 }
2886
2887 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//;
2727 2889
2728 $self->add (new CFClient::UI::Label 2890 $self->add (new CFClient::UI::Label
2729 markup => $tooltip, 2891 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 2893 fontsize => 0.8,
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2903 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 2904
2743 ($w + 4, $h + 4) 2905 ($w + 4, $h + 4)
2744} 2906}
2745 2907
2746sub size_allocate { 2908sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2748 2910
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 2911 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 2912}
2751 2913
2752sub visibility_change { 2914sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 2915 my ($self, $visible) = @_;
2754 2916
2755 return unless $visible; 2917 return unless $visible;
2756 2918
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 2919 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2759 or return; 2921 or return;
2760 2922
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 2924
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 2926 if $x + $self->{w} > $self->{root}{w};
2765 2927
2766 $self->move_abs ($x, $y); 2928 $self->move_abs ($x, $y);
2767 }); 2929 });
2768} 2930}
2769 2931
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 3021
2860 if ($tex) { 3022 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3023 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3025 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3026 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3027 glDisable GL_TEXTURE_2D;
2866 } 3028 }
2867} 3029}
2868 3030
2869sub DESTROY { 3031sub destroy {
2870 my ($self) = @_; 3032 my ($self) = @_;
2871 3033
2872 $self->{timer}->cancel 3034 $self->{timer}->cancel
2873 if $self->{timer}; 3035 if $self->{timer};
2874 3036
2875 $self->SUPER::DESTROY; 3037 $self->SUPER::destroy;
2876} 3038}
2877 3039
2878############################################################################# 3040#############################################################################
2879 3041
2880package CFClient::UI::Buttonbar; 3042package CFClient::UI::Buttonbar;
… …
2901 ); 3063 );
2902 3064
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3065 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2904 3066
2905 for my $item (@{ $self->{items} }) { 3067 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3068 my ($widget, $cb, $tooltip) = @$item;
2907 3069
2908 # handle various types of items, only text for now 3070 # handle various types of items, only text for now
2909 if (!ref $widget) { 3071 if (!ref $widget) {
2910 $widget = new CFClient::UI::Label 3072 $widget = new CFClient::UI::Label
2911 can_hover => 1, 3073 can_hover => 1,
2912 can_events => 1, 3074 can_events => 1,
2913 text => $widget; 3075 markup => $widget,
3076 tooltip => $tooltip
2914 } 3077 }
2915 3078
2916 $self->{item}{$widget} = $item; 3079 $self->{item}{$widget} = $item;
2917 3080
2918 $self->{vbox}->add ($widget); 3081 $self->{vbox}->add ($widget);
… …
2923 3086
2924# popup given the event (must be a mouse button down event currently) 3087# popup given the event (must be a mouse button down event currently)
2925sub popup { 3088sub popup {
2926 my ($self, $ev) = @_; 3089 my ($self, $ev) = @_;
2927 3090
2928 $self->_emit ("popdown"); 3091 $self->emit ("popdown");
2929 3092
2930 # maybe save $GRAB? must be careful about events... 3093 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3094 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3095 $self->{button} = $ev->{button};
2933 3096
2934 $self->show; 3097 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3098 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3099}
2937 3100
2938sub mouse_motion { 3101sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3102 my ($self, $ev, $x, $y) = @_;
2940 3103
2941 # TODO: should use vbox->find_widget or so 3104 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3105 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3106 $self->{hover} = $self->{item}{$HOVER};
2944 3107
2945 0 3108 0
2946} 3109}
2947 3110
2948sub button_up { 3111sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2950 3113
2951 if ($ev->{button} == $self->{button}) { 3114 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3115 undef $GRAB;
2953 $self->hide; 3116 $self->hide;
2954 3117
2955 $self->_emit ("popdown"); 3118 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3119 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3120 } else {
2958 return 0 3121 return 0
2959 } 3122 }
2960 3123
… …
2997 : $self->{children}[$page_or_widget]; 3160 : $self->{children}[$page_or_widget];
2998 3161
2999 $self->{current} = $widget; 3162 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3163 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3164
3002 $self->_emit (page_changed => $self->{current}); 3165 $self->emit (page_changed => $self->{current});
3003 3166
3004 $self->realloc; 3167 $self->realloc;
3005} 3168}
3006 3169
3007sub visible_children { 3170sub visible_children {
… …
3012 my ($self) = @_; 3175 my ($self) = @_;
3013 3176
3014 $self->{current}->size_request 3177 $self->{current}->size_request
3015} 3178}
3016 3179
3017sub size_allocate { 3180sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3181 my ($self, $w, $h) = @_;
3019 3182
3020 $self->{current}->configure (0, 0, $w, $h); 3183 $self->{current}->configure (0, 0, $w, $h);
3184
3185 1
3021} 3186}
3022 3187
3023sub _draw { 3188sub _draw {
3024 my ($self) = @_; 3189 my ($self) = @_;
3025 3190
… …
3064 3229
3065sub set_current_page { 3230sub set_current_page {
3066 my ($self, $page) = @_; 3231 my ($self, $page) = @_;
3067 3232
3068 $self->{multiplexer}->set_current_page ($page); 3233 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3234 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3235}
3071 3236
3072############################################################################# 3237#############################################################################
3073 3238
3074package CFClient::UI::Statusbox; 3239package CFClient::UI::Combobox;
3075 3240
3241use utf8;
3242
3076our @ISA = CFClient::UI::VBox::; 3243our @ISA = CFClient::UI::Button::;
3077 3244
3078sub new { 3245sub new {
3079 my $class = shift; 3246 my $class = shift;
3080 3247
3081 $class->SUPER::new ( 3248 my $self = $class->SUPER::new (
3249 options => [], # [value, title, longdesc], ...
3250 value => undef,
3251 @_,
3252 );
3253
3254 $self->_set_value ($self->{value});
3255
3256 $self
3257}
3258
3259sub invoke_button_down {
3260 my ($self, $ev) = @_;
3261
3262 my @menu_items;
3263
3264 for (@{ $self->{options} }) {
3265 my ($value, $title, $tooltip) = @$_;
3266
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 }
3269
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271}
3272
3273sub _set_value {
3274 my ($self, $value) = @_;
3275
3276 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3277 or return;
3278
3279 $self->{value} = $item->[0];
3280 $self->set_markup ("$item->[1] ⇓");
3281 $self->set_tooltip ($item->[2]);
3282}
3283
3284sub set_value {
3285 my ($self, $value) = @_;
3286
3287 return unless $self->{value} ne $value;
3288
3289 $self->_set_value ($value);
3290 $self->emit (changed => $value);
3291}
3292
3293#############################################################################
3294
3295package CFClient::UI::Statusbox;
3296
3297our @ISA = CFClient::UI::VBox::;
3298
3299sub new {
3300 my $class = shift;
3301
3302 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3303 fontsize => 0.8,
3083 @_, 3304 @_,
3084 ) 3305 );
3306
3307 Scalar::Util::weaken (my $this = $self);
3308
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310
3311 $self
3085} 3312}
3086 3313
3087sub reorder { 3314sub reorder {
3088 my ($self) = @_; 3315 my ($self) = @_;
3089 my $NOW = time; 3316 my $NOW = Time::HiRes::time;
3317
3318 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} };
3090 3322
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3323 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3324 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3325 }
3094 3326
… …
3097 my @items = sort { 3329 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3330 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3331 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3332 } values %{ $self->{item} };
3101 3333
3334 $self->{timer}->interval (1);
3335
3102 my $count = 10 + 1; 3336 my $count = 10 + 1;
3103 for my $item (@items) { 3337 for my $item (@items) {
3104 last unless --$count; 3338 last unless --$count;
3105 3339
3106 push @widgets, $item->{label} ||= do { 3340 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3341 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3342 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3343 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3344 : $item->{text};
3111 3345
… …
3119 tooltip => $item->{tooltip}, 3353 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3354 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3355 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3356 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3357 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3358 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3359 can_events => 1,
3126 can_hover => 1 3360 can_hover => 1
3127 }; 3361 };
3362
3363 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3364 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3365 $label->update;
3366 $label->set_max_size (undef, $label->{req_h} * $diff)
3367 if $diff < 1;
3368 $self->{timer}->interval (1/30);
3369 } else {
3370 $label->{fg}[3] = $item->{fg}[3] || 1;
3371 }
3372
3373 push @widgets, $label;
3128 } 3374 }
3129 3375
3130 $self->clear; 3376 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3377 $self->SUPER::add (reverse @widgets);
3132} 3378}
… …
3137 $text =~ s/^\s+//; 3383 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3384 $text =~ s/\s+$//;
3139 3385
3140 return unless $text; 3386 return unless $text;
3141 3387
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3388 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3389
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3390 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3391
3146 if (my $item = $self->{item}{$group}) { 3392 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3393 if ($item->{text} eq $text) {
3148 $item->{count}++; 3394 $item->{count}++;
3149 } else { 3395 } else {
3150 $item->{count} = 1; 3396 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3397 $item->{text} = $item->{tooltip} = $text;
3152 } 3398 }
3153 $item->{id} = ++$self->{id}; 3399 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3400 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3401 delete $item->{label};
3156 } else { 3402 } else {
3157 $self->{item}{$group} = { 3403 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3404 id => ++$self->{id},
… …
3177 3423
3178 $self->reorder; 3424 $self->reorder;
3179 $self->SUPER::reconfigure; 3425 $self->SUPER::reconfigure;
3180} 3426}
3181 3427
3428sub destroy {
3429 my ($self) = @_;
3430
3431 $self->{timer}->cancel;
3432
3433 $self->SUPER::destroy;
3434}
3435
3182############################################################################# 3436#############################################################################
3183 3437
3184package CFClient::UI::Inventory; 3438package CFClient::UI::Inventory;
3185 3439
3186our @ISA = CFClient::UI::ScrolledWindow::; 3440our @ISA = CFClient::UI::ScrolledWindow::;
… …
3216 $self->{child}->add (0, $row, $item->{face_widget}); 3470 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget}); 3471 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget}); 3472 $self->{child}->add (2, $row, $item->{weight_widget});
3219 3473
3220 $row++; 3474 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 } 3475 }
3419} 3476}
3420 3477
3421############################################################################# 3478#############################################################################
3422 3479
… …
3432 commands => [], 3489 commands => [],
3433 @_, 3490 @_,
3434 ) 3491 )
3435} 3492}
3436 3493
3437# XXX: Do sorting? Argl... 3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3438sub add_spell { 3579sub add_spell {
3439 my ($self, $spell) = @_; 3580 my ($self, $spell) = @_;
3581
3440 $self->{spells}->{$spell->{name}} = $spell; 3582 $self->{spell}->{$spell->{name}} = $spell;
3441 3583 $self->rebuild_spell_list;
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469} 3584}
3470 3585
3471sub remove_spell { 3586sub remove_spell {
3472 my ($self, $spell) = @_; 3587 my ($self, $spell) = @_;
3588
3473 delete $self->{spells}->{$spell->{name}}; 3589 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3590 $self->rebuild_spell_list;
3475} 3591}
3476 3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3477############################################################################# 3600#############################################################################
3478 3601
3479package CFClient::UI::Root; 3602package CFClient::UI::Root;
3480 3603
3481our @ISA = CFClient::UI::Container::; 3604our @ISA = CFClient::UI::Container::;
3605
3606use List::Util qw(min max);
3482 3607
3483use CFClient::OpenGL; 3608use CFClient::OpenGL;
3484 3609
3485sub new { 3610sub new {
3486 my $class = shift; 3611 my $class = shift;
… …
3513 $coord = $max - $size if $coord > $max - $size; 3638 $coord = $max - $size if $coord > $max - $size;
3514 3639
3515 int $coord + 0.5 3640 int $coord + 0.5
3516} 3641}
3517 3642
3518sub size_allocate { 3643sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 3644 my ($self, $w, $h) = @_;
3520 3645
3521 for my $child ($self->children) { 3646 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3647 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 3648
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 3652 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 3653 $Y = _to_pixel $Y, $H, $self->{h};
3529 3654
3530 $child->configure ($X, $Y, $W, $H); 3655 $child->configure ($X, $Y, $W, $H);
3531 } 3656 }
3657
3658 1
3532} 3659}
3533 3660
3534sub coord2local { 3661sub coord2local {
3535 my ($self, $x, $y) = @_; 3662 my ($self, $x, $y) = @_;
3536 3663
… …
3621 3748
3622 delete $queue{$widget+0}; 3749 delete $queue{$widget+0};
3623 3750
3624 my ($w, $h) = $widget->size_request; 3751 my ($w, $h) = $widget->size_request;
3625 3752
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3753 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3754 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3755
3756 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3757 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3758
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3759 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3760 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3761
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3762 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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