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.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.334 by root, Sun Jul 23 16:11:12 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
443 Carp::confess unless $self->{parent};#d#
444
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 446}
422 447
423sub focus_in { 448sub invoke_focus_in {
424 my ($self) = @_; 449 my ($self) = @_;
425 450
426 return if $FOCUS == $self; 451 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
428 453
429 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
430 455
431 $self->_emit (focus_in => $focus); 456 $self->update;
432 457
433 $focus->update if $focus; 458 0
434 $FOCUS->update;
435} 459}
436 460
437sub focus_out { 461sub invoke_focus_out {
438 my ($self) = @_; 462 my ($self) = @_;
439 463
440 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
441 465
442 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
443 467
444 $self->_emit (focus_out => $focus); 468 $self->update;
445 469
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 471 unless $FOCUS;
450}
451 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
452sub mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 484sub invoke_button_up { 0 }
454sub key_down { 0 } 485sub invoke_key_down { 0 }
455sub key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
456 488
457sub button_down { 489sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
459 491
460 $self->focus_in; 492 $self->grab_focus;
461 493
462 0 494 0
495}
496
497sub connect {
498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 531}
464 532
465sub find_widget { 533sub find_widget {
466 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
467 535
… …
477sub set_parent { 545sub set_parent {
478 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
479 547
480 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 549 $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} 550}
506 551
507sub realloc { 552sub realloc {
508 my ($self) = @_; 553 my ($self) = @_;
509 554
… …
542 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
543 588
544 # update screen rectangle 589 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 592
550 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 596
… …
592} 635}
593 636
594sub DESTROY { 637sub DESTROY {
595 my ($self) = @_; 638 my ($self) = @_;
596 639
640 return if CFClient::in_destruct;
641
597 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
598 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 646}
600 647
601############################################################################# 648#############################################################################
602 649
603package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
684 if $children; 731 if $children;
685 732
686 $self 733 $self
687} 734}
688 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
689sub add { 744sub add {
690 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
691 746
692 $_->set_parent ($self) 747 $_->set_parent ($self)
693 for @widgets; 748 for @widgets;
… …
768} 823}
769 824
770sub add { 825sub add {
771 my ($self, $child) = @_; 826 my ($self, $child) = @_;
772 827
773 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
776} 830}
777 831
778sub remove { 832sub remove {
779 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
788 842
789sub size_request { 843sub size_request {
790 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
791} 845}
792 846
793sub size_allocate { 847sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
795 849
796 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
797} 853}
798 854
799############################################################################# 855#############################################################################
800 856
801# back-buffered drawing area 857# back-buffered drawing area
… …
817 873
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 875 $self->SUPER::update;
820} 876}
821 877
822sub size_allocate { 878sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
824 880
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
827} 884}
828 885
829sub _render { 886sub _render {
830 my ($self) = @_; 887 my ($self) = @_;
831 888
… …
892 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
893 950
894 ($w, $h) 951 ($w, $h)
895} 952}
896 953
897sub size_allocate { 954sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
899 956
900 my $child = $self->child; 957 my $child = $self->child;
901 958
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 961
905 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
906 $self->update; 963 $self->update;
964
965 1
907} 966}
908 967
909sub set_offset { 968sub set_offset {
910 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
911 970
… …
974 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
975 }, 1034 },
976 ; 1035 ;
977 1036
978 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
980 slider => $slider, 1040 slider => $slider,
981 %arg, 1041 %arg,
982 ); 1042 );
983 1043
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
986 1046
987 $self 1047 $self
988} 1048}
989 1049
1050#TODO# update range on size_allocate depending on child
1051
990sub add { 1052sub add {
991 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
992 1054
993 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
994} 1056}
995 1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
996sub update { 1074sub update {
997 my ($self) = @_; 1075 my ($self) = @_;
998 1076
999 $self->SUPER::update; 1077 $self->SUPER::update;
1000 1078
1001 # todo: overwrite size_allocate of child 1079 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1080}
1005 1081
1006sub size_allocate { 1082sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1008 1084
1085 $self->update_slider;
1086
1009 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1088}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1089
1018############################################################################# 1090#############################################################################
1019 1091
1020package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1021 1093
… …
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1145
1074sub new { 1146sub new {
1075 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1076 1148
1077 my $title = delete $arg{title};
1078
1079 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1152 border => 0.6,
1083 can_events => 1, 1153 can_events => 1,
1084 min_w => 16, 1154 min_w => 64,
1085 min_h => 16, 1155 min_h => 32,
1086 %arg, 1156 %arg,
1087 ); 1157 );
1088 1158
1089 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1160 align => 0,
1091 valign => 1, 1161 valign => 1,
1092 text => $title, 1162 text => $self->{title},
1093 fontsize => $self->{border} 1163 fontsize => $self->{border},
1094 if defined $title; 1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFClient::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFClient::UI::Container::add ($self->{close_button});
1173 }
1095 1174
1096 $self 1175 $self
1097} 1176}
1098 1177
1099sub add { 1178sub add {
1100 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1101 1180
1102 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1184}
1105 1185
1106sub border { 1186sub border {
1107 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1108} 1188}
1109 1189
1110sub size_request { 1190sub size_request {
1111 my ($self) = @_; 1191 my ($self) = @_;
1112 1192
1113 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1114 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1115 1198
1116 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1117 1200
1118 ( 1201 (
1119 $w + $self->border * 2, 1202 $w + $self->border * 2,
1120 $h + $self->border * 2, 1203 $h + $self->border * 2,
1121 ) 1204 )
1122} 1205}
1123 1206
1124sub size_allocate { 1207sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1126 1209
1127 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1214 }
1132 1215
1133 my $border = $self->border; 1216 my $border = $self->border;
1134 1217
1135 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1220
1221 $self->child->configure ($border, $border, $w, $h);
1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1137 1233
1138 $self->child->configure ($border, $border, $w, $h); 1234 1
1139} 1235}
1140 1236
1141sub button_down { 1237sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1143 1239
1144 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1241 my $border = $self->border;
1146 1242
… …
1177 1273
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1275
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1279 };
1184 } else { 1280 } else {
1185 return 0; 1281 return 0;
1186 } 1282 }
1187 1283
1188 1 1284 1
1189} 1285}
1190 1286
1191sub button_up { 1287sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1193 1289
1194 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1195} 1291}
1196 1292
1197sub mouse_motion { 1293sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1199 1295
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1297
1202 !!$self->{motion} 1298 ! ! $self->{motion}
1203} 1299}
1204 1300
1205sub _draw { 1301sub _draw {
1206 my ($self) = @_; 1302 my ($self) = @_;
1207 1303
… …
1233 1329
1234 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1235 1331
1236 $child->draw; 1332 $child->draw;
1237 1333
1238 if ($self->{title}) { 1334 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1335 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1241 } 1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1242} 1343}
1243 1344
1244############################################################################# 1345#############################################################################
1245 1346
1246package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1263sub children { 1364sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1366}
1266 1367
1267sub add { 1368sub add {
1268 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1269 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1373 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1272 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1274} 1386}
1275 1387
1276# TODO: move to container class maybe? send children a signal on removal? 1388# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1389sub clear {
1278 my ($self) = @_; 1390 my ($self) = @_;
… …
1319 (sum @$ws), 1431 (sum @$ws),
1320 (sum @$hs), 1432 (sum @$hs),
1321 ) 1433 )
1322} 1434}
1323 1435
1324sub size_allocate { 1436sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1326 1438
1327 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1328 1440
1329 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1361 } 1473 }
1362 1474
1363 $y += $row_h; 1475 $y += $row_h;
1364 } 1476 }
1365 1477
1478 1
1366} 1479}
1367 1480
1368sub find_widget { 1481sub find_widget {
1369 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1370 1483
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1522 )
1410} 1523}
1411 1524
1412sub size_allocate { 1525sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1414 1527
1415 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1417 1530
1418 my @req; 1531 my @req;
1419 1532
1420 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1422 } else { 1535 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1425 1538
1426 if ($req > $space) { 1539 if ($req > $space) {
1427 # ah well, not enough space 1540 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1429 } else { 1542 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1544
1432 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1433 1546
1434 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1548 for 0 .. $#children;
1436 } 1549 }
1437 } 1550 }
1438 1551
1439 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1440 1553
1441 my $pos = 0; 1554 my $pos = 0;
1442 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1558
1446 $pos += $alloc; 1559 $pos += $alloc;
1447 } 1560 }
1448 1561
1449 1 1562 1
… …
1522 } 1635 }
1523 1636
1524 $self 1637 $self
1525} 1638}
1526 1639
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1640sub update {
1538 my ($self) = @_; 1641 my ($self) = @_;
1539 1642
1540 delete $self->{texture}; 1643 delete $self->{texture};
1541 $self->SUPER::update; 1644 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1553 1656
1554 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1556 1659
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1661
1559 delete $self->{req_h}; 1662 delete $self->{size_req};
1560
1561 $self->realloc; 1663 $self->realloc;
1562 $self->update; 1664 $self->update;
1563} 1665}
1564 1666
1565sub set_markup { 1667sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1570 1672
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1674
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1676
1575 delete $self->{req_h}; 1677 delete $self->{size_req};
1576
1577 $self->realloc; 1678 $self->realloc;
1578 $self->update; 1679 $self->update;
1579} 1680}
1580 1681
1581sub size_request { 1682sub size_request {
1582 my ($self) = @_; 1683 my ($self) = @_;
1583 1684
1584 if (exists $self->{req_h}) { 1685 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1691
1593 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1594 1693
1595 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1698
1599 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1600 1700
1601 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1603 } 1703 }
1604 1704
1605 ($w, $h) 1705 [$w, $h]
1606 } 1706 };
1607}
1608 1707
1708 @{ $self->{size_req} }
1709}
1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1609sub size_allocate { 1715sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1611 1717
1612 delete $self->{ox}; 1718 delete $self->{ox};
1613 1719
1614 delete $self->{texture} 1720 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1616} 1724}
1617 1725
1618sub set_fontsize { 1726sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1620 1728
1621 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1622 delete $self->{texture}; 1731 delete $self->{texture};
1623 1732
1624 $self->realloc; 1733 $self->realloc;
1625} 1734}
1626 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1627sub _draw { 1745sub _draw {
1628 my ($self) = @_; 1746 my ($self) = @_;
1629 1747
1630 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1631 1749
1632 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1757
1640 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1641 }; 1759 };
1642 1760
1643 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1647 1765
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1769 };
1652 1770
1653 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 1773
1656 if ($tex->{format} == GL_ALPHA) { 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661 }
1662
1663 glDisable GL_TEXTURE_2D;
1664} 1775}
1665 1776
1666############################################################################# 1777#############################################################################
1667 1778
1668package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1682 can_hover => 1, 1793 can_hover => 1,
1683 can_focus => 1, 1794 can_focus => 1,
1684 valign => 0, 1795 valign => 0,
1685 can_events => 1, 1796 can_events => 1,
1686 #text => ... 1797 #text => ...
1798 #hidden => "*",
1687 @_ 1799 @_
1688 ) 1800 )
1689} 1801}
1690 1802
1691sub _set_text { 1803sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 1811 $self->{text} = $text;
1700 1812
1701 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 1815 delete $self->{size_req};
1704 1816
1705 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1706 1818
1707 $self->realloc; 1819 $self->realloc;
1708 $self->update; 1820 $self->update;
1709} 1821}
1710 1822
… …
1725 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1726 1838
1727 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1728} 1840}
1729 1841
1730sub key_down { 1842sub invoke_key_down {
1731 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1732 1844
1733 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1747 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1748 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1750 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1751 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 1864 $self->emit ('escape');
1753 } elsif ($uni) { 1865 } elsif ($uni) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 1867 } else {
1756 return 0; 1868 return 0;
1757 } 1869 }
… …
1761 $self->realloc; 1873 $self->realloc;
1762 1874
1763 1 1875 1
1764} 1876}
1765 1877
1766sub focus_in { 1878sub invoke_focus_in {
1767 my ($self) = @_; 1879 my ($self) = @_;
1768 1880
1769 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1770 1882
1771 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1772} 1884}
1773 1885
1774sub button_down { 1886sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1776 1888
1777 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 1890
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 1892
1781 # byte-index to char-index 1893 # byte-index to char-index
1782 my $text = $self->{text}; 1894 my $text = $self->{text};
1783 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1785 1897
1786 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1787 $self->update; 1899 $self->update;
1788 1900
1789 1 1901 1
1790} 1902}
1791 1903
1792sub mouse_motion { 1904sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1906# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795 1907
1796 0 1908 1
1797} 1909}
1798 1910
1799sub _draw { 1911sub _draw {
1800 my ($self) = @_; 1912 my ($self) = @_;
1801 1913
… …
1842 1954
1843our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1844 1956
1845use CFClient::OpenGL; 1957use CFClient::OpenGL;
1846 1958
1847sub key_down { 1959sub invoke_key_down {
1848 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1849 1961
1850 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1851 1963
1852 if ($sym == 13) { 1964 if ($sym == 13) {
1853 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1855 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1858 $self->update; 1971 $self->update;
1859 1972
1860 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1878 } else { 1991 } else {
1879 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1880 } 1993 }
1881 1994
1882 } else { 1995 } else {
1883 return $self->SUPER::key_down ($ev) 1996 return $self->SUPER::invoke_key_down ($ev)
1884 } 1997 }
1885 1998
1886 1 1999 1
1887} 2000}
1888 2001
… …
1912 can_events => 1, 2025 can_events => 1,
1913 @_ 2026 @_
1914 ) 2027 )
1915} 2028}
1916 2029
1917sub activate { }
1918
1919sub button_up { 2030sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1921 2032
1922 $self->emit ("activate") 2033 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
… …
1938 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1939 2050
1940 glDisable GL_TEXTURE_2D; 2051 glDisable GL_TEXTURE_2D;
1941 2052
1942 $self->SUPER::_draw; 2053 $self->SUPER::_draw;
2054}
2055
2056#############################################################################
2057
2058package CFClient::UI::ImageButton;
2059
2060our @ISA = CFClient::UI::Image::;
2061
2062use CFClient::OpenGL;
2063
2064my %textures;
2065
2066sub new {
2067 my $class = shift;
2068
2069 my $self = $class->SUPER::new (
2070 padding_x => 4,
2071 padding_y => 4,
2072 fg => [1, 1, 1],
2073 active_fg => [0, 0, 1],
2074 can_hover => 1,
2075 align => 0,
2076 valign => 0,
2077 can_events => 1,
2078 @_
2079 );
2080}
2081
2082sub invoke_button_up {
2083 my ($self, $ev, $x, $y) = @_;
2084
2085 $self->emit ("activate")
2086 if $x >= 0 && $x < $self->{w}
2087 && $y >= 0 && $y < $self->{h};
2088
2089 1
1943} 2090}
1944 2091
1945############################################################################# 2092#############################################################################
1946 2093
1947package CFClient::UI::CheckBox; 2094package CFClient::UI::CheckBox;
… …
1974 my ($self) = @_; 2121 my ($self) = @_;
1975 2122
1976 (6) x 2 2123 (6) x 2
1977} 2124}
1978 2125
2126sub toggle {
2127 my ($self) = @_;
2128
2129 $self->{state} = !$self->{state};
2130 $self->emit (changed => $self->{state});
2131 $self->update;
2132}
2133
1979sub button_down { 2134sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2135 my ($self, $ev, $x, $y) = @_;
1981 2136
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2137 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2138 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2139 $self->toggle;
1985 $self->_emit (changed => $self->{state});
1986 } else { 2140 } else {
1987 return 0 2141 return 0
1988 } 2142 }
1989 2143
1990 1 2144 1
… …
2015package CFClient::UI::Image; 2169package CFClient::UI::Image;
2016 2170
2017our @ISA = CFClient::UI::Base::; 2171our @ISA = CFClient::UI::Base::;
2018 2172
2019use CFClient::OpenGL; 2173use CFClient::OpenGL;
2020use Carp qw/confess/;
2021 2174
2022our %loaded_images; 2175our %texture_cache;
2023 2176
2024sub new { 2177sub new {
2025 my $class = shift; 2178 my $class = shift;
2026 2179
2027 my $self = $class->SUPER::new (can_events => 0, @_); 2180 my $self = $class->SUPER::new (
2181 can_events => 0,
2182 @_,
2183 );
2028 2184
2029 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
2030 2187
2031 $loaded_images{$self->{image}} ||= 2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2032 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2033 2190
2034 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2035 2192
2036 Scalar::Util::weaken $loaded_images{$self->{image}}; 2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038 $self->{aspect} = $tex->{w} / $tex->{h};
2039 2194
2040 $self 2195 $self
2041} 2196}
2042 2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2201 warn "freeze<$self>\n";#d#
2202
2203 $self->{path}
2204 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206 $self->{path}
2207}
2208
2209sub STORABLE_attach {
2210 my ($self, $cloning, $path) = @_;
2211 warn "attach<@_>\n";#d#
2212
2213 $self->new (path => $path)
2214}
2215
2043sub size_request { 2216sub size_request {
2044 my ($self) = @_; 2217 my ($self) = @_;
2045 2218
2046 ($self->{tex}->{w}, $self->{tex}->{h}) 2219 ($self->{tex}{w}, $self->{tex}{h})
2047} 2220}
2048 2221
2049sub _draw { 2222sub _draw {
2050 my ($self) = @_; 2223 my ($self) = @_;
2051 2224
… …
2061 } 2234 }
2062 2235
2063 glEnable GL_TEXTURE_2D; 2236 glEnable GL_TEXTURE_2D;
2064 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065 2238
2066 $tex->draw_quad_alpha (0, 0, $w, $h); 2239 $tex->draw_quad (0, 0, $w, $h);
2067 2240
2068 glDisable GL_TEXTURE_2D; 2241 glDisable GL_TEXTURE_2D;
2069} 2242}
2070 2243
2071############################################################################# 2244#############################################################################
… …
2160 my $ycut1 = max 0, min 1, $ycut; 2333 my $ycut1 = max 0, min 1, $ycut;
2161 my $ycut2 = max 0, min 1, $ycut - 1; 2334 my $ycut2 = max 0, min 1, $ycut - 1;
2162 2335
2163 my $h1 = $self->{h} * (1 - $ycut1); 2336 my $h1 = $self->{h} * (1 - $ycut1);
2164 my $h2 = $self->{h} * (1 - $ycut2); 2337 my $h2 = $self->{h} * (1 - $ycut2);
2338 my $h3 = $self->{h};
2339
2340 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2165 2341
2166 glEnable GL_BLEND; 2342 glEnable GL_BLEND;
2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2343 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2344 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2345 glEnable GL_TEXTURE_2D;
… …
2188 2364
2189 if ($t3) { 2365 if ($t3) {
2190 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2366 glBindTexture GL_TEXTURE_2D, $t3->{name};
2191 glBegin GL_QUADS; 2367 glBegin GL_QUADS;
2192 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2368 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2369 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2370 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2371 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196 glEnd; 2372 glEnd;
2197 } 2373 }
2198 2374
2199 glDisable GL_BLEND; 2375 glDisable GL_BLEND;
… …
2287 $self->update; 2463 $self->update;
2288 2464
2289 $self 2465 $self
2290} 2466}
2291 2467
2292sub changed { }
2293
2294sub set_range { 2468sub set_range {
2295 my ($self, $range) = @_; 2469 my ($self, $range) = @_;
2296 2470
2297 ($range, $self->{range}) = ($self->{range}, $range); 2471 ($range, $self->{range}) = ($self->{range}, $range);
2298 2472
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2473 if ("@$range" ne "@{$self->{range}}") {
2474 $self->update;
2475 $self->set_value ($self->{range}[0]);
2476 }
2301} 2477}
2302 2478
2303sub set_value { 2479sub set_value {
2304 my ($self, $value) = @_; 2480 my ($self, $value) = @_;
2305 2481
… …
2316 if $unit; 2492 if $unit;
2317 2493
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2494 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2495
2320 if ($value != $old_value) { 2496 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2497 $self->emit (changed => $value);
2322 $self->update; 2498 $self->update;
2323 } 2499 }
2324} 2500}
2325 2501
2326sub size_request { 2502sub size_request {
2327 my ($self) = @_; 2503 my ($self) = @_;
2328 2504
2329 ($self->{req_w}, $self->{req_h}) 2505 ($self->{req_w}, $self->{req_h})
2330} 2506}
2331 2507
2332sub button_down { 2508sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2509 my ($self, $ev, $x, $y) = @_;
2334 2510
2335 $self->SUPER::button_down ($ev, $x, $y); 2511 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2512
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2513 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2514
2339 $self->mouse_motion ($ev, $x, $y) 2515 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2516}
2341 2517
2342sub mouse_motion { 2518sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2519 my ($self, $ev, $x, $y) = @_;
2344 2520
2345 if ($GRAB == $self) { 2521 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2522 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2523
… …
2353 } else { 2529 } else {
2354 return 0; 2530 return 0;
2355 } 2531 }
2356 2532
2357 1 2533 1
2534}
2535
2536sub invoke_mouse_wheel {
2537 my ($self, $ev) = @_;
2538
2539 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2540
2541 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2542
2543 ! ! $delta
2358} 2544}
2359 2545
2360sub update { 2546sub update {
2361 my ($self) = @_; 2547 my ($self) = @_;
2362 2548
… …
2452sub set_range { shift->{slider}->set_range (@_) } 2638sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 2639sub set_value { shift->{slider}->set_value (@_) }
2454 2640
2455############################################################################# 2641#############################################################################
2456 2642
2457package CFClient::UI::TextView; 2643package CFClient::UI::TextScroller;
2458 2644
2459our @ISA = CFClient::UI::HBox::; 2645our @ISA = CFClient::UI::HBox::;
2460 2646
2461use CFClient::OpenGL; 2647use CFClient::OpenGL;
2462 2648
2463sub new { 2649sub new {
2464 my $class = shift; 2650 my $class = shift;
2465 2651
2466 my $self = $class->SUPER::new ( 2652 my $self = $class->SUPER::new (
2467 fontsize => 1, 2653 fontsize => 1,
2468 can_events => 0, 2654 can_events => 1,
2655 indent => 0,
2469 #font => default_font 2656 #font => default_font
2470 @_, 2657 @_,
2471 2658
2472 layout => (new CFClient::Layout 1), 2659 layout => (new CFClient::Layout),
2473 par => [], 2660 par => [],
2474 height => 0, 2661 height => 0,
2475 children => [ 2662 children => [
2476 (new CFClient::UI::Empty expand => 1), 2663 (new CFClient::UI::Empty expand => 1),
2477 (new CFClient::UI::Slider vertical => 1), 2664 (new CFClient::UI::Slider vertical => 1),
… …
2488 2675
2489 $self->{fontsize} = $fontsize; 2676 $self->{fontsize} = $fontsize;
2490 $self->reflow; 2677 $self->reflow;
2491} 2678}
2492 2679
2680sub size_request {
2681 my ($self) = @_;
2682
2683 my ($empty, $slider) = @{ $self->{children} };
2684
2685 local $self->{children} = [$empty, $slider];
2686 $self->SUPER::size_request
2687}
2688
2493sub size_allocate { 2689sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 2690 my ($self, $w, $h) = @_;
2495 2691
2496 $self->SUPER::size_allocate ($w, $h); 2692 my ($empty, $slider, @other) = @{ $self->{children} };
2693 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497 2694
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2695 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2696 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $self->{layout}->set_width ($self->{children}[0]{w}); 2697 $self->{layout}->set_width ($empty->{w});
2698 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 2699
2502 $self->reflow; 2700 $self->reflow;
2503}
2504 2701
2505sub text_size { 2702 local $self->{children} = [$empty, $slider];
2703 $self->SUPER::invoke_size_allocate ($w, $h)
2704}
2705
2706sub invoke_mouse_wheel {
2506 my ($self, $text, $indent) = @_; 2707 my ($self, $ev) = @_;
2708
2709 return 0 unless $ev->{dy}; # only vertical movements
2710
2711 $self->{children}[1]->emit (mouse_wheel => $ev);
2712
2713 1
2714}
2715
2716sub get_layout {
2717 my ($self, $para) = @_;
2507 2718
2508 my $layout = $self->{layout}; 2719 my $layout = $self->{layout};
2509 2720
2721 $layout->set_font ($self->{font}) if $self->{font};
2722 $layout->set_foreground (@{$para->{fg}});
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2723 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $layout->set_width ($self->{children}[0]{w} - $indent); 2724 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2725 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 $layout->set_markup ($text); 2726 $layout->set_markup ($para->{markup});
2727
2728 $layout->set_shapes (
2729 map
2730 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2731 @{$para->{widget}}
2513 2732 );
2733
2514 $layout->size 2734 $layout
2515} 2735}
2516 2736
2517sub reflow { 2737sub reflow {
2518 my ($self) = @_; 2738 my ($self) = @_;
2519 2739
… …
2528 $self->{children}[1]->set_value ($offset); 2748 $self->{children}[1]->set_value ($offset);
2529} 2749}
2530 2750
2531sub clear { 2751sub clear {
2532 my ($self) = @_; 2752 my ($self) = @_;
2753
2754 my (undef, undef, @other) = @{ $self->{children} };
2755 $self->remove ($_) for @other;
2533 2756
2534 $self->{par} = []; 2757 $self->{par} = [];
2535 $self->{height} = 0; 2758 $self->{height} = 0;
2536 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2759 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537} 2760}
2538 2761
2539sub add_paragraph { 2762sub add_paragraph {
2540 my ($self, $color, $text, $indent) = @_; 2763 my ($self, $color, $para, $indent) = @_;
2541 2764
2542 for my $line (split /\n/, $text) { 2765 my ($text, @w) = ref $para ? @$para : $para;
2543 my ($w, $h) = $self->text_size ($line); 2766
2544 $self->{height} += $h; 2767 $para = {
2545 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2768 w => 1e10,
2769 wrapped => 1,
2770 fg => $color,
2771 indent => $indent,
2772 markup => $text,
2773 widget => \@w,
2546 } 2774 };
2547 2775
2548 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2776 $self->add (@w) if @w;
2777 push @{$self->{par}}, $para;
2778
2779 $self->{need_reflow}++;
2780 $self->update;
2781}
2782
2783sub scroll_to_bottom {
2784 my ($self) = @_;
2785
2786 $self->{scroll_to_bottom} = 1;
2787 $self->update;
2549} 2788}
2550 2789
2551sub update { 2790sub update {
2552 my ($self) = @_; 2791 my ($self) = @_;
2553 2792
… …
2555 2794
2556 return unless $self->{h} > 0; 2795 return unless $self->{h} > 0;
2557 2796
2558 delete $self->{texture}; 2797 delete $self->{texture};
2559 2798
2560 $ROOT->on_post_alloc ($self, sub { 2799 $ROOT->on_post_alloc ($self => sub {
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2800 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 2801
2563 if (delete $self->{need_reflow}) { 2802 if (delete $self->{need_reflow}) {
2564 my $height = 0; 2803 my $height = 0;
2565 2804
2566 my $layout = $self->{layout};
2567
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570 for (@{$self->{par}}) { 2805 for my $para (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2806 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2572 $layout->set_width ($W - $_->[3]); 2807 my $layout = $self->get_layout ($para);
2573 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size; 2808 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3]; 2809
2576 $_->[1] = $h; 2810 $para->{w} = $w + $para->{indent};
2811 $para->{h} = $h;
2812 $para->{wrapped} = $layout->has_wrapped;
2577 } 2813 }
2578 2814
2579 $height += $_->[1]; 2815 $height += $para->{h};
2580 } 2816 }
2581 2817
2582 $self->{height} = $height; 2818 $self->{height} = $height;
2583 2819
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2820 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2585 2821
2586 delete $self->{texture}; 2822 delete $self->{texture};
2823 }
2824
2825 if (delete $self->{scroll_to_bottom}) {
2826 $self->{children}[1]->set_value (1e10);
2587 } 2827 }
2588 2828
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2829 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 2830 glClearColor 0, 0, 0, 0;
2591 glClear GL_COLOR_BUFFER_BIT; 2831 glClear GL_COLOR_BUFFER_BIT;
… …
2595 my $y0 = $top; 2835 my $y0 = $top;
2596 my $y1 = $top + $H; 2836 my $y1 = $top + $H;
2597 2837
2598 my $y = 0; 2838 my $y = 0;
2599 2839
2600 my $layout = $self->{layout};
2601
2602 $layout->set_font ($self->{font}) if $self->{font};
2603
2604 glEnable GL_BLEND;
2605 #TODO# not correct in windows where rgba is forced off
2606 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608 for my $par (@{$self->{par}}) { 2840 for my $para (@{$self->{par}}) {
2609 my $h = $par->[1]; 2841 my $h = $para->{h};
2610 2842
2611 if ($y0 < $y + $h && $y < $y1) { 2843 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] });
2613 $layout->set_width ($W - $par->[3]);
2614 $layout->set_markup ($par->[4]);
2615 2844
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2845 my $layout = $self->get_layout ($para);
2617 2846
2618 glRasterPos $par->[3], $y - $y0; 2847 $layout->render ($para->{indent}, $y - $y0);
2619 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2848
2849 if (my @w = @{ $para->{widget} }) {
2850 my @s = $layout->get_shapes;
2851
2852 for (@w) {
2853 my ($dx, $dy) = splice @s, 0, 2, ();
2854
2855 $_->{x} = $dx + $para->{indent};
2856 $_->{y} = $dy + $y - $y0;
2857
2858 $_->draw;
2859 }
2860 }
2620 } 2861 }
2621 2862
2622 $y += $h; 2863 $y += $h;
2623 } 2864 }
2624
2625 glDisable GL_BLEND;
2626 }; 2865 };
2627 }); 2866 });
2867}
2868
2869sub reconfigure {
2870 my ($self) = @_;
2871
2872 $self->SUPER::reconfigure;
2873
2874 $_->{w} = 1e10 for @{ $self->{par} };
2875 $self->reflow;
2628} 2876}
2629 2877
2630sub _draw { 2878sub _draw {
2631 my ($self) = @_; 2879 my ($self) = @_;
2632 2880
… …
2635 glColor 0, 0, 0, 1; 2883 glColor 0, 0, 0, 1;
2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2884 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2638 2886
2639 $self->{children}[1]->draw; 2887 $self->{children}[1]->draw;
2640
2641} 2888}
2642 2889
2643############################################################################# 2890#############################################################################
2644 2891
2645package CFClient::UI::Animator; 2892package CFClient::UI::Animator;
… …
2732 $tooltip .= "\n\n" . (ref $widget) . "\n" 2979 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2980 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 2981 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 2982 . "visible $widget->{visible}";
2736 } 2983 }
2984
2985 $tooltip =~ s/^\n+//;
2986 $tooltip =~ s/\n+$//;
2737 2987
2738 $self->add (new CFClient::UI::Label 2988 $self->add (new CFClient::UI::Label
2739 markup => $tooltip, 2989 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2990 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 2991 fontsize => 0.8,
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3001 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 3002
2753 ($w + 4, $h + 4) 3003 ($w + 4, $h + 4)
2754} 3004}
2755 3005
2756sub size_allocate { 3006sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 3007 my ($self, $w, $h) = @_;
2758 3008
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 3009 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 3010}
2761 3011
2762sub visibility_change { 3012sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 3013 my ($self, $visible) = @_;
2764 3014
2765 return unless $visible; 3015 return unless $visible;
2766 3016
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 3017 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner} 3018 my $widget = $self->{owner}
2769 or return; 3019 or return;
2770 3020
3021 if ($widget->{visible}) {
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3022 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 3023
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3024 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 3025 if $x + $self->{w} > $self->{root}{w};
2775 3026
2776 $self->move_abs ($x, $y); 3027 $self->move_abs ($x, $y);
3028 } else {
3029 $self->hide;
3030 }
2777 }); 3031 });
2778} 3032}
2779 3033
2780sub _draw { 3034sub _draw {
2781 my ($self) = @_; 3035 my ($self) = @_;
… …
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 3129 glDisable GL_TEXTURE_2D;
2876 } 3130 }
2877} 3131}
2878 3132
2879sub DESTROY { 3133sub destroy {
2880 my ($self) = @_; 3134 my ($self) = @_;
2881 3135
2882 $self->{timer}->cancel 3136 $self->{timer}->cancel
2883 if $self->{timer}; 3137 if $self->{timer};
2884 3138
2885 $self->SUPER::DESTROY; 3139 $self->SUPER::destroy;
2886} 3140}
2887 3141
2888############################################################################# 3142#############################################################################
2889 3143
2890package CFClient::UI::Buttonbar; 3144package CFClient::UI::Buttonbar;
… …
2911 ); 3165 );
2912 3166
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3167 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2914 3168
2915 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
2917 3171
2918 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
2919 if (!ref $widget) { 3173 if (!ref $widget) {
3174 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2;
3176
3177 $widget = new CFClient::UI::HBox
3178 can_hover => 1,
3179 can_events => 1,
3180 tooltip => $tooltip,
3181 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1),
3184 ],
3185 ;
3186
3187 } else {
2920 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
2921 can_hover => 1, 3189 can_hover => 1,
2922 can_events => 1, 3190 can_events => 1,
2923 text => $widget; 3191 markup => $widget,
3192 tooltip => $tooltip;
3193 }
2924 } 3194 }
2925 3195
2926 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
2927 3197
2928 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
2933 3203
2934# popup given the event (must be a mouse button down event currently) 3204# popup given the event (must be a mouse button down event currently)
2935sub popup { 3205sub popup {
2936 my ($self, $ev) = @_; 3206 my ($self, $ev) = @_;
2937 3207
2938 $self->_emit ("popdown"); 3208 $self->emit ("popdown");
2939 3209
2940 # maybe save $GRAB? must be careful about events... 3210 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3211 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3212 $self->{button} = $ev->{button};
2943 3213
2944 $self->show; 3214 $self->show;
2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3215 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946} 3216}
2947 3217
2948sub mouse_motion { 3218sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3219 my ($self, $ev, $x, $y) = @_;
2950 3220
2951 # TODO: should use vbox->find_widget or so 3221 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3222 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3223 $self->{hover} = $self->{item}{$HOVER};
2954 3224
2955 0 3225 0
2956} 3226}
2957 3227
2958sub button_up { 3228sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2960 3230
2961 if ($ev->{button} == $self->{button}) { 3231 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3232 undef $GRAB;
2963 $self->hide; 3233 $self->hide;
2964 3234
2965 $self->_emit ("popdown"); 3235 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3236 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3237 } else {
2968 return 0 3238 return 0
2969 } 3239 }
2970 3240
… …
2997 3267
2998 $self->{current} = $self->{children}[0] 3268 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} }; 3269 if @{ $self->{children} };
3000} 3270}
3001 3271
3272sub get_current_page {
3273 my ($self) = @_;
3274
3275 $self->{current}
3276}
3277
3002sub set_current_page { 3278sub set_current_page {
3003 my ($self, $page_or_widget) = @_; 3279 my ($self, $page_or_widget) = @_;
3004 3280
3005 my $widget = ref $page_or_widget 3281 my $widget = ref $page_or_widget
3006 ? $page_or_widget 3282 ? $page_or_widget
3007 : $self->{children}[$page_or_widget]; 3283 : $self->{children}[$page_or_widget];
3008 3284
3009 $self->{current} = $widget; 3285 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3286 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3287
3012 $self->_emit (page_changed => $self->{current}); 3288 $self->emit (page_changed => $self->{current});
3013 3289
3014 $self->realloc; 3290 $self->realloc;
3015} 3291}
3016 3292
3017sub visible_children { 3293sub visible_children {
… …
3022 my ($self) = @_; 3298 my ($self) = @_;
3023 3299
3024 $self->{current}->size_request 3300 $self->{current}->size_request
3025} 3301}
3026 3302
3027sub size_allocate { 3303sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3304 my ($self, $w, $h) = @_;
3029 3305
3030 $self->{current}->configure (0, 0, $w, $h); 3306 $self->{current}->configure (0, 0, $w, $h);
3307
3308 1
3031} 3309}
3032 3310
3033sub _draw { 3311sub _draw {
3034 my ($self) = @_; 3312 my ($self) = @_;
3035 3313
… …
3070 ); 3348 );
3071 3349
3072 $self->{multiplexer}->add ($widget); 3350 $self->{multiplexer}->add ($widget);
3073} 3351}
3074 3352
3353sub get_current_page {
3354 my ($self) = @_;
3355
3356 $self->{multiplexer}->get_current_page
3357}
3358
3075sub set_current_page { 3359sub set_current_page {
3076 my ($self, $page) = @_; 3360 my ($self, $page) = @_;
3077 3361
3078 $self->{multiplexer}->set_current_page ($page); 3362 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3363 $self->emit (page_changed => $self->{multiplexer}{current});
3364}
3365
3366#############################################################################
3367
3368package CFClient::UI::Combobox;
3369
3370use utf8;
3371
3372our @ISA = CFClient::UI::Button::;
3373
3374sub new {
3375 my $class = shift;
3376
3377 my $self = $class->SUPER::new (
3378 options => [], # [value, title, longdesc], ...
3379 value => undef,
3380 @_,
3381 );
3382
3383 $self->_set_value ($self->{value});
3384
3385 $self
3386}
3387
3388sub invoke_button_down {
3389 my ($self, $ev) = @_;
3390
3391 my @menu_items;
3392
3393 for (@{ $self->{options} }) {
3394 my ($value, $title, $tooltip) = @$_;
3395
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 }
3398
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400}
3401
3402sub _set_value {
3403 my ($self, $value) = @_;
3404
3405 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3406 or return;
3407
3408 $self->{value} = $item->[0];
3409 $self->set_markup ("$item->[1] ⇓");
3410 $self->set_tooltip ($item->[2]);
3411}
3412
3413sub set_value {
3414 my ($self, $value) = @_;
3415
3416 return unless $self->{value} ne $value;
3417
3418 $self->_set_value ($value);
3419 $self->emit (changed => $value);
3080} 3420}
3081 3421
3082############################################################################# 3422#############################################################################
3083 3423
3084package CFClient::UI::Statusbox; 3424package CFClient::UI::Statusbox;
… …
3183 $item->{count}++; 3523 $item->{count}++;
3184 } else { 3524 } else {
3185 $item->{count} = 1; 3525 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 3526 $item->{text} = $item->{tooltip} = $text;
3187 } 3527 }
3188 $item->{id} = ++$self->{id}; 3528 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 3529 $item->{timeout} = $timeout;
3190 delete $item->{label}; 3530 delete $item->{label};
3191 } else { 3531 } else {
3192 $self->{item}{$group} = { 3532 $self->{item}{$group} = {
3193 id => ++$self->{id}, 3533 id => ++$self->{id},
… …
3199 count => 1, 3539 count => 1,
3200 %arg, 3540 %arg,
3201 }; 3541 };
3202 } 3542 }
3203 3543
3544 $ROOT->on_refresh (reorder => sub {
3204 $self->reorder; 3545 $self->reorder;
3546 });
3205} 3547}
3206 3548
3207sub reconfigure { 3549sub reconfigure {
3208 my ($self) = @_; 3550 my ($self) = @_;
3209 3551
… …
3212 3554
3213 $self->reorder; 3555 $self->reorder;
3214 $self->SUPER::reconfigure; 3556 $self->SUPER::reconfigure;
3215} 3557}
3216 3558
3217sub DESTROY { 3559sub destroy {
3218 my ($self) = @_; 3560 my ($self) = @_;
3219 3561
3220 $self->{timer}->cancel; 3562 $self->{timer}->cancel;
3221 3563
3222 $self->SUPER::DESTROY; 3564 $self->SUPER::destroy;
3223} 3565}
3224 3566
3225############################################################################# 3567#############################################################################
3226 3568
3227package CFClient::UI::Inventory; 3569package CFClient::UI::Inventory;
3228 3570
3229our @ISA = CFClient::UI::ScrolledWindow::; 3571our @ISA = CFClient::UI::Table::;
3230 3572
3231sub new { 3573sub new {
3232 my $class = shift; 3574 my $class = shift;
3233 3575
3234 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3577 col_expand => [0, 1, 0],
3578 items => [],
3236 @_, 3579 @_,
3237 ); 3580 );
3238 3581
3582 $self->set_sort_order (undef);
3583
3239 $self 3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3240} 3620}
3241 3621
3242sub set_items { 3622sub set_items {
3243 my ($self, $items) = @_; 3623 my ($self, $items) = @_;
3244 3624
3245 $self->{child}->clear; 3625 $self->{items} = [$items ? values %$items : ()];
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets; 3626 $self->update_items;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462} 3627}
3463 3628
3464############################################################################# 3629#############################################################################
3465 3630
3466package CFClient::UI::SpellList; 3631package CFClient::UI::SpellList;
… …
3475 commands => [], 3640 commands => [],
3476 @_, 3641 @_,
3477 ) 3642 )
3478} 3643}
3479 3644
3480# XXX: Do sorting? Argl... 3645my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658sub rebuild_spell_list {
3659 my ($self) = @_;
3660
3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3662 $self->clear;
3663
3664 return unless $::CONN;
3665
3666 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672 my $row = 0;
3673
3674 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675 my $spell = $self->{spell}{$_};
3676
3677 $row++;
3678
3679 my $spell_cb = sub {
3680 my ($widget, $ev) = @_;
3681
3682 if ($ev->{button} == 1) {
3683 $::CONN->user_send ("cast $spell->{name}");
3684 } elsif ($ev->{button} == 2) {
3685 $::CONN->user_send ("invoke $spell->{name}");
3686 } elsif ($ev->{button} == 3) {
3687 (new CFClient::UI::Menu
3688 items => [
3689 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691 ],
3692 )->popup ($ev);
3693 } else {
3694 return 0;
3695 }
3696
3697 1
3698 };
3699
3700 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702 #TODO: add path info to tooltip
3703 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705 $self->add (0, $row, new CFClient::UI::Face
3706 face => $spell->{face},
3707 can_hover => 1,
3708 can_events => 1,
3709 tooltip => $tooltip,
3710 on_button_down => $spell_cb,
3711 );
3712
3713 $self->add (1, $row, new CFClient::UI::Label
3714 expand => 1,
3715 text => $spell->{name},
3716 can_hover => 1,
3717 can_events => 1,
3718 tooltip => $tooltip,
3719 on_button_down => $spell_cb,
3720 );
3721
3722 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726 }
3727 });
3728}
3729
3481sub add_spell { 3730sub add_spell {
3482 my ($self, $spell) = @_; 3731 my ($self, $spell) = @_;
3732
3483 $self->{spells}->{$spell->{name}} = $spell; 3733 $self->{spell}->{$spell->{name}} = $spell;
3484 3734 $self->rebuild_spell_list;
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512} 3735}
3513 3736
3514sub remove_spell { 3737sub remove_spell {
3515 my ($self, $spell) = @_; 3738 my ($self, $spell) = @_;
3739
3516 delete $self->{spells}->{$spell->{name}}; 3740 delete $self->{spell}->{$spell->{name}};
3741 $self->rebuild_spell_list;
3742}
3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3517 $self->rebuild_spell_list; 3748 $self->rebuild_spell_list;
3518} 3749}
3519 3750
3520############################################################################# 3751#############################################################################
3521 3752
… …
3558 $coord = $max - $size if $coord > $max - $size; 3789 $coord = $max - $size if $coord > $max - $size;
3559 3790
3560 int $coord + 0.5 3791 int $coord + 0.5
3561} 3792}
3562 3793
3563sub size_allocate { 3794sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3565 3796
3566 for my $child ($self->children) { 3797 for my $child ($self->children) {
3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568 3799
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 3803 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 3804 $Y = _to_pixel $Y, $H, $self->{h};
3574 3805
3575 $child->configure ($X, $Y, $W, $H); 3806 $child->configure ($X, $Y, $W, $H);
3576 } 3807 }
3808
3809 1
3577} 3810}
3578 3811
3579sub coord2local { 3812sub coord2local {
3580 my ($self, $x, $y) = @_; 3813 my ($self, $x, $y) = @_;
3581 3814
… …
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708 3941
3709 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3710 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3711 3944
3945 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h;
3947
3948 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3950
3712 $w = int $w + 0.5; 3951 $w = int $w + 0.5;
3713 $h = int $h + 0.5; 3952 $h = int $h + 0.5;
3714 3953
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3954 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w}; 3955 $widget->{old_w} = $widget->{w};

Diff Legend

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