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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.325 by root, Thu Jul 13 01:29:17 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 {
… …
399 399
400 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
401 401
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 405 }
406} 406}
407 407
408# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
409sub coord2local { 409sub coord2local {
… …
417 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
418 418
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 420}
421 421
422sub focus_in { 422sub invoke_focus_in {
423 my ($self) = @_; 423 my ($self) = @_;
424 424
425 return if $FOCUS == $self; 425 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
427 427
428 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
429 429
430 $self->_emit (focus_in => $focus); 430 $self->update;
431 431
432 $focus->update if $focus; 432 0
433 $FOCUS->update;
434} 433}
435 434
436sub focus_out { 435sub invoke_focus_out {
437 my ($self) = @_; 436 my ($self) = @_;
438 437
439 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
440 439
441 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
442 441
443 $self->_emit (focus_out => $focus); 442 $self->update;
444 443
445 $focus->update if $focus; #?
446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 445 unless $FOCUS;
449}
450 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
451sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
452sub button_up { 0 } 458sub invoke_button_up { 1 }
453sub key_down { 0 } 459sub invoke_key_down { 1 }
454sub key_up { 0 } 460sub invoke_key_up { 1 }
455 461
456sub button_down { 462sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
458 464
459 $self->focus_in; 465 $self->grab_focus;
460 466
461 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
462} 483}
463 484
464sub find_widget { 485sub find_widget {
465 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
466 487
… …
476sub set_parent { 497sub set_parent {
477 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
478 499
479 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504} 502}
505 503
506sub realloc { 504sub realloc {
507 my ($self) = @_; 505 my ($self) = @_;
508 506
… …
541 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
542 540
543 # update screen rectangle 541 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 544
549 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 548
… …
591} 587}
592 588
593sub DESTROY { 589sub DESTROY {
594 my ($self) = @_; 590 my ($self) = @_;
595 591
592 return if CFClient::in_destruct;
593
596 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
597 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 598}
599 599
600############################################################################# 600#############################################################################
601 601
602package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
767} 767}
768 768
769sub add { 769sub add {
770 my ($self, $child) = @_; 770 my ($self, $child) = @_;
771 771
772 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
775} 774}
776 775
777sub remove { 776sub remove {
778 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
787 786
788sub size_request { 787sub size_request {
789 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
790} 789}
791 790
792sub size_allocate { 791sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
794 793
795 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
796} 797}
797 798
798############################################################################# 799#############################################################################
799 800
800# back-buffered drawing area 801# back-buffered drawing area
… …
816 817
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 819 $self->SUPER::update;
819} 820}
820 821
821sub size_allocate { 822sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
823 824
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
826} 828}
827 829
828sub _render { 830sub _render {
829 my ($self) = @_; 831 my ($self) = @_;
830 832
… …
891 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
892 894
893 ($w, $h) 895 ($w, $h)
894} 896}
895 897
896sub size_allocate { 898sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
898 900
899 my $child = $self->child; 901 my $child = $self->child;
900 902
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 905
904 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
905 $self->update; 907 $self->update;
908
909 1
906} 910}
907 911
908sub set_offset { 912sub set_offset {
909 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
910 914
… …
984 $self->add ($child) if $child; 988 $self->add ($child) if $child;
985 989
986 $self 990 $self
987} 991}
988 992
993#TODO# update range on size_allocate depending on child
994
989sub add { 995sub add {
990 my ($self, $widget) = @_; 996 my ($self, $widget) = @_;
991 997
992 $self->{vp}->add ($self->{child} = $widget); 998 $self->{vp}->add ($self->{child} = $widget);
993} 999}
994 1000
1001sub update_slider {
1002 my ($self) = @_;
1003
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005}
1006
995sub update { 1007sub update {
996 my ($self) = @_; 1008 my ($self) = @_;
997 1009
998 $self->SUPER::update; 1010 $self->SUPER::update;
999 1011
1000 # todo: overwrite size_allocate of child 1012 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1013}
1004 1014
1005sub size_allocate { 1015sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1016 my ($self, $w, $h) = @_;
1007 1017
1018 $self->update_slider;
1019
1008 $self->SUPER::size_allocate ($w, $h); 1020 $self->SUPER::invoke_size_allocate ($w, $h)
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012} 1021}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1022
1017############################################################################# 1023#############################################################################
1018 1024
1019package CFClient::UI::Frame; 1025package CFClient::UI::Frame;
1020 1026
… …
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1077 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1078
1073sub new { 1079sub new {
1074 my ($class, %arg) = @_; 1080 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1077 1081
1078 my $self = $class->SUPER::new ( 1082 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1083 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1084 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1085 border => 0.6,
… …
1083 min_w => 16, 1087 min_w => 16,
1084 min_h => 16, 1088 min_h => 16,
1085 %arg, 1089 %arg,
1086 ); 1090 );
1087 1091
1088 $self->{title} = new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1093 align => 0,
1090 valign => 1, 1094 valign => 1,
1091 text => $title, 1095 text => $self->{title},
1092 fontsize => $self->{border} 1096 fontsize => $self->{border},
1093 if defined $title; 1097 if exists $self->{title};
1098
1099 if ($self->{has_close_button}) {
1100 $self->{close_button} =
1101 new CFClient::UI::ImageButton
1102 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") };
1104
1105 $self->CFClient::UI::Container::add ($self->{close_button});
1106 }
1094 1107
1095 $self 1108 $self
1096} 1109}
1097 1110
1098sub add { 1111sub add {
1099 my ($self, @widgets) = @_; 1112 my ($self, @widgets) = @_;
1100 1113
1101 $self->SUPER::add (@widgets); 1114 $self->SUPER::add (@widgets);
1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1117}
1104 1118
1105sub border { 1119sub border {
1106 int $_[0]{border} * $::FONTSIZE 1120 int $_[0]{border} * $::FONTSIZE
1107} 1121}
1108 1122
1109sub size_request { 1123sub size_request {
1110 my ($self) = @_; 1124 my ($self) = @_;
1111 1125
1112 $self->{title}->size_request 1126 $self->{title_widget}->size_request
1113 if $self->{title}; 1127 if $self->{title_widget};
1128
1129 $self->{close_button}->size_request
1130 if $self->{close_button};
1114 1131
1115 my ($w, $h) = $self->SUPER::size_request; 1132 my ($w, $h) = $self->SUPER::size_request;
1116 1133
1117 ( 1134 (
1118 $w + $self->border * 2, 1135 $w + $self->border * 2,
1119 $h + $self->border * 2, 1136 $h + $self->border * 2,
1120 ) 1137 )
1121} 1138}
1122 1139
1123sub size_allocate { 1140sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1141 my ($self, $w, $h) = @_;
1125 1142
1126 if ($self->{title}) { 1143 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1144 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1145 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1146 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1147 }
1131 1148
1132 my $border = $self->border; 1149 my $border = $self->border;
1133 1150
1134 $h -= List::Util::max 0, $border * 2; 1151 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1152 $w -= List::Util::max 0, $border * 2;
1153
1154 $self->child->configure ($border, $border, $w, $h);
1155
1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1157 if $self->{close_button};
1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1136 1166
1137 $self->child->configure ($border, $border, $w, $h); 1167 1
1138} 1168}
1139 1169
1140sub button_down { 1170sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1142 1172
1143 my ($w, $h) = @$self{qw(w h)}; 1173 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1174 my $border = $self->border;
1145 1175
… …
1176 1206
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1207 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1208
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1209 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1210 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1211 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1212 };
1183 } else { 1213 } else {
1184 return 0; 1214 return 0;
1185 } 1215 }
1186 1216
1187 1 1217 1
1188} 1218}
1189 1219
1190sub button_up { 1220sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1192 1222
1193 !!delete $self->{motion} 1223 ! ! delete $self->{motion}
1194} 1224}
1195 1225
1196sub mouse_motion { 1226sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1227 my ($self, $ev, $x, $y) = @_;
1198 1228
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1229 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1230
1201 !!$self->{motion} 1231 ! ! $self->{motion}
1202} 1232}
1203 1233
1204sub _draw { 1234sub _draw {
1205 my ($self) = @_; 1235 my ($self) = @_;
1206 1236
… …
1232 1262
1233 glDisable GL_TEXTURE_2D; 1263 glDisable GL_TEXTURE_2D;
1234 1264
1235 $child->draw; 1265 $child->draw;
1236 1266
1237 if ($self->{title}) { 1267 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1268 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1269 $self->{title_widget}->_draw;
1270
1271 glTranslate 0, - ($border - $self->{h});
1240 } 1272 }
1273
1274 $self->{close_button}->draw
1275 if $self->{close_button};
1241} 1276}
1242 1277
1243############################################################################# 1278#############################################################################
1244 1279
1245package CFClient::UI::Table; 1280package CFClient::UI::Table;
… …
1268 1303
1269 $child->set_parent ($self); 1304 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1305 $self->{children}[$y][$x] = $child;
1271 1306
1272 $self->realloc; 1307 $self->realloc;
1308}
1309
1310sub remove {
1311 my ($self, $child) = @_;
1312
1313 # TODO: not yet implemented
1273} 1314}
1274 1315
1275# TODO: move to container class maybe? send children a signal on removal? 1316# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1317sub clear {
1277 my ($self) = @_; 1318 my ($self) = @_;
… …
1318 (sum @$ws), 1359 (sum @$ws),
1319 (sum @$hs), 1360 (sum @$hs),
1320 ) 1361 )
1321} 1362}
1322 1363
1323sub size_allocate { 1364sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1365 my ($self, $w, $h) = @_;
1325 1366
1326 my ($ws, $hs) = $self->get_wh; 1367 my ($ws, $hs) = $self->get_wh;
1327 1368
1328 my $req_w = (sum @$ws) || 1; 1369 my $req_w = (sum @$ws) || 1;
… …
1360 } 1401 }
1361 1402
1362 $y += $row_h; 1403 $y += $row_h;
1363 } 1404 }
1364 1405
1406 1
1365} 1407}
1366 1408
1367sub find_widget { 1409sub find_widget {
1368 my ($self, $x, $y) = @_; 1410 my ($self, $x, $y) = @_;
1369 1411
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1448 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1449 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1450 )
1409} 1451}
1410 1452
1411sub size_allocate { 1453sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1454 my ($self, $w, $h) = @_;
1413 1455
1414 my $space = $self->{vertical} ? $h : $w; 1456 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1457 my @children = $self->visible_children;
1416 1458
1417 my @req; 1459 my @req;
1418 1460
1419 if ($self->{homogeneous}) { 1461 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1462 @req = ($space / (@children || 1)) x @children;
1421 } else { 1463 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1464 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1465 my $req = List::Util::sum @req;
1424 1466
1425 if ($req > $space) { 1467 if ($req > $space) {
1426 # ah well, not enough space 1468 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1469 $_ *= $space / $req for @req;
1428 } else { 1470 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1471 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1472
1431 $space = ($space - $req) / $expand; # remaining space to give away 1473 $space = ($space - $req) / $expand; # remaining space to give away
1432 1474
1433 $req[$_] += $space * $children->[$_]{expand} 1475 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1476 for 0 .. $#children;
1435 } 1477 }
1436 } 1478 }
1437 1479
1438 CFClient::UI::harmonize \@req; 1480 CFClient::UI::harmonize \@req;
1439 1481
1440 my $pos = 0; 1482 my $pos = 0;
1441 for (0 .. $#$children) { 1483 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1484 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1486
1445 $pos += $alloc; 1487 $pos += $alloc;
1446 } 1488 }
1447 1489
1448 1 1490 1
… …
1542 1584
1543sub realloc { 1585sub realloc {
1544 my ($self) = @_; 1586 my ($self) = @_;
1545 1587
1546 delete $self->{ox}; 1588 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc; 1589 $self->SUPER::realloc;
1549} 1590}
1550 1591
1551sub set_text { 1592sub set_text {
1552 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1553 1594
1554 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1556 1597
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1559 1599
1600 delete $self->{size_req};
1560 $self->realloc; 1601 $self->realloc;
1561 $self->update; 1602 $self->update;
1562} 1603}
1563 1604
1564sub set_markup { 1605sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1569 1610
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1612
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1574 1614
1615 delete $self->{size_req};
1575 $self->realloc; 1616 $self->realloc;
1576 $self->update; 1617 $self->update;
1577} 1618}
1578 1619
1579sub size_request { 1620sub size_request {
1580 my ($self) = @_; 1621 my ($self) = @_;
1581 1622
1582 if (exists $self->{req_h}) { 1623 $self->{size_req} ||= do {
1583 @$self{qw(req_w req_h)}
1584 } else {
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590 1629
1591 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1592 1631
1593 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1634 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1636
1597 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1598 1638
1599 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
1600 $h = List::Util::max $h, $h2; 1640 $h = List::Util::max $h, $h2;
1601 } 1641 }
1602 1642
1603 ($w, $h) 1643 [$w, $h]
1604 } 1644 };
1605}
1606 1645
1646 @{ $self->{size_req} }
1647}
1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1607sub size_allocate { 1653sub invoke_size_allocate {
1608 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1609 1655
1610 delete $self->{ox}; 1656 delete $self->{ox};
1611 1657
1612 delete $self->{texture} 1658 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1659 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1660
1661 1
1614} 1662}
1615 1663
1616sub set_fontsize { 1664sub set_fontsize {
1617 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1618 1666
1619 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1620 delete $self->{texture}; 1669 delete $self->{texture};
1621 1670
1622 $self->realloc; 1671 $self->realloc;
1623} 1672}
1624 1673
1674sub reconfigure {
1675 my ($self) = @_;
1676
1677 delete $self->{size_req};
1678 delete $self->{texture};
1679
1680 $self->SUPER::reconfigure;
1681}
1682
1625sub _draw { 1683sub _draw {
1626 my ($self) = @_; 1684 my ($self) = @_;
1627 1685
1628 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1629 1687
1630 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1631 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1632 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1633 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1634 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1637 1695
1638 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1639 }; 1697 };
1640 1698
1641 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1644 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1645 1703
1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1648 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1649 }; 1707 };
1650 1708
1651 glEnable GL_TEXTURE_2D; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1653 1711
1654 glColor_premultiply @{$self->{fg}} 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1655 if $tex->{format} == GL_ALPHA;
1656
1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1658
1659 glDisable GL_TEXTURE_2D;
1660} 1713}
1661 1714
1662############################################################################# 1715#############################################################################
1663 1716
1664package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1678 can_hover => 1, 1731 can_hover => 1,
1679 can_focus => 1, 1732 can_focus => 1,
1680 valign => 0, 1733 valign => 0,
1681 can_events => 1, 1734 can_events => 1,
1682 #text => ... 1735 #text => ...
1736 #hidden => "*",
1683 @_ 1737 @_
1684 ) 1738 )
1685} 1739}
1686 1740
1687sub _set_text { 1741sub _set_text {
… …
1694 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1695 $self->{text} = $text; 1749 $self->{text} = $text;
1696 1750
1697 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1698 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1699 1754
1700 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1701 $self->update; 1758 $self->update;
1702} 1759}
1703 1760
1704sub set_text { 1761sub set_text {
1705 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1706 1763
1707 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1708 $self->_set_text ($text); 1765 $self->_set_text ($text);
1709
1710 $self->realloc;
1711} 1766}
1712 1767
1713sub get_text { 1768sub get_text {
1714 $_[0]{text} 1769 $_[0]{text}
1715} 1770}
… …
1720 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1721 1776
1722 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1723} 1778}
1724 1779
1725sub key_down { 1780sub invoke_key_down {
1726 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1727 1782
1728 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1729 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1730 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1742 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1743 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1744 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1745 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1746 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1747 $self->_emit ('escape'); 1802 $self->emit ('escape');
1748 } elsif ($uni) { 1803 } elsif ($uni) {
1749 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else { 1805 } else {
1751 return 0; 1806 return 0;
1752 } 1807 }
… …
1756 $self->realloc; 1811 $self->realloc;
1757 1812
1758 1 1813 1
1759} 1814}
1760 1815
1761sub focus_in { 1816sub invoke_focus_in {
1762 my ($self) = @_; 1817 my ($self) = @_;
1763 1818
1764 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1765 1820
1766 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1767} 1822}
1768 1823
1769sub button_down { 1824sub invoke_button_down {
1770 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1771 1826
1772 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1773 1828
1774 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1775 1830
1776 # byte-index to char-index 1831 # byte-index to char-index
1777 my $text = $self->{text}; 1832 my $text = $self->{text};
1778 utf8::encode $text; 1833 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1779 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length $text;
1780 1835
1781 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1782 $self->update; 1837 $self->update;
1783 1838
1784 1 1839 1
1785} 1840}
1786 1841
1787sub mouse_motion { 1842sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1789# 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#
1790 1845
1791 0 1846 1
1792} 1847}
1793 1848
1794sub _draw { 1849sub _draw {
1795 my ($self) = @_; 1850 my ($self) = @_;
1796 1851
… …
1837 1892
1838our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1839 1894
1840use CFClient::OpenGL; 1895use CFClient::OpenGL;
1841 1896
1842sub key_down { 1897sub invoke_key_down {
1843 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1844 1899
1845 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1846 1901
1847 if ($sym == 13) { 1902 if ($sym == 13) {
1848 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1849 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1850 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1851 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1852 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1853 $self->update; 1909 $self->update;
1854 1910
1855 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1856 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1857 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1873 } else { 1929 } else {
1874 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1875 } 1931 }
1876 1932
1877 } else { 1933 } else {
1878 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1879 } 1935 }
1880 1936
1881 1 1937 1
1882} 1938}
1883 1939
… …
1907 can_events => 1, 1963 can_events => 1,
1908 @_ 1964 @_
1909 ) 1965 )
1910} 1966}
1911 1967
1912sub activate { }
1913
1914sub button_up { 1968sub invoke_button_up {
1915 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1916 1970
1917 $self->emit ("activate") 1971 $self->emit ("activate")
1918 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1919 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
… …
1933 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1934 1988
1935 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1936 1990
1937 $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
1938} 2028}
1939 2029
1940############################################################################# 2030#############################################################################
1941 2031
1942package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1969 my ($self) = @_; 2059 my ($self) = @_;
1970 2060
1971 (6) x 2 2061 (6) x 2
1972} 2062}
1973 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
1974sub button_down { 2072sub invoke_button_down {
1975 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
1976 2074
1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979 $self->{state} = !$self->{state}; 2077 $self->toggle;
1980 $self->_emit (changed => $self->{state});
1981 } else { 2078 } else {
1982 return 0 2079 return 0
1983 } 2080 }
1984 2081
1985 1 2082 1
… …
2010package CFClient::UI::Image; 2107package CFClient::UI::Image;
2011 2108
2012our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
2013 2110
2014use CFClient::OpenGL; 2111use CFClient::OpenGL;
2015use Carp qw/confess/;
2016 2112
2017our %loaded_images; 2113our %texture_cache;
2018 2114
2019sub new { 2115sub new {
2020 my $class = shift; 2116 my $class = shift;
2021 2117
2022 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2023 2122
2024 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2123 $self->{path}
2124 or Carp::croak "required attribute 'path' not set";
2025 2125
2026 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2027 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2028 2128
2029 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2030 2130
2031 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033 $self->{aspect} = $tex->{w} / $tex->{h};
2034 2132
2035 $self 2133 $self
2036} 2134}
2037 2135
2038sub size_request { 2136sub size_request {
2039 my ($self) = @_; 2137 my ($self) = @_;
2040 2138
2041 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
2042} 2140}
2043 2141
2044sub _draw { 2142sub _draw {
2045 my ($self) = @_; 2143 my ($self) = @_;
2046 2144
… …
2155 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2156 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2157 2255
2158 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2159 my $h2 = $self->{h} * (1 - $ycut2); 2257 my $h2 = $self->{h} * (1 - $ycut2);
2258 my $h3 = $self->{h};
2259
2260 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2160 2261
2161 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
… …
2183 2284
2184 if ($t3) { 2285 if ($t3) {
2185 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2186 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2187 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191 glEnd; 2292 glEnd;
2192 } 2293 }
2193 2294
2194 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2282 $self->update; 2383 $self->update;
2283 2384
2284 $self 2385 $self
2285} 2386}
2286 2387
2287sub changed { }
2288
2289sub set_range { 2388sub set_range {
2290 my ($self, $range) = @_; 2389 my ($self, $range) = @_;
2291 2390
2292 ($range, $self->{range}) = ($self->{range}, $range); 2391 ($range, $self->{range}) = ($self->{range}, $range);
2293 2392
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}"; 2393 if ("@$range" ne "@{$self->{range}}") {
2394 $self->update;
2395 $self->set_value ($self->{range}[0]);
2396 }
2296} 2397}
2297 2398
2298sub set_value { 2399sub set_value {
2299 my ($self, $value) = @_; 2400 my ($self, $value) = @_;
2300 2401
… …
2311 if $unit; 2412 if $unit;
2312 2413
2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2414 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314 2415
2315 if ($value != $old_value) { 2416 if ($value != $old_value) {
2316 $self->_emit (changed => $value); 2417 $self->emit (changed => $value);
2317 $self->update; 2418 $self->update;
2318 } 2419 }
2319} 2420}
2320 2421
2321sub size_request { 2422sub size_request {
2322 my ($self) = @_; 2423 my ($self) = @_;
2323 2424
2324 ($self->{req_w}, $self->{req_h}) 2425 ($self->{req_w}, $self->{req_h})
2325} 2426}
2326 2427
2327sub button_down { 2428sub invoke_button_down {
2328 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2329 2430
2330 $self->SUPER::button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2331 2432
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333 2434
2334 $self->mouse_motion ($ev, $x, $y) 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2335} 2436}
2336 2437
2337sub mouse_motion { 2438sub invoke_mouse_motion {
2338 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2339 2440
2340 if ($GRAB == $self) { 2441 if ($GRAB == $self) {
2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2442 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342 2443
… …
2447sub set_range { shift->{slider}->set_range (@_) } 2548sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) } 2549sub set_value { shift->{slider}->set_value (@_) }
2449 2550
2450############################################################################# 2551#############################################################################
2451 2552
2452package CFClient::UI::TextView; 2553package CFClient::UI::TextScroller;
2453 2554
2454our @ISA = CFClient::UI::HBox::; 2555our @ISA = CFClient::UI::HBox::;
2455 2556
2456use CFClient::OpenGL; 2557use CFClient::OpenGL;
2457 2558
… …
2459 my $class = shift; 2560 my $class = shift;
2460 2561
2461 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2462 fontsize => 1, 2563 fontsize => 1,
2463 can_events => 0, 2564 can_events => 0,
2565 indent => 0,
2464 #font => default_font 2566 #font => default_font
2465 @_, 2567 @_,
2466 2568
2467 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2468 par => [], 2570 par => [],
2469 height => 0, 2571 height => 0,
2470 children => [ 2572 children => [
2471 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2472 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2483 2585
2484 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2485 $self->reflow; 2587 $self->reflow;
2486} 2588}
2487 2589
2590sub size_request {
2591 my ($self) = @_;
2592
2593 my ($empty, $slider) = @{ $self->{children} };
2594
2595 local $self->{children} = [$empty, $slider];
2596 $self->SUPER::size_request
2597}
2598
2488sub size_allocate { 2599sub invoke_size_allocate {
2489 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2490 2601
2491 $self->SUPER::size_allocate ($w, $h); 2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492 2604
2493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496 2609
2497 $self->reflow; 2610 $self->reflow;
2498}
2499 2611
2500sub text_size { 2612 local $self->{children} = [$empty, $slider];
2501 my ($self, $text, $indent) = @_; 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2614}
2615
2616sub get_layout {
2617 my ($self, $para) = @_;
2502 2618
2503 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2504 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $layout->set_width ($self->{children}[0]{w} - $indent); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507 $layout->set_markup ($text); 2626 $layout->set_markup ($para->{markup});
2627
2628 $layout->set_shapes (
2629 map
2630 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2631 @{$para->{widget}}
2508 2632 );
2633
2509 $layout->size 2634 $layout
2510} 2635}
2511 2636
2512sub reflow { 2637sub reflow {
2513 my ($self) = @_; 2638 my ($self) = @_;
2514 2639
… …
2523 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2524} 2649}
2525 2650
2526sub clear { 2651sub clear {
2527 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2528 2656
2529 $self->{par} = []; 2657 $self->{par} = [];
2530 $self->{height} = 0; 2658 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532} 2660}
2533 2661
2534sub add_paragraph { 2662sub add_paragraph {
2535 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2536 2664
2537 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2538 my ($w, $h) = $self->text_size ($line); 2666
2539 $self->{height} += $h; 2667 $para = {
2540 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2668 w => 1e10,
2669 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2541 } 2674 };
2542 2675
2543 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2676 $self->add (@w) if @w;
2677 push @{$self->{par}}, $para;
2678
2679 $self->{need_reflow}++;
2680 $self->update;
2681}
2682
2683sub scroll_to_bottom {
2684 my ($self) = @_;
2685
2686 $self->{scroll_to_bottom} = 1;
2687 $self->update;
2544} 2688}
2545 2689
2546sub update { 2690sub update {
2547 my ($self) = @_; 2691 my ($self) = @_;
2548 2692
… …
2550 2694
2551 return unless $self->{h} > 0; 2695 return unless $self->{h} > 0;
2552 2696
2553 delete $self->{texture}; 2697 delete $self->{texture};
2554 2698
2555 $ROOT->on_post_alloc ($self, sub { 2699 $ROOT->on_post_alloc ($self => sub {
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557 2701
2558 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2559 my $height = 0; 2703 my $height = 0;
2560 2704
2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2567 $layout->set_width ($W - $_->[3]); 2707 my $layout = $self->get_layout ($para);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3]; 2709
2571 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2572 } 2713 }
2573 2714
2574 $height += $_->[1]; 2715 $height += $para->{h};
2575 } 2716 }
2576 2717
2577 $self->{height} = $height; 2718 $self->{height} = $height;
2578 2719
2579 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2580 2721
2581 delete $self->{texture}; 2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2582 } 2727 }
2583 2728
2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2585 glClearColor 0, 0, 0, 0; 2730 glClearColor 0, 0, 0, 0;
2586 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
… …
2590 my $y0 = $top; 2735 my $y0 = $top;
2591 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2592 2737
2593 my $y = 0; 2738 my $y = 0;
2594 2739
2595 my $layout = $self->{layout};
2596
2597 $layout->set_font ($self->{font}) if $self->{font};
2598
2599 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2603 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2604 my $h = $par->[1]; 2741 my $h = $para->{h};
2605 2742
2606 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2607 $layout->set_foreground (@{ $par->[2] });
2608 $layout->set_width ($W - $par->[3]);
2609 $layout->set_markup ($par->[4]);
2610 2744
2611 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2612 2746
2613 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2614 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2748
2749 if (my @w = @{ $para->{widget} }) {
2750 my @s = $layout->get_shapes;
2751
2752 for (@w) {
2753 my ($dx, $dy) = splice @s, 0, 2, ();
2754
2755 $_->{x} = $dx + $para->{indent};
2756 $_->{y} = $dy + $y - $y0;
2757
2758 $_->draw;
2759 }
2760 }
2615 } 2761 }
2616 2762
2617 $y += $h; 2763 $y += $h;
2618 } 2764 }
2619
2620 glDisable GL_BLEND;
2621 }; 2765 };
2622 }); 2766 });
2767}
2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2623} 2776}
2624 2777
2625sub _draw { 2778sub _draw {
2626 my ($self) = @_; 2779 my ($self) = @_;
2627 2780
… …
2630 glColor 0, 0, 0, 1; 2783 glColor 0, 0, 0, 1;
2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2633 2786
2634 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2635
2636} 2788}
2637 2789
2638############################################################################# 2790#############################################################################
2639 2791
2640package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2727 $tooltip .= "\n\n" . (ref $widget) . "\n" 2879 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2880 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n" 2881 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}"; 2882 . "visible $widget->{visible}";
2731 } 2883 }
2884
2885 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//;
2732 2887
2733 $self->add (new CFClient::UI::Label 2888 $self->add (new CFClient::UI::Label
2734 markup => $tooltip, 2889 markup => $tooltip,
2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736 fontsize => 0.8, 2891 fontsize => 0.8,
… …
2746 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747 2902
2748 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2749} 2904}
2750 2905
2751sub size_allocate { 2906sub invoke_size_allocate {
2752 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2753 2908
2754 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755} 2910}
2756 2911
2757sub visibility_change { 2912sub invoke_visibility_change {
2758 my ($self, $visible) = @_; 2913 my ($self, $visible) = @_;
2759 2914
2760 return unless $visible; 2915 return unless $visible;
2761 2916
2762 $self->{root}->on_post_alloc ("move_$self" => sub { 2917 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2764 or return; 2919 or return;
2765 2920
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767 2922
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH; 2924 if $x + $self->{w} > $self->{root}{w};
2770 2925
2771 $self->move_abs ($x, $y); 2926 $self->move_abs ($x, $y);
2772 }); 2927 });
2773} 2928}
2774 2929
… …
2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2871 } 3026 }
2872} 3027}
2873 3028
2874sub DESTROY { 3029sub destroy {
2875 my ($self) = @_; 3030 my ($self) = @_;
2876 3031
2877 $self->{timer}->cancel 3032 $self->{timer}->cancel
2878 if $self->{timer}; 3033 if $self->{timer};
2879 3034
2880 $self->SUPER::DESTROY; 3035 $self->SUPER::destroy;
2881} 3036}
2882 3037
2883############################################################################# 3038#############################################################################
2884 3039
2885package CFClient::UI::Buttonbar; 3040package CFClient::UI::Buttonbar;
… …
2906 ); 3061 );
2907 3062
2908 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3063 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2909 3064
2910 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2911 my ($widget, $cb) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2912 3067
2913 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2914 if (!ref $widget) { 3069 if (!ref $widget) {
3070 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2;
3072
3073 $widget = new CFClient::UI::HBox
3074 can_hover => 1,
3075 can_events => 1,
3076 tooltip => $tooltip,
3077 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1),
3080 ],
3081 ;
3082
3083 } else {
2915 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2916 can_hover => 1, 3085 can_hover => 1,
2917 can_events => 1, 3086 can_events => 1,
2918 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip;
3089 }
2919 } 3090 }
2920 3091
2921 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
2922 3093
2923 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
2928 3099
2929# popup given the event (must be a mouse button down event currently) 3100# popup given the event (must be a mouse button down event currently)
2930sub popup { 3101sub popup {
2931 my ($self, $ev) = @_; 3102 my ($self, $ev) = @_;
2932 3103
2933 $self->_emit ("popdown"); 3104 $self->emit ("popdown");
2934 3105
2935 # maybe save $GRAB? must be careful about events... 3106 # maybe save $GRAB? must be careful about events...
2936 $GRAB = $self; 3107 $GRAB = $self;
2937 $self->{button} = $ev->{button}; 3108 $self->{button} = $ev->{button};
2938 3109
2939 $self->show; 3110 $self->show;
2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3111 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941} 3112}
2942 3113
2943sub mouse_motion { 3114sub invoke_mouse_motion {
2944 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
2945 3116
2946 # TODO: should use vbox->find_widget or so 3117 # TODO: should use vbox->find_widget or so
2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3118 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948 $self->{hover} = $self->{item}{$HOVER}; 3119 $self->{hover} = $self->{item}{$HOVER};
2949 3120
2950 0 3121 0
2951} 3122}
2952 3123
2953sub button_up { 3124sub invoke_button_up {
2954 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2955 3126
2956 if ($ev->{button} == $self->{button}) { 3127 if ($ev->{button} == $self->{button}) {
2957 undef $GRAB; 3128 undef $GRAB;
2958 $self->hide; 3129 $self->hide;
2959 3130
2960 $self->_emit ("popdown"); 3131 $self->emit ("popdown");
2961 $self->{hover}[1]->() if $self->{hover}; 3132 $self->{hover}[1]->() if $self->{hover};
2962 } else { 3133 } else {
2963 return 0 3134 return 0
2964 } 3135 }
2965 3136
… …
2992 3163
2993 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} }; 3165 if @{ $self->{children} };
2995} 3166}
2996 3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3172}
3173
2997sub set_current_page { 3174sub set_current_page {
2998 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
2999 3176
3000 my $widget = ref $page_or_widget 3177 my $widget = ref $page_or_widget
3001 ? $page_or_widget 3178 ? $page_or_widget
3002 : $self->{children}[$page_or_widget]; 3179 : $self->{children}[$page_or_widget];
3003 3180
3004 $self->{current} = $widget; 3181 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3182 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006 3183
3007 $self->_emit (page_changed => $self->{current}); 3184 $self->emit (page_changed => $self->{current});
3008 3185
3009 $self->realloc; 3186 $self->realloc;
3010} 3187}
3011 3188
3012sub visible_children { 3189sub visible_children {
… …
3017 my ($self) = @_; 3194 my ($self) = @_;
3018 3195
3019 $self->{current}->size_request 3196 $self->{current}->size_request
3020} 3197}
3021 3198
3022sub size_allocate { 3199sub invoke_size_allocate {
3023 my ($self, $w, $h) = @_; 3200 my ($self, $w, $h) = @_;
3024 3201
3025 $self->{current}->configure (0, 0, $w, $h); 3202 $self->{current}->configure (0, 0, $w, $h);
3203
3204 1
3026} 3205}
3027 3206
3028sub _draw { 3207sub _draw {
3029 my ($self) = @_; 3208 my ($self) = @_;
3030 3209
… …
3065 ); 3244 );
3066 3245
3067 $self->{multiplexer}->add ($widget); 3246 $self->{multiplexer}->add ($widget);
3068} 3247}
3069 3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3253}
3254
3070sub set_current_page { 3255sub set_current_page {
3071 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3072 3257
3073 $self->{multiplexer}->set_current_page ($page); 3258 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current}); 3259 $self->emit (page_changed => $self->{multiplexer}{current});
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::Combobox;
3265
3266use utf8;
3267
3268our @ISA = CFClient::UI::Button::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (
3274 options => [], # [value, title, longdesc], ...
3275 value => undef,
3276 @_,
3277 );
3278
3279 $self->_set_value ($self->{value});
3280
3281 $self
3282}
3283
3284sub invoke_button_down {
3285 my ($self, $ev) = @_;
3286
3287 my @menu_items;
3288
3289 for (@{ $self->{options} }) {
3290 my ($value, $title, $tooltip) = @$_;
3291
3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293 }
3294
3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296}
3297
3298sub _set_value {
3299 my ($self, $value) = @_;
3300
3301 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3302 or return;
3303
3304 $self->{value} = $item->[0];
3305 $self->set_markup ("$item->[1] ⇓");
3306 $self->set_tooltip ($item->[2]);
3307}
3308
3309sub set_value {
3310 my ($self, $value) = @_;
3311
3312 return unless $self->{value} ne $value;
3313
3314 $self->_set_value ($value);
3315 $self->emit (changed => $value);
3075} 3316}
3076 3317
3077############################################################################# 3318#############################################################################
3078 3319
3079package CFClient::UI::Statusbox; 3320package CFClient::UI::Statusbox;
… …
3178 $item->{count}++; 3419 $item->{count}++;
3179 } else { 3420 } else {
3180 $item->{count} = 1; 3421 $item->{count} = 1;
3181 $item->{text} = $item->{tooltip} = $text; 3422 $item->{text} = $item->{tooltip} = $text;
3182 } 3423 }
3183 $item->{id} = ++$self->{id}; 3424 $item->{id} += 0.2;#d#
3184 $item->{timeout} = $timeout; 3425 $item->{timeout} = $timeout;
3185 delete $item->{label}; 3426 delete $item->{label};
3186 } else { 3427 } else {
3187 $self->{item}{$group} = { 3428 $self->{item}{$group} = {
3188 id => ++$self->{id}, 3429 id => ++$self->{id},
… …
3194 count => 1, 3435 count => 1,
3195 %arg, 3436 %arg,
3196 }; 3437 };
3197 } 3438 }
3198 3439
3440 $ROOT->on_refresh (reorder => sub {
3199 $self->reorder; 3441 $self->reorder;
3442 });
3200} 3443}
3201 3444
3202sub reconfigure { 3445sub reconfigure {
3203 my ($self) = @_; 3446 my ($self) = @_;
3204 3447
… …
3207 3450
3208 $self->reorder; 3451 $self->reorder;
3209 $self->SUPER::reconfigure; 3452 $self->SUPER::reconfigure;
3210} 3453}
3211 3454
3212sub DESTROY { 3455sub destroy {
3213 my ($self) = @_; 3456 my ($self) = @_;
3214 3457
3215 $self->{timer}->cancel; 3458 $self->{timer}->cancel;
3216 3459
3217 $self->SUPER::DESTROY; 3460 $self->SUPER::destroy;
3218} 3461}
3219 3462
3220############################################################################# 3463#############################################################################
3221 3464
3222package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3223 3466
3224our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3225 3468
3226sub new { 3469sub new {
3227 my $class = shift; 3470 my $class = shift;
3228 3471
3229 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3231 @_, 3474 @_,
3232 ); 3475 );
3233 3476
3234 $self 3477 $self
3235} 3478}
3236 3479
3237sub set_items { 3480sub set_items {
3238 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3239 3482
3240 $self->{child}->clear; 3483 $self->clear;
3241 return unless $items; 3484 return unless $items;
3242 3485
3243 my @items = sort { 3486 my @items = sort {
3244 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3246 } @$items; 3489 } values %$items;
3247 3490
3248 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3249 3492
3250 my $row = 0; 3493 my $row = 0;
3251 for my $item (@items) { 3494 for my $item (@items) {
3252 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3253 3496
3254 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3257 3500
3258 $row++; 3501 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 } 3502 }
3457} 3503}
3458 3504
3459############################################################################# 3505#############################################################################
3460 3506
… …
3470 commands => [], 3516 commands => [],
3471 @_, 3517 @_,
3472 ) 3518 )
3473} 3519}
3474 3520
3475# XXX: Do sorting? Argl... 3521my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3522
3523my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3525my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3533
3534sub rebuild_spell_list {
3535 my ($self) = @_;
3536
3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3538 $self->clear;
3539
3540 return unless $::CONN;
3541
3542 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548 my $row = 0;
3549
3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551 my $spell = $self->{spell}{$_};
3552
3553 $row++;
3554
3555 my $spell_cb = sub {
3556 my ($widget, $ev) = @_;
3557
3558 if ($ev->{button} == 1) {
3559 $::CONN->user_send ("cast $spell->{name}");
3560 } elsif ($ev->{button} == 2) {
3561 $::CONN->user_send ("invoke $spell->{name}");
3562 } elsif ($ev->{button} == 3) {
3563 (new CFClient::UI::Menu
3564 items => [
3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567 ],
3568 )->popup ($ev);
3569 } else {
3570 return 0;
3571 }
3572
3573 1
3574 };
3575
3576 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578 #TODO: add path info to tooltip
3579 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581 $self->add (0, $row, new CFClient::UI::Face
3582 face => $spell->{face},
3583 can_hover => 1,
3584 can_events => 1,
3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3596 );
3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602 }
3603 });
3604}
3605
3476sub add_spell { 3606sub add_spell {
3477 my ($self, $spell) = @_; 3607 my ($self, $spell) = @_;
3608
3478 $self->{spells}->{$spell->{name}} = $spell; 3609 $self->{spell}->{$spell->{name}} = $spell;
3479 3610 $self->rebuild_spell_list;
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507} 3611}
3508 3612
3509sub remove_spell { 3613sub remove_spell {
3510 my ($self, $spell) = @_; 3614 my ($self, $spell) = @_;
3615
3511 delete $self->{spells}->{$spell->{name}}; 3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3512 $self->rebuild_spell_list; 3624 $self->rebuild_spell_list;
3513} 3625}
3514 3626
3515############################################################################# 3627#############################################################################
3516 3628
… …
3553 $coord = $max - $size if $coord > $max - $size; 3665 $coord = $max - $size if $coord > $max - $size;
3554 3666
3555 int $coord + 0.5 3667 int $coord + 0.5
3556} 3668}
3557 3669
3558sub size_allocate { 3670sub invoke_size_allocate {
3559 my ($self, $w, $h) = @_; 3671 my ($self, $w, $h) = @_;
3560 3672
3561 for my $child ($self->children) { 3673 for my $child ($self->children) {
3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3674 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563 3675
… …
3567 $X = _to_pixel $X, $W, $self->{w}; 3679 $X = _to_pixel $X, $W, $self->{w};
3568 $Y = _to_pixel $Y, $H, $self->{h}; 3680 $Y = _to_pixel $Y, $H, $self->{h};
3569 3681
3570 $child->configure ($X, $Y, $W, $H); 3682 $child->configure ($X, $Y, $W, $H);
3571 } 3683 }
3684
3685 1
3572} 3686}
3573 3687
3574sub coord2local { 3688sub coord2local {
3575 my ($self, $x, $y) = @_; 3689 my ($self, $x, $y) = @_;
3576 3690

Diff Legend

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