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.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.316 by root, Sun Jul 2 13:57:58 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
… …
889 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
890 892
891 ($w, $h) 893 ($w, $h)
892} 894}
893 895
894sub size_allocate { 896sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
896 898
897 my $child = $self->child; 899 my $child = $self->child;
898 900
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901 903
902 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
903 $self->update; 905 $self->update;
906
907 1
904} 908}
905 909
906sub set_offset { 910sub set_offset {
907 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
908 912
… …
982 $self->add ($child) if $child; 986 $self->add ($child) if $child;
983 987
984 $self 988 $self
985} 989}
986 990
991#TODO# update range on size_allocate depending on child
992
987sub add { 993sub add {
988 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
989 995
990 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
991} 997}
992 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
993sub update { 1005sub update {
994 my ($self) = @_; 1006 my ($self) = @_;
995 1007
996 $self->SUPER::update; 1008 $self->SUPER::update;
997 1009
998 # todo: overwrite size_allocate of child 1010 $self->update_slider;
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001} 1011}
1002 1012
1003sub size_allocate { 1013sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1005 1015
1016 $self->update_slider;
1017
1006 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010} 1019}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1020
1015############################################################################# 1021#############################################################################
1016 1022
1017package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1018 1024
… …
1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1069 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);
1070 1076
1071sub new { 1077sub new {
1072 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1073
1074 my $title = delete $arg{title};
1075 1079
1076 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1083 border => 0.6,
… …
1081 min_w => 16, 1085 min_w => 16,
1082 min_h => 16, 1086 min_h => 16,
1083 %arg, 1087 %arg,
1084 ); 1088 );
1085 1089
1086 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1091 align => 0,
1088 valign => 1, 1092 valign => 1,
1089 text => $title, 1093 text => $self->{title},
1090 fontsize => $self->{border} 1094 fontsize => $self->{border},
1091 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 }
1092 1105
1093 $self 1106 $self
1094} 1107}
1095 1108
1096sub add { 1109sub add {
1097 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1098 1111
1099 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1115}
1102 1116
1103sub border { 1117sub border {
1104 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1105} 1119}
1106 1120
1107sub size_request { 1121sub size_request {
1108 my ($self) = @_; 1122 my ($self) = @_;
1109 1123
1110 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1111 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1112 1129
1113 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1114 1131
1115 ( 1132 (
1116 $w + $self->border * 2, 1133 $w + $self->border * 2,
1117 $h + $self->border * 2, 1134 $h + $self->border * 2,
1118 ) 1135 )
1119} 1136}
1120 1137
1121sub size_allocate { 1138sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1123 1140
1124 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1145 }
1129 1146
1130 my $border = $self->border; 1147 my $border = $self->border;
1131 1148
1132 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1133 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1134 1151
1135 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1136}
1137 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1138sub button_down { 1160sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1140 1162
1141 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1164 my $border = $self->border;
1143 1165
… …
1174 1196
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1198
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1200 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1202 };
1181 } else { 1203 } else {
1182 return 0; 1204 return 0;
1183 } 1205 }
1184 1206
1185 1 1207 1
1186} 1208}
1187 1209
1188sub button_up { 1210sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1190 1212
1191 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1192} 1214}
1193 1215
1194sub mouse_motion { 1216sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1196 1218
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1220
1199 !!$self->{motion} 1221 ! ! $self->{motion}
1200} 1222}
1201 1223
1202sub _draw { 1224sub _draw {
1203 my ($self) = @_; 1225 my ($self) = @_;
1204 1226
… …
1230 1252
1231 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1232 1254
1233 $child->draw; 1255 $child->draw;
1234 1256
1235 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1238 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1239} 1266}
1240 1267
1241############################################################################# 1268#############################################################################
1242 1269
1243package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1266 1293
1267 $child->set_parent ($self); 1294 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1269 1296
1270 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1271} 1304}
1272 1305
1273# 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?
1274sub clear { 1307sub clear {
1275 my ($self) = @_; 1308 my ($self) = @_;
… …
1316 (sum @$ws), 1349 (sum @$ws),
1317 (sum @$hs), 1350 (sum @$hs),
1318 ) 1351 )
1319} 1352}
1320 1353
1321sub size_allocate { 1354sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1323 1356
1324 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1325 1358
1326 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1358 } 1391 }
1359 1392
1360 $y += $row_h; 1393 $y += $row_h;
1361 } 1394 }
1362 1395
1396 1
1363} 1397}
1364 1398
1365sub find_widget { 1399sub find_widget {
1366 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1367 1401
… …
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 ) 1440 )
1407} 1441}
1408 1442
1409sub size_allocate { 1443sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1411 1445
1412 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1414 1448
1415 my @req; 1449 my @req;
1416 1450
1417 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1419 } else { 1453 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1422 1456
1423 if ($req > $space) { 1457 if ($req > $space) {
1424 # ah well, not enough space 1458 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1426 } else { 1460 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1462
1429 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1430 1464
1431 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1466 for 0 .. $#children;
1433 } 1467 }
1434 } 1468 }
1435 1469
1436 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1437 1471
1438 my $pos = 0; 1472 my $pos = 0;
1439 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1441 $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));
1442 1476
1443 $pos += $alloc; 1477 $pos += $alloc;
1444 } 1478 }
1445 1479
1446 1 1480 1
… …
1536 1570
1537 delete $self->{texture}; 1571 delete $self->{texture};
1538 $self->SUPER::update; 1572 $self->SUPER::update;
1539} 1573}
1540 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1541sub set_text { 1582sub set_text {
1542 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1543 1584
1544 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1546 1587
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1549 1590
1591 delete $self->{size_req};
1550 $self->realloc; 1592 $self->realloc;
1551 $self->update; 1593 $self->update;
1552} 1594}
1553 1595
1554sub set_markup { 1596sub set_markup {
… …
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1603
1562 $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;
1563 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1564 1606
1607 delete $self->{size_req};
1565 $self->realloc; 1608 $self->realloc;
1566 $self->update; 1609 $self->update;
1567} 1610}
1568 1611
1569sub size_request { 1612sub size_request {
1570 my ($self) = @_; 1613 my ($self) = @_;
1571 1614
1615 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1621
1578 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1579 1623
1580 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1627
1584 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1585 1629
1586 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1588 } 1635 };
1589 1636
1590 ($w, $h) 1637 @{ $self->{size_req} }
1591} 1638}
1592 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1593sub size_allocate { 1644sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1595 1646
1596 delete $self->{ox}; 1647 delete $self->{ox};
1597 1648
1598 delete $self->{texture} 1649 delete $self->{texture}
1599 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
1600} 1653}
1601 1654
1602sub set_fontsize { 1655sub set_fontsize {
1603 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1604 1657
1605 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1606 delete $self->{texture}; 1660 delete $self->{texture};
1607 1661
1608 $self->realloc; 1662 $self->realloc;
1663}
1664
1665sub reconfigure {
1666 my ($self) = @_;
1667
1668 delete $self->{size_req};
1669
1670 $self->SUPER::reconfigure;
1609} 1671}
1610 1672
1611sub _draw { 1673sub _draw {
1612 my ($self) = @_; 1674 my ($self) = @_;
1613 1675
… …
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1696 : ($self->{h} - $tex->{h}) * 0.5);
1635 }; 1697 };
1636 1698
1637 glEnable GL_TEXTURE_2D; 1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1703
1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1639
1640 glColor_premultiply @{$self->{fg}}
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1644 1712
1645 glDisable GL_TEXTURE_2D; 1713 glDisable GL_TEXTURE_2D;
1646} 1714}
1647 1715
1648############################################################################# 1716#############################################################################
… …
1664 can_hover => 1, 1732 can_hover => 1,
1665 can_focus => 1, 1733 can_focus => 1,
1666 valign => 0, 1734 valign => 0,
1667 can_events => 1, 1735 can_events => 1,
1668 #text => ... 1736 #text => ...
1737 #hidden => "*",
1669 @_ 1738 @_
1670 ) 1739 )
1671} 1740}
1672 1741
1673sub _set_text { 1742sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 1749 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1750 $self->{text} = $text;
1682 1751
1683 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1754 delete $self->{size_req};
1685 1755
1686 $self->_emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1757
1758 $self->realloc;
1687 $self->update; 1759 $self->update;
1688} 1760}
1689 1761
1690sub set_text { 1762sub set_text {
1691 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1692 1764
1693 $self->{cursor} = length $text; 1765 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1766 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1767}
1698 1768
1699sub get_text { 1769sub get_text {
1700 $_[0]{text} 1770 $_[0]{text}
1701} 1771}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1707 1777
1708 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1709} 1779}
1710 1780
1711sub key_down { 1781sub invoke_key_down {
1712 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1713 1783
1714 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1798 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1799 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1800 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1803 $self->emit ('escape');
1734 } elsif ($uni) { 1804 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1806 } else {
1737 return 0; 1807 return 0;
1738 } 1808 }
… …
1742 $self->realloc; 1812 $self->realloc;
1743 1813
1744 1 1814 1
1745} 1815}
1746 1816
1747sub focus_in { 1817sub invoke_focus_in {
1748 my ($self) = @_; 1818 my ($self) = @_;
1749 1819
1750 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1751 1821
1752 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1753} 1823}
1754 1824
1755sub button_down { 1825sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1757 1827
1758 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1829
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1831
1762 # byte-index to char-index 1832 # byte-index to char-index
1763 my $text = $self->{text}; 1833 my $text = $self->{text};
… …
1768 $self->update; 1838 $self->update;
1769 1839
1770 1 1840 1
1771} 1841}
1772 1842
1773sub mouse_motion { 1843sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1845# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1846
1777 0 1847 1
1778} 1848}
1779 1849
1780sub _draw { 1850sub _draw {
1781 my ($self) = @_; 1851 my ($self) = @_;
1782 1852
… …
1823 1893
1824our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1825 1895
1826use CFClient::OpenGL; 1896use CFClient::OpenGL;
1827 1897
1828sub key_down { 1898sub invoke_key_down {
1829 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1830 1900
1831 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1832 1902
1833 if ($sym == 13) { 1903 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1836 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1909 $self->emit (activate => $txt);
1839 $self->update; 1910 $self->update;
1840 1911
1841 } elsif ($sym == CFClient::SDLK_UP) { 1912 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1913 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1914 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1930 } else {
1860 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1861 } 1932 }
1862 1933
1863 } else { 1934 } else {
1864 return $self->SUPER::key_down ($ev) 1935 return $self->SUPER::invoke_key_down ($ev)
1865 } 1936 }
1866 1937
1867 1 1938 1
1868} 1939}
1869 1940
… …
1893 can_events => 1, 1964 can_events => 1,
1894 @_ 1965 @_
1895 ) 1966 )
1896} 1967}
1897 1968
1898sub activate { }
1899
1900sub button_up { 1969sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1902 1971
1903 $self->emit ("activate") 1972 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 1974 && $y >= 0 && $y < $self->{h};
… …
1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1920 1989
1921 glDisable GL_TEXTURE_2D; 1990 glDisable GL_TEXTURE_2D;
1922 1991
1923 $self->SUPER::_draw; 1992 $self->SUPER::_draw;
1993}
1994
1995#############################################################################
1996
1997package CFClient::UI::ImageButton;
1998
1999our @ISA = CFClient::UI::Image::;
2000
2001use CFClient::OpenGL;
2002
2003my %textures;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 padding_x => 4,
2010 padding_y => 4,
2011 fg => [1, 1, 1],
2012 active_fg => [0, 0, 1],
2013 can_hover => 1,
2014 align => 0,
2015 valign => 0,
2016 can_events => 1,
2017 @_
2018 );
2019}
2020
2021sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_;
2023
2024 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h};
2027
2028 1
1924} 2029}
1925 2030
1926############################################################################# 2031#############################################################################
1927 2032
1928package CFClient::UI::CheckBox; 2033package CFClient::UI::CheckBox;
… …
1955 my ($self) = @_; 2060 my ($self) = @_;
1956 2061
1957 (6) x 2 2062 (6) x 2
1958} 2063}
1959 2064
1960sub button_down { 2065sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1962 2067
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
1966 $self->_emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
1967 } else { 2072 } else {
1968 return 0 2073 return 0
1969 } 2074 }
1970 2075
1971 1 2076 1
… …
1996package CFClient::UI::Image; 2101package CFClient::UI::Image;
1997 2102
1998our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
1999 2104
2000use CFClient::OpenGL; 2105use CFClient::OpenGL;
2001use Carp qw/confess/;
2002 2106
2003our %loaded_images; 2107our %texture_cache;
2004 2108
2005sub new { 2109sub new {
2006 my $class = shift; 2110 my $class = shift;
2007 2111
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2009 2116
2010 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2011 2119
2012 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2013 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2014 2122
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2016 2124
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2126
2021 $self 2127 $self
2022} 2128}
2023 2129
2024sub size_request { 2130sub size_request {
2025 my ($self) = @_; 2131 my ($self) = @_;
2026 2132
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
2028} 2134}
2029 2135
2030sub _draw { 2136sub _draw {
2031 my ($self) = @_; 2137 my ($self) = @_;
2032 2138
… …
2268 $self->update; 2374 $self->update;
2269 2375
2270 $self 2376 $self
2271} 2377}
2272 2378
2273sub changed { }
2274
2275sub set_range { 2379sub set_range {
2276 my ($self, $range) = @_; 2380 my ($self, $range) = @_;
2277 2381
2278 ($range, $self->{range}) = ($self->{range}, $range); 2382 ($range, $self->{range}) = ($self->{range}, $range);
2279 2383
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2384 if ("@$range" ne "@{$self->{range}}") {
2385 $self->update;
2386 $self->set_value ($self->{range}[0]);
2387 }
2282} 2388}
2283 2389
2284sub set_value { 2390sub set_value {
2285 my ($self, $value) = @_; 2391 my ($self, $value) = @_;
2286 2392
… …
2297 if $unit; 2403 if $unit;
2298 2404
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2406
2301 if ($value != $old_value) { 2407 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2408 $self->emit (changed => $value);
2303 $self->update; 2409 $self->update;
2304 } 2410 }
2305} 2411}
2306 2412
2307sub size_request { 2413sub size_request {
2308 my ($self) = @_; 2414 my ($self) = @_;
2309 2415
2310 ($self->{req_w}, $self->{req_h}) 2416 ($self->{req_w}, $self->{req_h})
2311} 2417}
2312 2418
2313sub button_down { 2419sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2315 2421
2316 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2423
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2425
2320 $self->mouse_motion ($ev, $x, $y) 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2427}
2322 2428
2323sub mouse_motion { 2429sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2325 2431
2326 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2434
… …
2433sub set_range { shift->{slider}->set_range (@_) } 2539sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 2540sub set_value { shift->{slider}->set_value (@_) }
2435 2541
2436############################################################################# 2542#############################################################################
2437 2543
2438package CFClient::UI::TextView; 2544package CFClient::UI::TextScroller;
2439 2545
2440our @ISA = CFClient::UI::HBox::; 2546our @ISA = CFClient::UI::HBox::;
2441 2547
2442use CFClient::OpenGL; 2548use CFClient::OpenGL;
2443 2549
… …
2445 my $class = shift; 2551 my $class = shift;
2446 2552
2447 my $self = $class->SUPER::new ( 2553 my $self = $class->SUPER::new (
2448 fontsize => 1, 2554 fontsize => 1,
2449 can_events => 0, 2555 can_events => 0,
2556 indent => 0,
2450 #font => default_font 2557 #font => default_font
2451 @_, 2558 @_,
2452 2559
2453 layout => (new CFClient::Layout 1), 2560 layout => (new CFClient::Layout 1),
2454 par => [], 2561 par => [],
… …
2469 2576
2470 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2471 $self->reflow; 2578 $self->reflow;
2472} 2579}
2473 2580
2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2474sub size_allocate { 2590sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2476 2592
2477 $self->SUPER::size_allocate ($w, $h); 2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 2595
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2482 2600
2483 $self->reflow; 2601 $self->reflow;
2484}
2485 2602
2486sub text_size { 2603 local $self->{children} = [$empty, $slider];
2487 my ($self, $text, $indent) = @_; 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2608 my ($self, $para) = @_;
2488 2609
2489 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2490 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2494 2623 );
2624
2495 $layout->size 2625 $layout
2496} 2626}
2497 2627
2498sub reflow { 2628sub reflow {
2499 my ($self) = @_; 2629 my ($self) = @_;
2500 2630
… …
2509 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2510} 2640}
2511 2641
2512sub clear { 2642sub clear {
2513 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2514 2647
2515 $self->{par} = []; 2648 $self->{par} = [];
2516 $self->{height} = 0; 2649 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 2651}
2519 2652
2520sub add_paragraph { 2653sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2522 2655
2523 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2524 my ($w, $h) = $self->text_size ($line); 2657
2525 $self->{height} += $h; 2658 $para = {
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2527 } 2665 };
2528 2666
2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2669
2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2673
2674sub scroll_to_bottom {
2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2530} 2679}
2531 2680
2532sub update { 2681sub update {
2533 my ($self) = @_; 2682 my ($self) = @_;
2534 2683
… …
2536 2685
2537 return unless $self->{h} > 0; 2686 return unless $self->{h} > 0;
2538 2687
2539 delete $self->{texture}; 2688 delete $self->{texture};
2540 2689
2541 $ROOT->on_post_alloc ($self, sub { 2690 $ROOT->on_post_alloc ($self => sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 2692
2544 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2545 my $height = 0; 2694 my $height = 0;
2546 2695
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2553 $layout->set_width ($W - $_->[3]); 2698 my $layout = $self->get_layout ($para);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size; 2699 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3]; 2700
2557 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2558 } 2704 }
2559 2705
2560 $height += $_->[1]; 2706 $height += $para->{h};
2561 } 2707 }
2562 2708
2563 $self->{height} = $height; 2709 $self->{height} = $height;
2564 2710
2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2566 2712
2567 delete $self->{texture}; 2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2568 } 2718 }
2569 2719
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 2721 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
… …
2576 my $y0 = $top; 2726 my $y0 = $top;
2577 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2578 2728
2579 my $y = 0; 2729 my $y = 0;
2580 2730
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
2585 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588 2734
2589 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 2736 my $h = $para->{h};
2591 2737
2592 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] }); 2739
2594 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2595 $layout->set_markup ($par->[4]);
2596 2741
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2598 2743
2599 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2601 } 2762 }
2602 2763
2603 $y += $h; 2764 $y += $h;
2604 } 2765 }
2605 2766
2606 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2607 }; 2768 };
2608 }); 2769 });
2770}
2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2609} 2779}
2610 2780
2611sub _draw { 2781sub _draw {
2612 my ($self) = @_; 2782 my ($self) = @_;
2613 2783
… …
2616 glColor 0, 0, 0, 1; 2786 glColor 0, 0, 0, 1;
2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2618 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2619 2789
2620 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2621
2622} 2791}
2623 2792
2624############################################################################# 2793#############################################################################
2625 2794
2626package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 2882 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 2884 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 2885 . "visible $widget->{visible}";
2717 } 2886 }
2887
2888 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//;
2718 2890
2719 $self->add (new CFClient::UI::Label 2891 $self->add (new CFClient::UI::Label
2720 markup => $tooltip, 2892 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 2894 fontsize => 0.8,
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 2905
2734 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2735} 2907}
2736 2908
2737sub size_allocate { 2909sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2739 2911
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 2913}
2742 2914
2743sub visibility_change { 2915sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 2916 my ($self, $visible) = @_;
2745 2917
2746 return unless $visible; 2918 return unless $visible;
2747 2919
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 2920 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2750 or return; 2922 or return;
2751 2923
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 2925
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 2927 if $x + $self->{w} > $self->{root}{w};
2756 2928
2757 $self->move_abs ($x, $y); 2929 $self->move_abs ($x, $y);
2758 }); 2930 });
2759} 2931}
2760 2932
… …
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3028 glDisable GL_TEXTURE_2D;
2857 } 3029 }
2858} 3030}
2859 3031
2860sub DESTROY { 3032sub destroy {
2861 my ($self) = @_; 3033 my ($self) = @_;
2862 3034
2863 $self->{timer}->cancel 3035 $self->{timer}->cancel
2864 if $self->{timer}; 3036 if $self->{timer};
2865 3037
2866 $self->SUPER::DESTROY; 3038 $self->SUPER::destroy;
2867} 3039}
2868 3040
2869############################################################################# 3041#############################################################################
2870 3042
2871package CFClient::UI::Buttonbar; 3043package CFClient::UI::Buttonbar;
… …
2892 ); 3064 );
2893 3065
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3066 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2895 3067
2896 for my $item (@{ $self->{items} }) { 3068 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3069 my ($widget, $cb, $tooltip) = @$item;
2898 3070
2899 # handle various types of items, only text for now 3071 # handle various types of items, only text for now
2900 if (!ref $widget) { 3072 if (!ref $widget) {
2901 $widget = new CFClient::UI::Label 3073 $widget = new CFClient::UI::Label
2902 can_hover => 1, 3074 can_hover => 1,
2903 can_events => 1, 3075 can_events => 1,
2904 text => $widget; 3076 markup => $widget,
3077 tooltip => $tooltip
2905 } 3078 }
2906 3079
2907 $self->{item}{$widget} = $item; 3080 $self->{item}{$widget} = $item;
2908 3081
2909 $self->{vbox}->add ($widget); 3082 $self->{vbox}->add ($widget);
… …
2914 3087
2915# popup given the event (must be a mouse button down event currently) 3088# popup given the event (must be a mouse button down event currently)
2916sub popup { 3089sub popup {
2917 my ($self, $ev) = @_; 3090 my ($self, $ev) = @_;
2918 3091
2919 $self->_emit ("popdown"); 3092 $self->emit ("popdown");
2920 3093
2921 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3095 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
2924 3097
2925 $self->show; 3098 $self->show;
2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2927} 3100}
2928 3101
2929sub mouse_motion { 3102sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
2931 3104
2932 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
2935 3108
2936 0 3109 0
2937} 3110}
2938 3111
2939sub button_up { 3112sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2941 3114
2942 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3116 undef $GRAB;
2944 $self->hide; 3117 $self->hide;
2945 3118
2946 $self->_emit ("popdown"); 3119 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3121 } else {
2949 return 0 3122 return 0
2950 } 3123 }
2951 3124
… …
2988 : $self->{children}[$page_or_widget]; 3161 : $self->{children}[$page_or_widget];
2989 3162
2990 $self->{current} = $widget; 3163 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3165
2993 $self->_emit (page_changed => $self->{current}); 3166 $self->emit (page_changed => $self->{current});
2994 3167
2995 $self->realloc; 3168 $self->realloc;
2996} 3169}
2997 3170
2998sub visible_children { 3171sub visible_children {
… …
3003 my ($self) = @_; 3176 my ($self) = @_;
3004 3177
3005 $self->{current}->size_request 3178 $self->{current}->size_request
3006} 3179}
3007 3180
3008sub size_allocate { 3181sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3182 my ($self, $w, $h) = @_;
3010 3183
3011 $self->{current}->configure (0, 0, $w, $h); 3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3012} 3187}
3013 3188
3014sub _draw { 3189sub _draw {
3015 my ($self) = @_; 3190 my ($self) = @_;
3016 3191
… …
3055 3230
3056sub set_current_page { 3231sub set_current_page {
3057 my ($self, $page) = @_; 3232 my ($self, $page) = @_;
3058 3233
3059 $self->{multiplexer}->set_current_page ($page); 3234 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3235 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3236}
3062 3237
3063############################################################################# 3238#############################################################################
3064 3239
3065package CFClient::UI::Statusbox; 3240package CFClient::UI::Combobox;
3066 3241
3242use utf8;
3243
3067our @ISA = CFClient::UI::VBox::; 3244our @ISA = CFClient::UI::Button::;
3068 3245
3069sub new { 3246sub new {
3070 my $class = shift; 3247 my $class = shift;
3071 3248
3072 $class->SUPER::new ( 3249 my $self = $class->SUPER::new (
3250 options => [], # [value, title, longdesc], ...
3251 value => undef,
3252 @_,
3253 );
3254
3255 $self->_set_value ($self->{value});
3256
3257 $self
3258}
3259
3260sub invoke_button_down {
3261 my ($self, $ev) = @_;
3262
3263 my @menu_items;
3264
3265 for (@{ $self->{options} }) {
3266 my ($value, $title, $tooltip) = @$_;
3267
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 }
3270
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272}
3273
3274sub _set_value {
3275 my ($self, $value) = @_;
3276
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3278 or return;
3279
3280 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]);
3283}
3284
3285sub set_value {
3286 my ($self, $value) = @_;
3287
3288 return unless $self->{value} ne $value;
3289
3290 $self->_set_value ($value);
3291 $self->emit (changed => $value);
3292}
3293
3294#############################################################################
3295
3296package CFClient::UI::Statusbox;
3297
3298our @ISA = CFClient::UI::VBox::;
3299
3300sub new {
3301 my $class = shift;
3302
3303 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3304 fontsize => 0.8,
3074 @_, 3305 @_,
3075 ) 3306 );
3307
3308 Scalar::Util::weaken (my $this = $self);
3309
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311
3312 $self
3076} 3313}
3077 3314
3078sub reorder { 3315sub reorder {
3079 my ($self) = @_; 3316 my ($self) = @_;
3080 my $NOW = time; 3317 my $NOW = Time::HiRes::time;
3318
3319 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} };
3081 3323
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3324 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3325 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3326 }
3085 3327
… …
3088 my @items = sort { 3330 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3331 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3332 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3333 } values %{ $self->{item} };
3092 3334
3335 $self->{timer}->interval (1);
3336
3093 my $count = 10 + 1; 3337 my $count = 10 + 1;
3094 for my $item (@items) { 3338 for my $item (@items) {
3095 last unless --$count; 3339 last unless --$count;
3096 3340
3097 push @widgets, $item->{label} ||= do { 3341 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3342 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3343 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3344 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3345 : $item->{text};
3102 3346
… …
3110 tooltip => $item->{tooltip}, 3354 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3355 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3356 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3357 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3358 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3359 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3360 can_events => 1,
3117 can_hover => 1 3361 can_hover => 1
3118 }; 3362 };
3363
3364 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3365 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3366 $label->update;
3367 $label->set_max_size (undef, $label->{req_h} * $diff)
3368 if $diff < 1;
3369 $self->{timer}->interval (1/30);
3370 } else {
3371 $label->{fg}[3] = $item->{fg}[3] || 1;
3372 }
3373
3374 push @widgets, $label;
3119 } 3375 }
3120 3376
3121 $self->clear; 3377 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3378 $self->SUPER::add (reverse @widgets);
3123} 3379}
… …
3128 $text =~ s/^\s+//; 3384 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3385 $text =~ s/\s+$//;
3130 3386
3131 return unless $text; 3387 return unless $text;
3132 3388
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3389 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3390
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3391 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3392
3137 if (my $item = $self->{item}{$group}) { 3393 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3394 if ($item->{text} eq $text) {
3139 $item->{count}++; 3395 $item->{count}++;
3140 } else { 3396 } else {
3141 $item->{count} = 1; 3397 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 3398 $item->{text} = $item->{tooltip} = $text;
3143 } 3399 }
3144 $item->{id} = ++$self->{id}; 3400 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 3401 $item->{timeout} = $timeout;
3146 delete $item->{label}; 3402 delete $item->{label};
3147 } else { 3403 } else {
3148 $self->{item}{$group} = { 3404 $self->{item}{$group} = {
3149 id => ++$self->{id}, 3405 id => ++$self->{id},
… …
3155 count => 1, 3411 count => 1,
3156 %arg, 3412 %arg,
3157 }; 3413 };
3158 } 3414 }
3159 3415
3416 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 3417 $self->reorder;
3418 });
3161} 3419}
3162 3420
3163sub reconfigure { 3421sub reconfigure {
3164 my ($self) = @_; 3422 my ($self) = @_;
3165 3423
3166 delete $_->{label} 3424 delete $_->{label}
3167 for values %{ $self->{item} || {} }; 3425 for values %{ $self->{item} || {} };
3168 3426
3169 $self->reorder; 3427 $self->reorder;
3170 $self->SUPER::reconfigure; 3428 $self->SUPER::reconfigure;
3429}
3430
3431sub destroy {
3432 my ($self) = @_;
3433
3434 $self->{timer}->cancel;
3435
3436 $self->SUPER::destroy;
3171} 3437}
3172 3438
3173############################################################################# 3439#############################################################################
3174 3440
3175package CFClient::UI::Inventory; 3441package CFClient::UI::Inventory;
… …
3194 return unless $items; 3460 return unless $items;
3195 3461
3196 my @items = sort { 3462 my @items = sort {
3197 ($a->{type} <=> $b->{type}) 3463 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name}) 3464 or ($a->{name} cmp $b->{name})
3199 } @$items; 3465 } values %$items;
3200 3466
3201 $self->{real_items} = \@items; 3467 $self->{real_items} = \@items;
3202 3468
3203 my $row = 0; 3469 my $row = 0;
3204 for my $item (@items) { 3470 for my $item (@items) {
… …
3207 $self->{child}->add (0, $row, $item->{face_widget}); 3473 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget}); 3474 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget}); 3475 $self->{child}->add (2, $row, $item->{weight_widget});
3210 3476
3211 $row++; 3477 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 } 3478 }
3410} 3479}
3411 3480
3412############################################################################# 3481#############################################################################
3413 3482
… …
3423 commands => [], 3492 commands => [],
3424 @_, 3493 @_,
3425 ) 3494 )
3426} 3495}
3427 3496
3428# XXX: Do sorting? Argl... 3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3429sub add_spell { 3582sub add_spell {
3430 my ($self, $spell) = @_; 3583 my ($self, $spell) = @_;
3584
3431 $self->{spells}->{$spell->{name}} = $spell; 3585 $self->{spell}->{$spell->{name}} = $spell;
3432 3586 $self->rebuild_spell_list;
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460} 3587}
3461 3588
3462sub remove_spell { 3589sub remove_spell {
3463 my ($self, $spell) = @_; 3590 my ($self, $spell) = @_;
3591
3464 delete $self->{spells}->{$spell->{name}}; 3592 delete $self->{spell}->{$spell->{name}};
3465 $self->rebuild_spell_list; 3593 $self->rebuild_spell_list;
3466} 3594}
3467 3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3468############################################################################# 3603#############################################################################
3469 3604
3470package CFClient::UI::Root; 3605package CFClient::UI::Root;
3471 3606
3472our @ISA = CFClient::UI::Container::; 3607our @ISA = CFClient::UI::Container::;
3608
3609use List::Util qw(min max);
3473 3610
3474use CFClient::OpenGL; 3611use CFClient::OpenGL;
3475 3612
3476sub new { 3613sub new {
3477 my $class = shift; 3614 my $class = shift;
… …
3504 $coord = $max - $size if $coord > $max - $size; 3641 $coord = $max - $size if $coord > $max - $size;
3505 3642
3506 int $coord + 0.5 3643 int $coord + 0.5
3507} 3644}
3508 3645
3509sub size_allocate { 3646sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
3511 3648
3512 for my $child ($self->children) { 3649 for my $child ($self->children) {
3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3650 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3514 3651
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 3655 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
3520 3657
3521 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
3522 } 3659 }
3660
3661 1
3523} 3662}
3524 3663
3525sub coord2local { 3664sub coord2local {
3526 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
3527 3666
… …
3612 3751
3613 delete $queue{$widget+0}; 3752 delete $queue{$widget+0};
3614 3753
3615 my ($w, $h) = $widget->size_request; 3754 my ($w, $h) = $widget->size_request;
3616 3755
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3756 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3757 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3758
3759 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3760 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3761
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3762 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3763 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3764
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3765 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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