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.285 by root, Mon Jun 5 03:07:01 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 2006 UTC

… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
189 203
190 } 204 }
191 } 205 }
192 206
193 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
194} 216}
195 217
196############################################################################# 218#############################################################################
197 219
198package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
272 294
273 return unless $self->{visible}; 295 return unless $self->{visible};
274 296
275 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
276 298
299 delete $self->{visible};
277 delete $self->{root}; 300 delete $self->{root};
278 delete $self->{visible};
279 301
280 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
282 304
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
285 307
286 $self->focus_out; 308 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
289} 310}
290 311
291sub set_visibility { 312sub set_visibility {
292 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
315} 336}
316 337
317sub move_abs { 338sub move_abs {
318 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
319 340
320 $self->{x} = List::Util::max 0, int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
323 344
324 $self->update; 345 $self->update;
325} 346}
326 347
… …
334} 355}
335 356
336sub size_request { 357sub size_request {
337 require Carp; 358 require Carp;
338 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
339} 364}
340 365
341sub configure { 366sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
343 368
… …
367 392
368 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
369 } 394 }
370} 395}
371 396
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 397sub children {
377 # nop 398 # nop
378} 399}
379 400
380sub visible_children { 401sub visible_children {
… …
418 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
419 440
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 442}
422 443
423sub focus_in { 444sub invoke_focus_in {
424 my ($self) = @_; 445 my ($self) = @_;
425 446
426 return if $FOCUS == $self; 447 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
428 449
429 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
430 451
431 $self->_emit (focus_in => $focus); 452 $self->update;
432 453
433 $focus->update if $focus; 454 0
434 $FOCUS->update;
435} 455}
436 456
437sub focus_out { 457sub invoke_focus_out {
438 my ($self) = @_; 458 my ($self) = @_;
439 459
440 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
441 461
442 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
443 463
444 $self->_emit (focus_out => $focus); 464 $self->update;
445 465
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 467 unless $FOCUS;
450}
451 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
452sub mouse_motion { 0 } 479sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 480sub invoke_button_up { 0 }
454sub key_down { 0 } 481sub invoke_key_down { 0 }
455sub key_up { 0 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
456 484
457sub button_down { 485sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
459 487
460 $self->focus_in; 488 $self->grab_focus;
461 489
462 0 490 0
491}
492
493sub connect {
494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 513}
464 514
465sub find_widget { 515sub find_widget {
466 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
467 517
… …
477sub set_parent { 527sub set_parent {
478 my ($self, $parent) = @_; 528 my ($self, $parent) = @_;
479 529
480 Scalar::Util::weaken ($self->{parent} = $parent); 530 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 531 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 532}
506 533
507sub realloc { 534sub realloc {
508 my ($self) = @_; 535 my ($self) = @_;
509 536
… …
542 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
543 570
544 # update screen rectangle 571 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 574
550 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 578
… …
592} 617}
593 618
594sub DESTROY { 619sub DESTROY {
595 my ($self) = @_; 620 my ($self) = @_;
596 621
622 return if CFClient::in_destruct;
623
597 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
598 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 628}
600 629
601############################################################################# 630#############################################################################
602 631
603package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
768} 797}
769 798
770sub add { 799sub add {
771 my ($self, $child) = @_; 800 my ($self, $child) = @_;
772 801
773 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
776} 804}
777 805
778sub remove { 806sub remove {
779 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
788 816
789sub size_request { 817sub size_request {
790 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
791} 819}
792 820
793sub size_allocate { 821sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
795 823
796 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
797} 827}
798 828
799############################################################################# 829#############################################################################
800 830
801# back-buffered drawing area 831# back-buffered drawing area
… …
817 847
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 849 $self->SUPER::update;
820} 850}
821 851
822sub size_allocate { 852sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
824 854
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
827} 858}
828 859
829sub _render { 860sub _render {
830 my ($self) = @_; 861 my ($self) = @_;
831 862
… …
892 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
893 924
894 ($w, $h) 925 ($w, $h)
895} 926}
896 927
897sub size_allocate { 928sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
899 930
900 my $child = $self->child; 931 my $child = $self->child;
901 932
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 935
905 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
906 $self->update; 937 $self->update;
938
939 1
907} 940}
908 941
909sub set_offset { 942sub set_offset {
910 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
911 944
… …
974 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
975 }, 1008 },
976 ; 1009 ;
977 1010
978 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
980 slider => $slider, 1014 slider => $slider,
981 %arg, 1015 %arg,
982 ); 1016 );
983 1017
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
986 1020
987 $self 1021 $self
988} 1022}
989 1023
1024#TODO# update range on size_allocate depending on child
1025
990sub add { 1026sub add {
991 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
992 1028
993 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
994} 1030}
995 1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
996sub update { 1048sub update {
997 my ($self) = @_; 1049 my ($self) = @_;
998 1050
999 $self->SUPER::update; 1051 $self->SUPER::update;
1000 1052
1001 # todo: overwrite size_allocate of child 1053 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1054}
1005 1055
1006sub size_allocate { 1056sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1008 1058
1059 $self->update_slider;
1060
1009 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1062}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1063
1018############################################################################# 1064#############################################################################
1019 1065
1020package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1021 1067
… …
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1119
1074sub new { 1120sub new {
1075 my ($class, %arg) = @_; 1121 my ($class, %arg) = @_;
1076 1122
1077 my $title = delete $arg{title};
1078
1079 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1126 border => 0.6,
1083 can_events => 1, 1127 can_events => 1,
1084 min_w => 16, 1128 min_w => 64,
1085 min_h => 16, 1129 min_h => 32,
1086 %arg, 1130 %arg,
1087 ); 1131 );
1088 1132
1089 $self->{title} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1134 align => 0,
1091 valign => 1, 1135 valign => 1,
1092 text => $title, 1136 text => $self->{title},
1093 fontsize => $self->{border} 1137 fontsize => $self->{border},
1094 if defined $title; 1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
1095 1148
1096 $self 1149 $self
1097} 1150}
1098 1151
1099sub add { 1152sub add {
1100 my ($self, @widgets) = @_; 1153 my ($self, @widgets) = @_;
1101 1154
1102 $self->SUPER::add (@widgets); 1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1158}
1105 1159
1106sub border { 1160sub border {
1107 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1108} 1162}
1109 1163
1110sub size_request { 1164sub size_request {
1111 my ($self) = @_; 1165 my ($self) = @_;
1112 1166
1113 $self->{title}->size_request 1167 $self->{title_widget}->size_request
1114 if $self->{title}; 1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1115 1172
1116 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1117 1174
1118 ( 1175 (
1119 $w + $self->border * 2, 1176 $w + $self->border * 2,
1120 $h + $self->border * 2, 1177 $h + $self->border * 2,
1121 ) 1178 )
1122} 1179}
1123 1180
1124sub size_allocate { 1181sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1126 1183
1127 if ($self->{title}) { 1184 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1185 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1186 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1188 }
1132 1189
1133 my $border = $self->border; 1190 my $border = $self->border;
1134 1191
1135 $h -= List::Util::max 0, $border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1193 $w -= List::Util::max 0, $border * 2;
1194
1195 $self->child->configure ($border, $border, $w, $h);
1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1137 1207
1138 $self->child->configure ($border, $border, $w, $h); 1208 1
1139} 1209}
1140 1210
1141sub button_down { 1211sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1143 1213
1144 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1215 my $border = $self->border;
1146 1216
… …
1177 1247
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1249
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1251 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1253 };
1184 } else { 1254 } else {
1185 return 0; 1255 return 0;
1186 } 1256 }
1187 1257
1188 1 1258 1
1189} 1259}
1190 1260
1191sub button_up { 1261sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1193 1263
1194 !!delete $self->{motion} 1264 ! ! delete $self->{motion}
1195} 1265}
1196 1266
1197sub mouse_motion { 1267sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1199 1269
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1271
1202 !!$self->{motion} 1272 ! ! $self->{motion}
1203} 1273}
1204 1274
1205sub _draw { 1275sub _draw {
1206 my ($self) = @_; 1276 my ($self) = @_;
1207 1277
… …
1233 1303
1234 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1235 1305
1236 $child->draw; 1306 $child->draw;
1237 1307
1238 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1241 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1242} 1317}
1243 1318
1244############################################################################# 1319#############################################################################
1245 1320
1246package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1269 1344
1270 $child->set_parent ($self); 1345 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1272 1347
1273 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1274} 1355}
1275 1356
1276# TODO: move to container class maybe? send children a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1358sub clear {
1278 my ($self) = @_; 1359 my ($self) = @_;
… …
1319 (sum @$ws), 1400 (sum @$ws),
1320 (sum @$hs), 1401 (sum @$hs),
1321 ) 1402 )
1322} 1403}
1323 1404
1324sub size_allocate { 1405sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1326 1407
1327 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1328 1409
1329 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1361 } 1442 }
1362 1443
1363 $y += $row_h; 1444 $y += $row_h;
1364 } 1445 }
1365 1446
1447 1
1366} 1448}
1367 1449
1368sub find_widget { 1450sub find_widget {
1369 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1370 1452
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1491 )
1410} 1492}
1411 1493
1412sub size_allocate { 1494sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1414 1496
1415 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1417 1499
1418 my @req; 1500 my @req;
1419 1501
1420 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1422 } else { 1504 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1425 1507
1426 if ($req > $space) { 1508 if ($req > $space) {
1427 # ah well, not enough space 1509 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1429 } else { 1511 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1513
1432 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1433 1515
1434 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1517 for 0 .. $#children;
1436 } 1518 }
1437 } 1519 }
1438 1520
1439 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1440 1522
1441 my $pos = 0; 1523 my $pos = 0;
1442 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1527
1446 $pos += $alloc; 1528 $pos += $alloc;
1447 } 1529 }
1448 1530
1449 1 1531 1
… …
1552 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1553 1635
1554 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1556 1638
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1640
1559 delete $self->{req_h}; 1641 delete $self->{size_req};
1560
1561 $self->realloc; 1642 $self->realloc;
1562 $self->update; 1643 $self->update;
1563} 1644}
1564 1645
1565sub set_markup { 1646sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1570 1651
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1653
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1655
1575 delete $self->{req_h}; 1656 delete $self->{size_req};
1576
1577 $self->realloc; 1657 $self->realloc;
1578 $self->update; 1658 $self->update;
1579} 1659}
1580 1660
1581sub size_request { 1661sub size_request {
1582 my ($self) = @_; 1662 my ($self) = @_;
1583 1663
1584 if (exists $self->{req_h}) { 1664 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1670
1593 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1594 1672
1595 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1677
1599 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1600 1679
1601 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1603 } 1682 }
1604 1683
1605 ($w, $h) 1684 [$w, $h]
1606 } 1685 };
1607}
1608 1686
1687 @{ $self->{size_req} }
1688}
1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1609sub size_allocate { 1694sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1611 1696
1612 delete $self->{ox}; 1697 delete $self->{ox};
1613 1698
1614 delete $self->{texture} 1699 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1616} 1703}
1617 1704
1618sub set_fontsize { 1705sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1620 1707
1621 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1622 delete $self->{texture}; 1710 delete $self->{texture};
1623 1711
1624 $self->realloc; 1712 $self->realloc;
1625} 1713}
1626 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1627sub _draw { 1724sub _draw {
1628 my ($self) = @_; 1725 my ($self) = @_;
1629 1726
1630 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1631 1728
1632 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1736
1640 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1641 }; 1738 };
1642 1739
1643 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1647 1744
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1748 };
1652 1749
1653 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 1752
1656 glColor_premultiply @{$self->{fg}} 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1657 if $tex->{format} == GL_ALPHA;
1658
1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1660
1661 glDisable GL_TEXTURE_2D;
1662} 1754}
1663 1755
1664############################################################################# 1756#############################################################################
1665 1757
1666package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1680 can_hover => 1, 1772 can_hover => 1,
1681 can_focus => 1, 1773 can_focus => 1,
1682 valign => 0, 1774 valign => 0,
1683 can_events => 1, 1775 can_events => 1,
1684 #text => ... 1776 #text => ...
1777 #hidden => "*",
1685 @_ 1778 @_
1686 ) 1779 )
1687} 1780}
1688 1781
1689sub _set_text { 1782sub _set_text {
… …
1696 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1697 $self->{text} = $text; 1790 $self->{text} = $text;
1698 1791
1699 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1700 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h}; 1794 delete $self->{size_req};
1702 1795
1703 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1704 1797
1705 $self->realloc; 1798 $self->realloc;
1706 $self->update; 1799 $self->update;
1707} 1800}
1708 1801
… …
1723 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1724 1817
1725 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1726} 1819}
1727 1820
1728sub key_down { 1821sub invoke_key_down {
1729 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1730 1823
1731 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1732 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1733 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1745 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1746 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1747 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1748 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1749 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1750 $self->_emit ('escape'); 1843 $self->emit ('escape');
1751 } elsif ($uni) { 1844 } elsif ($uni) {
1752 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else { 1846 } else {
1754 return 0; 1847 return 0;
1755 } 1848 }
… …
1759 $self->realloc; 1852 $self->realloc;
1760 1853
1761 1 1854 1
1762} 1855}
1763 1856
1764sub focus_in { 1857sub invoke_focus_in {
1765 my ($self) = @_; 1858 my ($self) = @_;
1766 1859
1767 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1768 1861
1769 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1770} 1863}
1771 1864
1772sub button_down { 1865sub invoke_button_down {
1773 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1774 1867
1775 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1776 1869
1777 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1778 1871
1779 # byte-index to char-index 1872 # byte-index to char-index
1780 my $text = $self->{text}; 1873 my $text = $self->{text};
1781 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1783 1876
1784 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1785 $self->update; 1878 $self->update;
1786 1879
1787 1 1880 1
1788} 1881}
1789 1882
1790sub mouse_motion { 1883sub invoke_mouse_motion {
1791 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1792# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793 1886
1794 0 1887 1
1795} 1888}
1796 1889
1797sub _draw { 1890sub _draw {
1798 my ($self) = @_; 1891 my ($self) = @_;
1799 1892
… …
1840 1933
1841our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1842 1935
1843use CFClient::OpenGL; 1936use CFClient::OpenGL;
1844 1937
1845sub key_down { 1938sub invoke_key_down {
1846 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1847 1940
1848 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1849 1942
1850 if ($sym == 13) { 1943 if ($sym == 13) {
1851 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1852 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1853 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1854 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1855 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1856 $self->update; 1950 $self->update;
1857 1951
1858 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1859 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1860 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1876 } else { 1970 } else {
1877 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1878 } 1972 }
1879 1973
1880 } else { 1974 } else {
1881 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1882 } 1976 }
1883 1977
1884 1 1978 1
1885} 1979}
1886 1980
… …
1910 can_events => 1, 2004 can_events => 1,
1911 @_ 2005 @_
1912 ) 2006 )
1913} 2007}
1914 2008
1915sub activate { }
1916
1917sub button_up { 2009sub invoke_button_up {
1918 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1919 2011
1920 $self->emit ("activate") 2012 $self->emit ("activate")
1921 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1922 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1936 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1937 2029
1938 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1939 2031
1940 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
2033}
2034
2035#############################################################################
2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
1941} 2069}
1942 2070
1943############################################################################# 2071#############################################################################
1944 2072
1945package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1972 my ($self) = @_; 2100 my ($self) = @_;
1973 2101
1974 (6) x 2 2102 (6) x 2
1975} 2103}
1976 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1977sub button_down { 2113sub invoke_button_down {
1978 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1979 2115
1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982 $self->{state} = !$self->{state}; 2118 $self->toggle;
1983 $self->_emit (changed => $self->{state});
1984 } else { 2119 } else {
1985 return 0 2120 return 0
1986 } 2121 }
1987 2122
1988 1 2123 1
… …
2013package CFClient::UI::Image; 2148package CFClient::UI::Image;
2014 2149
2015our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
2016 2151
2017use CFClient::OpenGL; 2152use CFClient::OpenGL;
2018use Carp qw/confess/;
2019 2153
2020our %loaded_images; 2154our %texture_cache;
2021 2155
2022sub new { 2156sub new {
2023 my $class = shift; 2157 my $class = shift;
2024 2158
2025 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2026 2163
2027 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2028 2166
2029 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2030 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2031 2169
2032 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2033 2171
2034 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036 $self->{aspect} = $tex->{w} / $tex->{h};
2037 2173
2038 $self 2174 $self
2039} 2175}
2040 2176
2041sub size_request { 2177sub size_request {
2042 my ($self) = @_; 2178 my ($self) = @_;
2043 2179
2044 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2045} 2181}
2046 2182
2047sub _draw { 2183sub _draw {
2048 my ($self) = @_; 2184 my ($self) = @_;
2049 2185
… …
2158 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2159 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2160 2296
2161 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2162 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2163 2302
2164 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2186 2325
2187 if ($t3) { 2326 if ($t3) {
2188 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2189 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2190 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194 glEnd; 2333 glEnd;
2195 } 2334 }
2196 2335
2197 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2285 $self->update; 2424 $self->update;
2286 2425
2287 $self 2426 $self
2288} 2427}
2289 2428
2290sub changed { }
2291
2292sub set_range { 2429sub set_range {
2293 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2294 2431
2295 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2296 2433
2297 $self->update
2298 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2299} 2438}
2300 2439
2301sub set_value { 2440sub set_value {
2302 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2303 2442
… …
2314 if $unit; 2453 if $unit;
2315 2454
2316 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317 2456
2318 if ($value != $old_value) { 2457 if ($value != $old_value) {
2319 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2320 $self->update; 2459 $self->update;
2321 } 2460 }
2322} 2461}
2323 2462
2324sub size_request { 2463sub size_request {
2325 my ($self) = @_; 2464 my ($self) = @_;
2326 2465
2327 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2328} 2467}
2329 2468
2330sub button_down { 2469sub invoke_button_down {
2331 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2332 2471
2333 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2334 2473
2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336 2475
2337 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2338} 2477}
2339 2478
2340sub mouse_motion { 2479sub invoke_mouse_motion {
2341 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2342 2481
2343 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345 2484
… …
2351 } else { 2490 } else {
2352 return 0; 2491 return 0;
2353 } 2492 }
2354 2493
2355 1 2494 1
2495}
2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2356} 2505}
2357 2506
2358sub update { 2507sub update {
2359 my ($self) = @_; 2508 my ($self) = @_;
2360 2509
… …
2450sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2451sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2452 2601
2453############################################################################# 2602#############################################################################
2454 2603
2455package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2456 2605
2457our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2458 2607
2459use CFClient::OpenGL; 2608use CFClient::OpenGL;
2460 2609
2461sub new { 2610sub new {
2462 my $class = shift; 2611 my $class = shift;
2463 2612
2464 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2465 fontsize => 1, 2614 fontsize => 1,
2466 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2467 #font => default_font 2617 #font => default_font
2468 @_, 2618 @_,
2469 2619
2470 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2471 par => [], 2621 par => [],
2472 height => 0, 2622 height => 0,
2473 children => [ 2623 children => [
2474 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2475 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2486 2636
2487 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2488 $self->reflow; 2638 $self->reflow;
2489} 2639}
2490 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2491sub size_allocate { 2650sub invoke_size_allocate {
2492 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2493 2652
2494 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495 2655
2496 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 2660
2500 $self->reflow; 2661 $self->reflow;
2501}
2502 2662
2503sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2504 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2505 2679
2506 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2507 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2508 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2511 2693 );
2694
2512 $layout->size 2695 $layout
2513} 2696}
2514 2697
2515sub reflow { 2698sub reflow {
2516 my ($self) = @_; 2699 my ($self) = @_;
2517 2700
… …
2526 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2527} 2710}
2528 2711
2529sub clear { 2712sub clear {
2530 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2531 2717
2532 $self->{par} = []; 2718 $self->{par} = [];
2533 $self->{height} = 0; 2719 $self->{height} = 0;
2534 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535} 2721}
2536 2722
2537sub add_paragraph { 2723sub add_paragraph {
2538 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2539 2725
2540 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2541 my ($w, $h) = $self->text_size ($line); 2727
2542 $self->{height} += $h; 2728 $para = {
2543 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2544 } 2735 };
2545 2736
2546 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2547} 2749}
2548 2750
2549sub update { 2751sub update {
2550 my ($self) = @_; 2752 my ($self) = @_;
2551 2753
… …
2553 2755
2554 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2555 2757
2556 delete $self->{texture}; 2758 delete $self->{texture};
2557 2759
2558 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560 2762
2561 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2562 my $height = 0; 2764 my $height = 0;
2563 2765
2564 my $layout = $self->{layout};
2565
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2569 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2570 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2571 $layout->set_markup ($_->[4]);
2572 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2573 $_->[0] = $w + $_->[3]; 2770
2574 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2575 } 2774 }
2576 2775
2577 $height += $_->[1]; 2776 $height += $para->{h};
2578 } 2777 }
2579 2778
2580 $self->{height} = $height; 2779 $self->{height} = $height;
2581 2780
2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2583 2782
2584 delete $self->{texture}; 2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2585 } 2788 }
2586 2789
2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2588 glClearColor 0, 0, 0, 0; 2791 glClearColor 0, 0, 0, 0;
2589 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
… …
2593 my $y0 = $top; 2796 my $y0 = $top;
2594 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2595 2798
2596 my $y = 0; 2799 my $y = 0;
2597 2800
2598 my $layout = $self->{layout};
2599
2600 $layout->set_font ($self->{font}) if $self->{font};
2601
2602 glEnable GL_BLEND;
2603 #TODO# not correct in windows where rgba is forced off
2604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2605
2606 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2607 my $h = $par->[1]; 2802 my $h = $para->{h};
2608 2803
2609 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2610 $layout->set_foreground (@{ $par->[2] });
2611 $layout->set_width ($W - $par->[3]);
2612 $layout->set_markup ($par->[4]);
2613 2805
2614 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2615 2807
2616 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2617 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2618 } 2822 }
2619 2823
2620 $y += $h; 2824 $y += $h;
2621 } 2825 }
2622
2623 glDisable GL_BLEND;
2624 }; 2826 };
2625 }); 2827 });
2828}
2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2626} 2837}
2627 2838
2628sub _draw { 2839sub _draw {
2629 my ($self) = @_; 2840 my ($self) = @_;
2630 2841
… …
2633 glColor 0, 0, 0, 1; 2844 glColor 0, 0, 0, 1;
2634 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2635 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2636 2847
2637 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2638
2639} 2849}
2640 2850
2641############################################################################# 2851#############################################################################
2642 2852
2643package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2730 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2734 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2735 2948
2736 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2737 markup => $tooltip, 2950 markup => $tooltip,
2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750 2963
2751 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2752} 2965}
2753 2966
2754sub size_allocate { 2967sub invoke_size_allocate {
2755 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2756 2969
2757 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758} 2971}
2759 2972
2760sub visibility_change { 2973sub invoke_visibility_change {
2761 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2762 2975
2763 return unless $visible; 2976 return unless $visible;
2764 2977
2765 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2767 or return; 2980 or return;
2768 2981
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770 2983
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2773 2986
2774 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2775 }); 2988 });
2776} 2989}
2777 2990
… …
2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2874 } 3087 }
2875} 3088}
2876 3089
2877sub DESTROY { 3090sub destroy {
2878 my ($self) = @_; 3091 my ($self) = @_;
2879 3092
2880 $self->{timer}->cancel 3093 $self->{timer}->cancel
2881 if $self->{timer}; 3094 if $self->{timer};
2882 3095
2883 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2884} 3097}
2885 3098
2886############################################################################# 3099#############################################################################
2887 3100
2888package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2909 ); 3122 );
2910 3123
2911 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2912 3125
2913 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2914 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2915 3128
2916 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2917 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2918 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2919 can_hover => 1, 3146 can_hover => 1,
2920 can_events => 1, 3147 can_events => 1,
2921 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2922 } 3151 }
2923 3152
2924 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2925 3154
2926 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2931 3160
2932# popup given the event (must be a mouse button down event currently) 3161# popup given the event (must be a mouse button down event currently)
2933sub popup { 3162sub popup {
2934 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2935 3164
2936 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2937 3166
2938 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2939 $GRAB = $self; 3168 $GRAB = $self;
2940 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2941 3170
2942 $self->show; 3171 $self->show;
2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944} 3173}
2945 3174
2946sub mouse_motion { 3175sub invoke_mouse_motion {
2947 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2948 3177
2949 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2952 3181
2953 0 3182 0
2954} 3183}
2955 3184
2956sub button_up { 3185sub invoke_button_up {
2957 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2958 3187
2959 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2960 undef $GRAB; 3189 undef $GRAB;
2961 $self->hide; 3190 $self->hide;
2962 3191
2963 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2964 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2965 } else { 3194 } else {
2966 return 0 3195 return 0
2967 } 3196 }
2968 3197
… …
2995 3224
2996 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} }; 3226 if @{ $self->{children} };
2998} 3227}
2999 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
3000sub set_current_page { 3235sub set_current_page {
3001 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3002 3237
3003 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
3004 ? $page_or_widget 3239 ? $page_or_widget
3005 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
3006 3241
3007 $self->{current} = $widget; 3242 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009 3244
3010 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
3011 3246
3012 $self->realloc; 3247 $self->realloc;
3013} 3248}
3014 3249
3015sub visible_children { 3250sub visible_children {
… …
3020 my ($self) = @_; 3255 my ($self) = @_;
3021 3256
3022 $self->{current}->size_request 3257 $self->{current}->size_request
3023} 3258}
3024 3259
3025sub size_allocate { 3260sub invoke_size_allocate {
3026 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3027 3262
3028 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3029} 3266}
3030 3267
3031sub _draw { 3268sub _draw {
3032 my ($self) = @_; 3269 my ($self) = @_;
3033 3270
… …
3068 ); 3305 );
3069 3306
3070 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3071} 3308}
3072 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3073sub set_current_page { 3316sub set_current_page {
3074 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3075 3318
3076 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current}); 3320 $self->emit (page_changed => $self->{multiplexer}{current});
3321}
3322
3323#############################################################################
3324
3325package CFClient::UI::Combobox;
3326
3327use utf8;
3328
3329our @ISA = CFClient::UI::Button::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3078} 3377}
3079 3378
3080############################################################################# 3379#############################################################################
3081 3380
3082package CFClient::UI::Statusbox; 3381package CFClient::UI::Statusbox;
… …
3181 $item->{count}++; 3480 $item->{count}++;
3182 } else { 3481 } else {
3183 $item->{count} = 1; 3482 $item->{count} = 1;
3184 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3185 } 3484 }
3186 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3187 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3188 delete $item->{label}; 3487 delete $item->{label};
3189 } else { 3488 } else {
3190 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3191 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3197 count => 1, 3496 count => 1,
3198 %arg, 3497 %arg,
3199 }; 3498 };
3200 } 3499 }
3201 3500
3501 $ROOT->on_refresh (reorder => sub {
3202 $self->reorder; 3502 $self->reorder;
3503 });
3203} 3504}
3204 3505
3205sub reconfigure { 3506sub reconfigure {
3206 my ($self) = @_; 3507 my ($self) = @_;
3207 3508
… …
3210 3511
3211 $self->reorder; 3512 $self->reorder;
3212 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3213} 3514}
3214 3515
3215sub DESTROY { 3516sub destroy {
3216 my ($self) = @_; 3517 my ($self) = @_;
3217 3518
3218 $self->{timer}->cancel; 3519 $self->{timer}->cancel;
3219 3520
3220 $self->SUPER::DESTROY; 3521 $self->SUPER::destroy;
3221} 3522}
3222 3523
3223############################################################################# 3524#############################################################################
3224 3525
3225package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3226 3527
3227our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3228 3529
3229sub new { 3530sub new {
3230 my $class = shift; 3531 my $class = shift;
3231 3532
3232 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3234 @_, 3535 @_,
3235 ); 3536 );
3236 3537
3237 $self 3538 $self
3238} 3539}
3239 3540
3240sub set_items { 3541sub set_items {
3241 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3242 3543
3243 $self->{child}->clear; 3544 $self->clear;
3244 return unless $items; 3545 return unless $items;
3245 3546
3246 my @items = sort { 3547 my @items = sort {
3247 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3249 } @$items; 3550 } values %$items;
3250 3551
3251 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3252 3553
3253 my $row = 0; 3554 my $row = 0;
3254 for my $item (@items) { 3555 for my $item (@items) {
3255 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3256 3557
3257 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3260 3561
3261 $row++; 3562 $row++;
3262 }
3263}
3264
3265#############################################################################
3266
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 } 3563 }
3460} 3564}
3461 3565
3462############################################################################# 3566#############################################################################
3463 3567
… …
3473 commands => [], 3577 commands => [],
3474 @_, 3578 @_,
3475 ) 3579 )
3476} 3580}
3477 3581
3478# XXX: Do sorting? Argl... 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3479sub add_spell { 3667sub add_spell {
3480 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3481 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3482 3671 $self->rebuild_spell_list;
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510} 3672}
3511 3673
3512sub remove_spell { 3674sub remove_spell {
3513 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3514 delete $self->{spells}->{$spell->{name}}; 3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3515 $self->rebuild_spell_list; 3685 $self->rebuild_spell_list;
3516} 3686}
3517 3687
3518############################################################################# 3688#############################################################################
3519 3689
… …
3556 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3557 3727
3558 int $coord + 0.5 3728 int $coord + 0.5
3559} 3729}
3560 3730
3561sub size_allocate { 3731sub invoke_size_allocate {
3562 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3563 3733
3564 for my $child ($self->children) { 3734 for my $child ($self->children) {
3565 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3566 3736
… …
3570 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3571 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3572 3742
3573 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3574 } 3744 }
3745
3746 1
3575} 3747}
3576 3748
3577sub coord2local { 3749sub coord2local {
3578 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3579 3751
… …
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706 3878
3707 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3708 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3709 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3710 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3711 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3712 3890
3713 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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