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.288 by root, Mon Jun 5 21:14:40 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
… …
526} 553}
527 554
528sub reconfigure { 555sub reconfigure {
529 my ($self) = @_; 556 my ($self) = @_;
530 557
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc; 558 $self->realloc;
536 $self->update; 559 $self->update;
537} 560}
538 561
539# using global variables seems a bit hacky, but passing through all drawing 562# using global variables seems a bit hacky, but passing through all drawing
… …
546 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
547 570
548 # update screen rectangle 571 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553 574
554 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557 578
… …
596} 617}
597 618
598sub DESTROY { 619sub DESTROY {
599 my ($self) = @_; 620 my ($self) = @_;
600 621
622 return if CFClient::in_destruct;
623
601 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
602 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
603} 628}
604 629
605############################################################################# 630#############################################################################
606 631
607package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
772} 797}
773 798
774sub add { 799sub add {
775 my ($self, $child) = @_; 800 my ($self, $child) = @_;
776 801
777 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
780} 804}
781 805
782sub remove { 806sub remove {
783 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
792 816
793sub size_request { 817sub size_request {
794 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
795} 819}
796 820
797sub size_allocate { 821sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
799 823
800 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
801} 827}
802 828
803############################################################################# 829#############################################################################
804 830
805# back-buffered drawing area 831# back-buffered drawing area
… …
821 847
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 849 $self->SUPER::update;
824} 850}
825 851
826sub size_allocate { 852sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
828 854
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
831} 858}
832 859
833sub _render { 860sub _render {
834 my ($self) = @_; 861 my ($self) = @_;
835 862
… …
896 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
897 924
898 ($w, $h) 925 ($w, $h)
899} 926}
900 927
901sub size_allocate { 928sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
903 930
904 my $child = $self->child; 931 my $child = $self->child;
905 932
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 935
909 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
910 $self->update; 937 $self->update;
938
939 1
911} 940}
912 941
913sub set_offset { 942sub set_offset {
914 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
915 944
… …
978 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
979 }, 1008 },
980 ; 1009 ;
981 1010
982 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
984 slider => $slider, 1014 slider => $slider,
985 %arg, 1015 %arg,
986 ); 1016 );
987 1017
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
990 1020
991 $self 1021 $self
992} 1022}
993 1023
1024#TODO# update range on size_allocate depending on child
1025
994sub add { 1026sub add {
995 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
996 1028
997 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
998} 1030}
999 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
1000sub update { 1048sub update {
1001 my ($self) = @_; 1049 my ($self) = @_;
1002 1050
1003 $self->SUPER::update; 1051 $self->SUPER::update;
1004 1052
1005 # todo: overwrite size_allocate of child 1053 $self->update_slider;
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008} 1054}
1009 1055
1010sub size_allocate { 1056sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1012 1058
1059 $self->update_slider;
1060
1013 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1017} 1062}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1063
1022############################################################################# 1064#############################################################################
1023 1065
1024package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1025 1067
… …
1076 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);
1077 1119
1078sub new { 1120sub new {
1079 my ($class, %arg) = @_; 1121 my ($class, %arg) = @_;
1080 1122
1081 my $title = delete $arg{title};
1082
1083 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1126 border => 0.6,
1087 can_events => 1, 1127 can_events => 1,
1088 min_w => 16, 1128 min_w => 64,
1089 min_h => 16, 1129 min_h => 32,
1090 %arg, 1130 %arg,
1091 ); 1131 );
1092 1132
1093 $self->{title} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1094 align => 0, 1134 align => 0,
1095 valign => 1, 1135 valign => 1,
1096 text => $title, 1136 text => $self->{title},
1097 fontsize => $self->{border} 1137 fontsize => $self->{border},
1098 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 }
1099 1148
1100 $self 1149 $self
1101} 1150}
1102 1151
1103sub add { 1152sub add {
1104 my ($self, @widgets) = @_; 1153 my ($self, @widgets) = @_;
1105 1154
1106 $self->SUPER::add (@widgets); 1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1158}
1109 1159
1110sub border { 1160sub border {
1111 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1112} 1162}
1113 1163
1114sub size_request { 1164sub size_request {
1115 my ($self) = @_; 1165 my ($self) = @_;
1116 1166
1117 $self->{title}->size_request 1167 $self->{title_widget}->size_request
1118 if $self->{title}; 1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1119 1172
1120 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1121 1174
1122 ( 1175 (
1123 $w + $self->border * 2, 1176 $w + $self->border * 2,
1124 $h + $self->border * 2, 1177 $h + $self->border * 2,
1125 ) 1178 )
1126} 1179}
1127 1180
1128sub size_allocate { 1181sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1130 1183
1131 if ($self->{title}) { 1184 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1185 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1186 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1188 }
1136 1189
1137 my $border = $self->border; 1190 my $border = $self->border;
1138 1191
1139 $h -= List::Util::max 0, $border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1140 $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;
1141 1207
1142 $self->child->configure ($border, $border, $w, $h); 1208 1
1143} 1209}
1144 1210
1145sub button_down { 1211sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1147 1213
1148 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1215 my $border = $self->border;
1150 1216
… …
1181 1247
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1249
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1251 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1253 };
1188 } else { 1254 } else {
1189 return 0; 1255 return 0;
1190 } 1256 }
1191 1257
1192 1 1258 1
1193} 1259}
1194 1260
1195sub button_up { 1261sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1197 1263
1198 !!delete $self->{motion} 1264 ! ! delete $self->{motion}
1199} 1265}
1200 1266
1201sub mouse_motion { 1267sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1203 1269
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1271
1206 !!$self->{motion} 1272 ! ! $self->{motion}
1207} 1273}
1208 1274
1209sub _draw { 1275sub _draw {
1210 my ($self) = @_; 1276 my ($self) = @_;
1211 1277
… …
1237 1303
1238 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1239 1305
1240 $child->draw; 1306 $child->draw;
1241 1307
1242 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1245 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1246} 1317}
1247 1318
1248############################################################################# 1319#############################################################################
1249 1320
1250package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1273 1344
1274 $child->set_parent ($self); 1345 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1276 1347
1277 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1278} 1355}
1279 1356
1280# 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?
1281sub clear { 1358sub clear {
1282 my ($self) = @_; 1359 my ($self) = @_;
… …
1323 (sum @$ws), 1400 (sum @$ws),
1324 (sum @$hs), 1401 (sum @$hs),
1325 ) 1402 )
1326} 1403}
1327 1404
1328sub size_allocate { 1405sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1330 1407
1331 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1332 1409
1333 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1365 } 1442 }
1366 1443
1367 $y += $row_h; 1444 $y += $row_h;
1368 } 1445 }
1369 1446
1447 1
1370} 1448}
1371 1449
1372sub find_widget { 1450sub find_widget {
1373 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1374 1452
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1491 )
1414} 1492}
1415 1493
1416sub size_allocate { 1494sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1418 1496
1419 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1421 1499
1422 my @req; 1500 my @req;
1423 1501
1424 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1426 } else { 1504 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1429 1507
1430 if ($req > $space) { 1508 if ($req > $space) {
1431 # ah well, not enough space 1509 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1433 } else { 1511 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1513
1436 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1437 1515
1438 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1517 for 0 .. $#children;
1440 } 1518 }
1441 } 1519 }
1442 1520
1443 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1444 1522
1445 my $pos = 0; 1523 my $pos = 0;
1446 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1448 $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));
1449 1527
1450 $pos += $alloc; 1528 $pos += $alloc;
1451 } 1529 }
1452 1530
1453 1 1531 1
… …
1556 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1557 1635
1558 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1560 1638
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1563 1640
1564 delete $self->{req_h}; 1641 delete $self->{size_req};
1565 $self->realloc; 1642 $self->realloc;
1566 $self->update; 1643 $self->update;
1567} 1644}
1568 1645
1569sub set_markup { 1646sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1574 1651
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1653
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1579 1655
1580 delete $self->{req_h}; 1656 delete $self->{size_req};
1581 $self->realloc; 1657 $self->realloc;
1582 $self->update; 1658 $self->update;
1583} 1659}
1584 1660
1585sub size_request { 1661sub size_request {
1586 my ($self) = @_; 1662 my ($self) = @_;
1587 1663
1588 if (exists $self->{req_h}) { 1664 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1670
1597 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1598 1672
1599 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1600 $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);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 1677
1603 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1604 1679
1605 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1607 } 1682 }
1608 1683
1609 ($w, $h) 1684 [$w, $h]
1610 } 1685 };
1611}
1612 1686
1687 @{ $self->{size_req} }
1688}
1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1613sub size_allocate { 1694sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1615 1696
1616 delete $self->{ox}; 1697 delete $self->{ox};
1617 1698
1618 delete $self->{texture} 1699 delete $self->{texture}
1619 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
1620} 1703}
1621 1704
1622sub set_fontsize { 1705sub set_fontsize {
1623 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1624 1707
1625 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1626 delete $self->{texture}; 1710 delete $self->{texture};
1627 1711
1628 $self->realloc; 1712 $self->realloc;
1629} 1713}
1630 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1631sub _draw { 1724sub _draw {
1632 my ($self) = @_; 1725 my ($self) = @_;
1633 1726
1634 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1635 1728
1636 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 1736
1644 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1645 }; 1738 };
1646 1739
1647 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1651 1744
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 1748 };
1656 1749
1657 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];
1658 1752
1659 if ($tex->{format} == GL_ALPHA) { 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1661 glColor @{$self->{fg}};
1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666 }
1667
1668 glDisable GL_TEXTURE_2D;
1669} 1754}
1670 1755
1671############################################################################# 1756#############################################################################
1672 1757
1673package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1687 can_hover => 1, 1772 can_hover => 1,
1688 can_focus => 1, 1773 can_focus => 1,
1689 valign => 0, 1774 valign => 0,
1690 can_events => 1, 1775 can_events => 1,
1691 #text => ... 1776 #text => ...
1777 #hidden => "*",
1692 @_ 1778 @_
1693 ) 1779 )
1694} 1780}
1695 1781
1696sub _set_text { 1782sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1790 $self->{text} = $text;
1705 1791
1706 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1794 delete $self->{size_req};
1709 1795
1710 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1711 1797
1712 $self->realloc; 1798 $self->realloc;
1713 $self->update; 1799 $self->update;
1714} 1800}
1715 1801
… …
1730 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1731 1817
1732 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1733} 1819}
1734 1820
1735sub key_down { 1821sub invoke_key_down {
1736 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1737 1823
1738 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1752 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1753 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 1843 $self->emit ('escape');
1758 } elsif ($uni) { 1844 } elsif ($uni) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 1846 } else {
1761 return 0; 1847 return 0;
1762 } 1848 }
… …
1766 $self->realloc; 1852 $self->realloc;
1767 1853
1768 1 1854 1
1769} 1855}
1770 1856
1771sub focus_in { 1857sub invoke_focus_in {
1772 my ($self) = @_; 1858 my ($self) = @_;
1773 1859
1774 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1775 1861
1776 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1777} 1863}
1778 1864
1779sub button_down { 1865sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1781 1867
1782 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 1869
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 1871
1786 # byte-index to char-index 1872 # byte-index to char-index
1787 my $text = $self->{text}; 1873 my $text = $self->{text};
1788 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1790 1876
1791 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1792 $self->update; 1878 $self->update;
1793 1879
1794 1 1880 1
1795} 1881}
1796 1882
1797sub mouse_motion { 1883sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1799# 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#
1800 1886
1801 0 1887 1
1802} 1888}
1803 1889
1804sub _draw { 1890sub _draw {
1805 my ($self) = @_; 1891 my ($self) = @_;
1806 1892
… …
1847 1933
1848our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1849 1935
1850use CFClient::OpenGL; 1936use CFClient::OpenGL;
1851 1937
1852sub key_down { 1938sub invoke_key_down {
1853 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1854 1940
1855 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1856 1942
1857 if ($sym == 13) { 1943 if ($sym == 13) {
1858 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1860 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1863 $self->update; 1950 $self->update;
1864 1951
1865 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1883 } else { 1970 } else {
1884 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1885 } 1972 }
1886 1973
1887 } else { 1974 } else {
1888 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1889 } 1976 }
1890 1977
1891 1 1978 1
1892} 1979}
1893 1980
… …
1917 can_events => 1, 2004 can_events => 1,
1918 @_ 2005 @_
1919 ) 2006 )
1920} 2007}
1921 2008
1922sub activate { }
1923
1924sub button_up { 2009sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1926 2011
1927 $self->emit ("activate") 2012 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944 2029
1945 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1946 2031
1947 $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
1948} 2069}
1949 2070
1950############################################################################# 2071#############################################################################
1951 2072
1952package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1979 my ($self) = @_; 2100 my ($self) = @_;
1980 2101
1981 (6) x 2 2102 (6) x 2
1982} 2103}
1983 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1984sub button_down { 2113sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1986 2115
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2118 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2119 } else {
1992 return 0 2120 return 0
1993 } 2121 }
1994 2122
1995 1 2123 1
… …
2020package CFClient::UI::Image; 2148package CFClient::UI::Image;
2021 2149
2022our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
2023 2151
2024use CFClient::OpenGL; 2152use CFClient::OpenGL;
2025use Carp qw/confess/;
2026 2153
2027our %loaded_images; 2154our %texture_cache;
2028 2155
2029sub new { 2156sub new {
2030 my $class = shift; 2157 my $class = shift;
2031 2158
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2033 2163
2034 $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";
2035 2166
2036 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 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;
2038 2169
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2040 2171
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2173
2045 $self 2174 $self
2046} 2175}
2047 2176
2048sub size_request { 2177sub size_request {
2049 my ($self) = @_; 2178 my ($self) = @_;
2050 2179
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2052} 2181}
2053 2182
2054sub _draw { 2183sub _draw {
2055 my ($self) = @_; 2184 my ($self) = @_;
2056 2185
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2296
2168 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2169 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);
2170 2302
2171 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2193 2325
2194 if ($t3) { 2326 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2333 glEnd;
2202 } 2334 }
2203 2335
2204 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2292 $self->update; 2424 $self->update;
2293 2425
2294 $self 2426 $self
2295} 2427}
2296 2428
2297sub changed { }
2298
2299sub set_range { 2429sub set_range {
2300 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2301 2431
2302 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2303 2433
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2306} 2438}
2307 2439
2308sub set_value { 2440sub set_value {
2309 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2310 2442
… …
2321 if $unit; 2453 if $unit;
2322 2454
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2456
2325 if ($value != $old_value) { 2457 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2327 $self->update; 2459 $self->update;
2328 } 2460 }
2329} 2461}
2330 2462
2331sub size_request { 2463sub size_request {
2332 my ($self) = @_; 2464 my ($self) = @_;
2333 2465
2334 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2335} 2467}
2336 2468
2337sub button_down { 2469sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2339 2471
2340 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2473
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2475
2344 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2477}
2346 2478
2347sub mouse_motion { 2479sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2349 2481
2350 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2484
… …
2358 } else { 2490 } else {
2359 return 0; 2491 return 0;
2360 } 2492 }
2361 2493
2362 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
2363} 2505}
2364 2506
2365sub update { 2507sub update {
2366 my ($self) = @_; 2508 my ($self) = @_;
2367 2509
… …
2457sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2459 2601
2460############################################################################# 2602#############################################################################
2461 2603
2462package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2463 2605
2464our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2465 2607
2466use CFClient::OpenGL; 2608use CFClient::OpenGL;
2467 2609
2468sub new { 2610sub new {
2469 my $class = shift; 2611 my $class = shift;
2470 2612
2471 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2472 fontsize => 1, 2614 fontsize => 1,
2473 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2474 #font => default_font 2617 #font => default_font
2475 @_, 2618 @_,
2476 2619
2477 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2478 par => [], 2621 par => [],
2479 height => 0, 2622 height => 0,
2480 children => [ 2623 children => [
2481 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2493 2636
2494 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2495 $self->reflow; 2638 $self->reflow;
2496} 2639}
2497 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
2498sub size_allocate { 2650sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2500 2652
2501 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 2655
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $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});
2506 2660
2507 $self->reflow; 2661 $self->reflow;
2508}
2509 2662
2510sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2511 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) = @_;
2512 2679
2513 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2514 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $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});
2517 $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}}
2518 2693 );
2694
2519 $layout->size 2695 $layout
2520} 2696}
2521 2697
2522sub reflow { 2698sub reflow {
2523 my ($self) = @_; 2699 my ($self) = @_;
2524 2700
… …
2533 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2534} 2710}
2535 2711
2536sub clear { 2712sub clear {
2537 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2538 2717
2539 $self->{par} = []; 2718 $self->{par} = [];
2540 $self->{height} = 0; 2719 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 2721}
2543 2722
2544sub add_paragraph { 2723sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2546 2725
2547 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2548 my ($w, $h) = $self->text_size ($line); 2727
2549 $self->{height} += $h; 2728 $para = {
2550 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,
2551 } 2735 };
2552 2736
2553 $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;
2554} 2749}
2555 2750
2556sub update { 2751sub update {
2557 my ($self) = @_; 2752 my ($self) = @_;
2558 2753
… …
2560 2755
2561 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2562 2757
2563 delete $self->{texture}; 2758 delete $self->{texture};
2564 2759
2565 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 2762
2568 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2569 my $height = 0; 2764 my $height = 0;
2570 2765
2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2577 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3]; 2770
2581 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2582 } 2774 }
2583 2775
2584 $height += $_->[1]; 2776 $height += $para->{h};
2585 } 2777 }
2586 2778
2587 $self->{height} = $height; 2779 $self->{height} = $height;
2588 2780
2589 $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]);
2590 2782
2591 delete $self->{texture}; 2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2592 } 2788 }
2593 2789
2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 2791 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
… …
2600 my $y0 = $top; 2796 my $y0 = $top;
2601 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2602 2798
2603 my $y = 0; 2799 my $y = 0;
2604 2800
2605 my $layout = $self->{layout};
2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608
2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2612
2613 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 2802 my $h = $para->{h};
2615 2803
2616 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] });
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 2805
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2622 2807
2623 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2624 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 }
2625 } 2822 }
2626 2823
2627 $y += $h; 2824 $y += $h;
2628 } 2825 }
2629
2630 glDisable GL_BLEND;
2631 }; 2826 };
2632 }); 2827 });
2828}
2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2633} 2837}
2634 2838
2635sub _draw { 2839sub _draw {
2636 my ($self) = @_; 2840 my ($self) = @_;
2637 2841
… …
2640 glColor 0, 0, 0, 1; 2844 glColor 0, 0, 0, 1;
2641 $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});
2642 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2643 2847
2644 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2645
2646} 2849}
2647 2850
2648############################################################################# 2851#############################################################################
2649 2852
2650package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2741 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2742 2948
2743 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2744 markup => $tooltip, 2950 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 2963
2758 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2759} 2965}
2760 2966
2761sub size_allocate { 2967sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2763 2969
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 2971}
2766 2972
2767sub visibility_change { 2973sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2769 2975
2770 return unless $visible; 2976 return unless $visible;
2771 2977
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2774 or return; 2980 or return;
2775 2981
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 2983
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2780 2986
2781 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2782 }); 2988 });
2783} 2989}
2784 2990
… …
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2881 } 3087 }
2882} 3088}
2883 3089
2884sub DESTROY { 3090sub destroy {
2885 my ($self) = @_; 3091 my ($self) = @_;
2886 3092
2887 $self->{timer}->cancel 3093 $self->{timer}->cancel
2888 if $self->{timer}; 3094 if $self->{timer};
2889 3095
2890 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2891} 3097}
2892 3098
2893############################################################################# 3099#############################################################################
2894 3100
2895package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2916 ); 3122 );
2917 3123
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2919 3125
2920 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2922 3128
2923 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2924 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 {
2925 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2926 can_hover => 1, 3146 can_hover => 1,
2927 can_events => 1, 3147 can_events => 1,
2928 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2929 } 3151 }
2930 3152
2931 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2932 3154
2933 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2938 3160
2939# 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)
2940sub popup { 3162sub popup {
2941 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2942 3164
2943 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2944 3166
2945 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3168 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2948 3170
2949 $self->show; 3171 $self->show;
2950 $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);
2951} 3173}
2952 3174
2953sub mouse_motion { 3175sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2955 3177
2956 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2959 3181
2960 0 3182 0
2961} 3183}
2962 3184
2963sub button_up { 3185sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2965 3187
2966 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3189 undef $GRAB;
2968 $self->hide; 3190 $self->hide;
2969 3191
2970 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3194 } else {
2973 return 0 3195 return 0
2974 } 3196 }
2975 3197
… …
3002 3224
3003 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3226 if @{ $self->{children} };
3005} 3227}
3006 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
3007sub set_current_page { 3235sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3009 3237
3010 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3239 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
3013 3241
3014 $self->{current} = $widget; 3242 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3244
3017 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
3018 3246
3019 $self->realloc; 3247 $self->realloc;
3020} 3248}
3021 3249
3022sub visible_children { 3250sub visible_children {
… …
3027 my ($self) = @_; 3255 my ($self) = @_;
3028 3256
3029 $self->{current}->size_request 3257 $self->{current}->size_request
3030} 3258}
3031 3259
3032sub size_allocate { 3260sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3034 3262
3035 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3036} 3266}
3037 3267
3038sub _draw { 3268sub _draw {
3039 my ($self) = @_; 3269 my ($self) = @_;
3040 3270
… …
3075 ); 3305 );
3076 3306
3077 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3078} 3308}
3079 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3080sub set_current_page { 3316sub set_current_page {
3081 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3082 3318
3083 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3084 $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);
3085} 3377}
3086 3378
3087############################################################################# 3379#############################################################################
3088 3380
3089package CFClient::UI::Statusbox; 3381package CFClient::UI::Statusbox;
… …
3188 $item->{count}++; 3480 $item->{count}++;
3189 } else { 3481 } else {
3190 $item->{count} = 1; 3482 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3192 } 3484 }
3193 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3487 delete $item->{label};
3196 } else { 3488 } else {
3197 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3204 count => 1, 3496 count => 1,
3205 %arg, 3497 %arg,
3206 }; 3498 };
3207 } 3499 }
3208 3500
3501 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3502 $self->reorder;
3503 });
3210} 3504}
3211 3505
3212sub reconfigure { 3506sub reconfigure {
3213 my ($self) = @_; 3507 my ($self) = @_;
3214 3508
… …
3217 3511
3218 $self->reorder; 3512 $self->reorder;
3219 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3220} 3514}
3221 3515
3222sub DESTROY { 3516sub destroy {
3223 my ($self) = @_; 3517 my ($self) = @_;
3224 3518
3225 $self->{timer}->cancel; 3519 $self->{timer}->cancel;
3226 3520
3227 $self->SUPER::DESTROY; 3521 $self->SUPER::destroy;
3228} 3522}
3229 3523
3230############################################################################# 3524#############################################################################
3231 3525
3232package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3233 3527
3234our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3235 3529
3236sub new { 3530sub new {
3237 my $class = shift; 3531 my $class = shift;
3238 3532
3239 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3241 @_, 3535 @_,
3242 ); 3536 );
3243 3537
3244 $self 3538 $self
3245} 3539}
3246 3540
3247sub set_items { 3541sub set_items {
3248 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3249 3543
3250 $self->{child}->clear; 3544 $self->clear;
3251 return unless $items; 3545 return unless $items;
3252 3546
3253 my @items = sort { 3547 my @items = sort {
3254 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3256 } @$items; 3550 } values %$items;
3257 3551
3258 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3259 3553
3260 my $row = 0; 3554 my $row = 0;
3261 for my $item (@items) { 3555 for my $item (@items) {
3262 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3263 3557
3264 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3267 3561
3268 $row++; 3562 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 } 3563 }
3467} 3564}
3468 3565
3469############################################################################# 3566#############################################################################
3470 3567
… …
3480 commands => [], 3577 commands => [],
3481 @_, 3578 @_,
3482 ) 3579 )
3483} 3580}
3484 3581
3485# 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
3486sub add_spell { 3667sub add_spell {
3487 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3488 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3489 3671 $self->rebuild_spell_list;
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517} 3672}
3518 3673
3519sub remove_spell { 3674sub remove_spell {
3520 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3521 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} = {};
3522 $self->rebuild_spell_list; 3685 $self->rebuild_spell_list;
3523} 3686}
3524 3687
3525############################################################################# 3688#############################################################################
3526 3689
… …
3563 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3564 3727
3565 int $coord + 0.5 3728 int $coord + 0.5
3566} 3729}
3567 3730
3568sub size_allocate { 3731sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3570 3733
3571 for my $child ($self->children) { 3734 for my $child ($self->children) {
3572 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)};
3573 3736
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3579 3742
3580 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3581 } 3744 }
3745
3746 1
3582} 3747}
3583 3748
3584sub coord2local { 3749sub coord2local {
3585 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3586 3751
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 3878
3714 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3716 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
3717 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3719 3890
3720 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}) {
3721 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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