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

Diff Legend

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