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.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
… …
526} 562}
527 563
528sub reconfigure { 564sub reconfigure {
529 my ($self) = @_; 565 my ($self) = @_;
530 566
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc; 567 $self->realloc;
536 $self->update; 568 $self->update;
537} 569}
538 570
539# using global variables seems a bit hacky, but passing through all drawing 571# using global variables seems a bit hacky, but passing through all drawing
… …
546 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
547 579
548 # update screen rectangle 580 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553 583
554 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557 587
… …
596} 626}
597 627
598sub DESTROY { 628sub DESTROY {
599 my ($self) = @_; 629 my ($self) = @_;
600 630
631 return if CFClient::in_destruct;
632
601 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
602 #$self->deactivate; 634
635 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
603} 637}
604 638
605############################################################################# 639#############################################################################
606 640
607package CFClient::UI::DrawBG; 641package CFClient::UI::DrawBG;
… …
772} 806}
773 807
774sub add { 808sub add {
775 my ($self, $child) = @_; 809 my ($self, $child) = @_;
776 810
777 $self->{children} = []; 811 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 812 $self->SUPER::add ($child);
780} 813}
781 814
782sub remove { 815sub remove {
783 my ($self, $widget) = @_; 816 my ($self, $widget) = @_;
… …
792 825
793sub size_request { 826sub size_request {
794 $_[0]{children}[0]->size_request 827 $_[0]{children}[0]->size_request
795} 828}
796 829
797sub size_allocate { 830sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 831 my ($self, $w, $h) = @_;
799 832
800 $self->{children}[0]->configure (0, 0, $w, $h); 833 $self->{children}[0]->configure (0, 0, $w, $h);
834
835 1
801} 836}
802 837
803############################################################################# 838#############################################################################
804 839
805# back-buffered drawing area 840# back-buffered drawing area
… …
821 856
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 857 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 858 $self->SUPER::update;
824} 859}
825 860
826sub size_allocate { 861sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
828 863
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 864 $self->update;
865
866 $self->SUPER::invoke_size_allocate ($w, $h)
831} 867}
832 868
833sub _render { 869sub _render {
834 my ($self) = @_; 870 my ($self) = @_;
835 871
… …
896 $h = 10 if $self->{scroll_y}; 932 $h = 10 if $self->{scroll_y};
897 933
898 ($w, $h) 934 ($w, $h)
899} 935}
900 936
901sub size_allocate { 937sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 938 my ($self, $w, $h) = @_;
903 939
904 my $child = $self->child; 940 my $child = $self->child;
905 941
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 942 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 943 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 944
909 $self->child->configure (0, 0, $w, $h); 945 $self->child->configure (0, 0, $w, $h);
910 $self->update; 946 $self->update;
947
948 1
911} 949}
912 950
913sub set_offset { 951sub set_offset {
914 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
915 953
… …
978 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
979 }, 1017 },
980 ; 1018 ;
981 1019
982 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
984 slider => $slider, 1023 slider => $slider,
985 %arg, 1024 %arg,
986 ); 1025 );
987 1026
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
990 1029
991 $self 1030 $self
992} 1031}
993 1032
1033#TODO# update range on size_allocate depending on child
1034
994sub add { 1035sub add {
995 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
996 1037
997 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
998} 1039}
999 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
1000sub update { 1057sub update {
1001 my ($self) = @_; 1058 my ($self) = @_;
1002 1059
1003 $self->SUPER::update; 1060 $self->SUPER::update;
1004 1061
1005 # todo: overwrite size_allocate of child 1062 $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} 1063}
1009 1064
1010sub size_allocate { 1065sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1012 1067
1068 $self->update_slider;
1069
1013 $self->SUPER::size_allocate ($w, $h); 1070 $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} 1071}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1072
1022############################################################################# 1073#############################################################################
1023 1074
1024package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1025 1076
… …
1076 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);
1077 1128
1078sub new { 1129sub new {
1079 my ($class, %arg) = @_; 1130 my ($class, %arg) = @_;
1080 1131
1081 my $title = delete $arg{title};
1082
1083 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1135 border => 0.6,
1087 can_events => 1, 1136 can_events => 1,
1088 min_w => 16, 1137 min_w => 64,
1089 min_h => 16, 1138 min_h => 32,
1090 %arg, 1139 %arg,
1091 ); 1140 );
1092 1141
1093 $self->{title} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1094 align => 0, 1143 align => 0,
1095 valign => 1, 1144 valign => 1,
1096 text => $title, 1145 text => $self->{title},
1097 fontsize => $self->{border} 1146 fontsize => $self->{border},
1098 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 }
1099 1157
1100 $self 1158 $self
1101} 1159}
1102 1160
1103sub add { 1161sub add {
1104 my ($self, @widgets) = @_; 1162 my ($self, @widgets) = @_;
1105 1163
1106 $self->SUPER::add (@widgets); 1164 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1167}
1109 1168
1110sub border { 1169sub border {
1111 int $_[0]{border} * $::FONTSIZE 1170 int $_[0]{border} * $::FONTSIZE
1112} 1171}
1113 1172
1114sub size_request { 1173sub size_request {
1115 my ($self) = @_; 1174 my ($self) = @_;
1116 1175
1117 $self->{title}->size_request 1176 $self->{title_widget}->size_request
1118 if $self->{title}; 1177 if $self->{title_widget};
1178
1179 $self->{close_button}->size_request
1180 if $self->{close_button};
1119 1181
1120 my ($w, $h) = $self->SUPER::size_request; 1182 my ($w, $h) = $self->SUPER::size_request;
1121 1183
1122 ( 1184 (
1123 $w + $self->border * 2, 1185 $w + $self->border * 2,
1124 $h + $self->border * 2, 1186 $h + $self->border * 2,
1125 ) 1187 )
1126} 1188}
1127 1189
1128sub size_allocate { 1190sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1191 my ($self, $w, $h) = @_;
1130 1192
1131 if ($self->{title}) { 1193 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1194 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1195 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1196 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1197 }
1136 1198
1137 my $border = $self->border; 1199 my $border = $self->border;
1138 1200
1139 $h -= List::Util::max 0, $border * 2; 1201 $h -= List::Util::max 0, $border * 2;
1140 $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;
1141 1216
1142 $self->child->configure ($border, $border, $w, $h); 1217 1
1143} 1218}
1144 1219
1145sub button_down { 1220sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1147 1222
1148 my ($w, $h) = @$self{qw(w h)}; 1223 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1224 my $border = $self->border;
1150 1225
… …
1181 1256
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1257 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1258
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1259 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1260 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1261 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1262 };
1188 } else { 1263 } else {
1189 return 0; 1264 return 0;
1190 } 1265 }
1191 1266
1192 1 1267 1
1193} 1268}
1194 1269
1195sub button_up { 1270sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1271 my ($self, $ev, $x, $y) = @_;
1197 1272
1198 !!delete $self->{motion} 1273 ! ! delete $self->{motion}
1199} 1274}
1200 1275
1201sub mouse_motion { 1276sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1277 my ($self, $ev, $x, $y) = @_;
1203 1278
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1279 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1280
1206 !!$self->{motion} 1281 ! ! $self->{motion}
1207} 1282}
1208 1283
1209sub _draw { 1284sub _draw {
1210 my ($self) = @_; 1285 my ($self) = @_;
1211 1286
… …
1237 1312
1238 glDisable GL_TEXTURE_2D; 1313 glDisable GL_TEXTURE_2D;
1239 1314
1240 $child->draw; 1315 $child->draw;
1241 1316
1242 if ($self->{title}) { 1317 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1318 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1319 $self->{title_widget}->_draw;
1320
1321 glTranslate 0, - ($border - $self->{h});
1245 } 1322 }
1323
1324 $self->{close_button}->draw
1325 if $self->{close_button};
1246} 1326}
1247 1327
1248############################################################################# 1328#############################################################################
1249 1329
1250package CFClient::UI::Table; 1330package CFClient::UI::Table;
… …
1273 1353
1274 $child->set_parent ($self); 1354 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1355 $self->{children}[$y][$x] = $child;
1276 1356
1277 $self->realloc; 1357 $self->realloc;
1358}
1359
1360sub remove {
1361 my ($self, $child) = @_;
1362
1363 # TODO: not yet implemented
1278} 1364}
1279 1365
1280# 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?
1281sub clear { 1367sub clear {
1282 my ($self) = @_; 1368 my ($self) = @_;
… …
1323 (sum @$ws), 1409 (sum @$ws),
1324 (sum @$hs), 1410 (sum @$hs),
1325 ) 1411 )
1326} 1412}
1327 1413
1328sub size_allocate { 1414sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1415 my ($self, $w, $h) = @_;
1330 1416
1331 my ($ws, $hs) = $self->get_wh; 1417 my ($ws, $hs) = $self->get_wh;
1332 1418
1333 my $req_w = (sum @$ws) || 1; 1419 my $req_w = (sum @$ws) || 1;
… …
1365 } 1451 }
1366 1452
1367 $y += $row_h; 1453 $y += $row_h;
1368 } 1454 }
1369 1455
1456 1
1370} 1457}
1371 1458
1372sub find_widget { 1459sub find_widget {
1373 my ($self, $x, $y) = @_; 1460 my ($self, $x, $y) = @_;
1374 1461
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1498 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1499 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1500 )
1414} 1501}
1415 1502
1416sub size_allocate { 1503sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1418 1505
1419 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1421 1508
1422 my @req; 1509 my @req;
1423 1510
1424 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1426 } else { 1513 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1429 1516
1430 if ($req > $space) { 1517 if ($req > $space) {
1431 # ah well, not enough space 1518 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1433 } else { 1520 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1522
1436 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1437 1524
1438 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1526 for 0 .. $#children;
1440 } 1527 }
1441 } 1528 }
1442 1529
1443 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1444 1531
1445 my $pos = 0; 1532 my $pos = 0;
1446 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1448 $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));
1449 1536
1450 $pos += $alloc; 1537 $pos += $alloc;
1451 } 1538 }
1452 1539
1453 1 1540 1
… …
1556 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1557 1644
1558 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1560 1647
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1563 1649
1564 delete $self->{req_h}; 1650 delete $self->{size_req};
1565 $self->realloc; 1651 $self->realloc;
1566 $self->update; 1652 $self->update;
1567} 1653}
1568 1654
1569sub set_markup { 1655sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1574 1660
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1662
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1579 1664
1580 delete $self->{req_h}; 1665 delete $self->{size_req};
1581 $self->realloc; 1666 $self->realloc;
1582 $self->update; 1667 $self->update;
1583} 1668}
1584 1669
1585sub size_request { 1670sub size_request {
1586 my ($self) = @_; 1671 my ($self) = @_;
1587 1672
1588 if (exists $self->{req_h}) { 1673 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1674 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1675 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1676 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1677 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1678 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1679
1597 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1598 1681
1599 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1600 $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);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 1686
1603 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1604 1688
1605 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1690 $h = List::Util::max $h, $h2;
1607 } 1691 }
1608 1692
1609 ($w, $h) 1693 [$w, $h]
1610 } 1694 };
1611}
1612 1695
1696 @{ $self->{size_req} }
1697}
1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1613sub size_allocate { 1703sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1615 1705
1616 delete $self->{ox}; 1706 delete $self->{ox};
1617 1707
1618 delete $self->{texture} 1708 delete $self->{texture}
1619 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
1620} 1712}
1621 1713
1622sub set_fontsize { 1714sub set_fontsize {
1623 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1624 1716
1625 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1626 delete $self->{texture}; 1719 delete $self->{texture};
1627 1720
1628 $self->realloc; 1721 $self->realloc;
1629} 1722}
1630 1723
1724sub reconfigure {
1725 my ($self) = @_;
1726
1727 delete $self->{size_req};
1728 delete $self->{texture};
1729
1730 $self->SUPER::reconfigure;
1731}
1732
1631sub _draw { 1733sub _draw {
1632 my ($self) = @_; 1734 my ($self) = @_;
1633 1735
1634 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1635 1737
1636 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 1745
1644 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1645 }; 1747 };
1646 1748
1647 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1651 1753
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 1757 };
1656 1758
1657 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];
1658 1761
1659 if ($tex->{format} == GL_ALPHA) { 1762 $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} 1763}
1670 1764
1671############################################################################# 1765#############################################################################
1672 1766
1673package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1687 can_hover => 1, 1781 can_hover => 1,
1688 can_focus => 1, 1782 can_focus => 1,
1689 valign => 0, 1783 valign => 0,
1690 can_events => 1, 1784 can_events => 1,
1691 #text => ... 1785 #text => ...
1786 #hidden => "*",
1692 @_ 1787 @_
1693 ) 1788 )
1694} 1789}
1695 1790
1696sub _set_text { 1791sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 1798 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1799 $self->{text} = $text;
1705 1800
1706 $text =~ s/./*/g if $self->{hidden}; 1801 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1802 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1803 delete $self->{size_req};
1709 1804
1710 $self->_emit (changed => $self->{text}); 1805 $self->emit (changed => $self->{text});
1711 1806
1712 $self->realloc; 1807 $self->realloc;
1713 $self->update; 1808 $self->update;
1714} 1809}
1715 1810
… …
1730 my ($w, $h) = $self->SUPER::size_request; 1825 my ($w, $h) = $self->SUPER::size_request;
1731 1826
1732 ($w + 1, $h) # add 1 for cursor 1827 ($w + 1, $h) # add 1 for cursor
1733} 1828}
1734 1829
1735sub key_down { 1830sub invoke_key_down {
1736 my ($self, $ev) = @_; 1831 my ($self, $ev) = @_;
1737 1832
1738 my $mod = $ev->{mod}; 1833 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 1835 my $uni = $ev->{unicode};
… …
1752 } elsif ($sym == CFClient::SDLK_HOME) { 1847 } elsif ($sym == CFClient::SDLK_HOME) {
1753 $self->{cursor} = 0; 1848 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) { 1849 } elsif ($sym == CFClient::SDLK_END) {
1755 $self->{cursor} = length $text; 1850 $self->{cursor} = length $text;
1756 } elsif ($uni == 27) { 1851 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 1852 $self->emit ('escape');
1758 } elsif ($uni) { 1853 } elsif ($uni) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 1854 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 1855 } else {
1761 return 0; 1856 return 0;
1762 } 1857 }
… …
1766 $self->realloc; 1861 $self->realloc;
1767 1862
1768 1 1863 1
1769} 1864}
1770 1865
1771sub focus_in { 1866sub invoke_focus_in {
1772 my ($self) = @_; 1867 my ($self) = @_;
1773 1868
1774 $self->{last_activity} = $::NOW; 1869 $self->{last_activity} = $::NOW;
1775 1870
1776 $self->SUPER::focus_in; 1871 $self->SUPER::invoke_focus_in
1777} 1872}
1778 1873
1779sub button_down { 1874sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1781 1876
1782 $self->SUPER::button_down ($ev, $x, $y); 1877 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 1878
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 1880
1786 # byte-index to char-index 1881 # byte-index to char-index
1787 my $text = $self->{text}; 1882 my $text = $self->{text};
1788 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1790 1885
1791 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1792 $self->update; 1887 $self->update;
1793 1888
1794 1 1889 1
1795} 1890}
1796 1891
1797sub mouse_motion { 1892sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 1893 my ($self, $ev, $x, $y) = @_;
1799# 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#
1800 1895
1801 0 1896 1
1802} 1897}
1803 1898
1804sub _draw { 1899sub _draw {
1805 my ($self) = @_; 1900 my ($self) = @_;
1806 1901
… …
1847 1942
1848our @ISA = CFClient::UI::EntryBase::; 1943our @ISA = CFClient::UI::EntryBase::;
1849 1944
1850use CFClient::OpenGL; 1945use CFClient::OpenGL;
1851 1946
1852sub key_down { 1947sub invoke_key_down {
1853 my ($self, $ev) = @_; 1948 my ($self, $ev) = @_;
1854 1949
1855 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1856 1951
1857 if ($sym == 13) { 1952 if ($sym == 13) {
1858 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1860 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 1958 $self->emit (activate => $txt);
1863 $self->update; 1959 $self->update;
1864 1960
1865 } elsif ($sym == CFClient::SDLK_UP) { 1961 } elsif ($sym == CFClient::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 1962 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 1963 $self->{history_saveback} = $self->get_text;
… …
1883 } else { 1979 } else {
1884 $self->set_text ($self->{history_saveback}); 1980 $self->set_text ($self->{history_saveback});
1885 } 1981 }
1886 1982
1887 } else { 1983 } else {
1888 return $self->SUPER::key_down ($ev) 1984 return $self->SUPER::invoke_key_down ($ev)
1889 } 1985 }
1890 1986
1891 1 1987 1
1892} 1988}
1893 1989
… …
1917 can_events => 1, 2013 can_events => 1,
1918 @_ 2014 @_
1919 ) 2015 )
1920} 2016}
1921 2017
1922sub activate { }
1923
1924sub button_up { 2018sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
1926 2020
1927 $self->emit ("activate") 2021 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
… …
1943 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1944 2038
1945 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1946 2040
1947 $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
1948} 2078}
1949 2079
1950############################################################################# 2080#############################################################################
1951 2081
1952package CFClient::UI::CheckBox; 2082package CFClient::UI::CheckBox;
… …
1979 my ($self) = @_; 2109 my ($self) = @_;
1980 2110
1981 (6) x 2 2111 (6) x 2
1982} 2112}
1983 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
1984sub button_down { 2122sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
1986 2124
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2127 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2128 } else {
1992 return 0 2129 return 0
1993 } 2130 }
1994 2131
1995 1 2132 1
… …
2020package CFClient::UI::Image; 2157package CFClient::UI::Image;
2021 2158
2022our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
2023 2160
2024use CFClient::OpenGL; 2161use CFClient::OpenGL;
2025use Carp qw/confess/;
2026 2162
2027our %loaded_images; 2163our %texture_cache;
2028 2164
2029sub new { 2165sub new {
2030 my $class = shift; 2166 my $class = shift;
2031 2167
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
2033 2172
2034 $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";
2035 2175
2036 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 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;
2038 2178
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2040 2180
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2182
2045 $self 2183 $self
2046} 2184}
2047 2185
2048sub size_request { 2186sub size_request {
2049 my ($self) = @_; 2187 my ($self) = @_;
2050 2188
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2052} 2190}
2053 2191
2054sub _draw { 2192sub _draw {
2055 my ($self) = @_; 2193 my ($self) = @_;
2056 2194
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2305
2168 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2169 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);
2170 2311
2171 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2193 2334
2194 if ($t3) { 2335 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2342 glEnd;
2202 } 2343 }
2203 2344
2204 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2292 $self->update; 2433 $self->update;
2293 2434
2294 $self 2435 $self
2295} 2436}
2296 2437
2297sub changed { }
2298
2299sub set_range { 2438sub set_range {
2300 my ($self, $range) = @_; 2439 my ($self, $range) = @_;
2301 2440
2302 ($range, $self->{range}) = ($self->{range}, $range); 2441 ($range, $self->{range}) = ($self->{range}, $range);
2303 2442
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2443 if ("@$range" ne "@{$self->{range}}") {
2444 $self->update;
2445 $self->set_value ($self->{range}[0]);
2446 }
2306} 2447}
2307 2448
2308sub set_value { 2449sub set_value {
2309 my ($self, $value) = @_; 2450 my ($self, $value) = @_;
2310 2451
… …
2321 if $unit; 2462 if $unit;
2322 2463
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2464 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2465
2325 if ($value != $old_value) { 2466 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2467 $self->emit (changed => $value);
2327 $self->update; 2468 $self->update;
2328 } 2469 }
2329} 2470}
2330 2471
2331sub size_request { 2472sub size_request {
2332 my ($self) = @_; 2473 my ($self) = @_;
2333 2474
2334 ($self->{req_w}, $self->{req_h}) 2475 ($self->{req_w}, $self->{req_h})
2335} 2476}
2336 2477
2337sub button_down { 2478sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2339 2480
2340 $self->SUPER::button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2482
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2484
2344 $self->mouse_motion ($ev, $x, $y) 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2486}
2346 2487
2347sub mouse_motion { 2488sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2349 2490
2350 if ($GRAB == $self) { 2491 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2492 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2493
… …
2358 } else { 2499 } else {
2359 return 0; 2500 return 0;
2360 } 2501 }
2361 2502
2362 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
2363} 2514}
2364 2515
2365sub update { 2516sub update {
2366 my ($self) = @_; 2517 my ($self) = @_;
2367 2518
… …
2457sub set_range { shift->{slider}->set_range (@_) } 2608sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2609sub set_value { shift->{slider}->set_value (@_) }
2459 2610
2460############################################################################# 2611#############################################################################
2461 2612
2462package CFClient::UI::TextView; 2613package CFClient::UI::TextScroller;
2463 2614
2464our @ISA = CFClient::UI::HBox::; 2615our @ISA = CFClient::UI::HBox::;
2465 2616
2466use CFClient::OpenGL; 2617use CFClient::OpenGL;
2467 2618
2468sub new { 2619sub new {
2469 my $class = shift; 2620 my $class = shift;
2470 2621
2471 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2472 fontsize => 1, 2623 fontsize => 1,
2473 can_events => 0, 2624 can_events => 1,
2625 indent => 0,
2474 #font => default_font 2626 #font => default_font
2475 @_, 2627 @_,
2476 2628
2477 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2478 par => [], 2630 par => [],
2479 height => 0, 2631 height => 0,
2480 children => [ 2632 children => [
2481 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2493 2645
2494 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2495 $self->reflow; 2647 $self->reflow;
2496} 2648}
2497 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
2498sub size_allocate { 2659sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2500 2661
2501 $self->SUPER::size_allocate ($w, $h); 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 2664
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $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});
2506 2669
2507 $self->reflow; 2670 $self->reflow;
2508}
2509 2671
2510sub text_size { 2672 local $self->{children} = [$empty, $slider];
2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2511 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) = @_;
2512 2688
2513 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2514 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $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});
2517 $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}}
2518 2702 );
2703
2519 $layout->size 2704 $layout
2520} 2705}
2521 2706
2522sub reflow { 2707sub reflow {
2523 my ($self) = @_; 2708 my ($self) = @_;
2524 2709
… …
2533 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2534} 2719}
2535 2720
2536sub clear { 2721sub clear {
2537 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2538 2726
2539 $self->{par} = []; 2727 $self->{par} = [];
2540 $self->{height} = 0; 2728 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 2730}
2543 2731
2544sub add_paragraph { 2732sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2546 2734
2547 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2548 my ($w, $h) = $self->text_size ($line); 2736
2549 $self->{height} += $h; 2737 $para = {
2550 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,
2551 } 2744 };
2552 2745
2553 $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;
2554} 2758}
2555 2759
2556sub update { 2760sub update {
2557 my ($self) = @_; 2761 my ($self) = @_;
2558 2762
… …
2560 2764
2561 return unless $self->{h} > 0; 2765 return unless $self->{h} > 0;
2562 2766
2563 delete $self->{texture}; 2767 delete $self->{texture};
2564 2768
2565 $ROOT->on_post_alloc ($self, sub { 2769 $ROOT->on_post_alloc ($self => sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 2771
2568 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2569 my $height = 0; 2773 my $height = 0;
2570 2774
2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2577 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3]; 2779
2581 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2582 } 2783 }
2583 2784
2584 $height += $_->[1]; 2785 $height += $para->{h};
2585 } 2786 }
2586 2787
2587 $self->{height} = $height; 2788 $self->{height} = $height;
2588 2789
2589 $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]);
2590 2791
2591 delete $self->{texture}; 2792 delete $self->{texture};
2793 }
2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2592 } 2797 }
2593 2798
2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 2800 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
… …
2600 my $y0 = $top; 2805 my $y0 = $top;
2601 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2602 2807
2603 my $y = 0; 2808 my $y = 0;
2604 2809
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}}) { 2810 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 2811 my $h = $para->{h};
2615 2812
2616 if ($y0 < $y + $h && $y < $y1) { 2813 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 2814
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2622 2816
2623 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2624 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 }
2625 } 2831 }
2626 2832
2627 $y += $h; 2833 $y += $h;
2628 } 2834 }
2629
2630 glDisable GL_BLEND;
2631 }; 2835 };
2632 }); 2836 });
2837}
2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2633} 2846}
2634 2847
2635sub _draw { 2848sub _draw {
2636 my ($self) = @_; 2849 my ($self) = @_;
2637 2850
… …
2640 glColor 0, 0, 0, 1; 2853 glColor 0, 0, 0, 1;
2641 $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});
2642 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2643 2856
2644 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2645
2646} 2858}
2647 2859
2648############################################################################# 2860#############################################################################
2649 2861
2650package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 2949 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2950 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 2951 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 2952 . "visible $widget->{visible}";
2741 } 2953 }
2954
2955 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//;
2742 2957
2743 $self->add (new CFClient::UI::Label 2958 $self->add (new CFClient::UI::Label
2744 markup => $tooltip, 2959 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 2961 fontsize => 0.8,
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2971 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 2972
2758 ($w + 4, $h + 4) 2973 ($w + 4, $h + 4)
2759} 2974}
2760 2975
2761sub size_allocate { 2976sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 2977 my ($self, $w, $h) = @_;
2763 2978
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 2979 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 2980}
2766 2981
2767sub visibility_change { 2982sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 2983 my ($self, $visible) = @_;
2769 2984
2770 return unless $visible; 2985 return unless $visible;
2771 2986
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 2987 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2774 or return; 2989 or return;
2775 2990
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 2992
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 2994 if $x + $self->{w} > $self->{root}{w};
2780 2995
2781 $self->move_abs ($x, $y); 2996 $self->move_abs ($x, $y);
2782 }); 2997 });
2783} 2998}
2784 2999
… …
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3094 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3095 glDisable GL_TEXTURE_2D;
2881 } 3096 }
2882} 3097}
2883 3098
2884sub DESTROY { 3099sub destroy {
2885 my ($self) = @_; 3100 my ($self) = @_;
2886 3101
2887 $self->{timer}->cancel 3102 $self->{timer}->cancel
2888 if $self->{timer}; 3103 if $self->{timer};
2889 3104
2890 $self->SUPER::DESTROY; 3105 $self->SUPER::destroy;
2891} 3106}
2892 3107
2893############################################################################# 3108#############################################################################
2894 3109
2895package CFClient::UI::Buttonbar; 3110package CFClient::UI::Buttonbar;
… …
2916 ); 3131 );
2917 3132
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3133 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2919 3134
2920 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
2922 3137
2923 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
2924 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 {
2925 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
2926 can_hover => 1, 3155 can_hover => 1,
2927 can_events => 1, 3156 can_events => 1,
2928 text => $widget; 3157 markup => $widget,
3158 tooltip => $tooltip;
3159 }
2929 } 3160 }
2930 3161
2931 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
2932 3163
2933 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
2938 3169
2939# 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)
2940sub popup { 3171sub popup {
2941 my ($self, $ev) = @_; 3172 my ($self, $ev) = @_;
2942 3173
2943 $self->_emit ("popdown"); 3174 $self->emit ("popdown");
2944 3175
2945 # maybe save $GRAB? must be careful about events... 3176 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3177 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3178 $self->{button} = $ev->{button};
2948 3179
2949 $self->show; 3180 $self->show;
2950 $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);
2951} 3182}
2952 3183
2953sub mouse_motion { 3184sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3185 my ($self, $ev, $x, $y) = @_;
2955 3186
2956 # TODO: should use vbox->find_widget or so 3187 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3188 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3189 $self->{hover} = $self->{item}{$HOVER};
2959 3190
2960 0 3191 0
2961} 3192}
2962 3193
2963sub button_up { 3194sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3195 my ($self, $ev, $x, $y) = @_;
2965 3196
2966 if ($ev->{button} == $self->{button}) { 3197 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3198 undef $GRAB;
2968 $self->hide; 3199 $self->hide;
2969 3200
2970 $self->_emit ("popdown"); 3201 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3202 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3203 } else {
2973 return 0 3204 return 0
2974 } 3205 }
2975 3206
… …
3002 3233
3003 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3235 if @{ $self->{children} };
3005} 3236}
3006 3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3242}
3243
3007sub set_current_page { 3244sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
3009 3246
3010 my $widget = ref $page_or_widget 3247 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3248 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3249 : $self->{children}[$page_or_widget];
3013 3250
3014 $self->{current} = $widget; 3251 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3252 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3253
3017 $self->_emit (page_changed => $self->{current}); 3254 $self->emit (page_changed => $self->{current});
3018 3255
3019 $self->realloc; 3256 $self->realloc;
3020} 3257}
3021 3258
3022sub visible_children { 3259sub visible_children {
… …
3027 my ($self) = @_; 3264 my ($self) = @_;
3028 3265
3029 $self->{current}->size_request 3266 $self->{current}->size_request
3030} 3267}
3031 3268
3032sub size_allocate { 3269sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3270 my ($self, $w, $h) = @_;
3034 3271
3035 $self->{current}->configure (0, 0, $w, $h); 3272 $self->{current}->configure (0, 0, $w, $h);
3273
3274 1
3036} 3275}
3037 3276
3038sub _draw { 3277sub _draw {
3039 my ($self) = @_; 3278 my ($self) = @_;
3040 3279
… …
3075 ); 3314 );
3076 3315
3077 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3078} 3317}
3079 3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3323}
3324
3080sub set_current_page { 3325sub set_current_page {
3081 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3082 3327
3083 $self->{multiplexer}->set_current_page ($page); 3328 $self->{multiplexer}->set_current_page ($page);
3084 $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);
3085} 3386}
3086 3387
3087############################################################################# 3388#############################################################################
3088 3389
3089package CFClient::UI::Statusbox; 3390package CFClient::UI::Statusbox;
… …
3188 $item->{count}++; 3489 $item->{count}++;
3189 } else { 3490 } else {
3190 $item->{count} = 1; 3491 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3492 $item->{text} = $item->{tooltip} = $text;
3192 } 3493 }
3193 $item->{id} = ++$self->{id}; 3494 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3495 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3496 delete $item->{label};
3196 } else { 3497 } else {
3197 $self->{item}{$group} = { 3498 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3499 id => ++$self->{id},
… …
3204 count => 1, 3505 count => 1,
3205 %arg, 3506 %arg,
3206 }; 3507 };
3207 } 3508 }
3208 3509
3510 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3511 $self->reorder;
3512 });
3210} 3513}
3211 3514
3212sub reconfigure { 3515sub reconfigure {
3213 my ($self) = @_; 3516 my ($self) = @_;
3214 3517
… …
3217 3520
3218 $self->reorder; 3521 $self->reorder;
3219 $self->SUPER::reconfigure; 3522 $self->SUPER::reconfigure;
3220} 3523}
3221 3524
3222sub DESTROY { 3525sub destroy {
3223 my ($self) = @_; 3526 my ($self) = @_;
3224 3527
3225 $self->{timer}->cancel; 3528 $self->{timer}->cancel;
3226 3529
3227 $self->SUPER::DESTROY; 3530 $self->SUPER::destroy;
3228} 3531}
3229 3532
3230############################################################################# 3533#############################################################################
3231 3534
3232package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3233 3536
3234our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3235 3538
3236sub new { 3539sub new {
3237 my $class = shift; 3540 my $class = shift;
3238 3541
3239 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3241 @_, 3544 @_,
3242 ); 3545 );
3243 3546
3244 $self 3547 $self
3245} 3548}
3246 3549
3247sub set_items { 3550sub set_items {
3248 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3249 3552
3250 $self->{child}->clear; 3553 $self->clear;
3251 return unless $items; 3554 return unless $items;
3252 3555
3253 my @items = sort { 3556 my @items = sort {
3254 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3256 } @$items; 3559 } values %$items;
3257 3560
3258 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3259 3562
3260 my $row = 0; 3563 my $row = 0;
3261 for my $item (@items) { 3564 for my $item (@items) {
3262 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3263 3566
3264 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3267 3570
3268 $row++; 3571 $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 } 3572 }
3467} 3573}
3468 3574
3469############################################################################# 3575#############################################################################
3470 3576
… …
3480 commands => [], 3586 commands => [],
3481 @_, 3587 @_,
3482 ) 3588 )
3483} 3589}
3484 3590
3485# XXX: Do sorting? Argl... 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");
3597my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604sub rebuild_spell_list {
3605 my ($self) = @_;
3606
3607 $CFClient::UI::ROOT->on_refresh ($self => sub {
3608 $self->clear;
3609
3610 return unless $::CONN;
3611
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);
3614 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618 my $row = 0;
3619
3620 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621 my $spell = $self->{spell}{$_};
3622
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});
3650
3651 $self->add (0, $row, new CFClient::UI::Face
3652 face => $spell->{face},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (1, $row, new CFClient::UI::Label
3660 expand => 1,
3661 text => $spell->{name},
3662 can_hover => 1,
3663 can_events => 1,
3664 tooltip => $tooltip,
3665 on_button_down => $spell_cb,
3666 );
3667
3668 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672 }
3673 });
3674}
3675
3486sub add_spell { 3676sub add_spell {
3487 my ($self, $spell) = @_; 3677 my ($self, $spell) = @_;
3678
3488 $self->{spells}->{$spell->{name}} = $spell; 3679 $self->{spell}->{$spell->{name}} = $spell;
3489 3680 $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} 3681}
3518 3682
3519sub remove_spell { 3683sub remove_spell {
3520 my ($self, $spell) = @_; 3684 my ($self, $spell) = @_;
3685
3521 delete $self->{spells}->{$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} = {};
3522 $self->rebuild_spell_list; 3694 $self->rebuild_spell_list;
3523} 3695}
3524 3696
3525############################################################################# 3697#############################################################################
3526 3698
… …
3563 $coord = $max - $size if $coord > $max - $size; 3735 $coord = $max - $size if $coord > $max - $size;
3564 3736
3565 int $coord + 0.5 3737 int $coord + 0.5
3566} 3738}
3567 3739
3568sub size_allocate { 3740sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 3741 my ($self, $w, $h) = @_;
3570 3742
3571 for my $child ($self->children) { 3743 for my $child ($self->children) {
3572 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)};
3573 3745
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 3749 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 3750 $Y = _to_pixel $Y, $H, $self->{h};
3579 3751
3580 $child->configure ($X, $Y, $W, $H); 3752 $child->configure ($X, $Y, $W, $H);
3581 } 3753 }
3754
3755 1
3582} 3756}
3583 3757
3584sub coord2local { 3758sub coord2local {
3585 my ($self, $x, $y) = @_; 3759 my ($self, $x, $y) = @_;
3586 3760
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 3887
3714 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3716 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
3717 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3719 3899
3720 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}) {
3721 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

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