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.287 by root, Mon Jun 5 05:31:13 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];
1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 1752
1655 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1662 }
1663
1664 glDisable GL_TEXTURE_2D;
1665} 1754}
1666 1755
1667############################################################################# 1756#############################################################################
1668 1757
1669package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1683 can_hover => 1, 1772 can_hover => 1,
1684 can_focus => 1, 1773 can_focus => 1,
1685 valign => 0, 1774 valign => 0,
1686 can_events => 1, 1775 can_events => 1,
1687 #text => ... 1776 #text => ...
1777 #hidden => "*",
1688 @_ 1778 @_
1689 ) 1779 )
1690} 1780}
1691 1781
1692sub _set_text { 1782sub _set_text {
… …
1699 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1700 $self->{text} = $text; 1790 $self->{text} = $text;
1701 1791
1702 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1703 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h}; 1794 delete $self->{size_req};
1705 1795
1706 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1707 1797
1708 $self->realloc; 1798 $self->realloc;
1709 $self->update; 1799 $self->update;
1710} 1800}
1711 1801
… …
1726 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1727 1817
1728 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1729} 1819}
1730 1820
1731sub key_down { 1821sub invoke_key_down {
1732 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1733 1823
1734 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1735 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1736 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1748 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1749 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1750 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1751 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1752 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1753 $self->_emit ('escape'); 1843 $self->emit ('escape');
1754 } elsif ($uni) { 1844 } elsif ($uni) {
1755 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else { 1846 } else {
1757 return 0; 1847 return 0;
1758 } 1848 }
… …
1762 $self->realloc; 1852 $self->realloc;
1763 1853
1764 1 1854 1
1765} 1855}
1766 1856
1767sub focus_in { 1857sub invoke_focus_in {
1768 my ($self) = @_; 1858 my ($self) = @_;
1769 1859
1770 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1771 1861
1772 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1773} 1863}
1774 1864
1775sub button_down { 1865sub invoke_button_down {
1776 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1777 1867
1778 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1779 1869
1780 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1781 1871
1782 # byte-index to char-index 1872 # byte-index to char-index
1783 my $text = $self->{text}; 1873 my $text = $self->{text};
1784 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1785 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1786 1876
1787 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1788 $self->update; 1878 $self->update;
1789 1879
1790 1 1880 1
1791} 1881}
1792 1882
1793sub mouse_motion { 1883sub invoke_mouse_motion {
1794 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1795# 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#
1796 1886
1797 0 1887 1
1798} 1888}
1799 1889
1800sub _draw { 1890sub _draw {
1801 my ($self) = @_; 1891 my ($self) = @_;
1802 1892
… …
1843 1933
1844our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1845 1935
1846use CFClient::OpenGL; 1936use CFClient::OpenGL;
1847 1937
1848sub key_down { 1938sub invoke_key_down {
1849 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1850 1940
1851 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1852 1942
1853 if ($sym == 13) { 1943 if ($sym == 13) {
1854 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1855 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1856 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1857 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1858 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1859 $self->update; 1950 $self->update;
1860 1951
1861 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1862 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1863 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1879 } else { 1970 } else {
1880 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1881 } 1972 }
1882 1973
1883 } else { 1974 } else {
1884 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1885 } 1976 }
1886 1977
1887 1 1978 1
1888} 1979}
1889 1980
… …
1913 can_events => 1, 2004 can_events => 1,
1914 @_ 2005 @_
1915 ) 2006 )
1916} 2007}
1917 2008
1918sub activate { }
1919
1920sub button_up { 2009sub invoke_button_up {
1921 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1922 2011
1923 $self->emit ("activate") 2012 $self->emit ("activate")
1924 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1925 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1939 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1940 2029
1941 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1942 2031
1943 $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
1944} 2069}
1945 2070
1946############################################################################# 2071#############################################################################
1947 2072
1948package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1975 my ($self) = @_; 2100 my ($self) = @_;
1976 2101
1977 (6) x 2 2102 (6) x 2
1978} 2103}
1979 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1980sub button_down { 2113sub invoke_button_down {
1981 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1982 2115
1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1985 $self->{state} = !$self->{state}; 2118 $self->toggle;
1986 $self->_emit (changed => $self->{state});
1987 } else { 2119 } else {
1988 return 0 2120 return 0
1989 } 2121 }
1990 2122
1991 1 2123 1
… …
2016package CFClient::UI::Image; 2148package CFClient::UI::Image;
2017 2149
2018our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
2019 2151
2020use CFClient::OpenGL; 2152use CFClient::OpenGL;
2021use Carp qw/confess/;
2022 2153
2023our %loaded_images; 2154our %texture_cache;
2024 2155
2025sub new { 2156sub new {
2026 my $class = shift; 2157 my $class = shift;
2027 2158
2028 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2029 2163
2030 $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";
2031 2166
2032 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2033 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;
2034 2169
2035 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2036 2171
2037 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2038
2039 $self->{aspect} = $tex->{w} / $tex->{h};
2040 2173
2041 $self 2174 $self
2042} 2175}
2043 2176
2044sub size_request { 2177sub size_request {
2045 my ($self) = @_; 2178 my ($self) = @_;
2046 2179
2047 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2048} 2181}
2049 2182
2050sub _draw { 2183sub _draw {
2051 my ($self) = @_; 2184 my ($self) = @_;
2052 2185
… …
2161 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2162 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2163 2296
2164 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2165 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);
2166 2302
2167 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2170 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2189 2325
2190 if ($t3) { 2326 if ($t3) {
2191 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2192 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2193 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2194 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2195 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2196 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2197 glEnd; 2333 glEnd;
2198 } 2334 }
2199 2335
2200 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2288 $self->update; 2424 $self->update;
2289 2425
2290 $self 2426 $self
2291} 2427}
2292 2428
2293sub changed { }
2294
2295sub set_range { 2429sub set_range {
2296 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2297 2431
2298 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2299 2433
2300 $self->update
2301 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2302} 2438}
2303 2439
2304sub set_value { 2440sub set_value {
2305 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2306 2442
… …
2317 if $unit; 2453 if $unit;
2318 2454
2319 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2320 2456
2321 if ($value != $old_value) { 2457 if ($value != $old_value) {
2322 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2323 $self->update; 2459 $self->update;
2324 } 2460 }
2325} 2461}
2326 2462
2327sub size_request { 2463sub size_request {
2328 my ($self) = @_; 2464 my ($self) = @_;
2329 2465
2330 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2331} 2467}
2332 2468
2333sub button_down { 2469sub invoke_button_down {
2334 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2335 2471
2336 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2337 2473
2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2339 2475
2340 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2341} 2477}
2342 2478
2343sub mouse_motion { 2479sub invoke_mouse_motion {
2344 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2345 2481
2346 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2347 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2348 2484
… …
2354 } else { 2490 } else {
2355 return 0; 2491 return 0;
2356 } 2492 }
2357 2493
2358 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
2359} 2505}
2360 2506
2361sub update { 2507sub update {
2362 my ($self) = @_; 2508 my ($self) = @_;
2363 2509
… …
2453sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2454sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2455 2601
2456############################################################################# 2602#############################################################################
2457 2603
2458package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2459 2605
2460our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2461 2607
2462use CFClient::OpenGL; 2608use CFClient::OpenGL;
2463 2609
2464sub new { 2610sub new {
2465 my $class = shift; 2611 my $class = shift;
2466 2612
2467 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2468 fontsize => 1, 2614 fontsize => 1,
2469 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2470 #font => default_font 2617 #font => default_font
2471 @_, 2618 @_,
2472 2619
2473 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2474 par => [], 2621 par => [],
2475 height => 0, 2622 height => 0,
2476 children => [ 2623 children => [
2477 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2478 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2489 2636
2490 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2491 $self->reflow; 2638 $self->reflow;
2492} 2639}
2493 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
2494sub size_allocate { 2650sub invoke_size_allocate {
2495 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2496 2652
2497 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2498 2655
2499 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2500 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $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});
2502 2660
2503 $self->reflow; 2661 $self->reflow;
2504}
2505 2662
2506sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2507 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) = @_;
2508 2679
2509 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2510 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2511 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2512 $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});
2513 $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}}
2514 2693 );
2694
2515 $layout->size 2695 $layout
2516} 2696}
2517 2697
2518sub reflow { 2698sub reflow {
2519 my ($self) = @_; 2699 my ($self) = @_;
2520 2700
… …
2529 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2530} 2710}
2531 2711
2532sub clear { 2712sub clear {
2533 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2534 2717
2535 $self->{par} = []; 2718 $self->{par} = [];
2536 $self->{height} = 0; 2719 $self->{height} = 0;
2537 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2538} 2721}
2539 2722
2540sub add_paragraph { 2723sub add_paragraph {
2541 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2542 2725
2543 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2544 my ($w, $h) = $self->text_size ($line); 2727
2545 $self->{height} += $h; 2728 $para = {
2546 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,
2547 } 2735 };
2548 2736
2549 $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;
2550} 2749}
2551 2750
2552sub update { 2751sub update {
2553 my ($self) = @_; 2752 my ($self) = @_;
2554 2753
… …
2556 2755
2557 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2558 2757
2559 delete $self->{texture}; 2758 delete $self->{texture};
2560 2759
2561 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2562 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2563 2762
2564 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2565 my $height = 0; 2764 my $height = 0;
2566 2765
2567 my $layout = $self->{layout};
2568
2569 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2570
2571 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2572 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2573 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2574 $layout->set_markup ($_->[4]);
2575 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2576 $_->[0] = $w + $_->[3]; 2770
2577 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2578 } 2774 }
2579 2775
2580 $height += $_->[1]; 2776 $height += $para->{h};
2581 } 2777 }
2582 2778
2583 $self->{height} = $height; 2779 $self->{height} = $height;
2584 2780
2585 $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]);
2586 2782
2587 delete $self->{texture}; 2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2588 } 2788 }
2589 2789
2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2591 glClearColor 0, 0, 0, 0; 2791 glClearColor 0, 0, 0, 0;
2592 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
… …
2596 my $y0 = $top; 2796 my $y0 = $top;
2597 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2598 2798
2599 my $y = 0; 2799 my $y = 0;
2600 2800
2601 my $layout = $self->{layout};
2602
2603 $layout->set_font ($self->{font}) if $self->{font};
2604
2605 glEnable GL_BLEND;
2606 #TODO# not correct in windows where rgba is forced off
2607 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2608
2609 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2610 my $h = $par->[1]; 2802 my $h = $para->{h};
2611 2803
2612 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2613 $layout->set_foreground (@{ $par->[2] });
2614 $layout->set_width ($W - $par->[3]);
2615 $layout->set_markup ($par->[4]);
2616 2805
2617 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2618 2807
2619 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2620 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 }
2621 } 2822 }
2622 2823
2623 $y += $h; 2824 $y += $h;
2624 } 2825 }
2625
2626 glDisable GL_BLEND;
2627 }; 2826 };
2628 }); 2827 });
2828}
2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2629} 2837}
2630 2838
2631sub _draw { 2839sub _draw {
2632 my ($self) = @_; 2840 my ($self) = @_;
2633 2841
… …
2636 glColor 0, 0, 0, 1; 2844 glColor 0, 0, 0, 1;
2637 $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});
2638 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2639 2847
2640 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2641
2642} 2849}
2643 2850
2644############################################################################# 2851#############################################################################
2645 2852
2646package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2733 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2737 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2738 2948
2739 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2740 markup => $tooltip, 2950 markup => $tooltip,
2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2742 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2752 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2753 2963
2754 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2755} 2965}
2756 2966
2757sub size_allocate { 2967sub invoke_size_allocate {
2758 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2759 2969
2760 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2761} 2971}
2762 2972
2763sub visibility_change { 2973sub invoke_visibility_change {
2764 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2765 2975
2766 return unless $visible; 2976 return unless $visible;
2767 2977
2768 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2770 or return; 2980 or return;
2771 2981
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773 2983
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2776 2986
2777 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2778 }); 2988 });
2779} 2989}
2780 2990
… …
2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2876 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2877 } 3087 }
2878} 3088}
2879 3089
2880sub DESTROY { 3090sub destroy {
2881 my ($self) = @_; 3091 my ($self) = @_;
2882 3092
2883 $self->{timer}->cancel 3093 $self->{timer}->cancel
2884 if $self->{timer}; 3094 if $self->{timer};
2885 3095
2886 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2887} 3097}
2888 3098
2889############################################################################# 3099#############################################################################
2890 3100
2891package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2912 ); 3122 );
2913 3123
2914 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2915 3125
2916 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2917 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2918 3128
2919 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2920 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 {
2921 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2922 can_hover => 1, 3146 can_hover => 1,
2923 can_events => 1, 3147 can_events => 1,
2924 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2925 } 3151 }
2926 3152
2927 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2928 3154
2929 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2934 3160
2935# 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)
2936sub popup { 3162sub popup {
2937 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2938 3164
2939 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2940 3166
2941 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2942 $GRAB = $self; 3168 $GRAB = $self;
2943 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2944 3170
2945 $self->show; 3171 $self->show;
2946 $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);
2947} 3173}
2948 3174
2949sub mouse_motion { 3175sub invoke_mouse_motion {
2950 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2951 3177
2952 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2954 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2955 3181
2956 0 3182 0
2957} 3183}
2958 3184
2959sub button_up { 3185sub invoke_button_up {
2960 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2961 3187
2962 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2963 undef $GRAB; 3189 undef $GRAB;
2964 $self->hide; 3190 $self->hide;
2965 3191
2966 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2967 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2968 } else { 3194 } else {
2969 return 0 3195 return 0
2970 } 3196 }
2971 3197
… …
2998 3224
2999 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} }; 3226 if @{ $self->{children} };
3001} 3227}
3002 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
3003sub set_current_page { 3235sub set_current_page {
3004 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3005 3237
3006 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
3007 ? $page_or_widget 3239 ? $page_or_widget
3008 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
3009 3241
3010 $self->{current} = $widget; 3242 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012 3244
3013 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
3014 3246
3015 $self->realloc; 3247 $self->realloc;
3016} 3248}
3017 3249
3018sub visible_children { 3250sub visible_children {
… …
3023 my ($self) = @_; 3255 my ($self) = @_;
3024 3256
3025 $self->{current}->size_request 3257 $self->{current}->size_request
3026} 3258}
3027 3259
3028sub size_allocate { 3260sub invoke_size_allocate {
3029 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3030 3262
3031 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3032} 3266}
3033 3267
3034sub _draw { 3268sub _draw {
3035 my ($self) = @_; 3269 my ($self) = @_;
3036 3270
… …
3071 ); 3305 );
3072 3306
3073 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3074} 3308}
3075 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3076sub set_current_page { 3316sub set_current_page {
3077 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3078 3318
3079 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3080 $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);
3081} 3377}
3082 3378
3083############################################################################# 3379#############################################################################
3084 3380
3085package CFClient::UI::Statusbox; 3381package CFClient::UI::Statusbox;
… …
3184 $item->{count}++; 3480 $item->{count}++;
3185 } else { 3481 } else {
3186 $item->{count} = 1; 3482 $item->{count} = 1;
3187 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3188 } 3484 }
3189 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3190 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3191 delete $item->{label}; 3487 delete $item->{label};
3192 } else { 3488 } else {
3193 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3194 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3200 count => 1, 3496 count => 1,
3201 %arg, 3497 %arg,
3202 }; 3498 };
3203 } 3499 }
3204 3500
3501 $ROOT->on_refresh (reorder => sub {
3205 $self->reorder; 3502 $self->reorder;
3503 });
3206} 3504}
3207 3505
3208sub reconfigure { 3506sub reconfigure {
3209 my ($self) = @_; 3507 my ($self) = @_;
3210 3508
… …
3213 3511
3214 $self->reorder; 3512 $self->reorder;
3215 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3216} 3514}
3217 3515
3218sub DESTROY { 3516sub destroy {
3219 my ($self) = @_; 3517 my ($self) = @_;
3220 3518
3221 $self->{timer}->cancel; 3519 $self->{timer}->cancel;
3222 3520
3223 $self->SUPER::DESTROY; 3521 $self->SUPER::destroy;
3224} 3522}
3225 3523
3226############################################################################# 3524#############################################################################
3227 3525
3228package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3229 3527
3230our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3231 3529
3232sub new { 3530sub new {
3233 my $class = shift; 3531 my $class = shift;
3234 3532
3235 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3237 @_, 3535 @_,
3238 ); 3536 );
3239 3537
3240 $self 3538 $self
3241} 3539}
3242 3540
3243sub set_items { 3541sub set_items {
3244 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3245 3543
3246 $self->{child}->clear; 3544 $self->clear;
3247 return unless $items; 3545 return unless $items;
3248 3546
3249 my @items = sort { 3547 my @items = sort {
3250 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3252 } @$items; 3550 } values %$items;
3253 3551
3254 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3255 3553
3256 my $row = 0; 3554 my $row = 0;
3257 for my $item (@items) { 3555 for my $item (@items) {
3258 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3259 3557
3260 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3263 3561
3264 $row++; 3562 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 } 3563 }
3463} 3564}
3464 3565
3465############################################################################# 3566#############################################################################
3466 3567
… …
3476 commands => [], 3577 commands => [],
3477 @_, 3578 @_,
3478 ) 3579 )
3479} 3580}
3480 3581
3481# 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
3482sub add_spell { 3667sub add_spell {
3483 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3484 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3485 3671 $self->rebuild_spell_list;
3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513} 3672}
3514 3673
3515sub remove_spell { 3674sub remove_spell {
3516 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3517 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} = {};
3518 $self->rebuild_spell_list; 3685 $self->rebuild_spell_list;
3519} 3686}
3520 3687
3521############################################################################# 3688#############################################################################
3522 3689
… …
3559 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3560 3727
3561 int $coord + 0.5 3728 int $coord + 0.5
3562} 3729}
3563 3730
3564sub size_allocate { 3731sub invoke_size_allocate {
3565 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3566 3733
3567 for my $child ($self->children) { 3734 for my $child ($self->children) {
3568 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)};
3569 3736
… …
3573 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3574 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3575 3742
3576 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3577 } 3744 }
3745
3746 1
3578} 3747}
3579 3748
3580sub coord2local { 3749sub coord2local {
3581 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3582 3751
… …
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3709 3878
3710 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3711 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3712 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
3713 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3714 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3715 3890
3716 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}) {
3717 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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