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.290 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.331 by root, Sun Jul 23 04:46:02 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 {
… …
408 429
409# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
410sub coord2local { 431sub coord2local {
411 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
412 433
434 Carp::confess unless $self->{parent};#d#
435
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 437}
415 438
416# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
417sub coord2global { 440sub coord2global {
418 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
419 442
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 443 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 444}
422 445
423sub focus_in { 446sub invoke_focus_in {
424 my ($self) = @_; 447 my ($self) = @_;
425 448
426 return if $FOCUS == $self; 449 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
428 451
429 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
430 453
431 $self->_emit (focus_in => $focus); 454 $self->update;
432 455
433 $focus->update if $focus; 456 0
434 $FOCUS->update;
435} 457}
436 458
437sub focus_out { 459sub invoke_focus_out {
438 my ($self) = @_; 460 my ($self) = @_;
439 461
440 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
441 463
442 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
443 465
444 $self->_emit (focus_out => $focus); 466 $self->update;
445 467
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 469 unless $FOCUS;
450}
451 470
471 0
472}
473
474sub grab_focus {
475 my ($self) = @_;
476
477 $FOCUS->emit ("focus_out") if $FOCUS;
478 $self->emit ("focus_in");
479}
480
452sub mouse_motion { 0 } 481sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 482sub invoke_button_up { 0 }
454sub key_down { 0 } 483sub invoke_key_down { 0 }
455sub key_up { 0 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
456 486
457sub button_down { 487sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
459 489
460 $self->focus_in; 490 $self->grab_focus;
461 491
462 0 492 0
493}
494
495sub connect {
496 my ($self, $signal, $cb) = @_;
497
498 push @{ $self->{signal_cb}{$signal} }, $cb;
499}
500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
508sub emit {
509 my ($self, $signal, @args) = @_;
510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
518 #d##TODO# stop propagating at first true, do not use sum
519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 522}
464 523
465sub find_widget { 524sub find_widget {
466 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
467 526
… …
477sub set_parent { 536sub set_parent {
478 my ($self, $parent) = @_; 537 my ($self, $parent) = @_;
479 538
480 Scalar::Util::weaken ($self->{parent} = $parent); 539 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 540 $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} 541}
506 542
507sub realloc { 543sub realloc {
508 my ($self) = @_; 544 my ($self) = @_;
509 545
… …
542 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
543 579
544 # update screen rectangle 580 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 583
550 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 587
… …
592} 626}
593 627
594sub DESTROY { 628sub DESTROY {
595 my ($self) = @_; 629 my ($self) = @_;
596 630
631 return if CFClient::in_destruct;
632
597 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
598 #$self->deactivate; 634
635 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 637}
600 638
601############################################################################# 639#############################################################################
602 640
603package CFClient::UI::DrawBG; 641package CFClient::UI::DrawBG;
… …
768} 806}
769 807
770sub add { 808sub add {
771 my ($self, $child) = @_; 809 my ($self, $child) = @_;
772 810
773 $self->{children} = []; 811 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 812 $self->SUPER::add ($child);
776} 813}
777 814
778sub remove { 815sub remove {
779 my ($self, $widget) = @_; 816 my ($self, $widget) = @_;
… …
788 825
789sub size_request { 826sub size_request {
790 $_[0]{children}[0]->size_request 827 $_[0]{children}[0]->size_request
791} 828}
792 829
793sub size_allocate { 830sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 831 my ($self, $w, $h) = @_;
795 832
796 $self->{children}[0]->configure (0, 0, $w, $h); 833 $self->{children}[0]->configure (0, 0, $w, $h);
834
835 1
797} 836}
798 837
799############################################################################# 838#############################################################################
800 839
801# back-buffered drawing area 840# back-buffered drawing area
… …
817 856
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 857 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 858 $self->SUPER::update;
820} 859}
821 860
822sub size_allocate { 861sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
824 863
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 864 $self->update;
865
866 $self->SUPER::invoke_size_allocate ($w, $h)
827} 867}
828 868
829sub _render { 869sub _render {
830 my ($self) = @_; 870 my ($self) = @_;
831 871
… …
892 $h = 10 if $self->{scroll_y}; 932 $h = 10 if $self->{scroll_y};
893 933
894 ($w, $h) 934 ($w, $h)
895} 935}
896 936
897sub size_allocate { 937sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 938 my ($self, $w, $h) = @_;
899 939
900 my $child = $self->child; 940 my $child = $self->child;
901 941
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 942 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 943 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 944
905 $self->child->configure (0, 0, $w, $h); 945 $self->child->configure (0, 0, $w, $h);
906 $self->update; 946 $self->update;
947
948 1
907} 949}
908 950
909sub set_offset { 951sub set_offset {
910 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
911 953
… …
974 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
975 }, 1017 },
976 ; 1018 ;
977 1019
978 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
980 slider => $slider, 1023 slider => $slider,
981 %arg, 1024 %arg,
982 ); 1025 );
983 1026
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
986 1029
987 $self 1030 $self
988} 1031}
989 1032
1033#TODO# update range on size_allocate depending on child
1034
990sub add { 1035sub add {
991 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
992 1037
993 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
994} 1039}
995 1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
996sub update { 1057sub update {
997 my ($self) = @_; 1058 my ($self) = @_;
998 1059
999 $self->SUPER::update; 1060 $self->SUPER::update;
1000 1061
1001 # todo: overwrite size_allocate of child 1062 $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} 1063}
1005 1064
1006sub size_allocate { 1065sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1008 1067
1068 $self->update_slider;
1069
1009 $self->SUPER::size_allocate ($w, $h); 1070 $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} 1071}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1072
1018############################################################################# 1073#############################################################################
1019 1074
1020package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1021 1076
… …
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1127 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1128
1074sub new { 1129sub new {
1075 my ($class, %arg) = @_; 1130 my ($class, %arg) = @_;
1076 1131
1077 my $title = delete $arg{title};
1078
1079 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1135 border => 0.6,
1083 can_events => 1, 1136 can_events => 1,
1084 min_w => 16, 1137 min_w => 64,
1085 min_h => 16, 1138 min_h => 32,
1086 %arg, 1139 %arg,
1087 ); 1140 );
1088 1141
1089 $self->{title} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1143 align => 0,
1091 valign => 1, 1144 valign => 1,
1092 text => $title, 1145 text => $self->{title},
1093 fontsize => $self->{border} 1146 fontsize => $self->{border},
1094 if defined $title; 1147 if exists $self->{title};
1148
1149 if ($self->{has_close_button}) {
1150 $self->{close_button} =
1151 new CFClient::UI::ImageButton
1152 path => 'x1_close.png',
1153 on_activate => sub { $self->emit ("delete") };
1154
1155 $self->CFClient::UI::Container::add ($self->{close_button});
1156 }
1095 1157
1096 $self 1158 $self
1097} 1159}
1098 1160
1099sub add { 1161sub add {
1100 my ($self, @widgets) = @_; 1162 my ($self, @widgets) = @_;
1101 1163
1102 $self->SUPER::add (@widgets); 1164 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1167}
1105 1168
1106sub border { 1169sub border {
1107 int $_[0]{border} * $::FONTSIZE 1170 int $_[0]{border} * $::FONTSIZE
1108} 1171}
1109 1172
1110sub size_request { 1173sub size_request {
1111 my ($self) = @_; 1174 my ($self) = @_;
1112 1175
1113 $self->{title}->size_request 1176 $self->{title_widget}->size_request
1114 if $self->{title}; 1177 if $self->{title_widget};
1178
1179 $self->{close_button}->size_request
1180 if $self->{close_button};
1115 1181
1116 my ($w, $h) = $self->SUPER::size_request; 1182 my ($w, $h) = $self->SUPER::size_request;
1117 1183
1118 ( 1184 (
1119 $w + $self->border * 2, 1185 $w + $self->border * 2,
1120 $h + $self->border * 2, 1186 $h + $self->border * 2,
1121 ) 1187 )
1122} 1188}
1123 1189
1124sub size_allocate { 1190sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1191 my ($self, $w, $h) = @_;
1126 1192
1127 if ($self->{title}) { 1193 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1194 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1195 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1196 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1197 }
1132 1198
1133 my $border = $self->border; 1199 my $border = $self->border;
1134 1200
1135 $h -= List::Util::max 0, $border * 2; 1201 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1202 $w -= List::Util::max 0, $border * 2;
1203
1204 $self->child->configure ($border, $border, $w, $h);
1205
1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1207 if $self->{close_button};
1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1137 1216
1138 $self->child->configure ($border, $border, $w, $h); 1217 1
1139} 1218}
1140 1219
1141sub button_down { 1220sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1143 1222
1144 my ($w, $h) = @$self{qw(w h)}; 1223 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1224 my $border = $self->border;
1146 1225
… …
1177 1256
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1257 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1258
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1259 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1260 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1261 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1262 };
1184 } else { 1263 } else {
1185 return 0; 1264 return 0;
1186 } 1265 }
1187 1266
1188 1 1267 1
1189} 1268}
1190 1269
1191sub button_up { 1270sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1271 my ($self, $ev, $x, $y) = @_;
1193 1272
1194 !!delete $self->{motion} 1273 ! ! delete $self->{motion}
1195} 1274}
1196 1275
1197sub mouse_motion { 1276sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1277 my ($self, $ev, $x, $y) = @_;
1199 1278
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1279 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1280
1202 !!$self->{motion} 1281 ! ! $self->{motion}
1203} 1282}
1204 1283
1205sub _draw { 1284sub _draw {
1206 my ($self) = @_; 1285 my ($self) = @_;
1207 1286
… …
1233 1312
1234 glDisable GL_TEXTURE_2D; 1313 glDisable GL_TEXTURE_2D;
1235 1314
1236 $child->draw; 1315 $child->draw;
1237 1316
1238 if ($self->{title}) { 1317 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1318 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1319 $self->{title_widget}->_draw;
1320
1321 glTranslate 0, - ($border - $self->{h});
1241 } 1322 }
1323
1324 $self->{close_button}->draw
1325 if $self->{close_button};
1242} 1326}
1243 1327
1244############################################################################# 1328#############################################################################
1245 1329
1246package CFClient::UI::Table; 1330package CFClient::UI::Table;
… …
1269 1353
1270 $child->set_parent ($self); 1354 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1355 $self->{children}[$y][$x] = $child;
1272 1356
1273 $self->realloc; 1357 $self->realloc;
1358}
1359
1360sub remove {
1361 my ($self, $child) = @_;
1362
1363 # TODO: not yet implemented
1274} 1364}
1275 1365
1276# TODO: move to container class maybe? send children a signal on removal? 1366# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1367sub clear {
1278 my ($self) = @_; 1368 my ($self) = @_;
… …
1319 (sum @$ws), 1409 (sum @$ws),
1320 (sum @$hs), 1410 (sum @$hs),
1321 ) 1411 )
1322} 1412}
1323 1413
1324sub size_allocate { 1414sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1415 my ($self, $w, $h) = @_;
1326 1416
1327 my ($ws, $hs) = $self->get_wh; 1417 my ($ws, $hs) = $self->get_wh;
1328 1418
1329 my $req_w = (sum @$ws) || 1; 1419 my $req_w = (sum @$ws) || 1;
… …
1361 } 1451 }
1362 1452
1363 $y += $row_h; 1453 $y += $row_h;
1364 } 1454 }
1365 1455
1456 1
1366} 1457}
1367 1458
1368sub find_widget { 1459sub find_widget {
1369 my ($self, $x, $y) = @_; 1460 my ($self, $x, $y) = @_;
1370 1461
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1498 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1499 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1500 )
1410} 1501}
1411 1502
1412sub size_allocate { 1503sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1414 1505
1415 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1417 1508
1418 my @req; 1509 my @req;
1419 1510
1420 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1422 } else { 1513 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1425 1516
1426 if ($req > $space) { 1517 if ($req > $space) {
1427 # ah well, not enough space 1518 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1429 } else { 1520 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1522
1432 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1433 1524
1434 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1526 for 0 .. $#children;
1436 } 1527 }
1437 } 1528 }
1438 1529
1439 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1440 1531
1441 my $pos = 0; 1532 my $pos = 0;
1442 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1536
1446 $pos += $alloc; 1537 $pos += $alloc;
1447 } 1538 }
1448 1539
1449 1 1540 1
… …
1552 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1553 1644
1554 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1556 1647
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1559 1649
1560 delete $self->{size_req}; 1650 delete $self->{size_req};
1561 $self->realloc; 1651 $self->realloc;
1562 $self->update; 1652 $self->update;
… …
1568 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1570 1660
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1662
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1575 1664
1576 delete $self->{size_req}; 1665 delete $self->{size_req};
1577 $self->realloc; 1666 $self->realloc;
1578 $self->update; 1667 $self->update;
… …
1590 1679
1591 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1592 1681
1593 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1686
1597 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1598 1688
1599 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
… …
1604 }; 1694 };
1605 1695
1606 @{ $self->{size_req} } 1696 @{ $self->{size_req} }
1607} 1697}
1608 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1609sub size_allocate { 1703sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1611 1705
1612 delete $self->{ox}; 1706 delete $self->{ox};
1613 1707
1614 delete $self->{texture} 1708 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1709 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1710
1711 1
1616} 1712}
1617 1713
1618sub set_fontsize { 1714sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1620 1716
1621 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1622 delete $self->{texture}; 1719 delete $self->{texture};
1623 1720
1624 $self->realloc; 1721 $self->realloc;
1625} 1722}
1626 1723
1627sub reconfigure { 1724sub reconfigure {
1628 my ($self) = @_; 1725 my ($self) = @_;
1629 1726
1630 delete $self->{size_req}; 1727 delete $self->{size_req};
1728 delete $self->{texture};
1631 1729
1632 $self->SUPER::reconfigure; 1730 $self->SUPER::reconfigure;
1633} 1731}
1634 1732
1635sub _draw { 1733sub _draw {
1636 my ($self) = @_; 1734 my ($self) = @_;
1637 1735
1638 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1639 1737
1640 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 1745
1648 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1649 }; 1747 };
1650 1748
1651 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1655 1753
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 1757 };
1660 1758
1661 glEnable GL_TEXTURE_2D; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1662 1761
1663 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1671
1672 glDisable GL_TEXTURE_2D;
1673} 1763}
1674 1764
1675############################################################################# 1765#############################################################################
1676 1766
1677package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1691 can_hover => 1, 1781 can_hover => 1,
1692 can_focus => 1, 1782 can_focus => 1,
1693 valign => 0, 1783 valign => 0,
1694 can_events => 1, 1784 can_events => 1,
1695 #text => ... 1785 #text => ...
1786 #hidden => "*",
1696 @_ 1787 @_
1697 ) 1788 )
1698} 1789}
1699 1790
1700sub _set_text { 1791sub _set_text {
… …
1709 1800
1710 $text =~ s/./*/g if $self->{hidden}; 1801 $text =~ s/./*/g if $self->{hidden};
1711 $self->{layout}->set_text ("$text "); 1802 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req}; 1803 delete $self->{size_req};
1713 1804
1714 $self->_emit (changed => $self->{text}); 1805 $self->emit (changed => $self->{text});
1715 1806
1716 $self->realloc; 1807 $self->realloc;
1717 $self->update; 1808 $self->update;
1718} 1809}
1719 1810
… …
1734 my ($w, $h) = $self->SUPER::size_request; 1825 my ($w, $h) = $self->SUPER::size_request;
1735 1826
1736 ($w + 1, $h) # add 1 for cursor 1827 ($w + 1, $h) # add 1 for cursor
1737} 1828}
1738 1829
1739sub key_down { 1830sub invoke_key_down {
1740 my ($self, $ev) = @_; 1831 my ($self, $ev) = @_;
1741 1832
1742 my $mod = $ev->{mod}; 1833 my $mod = $ev->{mod};
1743 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1744 my $uni = $ev->{unicode}; 1835 my $uni = $ev->{unicode};
… …
1756 } elsif ($sym == CFClient::SDLK_HOME) { 1847 } elsif ($sym == CFClient::SDLK_HOME) {
1757 $self->{cursor} = 0; 1848 $self->{cursor} = 0;
1758 } elsif ($sym == CFClient::SDLK_END) { 1849 } elsif ($sym == CFClient::SDLK_END) {
1759 $self->{cursor} = length $text; 1850 $self->{cursor} = length $text;
1760 } elsif ($uni == 27) { 1851 } elsif ($uni == 27) {
1761 $self->_emit ('escape'); 1852 $self->emit ('escape');
1762 } elsif ($uni) { 1853 } elsif ($uni) {
1763 substr $text, $self->{cursor}++, 0, chr $uni; 1854 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else { 1855 } else {
1765 return 0; 1856 return 0;
1766 } 1857 }
… …
1770 $self->realloc; 1861 $self->realloc;
1771 1862
1772 1 1863 1
1773} 1864}
1774 1865
1775sub focus_in { 1866sub invoke_focus_in {
1776 my ($self) = @_; 1867 my ($self) = @_;
1777 1868
1778 $self->{last_activity} = $::NOW; 1869 $self->{last_activity} = $::NOW;
1779 1870
1780 $self->SUPER::focus_in; 1871 $self->SUPER::invoke_focus_in
1781} 1872}
1782 1873
1783sub button_down { 1874sub invoke_button_down {
1784 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1785 1876
1786 $self->SUPER::button_down ($ev, $x, $y); 1877 $self->SUPER::invoke_button_down ($ev, $x, $y);
1787 1878
1788 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1789 1880
1790 # byte-index to char-index 1881 # byte-index to char-index
1791 my $text = $self->{text}; 1882 my $text = $self->{text};
1792 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1793 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1794 1885
1795 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1796 $self->update; 1887 $self->update;
1797 1888
1798 1 1889 1
1799} 1890}
1800 1891
1801sub mouse_motion { 1892sub invoke_mouse_motion {
1802 my ($self, $ev, $x, $y) = @_; 1893 my ($self, $ev, $x, $y) = @_;
1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1894# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804 1895
1805 0 1896 1
1806} 1897}
1807 1898
1808sub _draw { 1899sub _draw {
1809 my ($self) = @_; 1900 my ($self) = @_;
1810 1901
… …
1851 1942
1852our @ISA = CFClient::UI::EntryBase::; 1943our @ISA = CFClient::UI::EntryBase::;
1853 1944
1854use CFClient::OpenGL; 1945use CFClient::OpenGL;
1855 1946
1856sub key_down { 1947sub invoke_key_down {
1857 my ($self, $ev) = @_; 1948 my ($self, $ev) = @_;
1858 1949
1859 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1860 1951
1861 if ($sym == 13) { 1952 if ($sym == 13) {
1862 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1863 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1864 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1865 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1866 $self->_emit (activate => $txt); 1958 $self->emit (activate => $txt);
1867 $self->update; 1959 $self->update;
1868 1960
1869 } elsif ($sym == CFClient::SDLK_UP) { 1961 } elsif ($sym == CFClient::SDLK_UP) {
1870 if ($self->{history_pointer} < 0) { 1962 if ($self->{history_pointer} < 0) {
1871 $self->{history_saveback} = $self->get_text; 1963 $self->{history_saveback} = $self->get_text;
… …
1887 } else { 1979 } else {
1888 $self->set_text ($self->{history_saveback}); 1980 $self->set_text ($self->{history_saveback});
1889 } 1981 }
1890 1982
1891 } else { 1983 } else {
1892 return $self->SUPER::key_down ($ev) 1984 return $self->SUPER::invoke_key_down ($ev)
1893 } 1985 }
1894 1986
1895 1 1987 1
1896} 1988}
1897 1989
… …
1921 can_events => 1, 2013 can_events => 1,
1922 @_ 2014 @_
1923 ) 2015 )
1924} 2016}
1925 2017
1926sub activate { }
1927
1928sub button_up { 2018sub invoke_button_up {
1929 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
1930 2020
1931 $self->emit ("activate") 2021 $self->emit ("activate")
1932 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
1933 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
… …
1947 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1948 2038
1949 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1950 2040
1951 $self->SUPER::_draw; 2041 $self->SUPER::_draw;
2042}
2043
2044#############################################################################
2045
2046package CFClient::UI::ImageButton;
2047
2048our @ISA = CFClient::UI::Image::;
2049
2050use CFClient::OpenGL;
2051
2052my %textures;
2053
2054sub new {
2055 my $class = shift;
2056
2057 my $self = $class->SUPER::new (
2058 padding_x => 4,
2059 padding_y => 4,
2060 fg => [1, 1, 1],
2061 active_fg => [0, 0, 1],
2062 can_hover => 1,
2063 align => 0,
2064 valign => 0,
2065 can_events => 1,
2066 @_
2067 );
2068}
2069
2070sub invoke_button_up {
2071 my ($self, $ev, $x, $y) = @_;
2072
2073 $self->emit ("activate")
2074 if $x >= 0 && $x < $self->{w}
2075 && $y >= 0 && $y < $self->{h};
2076
2077 1
1952} 2078}
1953 2079
1954############################################################################# 2080#############################################################################
1955 2081
1956package CFClient::UI::CheckBox; 2082package CFClient::UI::CheckBox;
… …
1983 my ($self) = @_; 2109 my ($self) = @_;
1984 2110
1985 (6) x 2 2111 (6) x 2
1986} 2112}
1987 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
1988sub button_down { 2122sub invoke_button_down {
1989 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
1990 2124
1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1993 $self->{state} = !$self->{state}; 2127 $self->toggle;
1994 $self->_emit (changed => $self->{state});
1995 } else { 2128 } else {
1996 return 0 2129 return 0
1997 } 2130 }
1998 2131
1999 1 2132 1
… …
2024package CFClient::UI::Image; 2157package CFClient::UI::Image;
2025 2158
2026our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
2027 2160
2028use CFClient::OpenGL; 2161use CFClient::OpenGL;
2029use Carp qw/confess/;
2030 2162
2031our %loaded_images; 2163our %texture_cache;
2032 2164
2033sub new { 2165sub new {
2034 my $class = shift; 2166 my $class = shift;
2035 2167
2036 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
2037 2172
2038 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2173 $self->{path} || $self->{tex}
2174 or Carp::croak "'path' or 'tex' attributes required";
2039 2175
2040 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2041 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2042 2178
2043 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2044 2180
2045 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2046
2047 $self->{aspect} = $tex->{w} / $tex->{h};
2048 2182
2049 $self 2183 $self
2050} 2184}
2051 2185
2052sub size_request { 2186sub size_request {
2053 my ($self) = @_; 2187 my ($self) = @_;
2054 2188
2055 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2056} 2190}
2057 2191
2058sub _draw { 2192sub _draw {
2059 my ($self) = @_; 2193 my ($self) = @_;
2060 2194
… …
2169 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2170 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2171 2305
2172 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2173 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2174 2311
2175 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2178 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2197 2334
2198 if ($t3) { 2335 if ($t3) {
2199 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2200 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2201 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2202 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2203 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2204 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2205 glEnd; 2342 glEnd;
2206 } 2343 }
2207 2344
2208 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2296 $self->update; 2433 $self->update;
2297 2434
2298 $self 2435 $self
2299} 2436}
2300 2437
2301sub changed { }
2302
2303sub set_range { 2438sub set_range {
2304 my ($self, $range) = @_; 2439 my ($self, $range) = @_;
2305 2440
2306 ($range, $self->{range}) = ($self->{range}, $range); 2441 ($range, $self->{range}) = ($self->{range}, $range);
2307 2442
2308 $self->update
2309 if "@$range" ne "@{$self->{range}}"; 2443 if ("@$range" ne "@{$self->{range}}") {
2444 $self->update;
2445 $self->set_value ($self->{range}[0]);
2446 }
2310} 2447}
2311 2448
2312sub set_value { 2449sub set_value {
2313 my ($self, $value) = @_; 2450 my ($self, $value) = @_;
2314 2451
… …
2325 if $unit; 2462 if $unit;
2326 2463
2327 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2464 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2328 2465
2329 if ($value != $old_value) { 2466 if ($value != $old_value) {
2330 $self->_emit (changed => $value); 2467 $self->emit (changed => $value);
2331 $self->update; 2468 $self->update;
2332 } 2469 }
2333} 2470}
2334 2471
2335sub size_request { 2472sub size_request {
2336 my ($self) = @_; 2473 my ($self) = @_;
2337 2474
2338 ($self->{req_w}, $self->{req_h}) 2475 ($self->{req_w}, $self->{req_h})
2339} 2476}
2340 2477
2341sub button_down { 2478sub invoke_button_down {
2342 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2343 2480
2344 $self->SUPER::button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2345 2482
2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2347 2484
2348 $self->mouse_motion ($ev, $x, $y) 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2349} 2486}
2350 2487
2351sub mouse_motion { 2488sub invoke_mouse_motion {
2352 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2353 2490
2354 if ($GRAB == $self) { 2491 if ($GRAB == $self) {
2355 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2492 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2356 2493
… …
2362 } else { 2499 } else {
2363 return 0; 2500 return 0;
2364 } 2501 }
2365 2502
2366 1 2503 1
2504}
2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2367} 2514}
2368 2515
2369sub update { 2516sub update {
2370 my ($self) = @_; 2517 my ($self) = @_;
2371 2518
… …
2461sub set_range { shift->{slider}->set_range (@_) } 2608sub set_range { shift->{slider}->set_range (@_) }
2462sub set_value { shift->{slider}->set_value (@_) } 2609sub set_value { shift->{slider}->set_value (@_) }
2463 2610
2464############################################################################# 2611#############################################################################
2465 2612
2466package CFClient::UI::TextView; 2613package CFClient::UI::TextScroller;
2467 2614
2468our @ISA = CFClient::UI::HBox::; 2615our @ISA = CFClient::UI::HBox::;
2469 2616
2470use CFClient::OpenGL; 2617use CFClient::OpenGL;
2471 2618
2472sub new { 2619sub new {
2473 my $class = shift; 2620 my $class = shift;
2474 2621
2475 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2476 fontsize => 1, 2623 fontsize => 1,
2477 can_events => 0, 2624 can_events => 1,
2625 indent => 0,
2478 #font => default_font 2626 #font => default_font
2479 @_, 2627 @_,
2480 2628
2481 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2482 par => [], 2630 par => [],
2483 height => 0, 2631 height => 0,
2484 children => [ 2632 children => [
2485 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2486 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2497 2645
2498 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2499 $self->reflow; 2647 $self->reflow;
2500} 2648}
2501 2649
2650sub size_request {
2651 my ($self) = @_;
2652
2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2657}
2658
2502sub size_allocate { 2659sub invoke_size_allocate {
2503 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2504 2661
2505 $self->SUPER::size_allocate ($w, $h); 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2506 2664
2507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $self->{layout}->set_width ($self->{children}[0]{w}); 2667 $self->{layout}->set_width ($empty->{w});
2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 2669
2511 $self->reflow; 2670 $self->reflow;
2512}
2513 2671
2514sub text_size { 2672 local $self->{children} = [$empty, $slider];
2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2515 my ($self, $text, $indent) = @_; 2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2684}
2685
2686sub get_layout {
2687 my ($self, $para) = @_;
2516 2688
2517 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2518 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent); 2694 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($text); 2696 $layout->set_markup ($para->{markup});
2697
2698 $layout->set_shapes (
2699 map
2700 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2701 @{$para->{widget}}
2522 2702 );
2703
2523 $layout->size 2704 $layout
2524} 2705}
2525 2706
2526sub reflow { 2707sub reflow {
2527 my ($self) = @_; 2708 my ($self) = @_;
2528 2709
… …
2537 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2538} 2719}
2539 2720
2540sub clear { 2721sub clear {
2541 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2542 2726
2543 $self->{par} = []; 2727 $self->{par} = [];
2544 $self->{height} = 0; 2728 $self->{height} = 0;
2545 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2546} 2730}
2547 2731
2548sub add_paragraph { 2732sub add_paragraph {
2549 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2550 2734
2551 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2552 my ($w, $h) = $self->text_size ($line); 2736
2553 $self->{height} += $h; 2737 $para = {
2554 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2738 w => 1e10,
2739 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2555 } 2744 };
2556 2745
2557 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2746 $self->add (@w) if @w;
2747 push @{$self->{par}}, $para;
2748
2749 $self->{need_reflow}++;
2750 $self->update;
2751}
2752
2753sub scroll_to_bottom {
2754 my ($self) = @_;
2755
2756 $self->{scroll_to_bottom} = 1;
2757 $self->update;
2558} 2758}
2559 2759
2560sub update { 2760sub update {
2561 my ($self) = @_; 2761 my ($self) = @_;
2562 2762
… …
2564 2764
2565 return unless $self->{h} > 0; 2765 return unless $self->{h} > 0;
2566 2766
2567 delete $self->{texture}; 2767 delete $self->{texture};
2568 2768
2569 $ROOT->on_post_alloc ($self, sub { 2769 $ROOT->on_post_alloc ($self => sub {
2570 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571 2771
2572 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2573 my $height = 0; 2773 my $height = 0;
2574 2774
2575 my $layout = $self->{layout};
2576
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578
2579 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2581 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2582 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3]; 2779
2585 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2586 } 2783 }
2587 2784
2588 $height += $_->[1]; 2785 $height += $para->{h};
2589 } 2786 }
2590 2787
2591 $self->{height} = $height; 2788 $self->{height} = $height;
2592 2789
2593 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2790 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2594 2791
2595 delete $self->{texture}; 2792 delete $self->{texture};
2793 }
2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2596 } 2797 }
2597 2798
2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2599 glClearColor 0, 0, 0, 0; 2800 glClearColor 0, 0, 0, 0;
2600 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
… …
2604 my $y0 = $top; 2805 my $y0 = $top;
2605 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2606 2807
2607 my $y = 0; 2808 my $y = 0;
2608 2809
2609 my $layout = $self->{layout};
2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612
2613 glEnable GL_BLEND;
2614 #TODO# not correct in windows where rgba is forced off
2615 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2616
2617 for my $par (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2618 my $h = $par->[1]; 2811 my $h = $para->{h};
2619 2812
2620 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] });
2622 $layout->set_width ($W - $par->[3]);
2623 $layout->set_markup ($par->[4]);
2624 2814
2625 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2626 2816
2627 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2628 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2818
2819 if (my @w = @{ $para->{widget} }) {
2820 my @s = $layout->get_shapes;
2821
2822 for (@w) {
2823 my ($dx, $dy) = splice @s, 0, 2, ();
2824
2825 $_->{x} = $dx + $para->{indent};
2826 $_->{y} = $dy + $y - $y0;
2827
2828 $_->draw;
2829 }
2830 }
2629 } 2831 }
2630 2832
2631 $y += $h; 2833 $y += $h;
2632 } 2834 }
2633
2634 glDisable GL_BLEND;
2635 }; 2835 };
2636 }); 2836 });
2837}
2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2637} 2846}
2638 2847
2639sub _draw { 2848sub _draw {
2640 my ($self) = @_; 2849 my ($self) = @_;
2641 2850
… …
2644 glColor 0, 0, 0, 1; 2853 glColor 0, 0, 0, 1;
2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2854 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2646 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2647 2856
2648 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2649
2650} 2858}
2651 2859
2652############################################################################# 2860#############################################################################
2653 2861
2654package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2741 $tooltip .= "\n\n" . (ref $widget) . "\n" 2949 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2950 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n" 2951 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}"; 2952 . "visible $widget->{visible}";
2745 } 2953 }
2954
2955 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//;
2746 2957
2747 $self->add (new CFClient::UI::Label 2958 $self->add (new CFClient::UI::Label
2748 markup => $tooltip, 2959 markup => $tooltip,
2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750 fontsize => 0.8, 2961 fontsize => 0.8,
… …
2760 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2971 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2761 2972
2762 ($w + 4, $h + 4) 2973 ($w + 4, $h + 4)
2763} 2974}
2764 2975
2765sub size_allocate { 2976sub invoke_size_allocate {
2766 my ($self, $w, $h) = @_; 2977 my ($self, $w, $h) = @_;
2767 2978
2768 $self->SUPER::size_allocate ($w - 4, $h - 4); 2979 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2769} 2980}
2770 2981
2771sub visibility_change { 2982sub invoke_visibility_change {
2772 my ($self, $visible) = @_; 2983 my ($self, $visible) = @_;
2773 2984
2774 return unless $visible; 2985 return unless $visible;
2775 2986
2776 $self->{root}->on_post_alloc ("move_$self" => sub { 2987 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2778 or return; 2989 or return;
2779 2990
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781 2992
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH; 2994 if $x + $self->{w} > $self->{root}{w};
2784 2995
2785 $self->move_abs ($x, $y); 2996 $self->move_abs ($x, $y);
2786 }); 2997 });
2787} 2998}
2788 2999
… …
2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3094 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2884 glDisable GL_TEXTURE_2D; 3095 glDisable GL_TEXTURE_2D;
2885 } 3096 }
2886} 3097}
2887 3098
2888sub DESTROY { 3099sub destroy {
2889 my ($self) = @_; 3100 my ($self) = @_;
2890 3101
2891 $self->{timer}->cancel 3102 $self->{timer}->cancel
2892 if $self->{timer}; 3103 if $self->{timer};
2893 3104
2894 $self->SUPER::DESTROY; 3105 $self->SUPER::destroy;
2895} 3106}
2896 3107
2897############################################################################# 3108#############################################################################
2898 3109
2899package CFClient::UI::Buttonbar; 3110package CFClient::UI::Buttonbar;
… …
2920 ); 3131 );
2921 3132
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3133 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923 3134
2924 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
2926 3137
2927 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
2928 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
2929 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
2930 can_hover => 1, 3155 can_hover => 1,
2931 can_events => 1, 3156 can_events => 1,
2932 text => $widget; 3157 markup => $widget,
3158 tooltip => $tooltip;
3159 }
2933 } 3160 }
2934 3161
2935 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
2936 3163
2937 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
2942 3169
2943# popup given the event (must be a mouse button down event currently) 3170# popup given the event (must be a mouse button down event currently)
2944sub popup { 3171sub popup {
2945 my ($self, $ev) = @_; 3172 my ($self, $ev) = @_;
2946 3173
2947 $self->_emit ("popdown"); 3174 $self->emit ("popdown");
2948 3175
2949 # maybe save $GRAB? must be careful about events... 3176 # maybe save $GRAB? must be careful about events...
2950 $GRAB = $self; 3177 $GRAB = $self;
2951 $self->{button} = $ev->{button}; 3178 $self->{button} = $ev->{button};
2952 3179
2953 $self->show; 3180 $self->show;
2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3181 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2955} 3182}
2956 3183
2957sub mouse_motion { 3184sub invoke_mouse_motion {
2958 my ($self, $ev, $x, $y) = @_; 3185 my ($self, $ev, $x, $y) = @_;
2959 3186
2960 # TODO: should use vbox->find_widget or so 3187 # TODO: should use vbox->find_widget or so
2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3188 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2962 $self->{hover} = $self->{item}{$HOVER}; 3189 $self->{hover} = $self->{item}{$HOVER};
2963 3190
2964 0 3191 0
2965} 3192}
2966 3193
2967sub button_up { 3194sub invoke_button_up {
2968 my ($self, $ev, $x, $y) = @_; 3195 my ($self, $ev, $x, $y) = @_;
2969 3196
2970 if ($ev->{button} == $self->{button}) { 3197 if ($ev->{button} == $self->{button}) {
2971 undef $GRAB; 3198 undef $GRAB;
2972 $self->hide; 3199 $self->hide;
2973 3200
2974 $self->_emit ("popdown"); 3201 $self->emit ("popdown");
2975 $self->{hover}[1]->() if $self->{hover}; 3202 $self->{hover}[1]->() if $self->{hover};
2976 } else { 3203 } else {
2977 return 0 3204 return 0
2978 } 3205 }
2979 3206
… …
3006 3233
3007 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} }; 3235 if @{ $self->{children} };
3009} 3236}
3010 3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3242}
3243
3011sub set_current_page { 3244sub set_current_page {
3012 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
3013 3246
3014 my $widget = ref $page_or_widget 3247 my $widget = ref $page_or_widget
3015 ? $page_or_widget 3248 ? $page_or_widget
3016 : $self->{children}[$page_or_widget]; 3249 : $self->{children}[$page_or_widget];
3017 3250
3018 $self->{current} = $widget; 3251 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3252 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020 3253
3021 $self->_emit (page_changed => $self->{current}); 3254 $self->emit (page_changed => $self->{current});
3022 3255
3023 $self->realloc; 3256 $self->realloc;
3024} 3257}
3025 3258
3026sub visible_children { 3259sub visible_children {
… …
3031 my ($self) = @_; 3264 my ($self) = @_;
3032 3265
3033 $self->{current}->size_request 3266 $self->{current}->size_request
3034} 3267}
3035 3268
3036sub size_allocate { 3269sub invoke_size_allocate {
3037 my ($self, $w, $h) = @_; 3270 my ($self, $w, $h) = @_;
3038 3271
3039 $self->{current}->configure (0, 0, $w, $h); 3272 $self->{current}->configure (0, 0, $w, $h);
3273
3274 1
3040} 3275}
3041 3276
3042sub _draw { 3277sub _draw {
3043 my ($self) = @_; 3278 my ($self) = @_;
3044 3279
… …
3079 ); 3314 );
3080 3315
3081 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3082} 3317}
3083 3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3323}
3324
3084sub set_current_page { 3325sub set_current_page {
3085 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3086 3327
3087 $self->{multiplexer}->set_current_page ($page); 3328 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current}); 3329 $self->emit (page_changed => $self->{multiplexer}{current});
3330}
3331
3332#############################################################################
3333
3334package CFClient::UI::Combobox;
3335
3336use utf8;
3337
3338our @ISA = CFClient::UI::Button::;
3339
3340sub new {
3341 my $class = shift;
3342
3343 my $self = $class->SUPER::new (
3344 options => [], # [value, title, longdesc], ...
3345 value => undef,
3346 @_,
3347 );
3348
3349 $self->_set_value ($self->{value});
3350
3351 $self
3352}
3353
3354sub invoke_button_down {
3355 my ($self, $ev) = @_;
3356
3357 my @menu_items;
3358
3359 for (@{ $self->{options} }) {
3360 my ($value, $title, $tooltip) = @$_;
3361
3362 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363 }
3364
3365 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366}
3367
3368sub _set_value {
3369 my ($self, $value) = @_;
3370
3371 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3372 or return;
3373
3374 $self->{value} = $item->[0];
3375 $self->set_markup ("$item->[1] ⇓");
3376 $self->set_tooltip ($item->[2]);
3377}
3378
3379sub set_value {
3380 my ($self, $value) = @_;
3381
3382 return unless $self->{value} ne $value;
3383
3384 $self->_set_value ($value);
3385 $self->emit (changed => $value);
3089} 3386}
3090 3387
3091############################################################################# 3388#############################################################################
3092 3389
3093package CFClient::UI::Statusbox; 3390package CFClient::UI::Statusbox;
… …
3192 $item->{count}++; 3489 $item->{count}++;
3193 } else { 3490 } else {
3194 $item->{count} = 1; 3491 $item->{count} = 1;
3195 $item->{text} = $item->{tooltip} = $text; 3492 $item->{text} = $item->{tooltip} = $text;
3196 } 3493 }
3197 $item->{id} = ++$self->{id}; 3494 $item->{id} += 0.2;#d#
3198 $item->{timeout} = $timeout; 3495 $item->{timeout} = $timeout;
3199 delete $item->{label}; 3496 delete $item->{label};
3200 } else { 3497 } else {
3201 $self->{item}{$group} = { 3498 $self->{item}{$group} = {
3202 id => ++$self->{id}, 3499 id => ++$self->{id},
… …
3208 count => 1, 3505 count => 1,
3209 %arg, 3506 %arg,
3210 }; 3507 };
3211 } 3508 }
3212 3509
3510 $ROOT->on_refresh (reorder => sub {
3213 $self->reorder; 3511 $self->reorder;
3512 });
3214} 3513}
3215 3514
3216sub reconfigure { 3515sub reconfigure {
3217 my ($self) = @_; 3516 my ($self) = @_;
3218 3517
… …
3221 3520
3222 $self->reorder; 3521 $self->reorder;
3223 $self->SUPER::reconfigure; 3522 $self->SUPER::reconfigure;
3224} 3523}
3225 3524
3226sub DESTROY { 3525sub destroy {
3227 my ($self) = @_; 3526 my ($self) = @_;
3228 3527
3229 $self->{timer}->cancel; 3528 $self->{timer}->cancel;
3230 3529
3231 $self->SUPER::DESTROY; 3530 $self->SUPER::destroy;
3232} 3531}
3233 3532
3234############################################################################# 3533#############################################################################
3235 3534
3236package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3237 3536
3238our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3239 3538
3240sub new { 3539sub new {
3241 my $class = shift; 3540 my $class = shift;
3242 3541
3243 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3245 @_, 3544 @_,
3246 ); 3545 );
3247 3546
3248 $self 3547 $self
3249} 3548}
3250 3549
3251sub set_items { 3550sub set_items {
3252 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3253 3552
3254 $self->{child}->clear; 3553 $self->clear;
3255 return unless $items; 3554 return unless $items;
3256 3555
3257 my @items = sort { 3556 my @items = sort {
3258 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3259 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3260 } @$items; 3559 } values %$items;
3261 3560
3262 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3263 3562
3264 my $row = 0; 3563 my $row = 0;
3265 for my $item (@items) { 3564 for my $item (@items) {
3266 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3267 3566
3268 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3269 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3270 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3271 3570
3272 $row++; 3571 $row++;
3273 }
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::BindEditor;
3279
3280our @ISA = CFClient::UI::FancyFrame::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287 $self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291 text => "start recording",
3292 tooltip => "Start/Stops recording of actions."
3293 ."All subsequent actions after the recording started will be captured."
3294 ."The actions are displayed after the record was stopped."
3295 ."To bind the action you have to click on the 'Bind' button",
3296 on_activate => sub {
3297 unless ($self->{recording}) {
3298 $self->start;
3299 } else {
3300 $self->stop;
3301 }
3302 });
3303
3304 $vb->add (new CFClient::UI::Label text => "Actions:");
3305 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310 $hb->add (new CFClient::UI::Button
3311 text => "bind",
3312 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313 on_activate => sub {
3314 $self->ask_for_bind;
3315 });
3316
3317 $vb->add (my $hb = new CFClient::UI::HBox);
3318 $hb->add (new CFClient::UI::Button
3319 text => "ok",
3320 expand => 1,
3321 tooltip => "This closes the binding editor and saves the binding",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->commit;
3325 });
3326
3327 $hb->add (new CFClient::UI::Button
3328 text => "cancel",
3329 expand => 1,
3330 tooltip => "This closes the binding editor without saving",
3331 on_activate => sub {
3332 $self->hide;
3333 $self->{binding_cancel}->()
3334 if $self->{binding_cancel};
3335 });
3336
3337 $self->update_binding_widgets;
3338
3339 $self
3340}
3341
3342sub commit {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347 ."'. Don't forget 'Save Config'!");
3348 $self->{binding_change}->($mod, $sym, $cmds)
3349 if $self->{binding_change};
3350 } else {
3351 $::STATUSBOX->add ("No action bound, no key or action specified!");
3352 $self->{binding_cancel}->()
3353 if $self->{binding_cancel};
3354 }
3355}
3356
3357sub start {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("stop recording");
3361 $self->{recording} = 1;
3362 $self->clear_command_list;
3363 $::CONN->start_record if $::CONN;
3364}
3365
3366sub stop {
3367 my ($self) = @_;
3368
3369 $self->{rec_btn}->set_text ("start recording");
3370 $self->{recording} = 0;
3371
3372 my $rec;
3373 $rec = $::CONN->stop_record if $::CONN;
3374 return unless ref $rec eq 'ARRAY';
3375 $self->set_command_list ($rec);
3376}
3377
3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3384sub ask_for_bind {
3385 my ($self, $commit) = @_;
3386
3387 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets;
3391 $self->commit if $commit;
3392 });
3393}
3394
3395# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands)
3397# $cb is the callback that is executed on OK
3398# $ccb is the callback that is executed on CANCEL and
3399# when the binding was unsuccessful on OK
3400sub set_binding {
3401 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403 $self->clear_command_list;
3404 $self->{recording} = 0;
3405 $self->{rec_btn}->set_text ("start recording");
3406
3407 $self->{binding} = [$mod, $sym];
3408 $self->{commands} = $cmds;
3409
3410 $self->{binding_change} = $cb;
3411 $self->{binding_cancel} = $ccb;
3412
3413 $self->update_binding_widgets;
3414}
3415
3416# this is a shortcut method that asks for a binding
3417# and then just binds it.
3418sub do_quick_binding {
3419 my ($self, $cmds) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1);
3424}
3425
3426sub update_binding_widgets {
3427 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding;
3429 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430 $self->set_command_list ($cmds);
3431}
3432
3433sub get_binding {
3434 my ($self) = @_;
3435 return (
3436 $self->{binding}->[0],
3437 $self->{binding}->[1],
3438 [ grep { defined $_ } @{$self->{commands}} ]
3439 );
3440}
3441
3442sub clear_command_list {
3443 my ($self) = @_;
3444 $self->{cmdbox}->clear ();
3445}
3446
3447sub set_command_list {
3448 my ($self, $cmds) = @_;
3449
3450 $self->{cmdbox}->clear ();
3451 $self->{commands} = $cmds;
3452
3453 my $idx = 0;
3454
3455 for (@$cmds) {
3456 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458 my $i = $idx;
3459 $hb->add (new CFClient::UI::Label text => $_);
3460 $hb->add (new CFClient::UI::Button
3461 text => "delete",
3462 tooltip => "Deletes the action from the record",
3463 on_activate => sub {
3464 $self->{cmdbox}->remove ($hb);
3465 $cmds->[$i] = undef;
3466 });
3467
3468
3469 $idx++
3470 } 3572 }
3471} 3573}
3472 3574
3473############################################################################# 3575#############################################################################
3474 3576
… …
3484 commands => [], 3586 commands => [],
3485 @_, 3587 @_,
3486 ) 3588 )
3487} 3589}
3488 3590
3591my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3597my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3598 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3599my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3600 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3601my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3602 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3495 3603
3496sub rebuild_spell_list { 3604sub rebuild_spell_list {
3497 my ($self) = @_; 3605 my ($self) = @_;
3498 3606
3499 $CFClient::UI::ROOT->on_refresh ($self => sub { 3607 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear; 3608 $self->clear;
3501 3609
3610 return unless $::CONN;
3611
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3612 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3614 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3615 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3616 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506 3617
3507 my $row = 0; 3618 my $row = 0;
3508 3619
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3620 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_}; 3621 my $spell = $self->{spell}{$_};
3511 3622
3512 $row++; 3623 $row++;
3624
3625 my $spell_cb = sub {
3626 my ($widget, $ev) = @_;
3627
3628 if ($ev->{button} == 1) {
3629 $::CONN->user_send ("cast $spell->{name}");
3630 } elsif ($ev->{button} == 2) {
3631 $::CONN->user_send ("invoke $spell->{name}");
3632 } elsif ($ev->{button} == 3) {
3633 (new CFClient::UI::Menu
3634 items => [
3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637 ],
3638 )->popup ($ev);
3639 } else {
3640 return 0;
3641 }
3642
3643 1
3644 };
3645
3646 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648 #TODO: add path info to tooltip
3649 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3513 3650
3514 $self->add (0, $row, new CFClient::UI::Face 3651 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face}, 3652 face => $spell->{face},
3516 can_hover => 1, 3653 can_hover => 1,
3517 can_events => 1, 3654 can_events => 1,
3518 tooltip => $spell->{message}, 3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3519 ); 3657 );
3520 3658
3521 $self->add (1, $row, new CFClient::UI::Label 3659 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1, 3660 expand => 1,
3523 text => $spell->{name}, 3661 text => $spell->{name},
3524 can_hover => 1, 3662 can_hover => 1,
3525 can_events => 1, 3663 can_events => 1,
3526 tooltip => $spell->{message}, 3664 tooltip => $tooltip,
3665 on_button_down => $spell_cb,
3527 ); 3666 );
3528 3667
3668 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3669 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3670 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3671 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 } 3672 }
3540 }); 3673 });
3541} 3674}
3542 3675
3543sub add_spell { 3676sub add_spell {
… …
3549 3682
3550sub remove_spell { 3683sub remove_spell {
3551 my ($self, $spell) = @_; 3684 my ($self, $spell) = @_;
3552 3685
3553 delete $self->{spell}->{$spell->{name}}; 3686 delete $self->{spell}->{$spell->{name}};
3687 $self->rebuild_spell_list;
3688}
3689
3690sub clear_spells {
3691 my ($self) = @_;
3692
3693 $self->{spell} = {};
3554 $self->rebuild_spell_list; 3694 $self->rebuild_spell_list;
3555} 3695}
3556 3696
3557############################################################################# 3697#############################################################################
3558 3698
… …
3595 $coord = $max - $size if $coord > $max - $size; 3735 $coord = $max - $size if $coord > $max - $size;
3596 3736
3597 int $coord + 0.5 3737 int $coord + 0.5
3598} 3738}
3599 3739
3600sub size_allocate { 3740sub invoke_size_allocate {
3601 my ($self, $w, $h) = @_; 3741 my ($self, $w, $h) = @_;
3602 3742
3603 for my $child ($self->children) { 3743 for my $child ($self->children) {
3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3744 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3605 3745
… …
3609 $X = _to_pixel $X, $W, $self->{w}; 3749 $X = _to_pixel $X, $W, $self->{w};
3610 $Y = _to_pixel $Y, $H, $self->{h}; 3750 $Y = _to_pixel $Y, $H, $self->{h};
3611 3751
3612 $child->configure ($X, $Y, $W, $H); 3752 $child->configure ($X, $Y, $W, $H);
3613 } 3753 }
3754
3755 1
3614} 3756}
3615 3757
3616sub coord2local { 3758sub coord2local {
3617 my ($self, $x, $y) = @_; 3759 my ($self, $x, $y) = @_;
3618 3760
… …
3744 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3745 3887
3746 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3747 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3748 3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896
3749 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3750 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3751 3899
3752 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

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