ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.336 by root, Sun Jul 23 16:46:06 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
… …
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";
339} 360}
340 361
362sub baseline_shift {
363 0
364}
365
341sub configure { 366sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
343 368
344 if ($self->{aspect}) { 369 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 370 my ($ow, $oh) = ($w, $h);
346 371
347 $w = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
349 374
350 # use alignment to adjust x, y 375 # use alignment to adjust x, y
351 376
352 $x += int 0.5 * ($ow - $w); 377 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 378 $y += int 0.5 * ($oh - $h);
… …
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);
1559 1661
1560 delete $self->{size_req}; 1662 delete $self->{size_req};
1561 $self->realloc; 1663 $self->realloc;
1562 $self->update; 1664 $self->update;
… …
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);
1575 1676
1576 delete $self->{size_req}; 1677 delete $self->{size_req};
1577 $self->realloc; 1678 $self->realloc;
1578 $self->update; 1679 $self->update;
… …
1590 1691
1591 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1592 1693
1593 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1594 $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);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1698
1597 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1598 1700
1599 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
… …
1604 }; 1706 };
1605 1707
1606 @{ $self->{size_req} } 1708 @{ $self->{size_req} }
1607} 1709}
1608 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
1627sub reconfigure { 1736sub reconfigure {
1628 my ($self) = @_; 1737 my ($self) = @_;
1629 1738
1630 delete $self->{size_req}; 1739 delete $self->{size_req};
1740 delete $self->{texture};
1631 1741
1632 $self->SUPER::reconfigure; 1742 $self->SUPER::reconfigure;
1633} 1743}
1634 1744
1635sub _draw { 1745sub _draw {
1636 my ($self) = @_; 1746 my ($self) = @_;
1637 1747
1638 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1639 1749
1640 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 1757
1648 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1649 }; 1759 };
1650 1760
1651 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1655 1765
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 1769 };
1660 1770
1661 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1662 1773
1663 if ($tex->{format} == GL_ALPHA) { 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1671
1672 glDisable GL_TEXTURE_2D;
1673} 1775}
1674 1776
1675############################################################################# 1777#############################################################################
1676 1778
1677package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1691 can_hover => 1, 1793 can_hover => 1,
1692 can_focus => 1, 1794 can_focus => 1,
1693 valign => 0, 1795 valign => 0,
1694 can_events => 1, 1796 can_events => 1,
1695 #text => ... 1797 #text => ...
1798 #hidden => "*",
1696 @_ 1799 @_
1697 ) 1800 )
1698} 1801}
1699 1802
1700sub _set_text { 1803sub _set_text {
… …
1709 1812
1710 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1711 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req}; 1815 delete $self->{size_req};
1713 1816
1714 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1715 1818
1716 $self->realloc; 1819 $self->realloc;
1717 $self->update; 1820 $self->update;
1718} 1821}
1719 1822
… …
1734 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1735 1838
1736 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1737} 1840}
1738 1841
1739sub key_down { 1842sub invoke_key_down {
1740 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1741 1844
1742 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1743 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1744 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1756 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1757 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1758 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1759 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1760 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1761 $self->_emit ('escape'); 1864 $self->emit ('escape');
1762 } elsif ($uni) { 1865 } elsif ($uni) {
1763 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else { 1867 } else {
1765 return 0; 1868 return 0;
1766 } 1869 }
… …
1770 $self->realloc; 1873 $self->realloc;
1771 1874
1772 1 1875 1
1773} 1876}
1774 1877
1775sub focus_in { 1878sub invoke_focus_in {
1776 my ($self) = @_; 1879 my ($self) = @_;
1777 1880
1778 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1779 1882
1780 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1781} 1884}
1782 1885
1783sub button_down { 1886sub invoke_button_down {
1784 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1785 1888
1786 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1787 1890
1788 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1789 1892
1790 # byte-index to char-index 1893 # byte-index to char-index
1791 my $text = $self->{text}; 1894 my $text = $self->{text};
1792 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1793 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1794 1897
1795 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1796 $self->update; 1899 $self->update;
1797 1900
1798 1 1901 1
1799} 1902}
1800 1903
1801sub mouse_motion { 1904sub invoke_mouse_motion {
1802 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1803# 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#
1804 1907
1805 0 1908 1
1806} 1909}
1807 1910
1808sub _draw { 1911sub _draw {
1809 my ($self) = @_; 1912 my ($self) = @_;
1810 1913
… …
1851 1954
1852our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1853 1956
1854use CFClient::OpenGL; 1957use CFClient::OpenGL;
1855 1958
1856sub key_down { 1959sub invoke_key_down {
1857 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1858 1961
1859 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1860 1963
1861 if ($sym == 13) { 1964 if ($sym == 13) {
1862 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1863 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1864 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1865 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1866 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1867 $self->update; 1971 $self->update;
1868 1972
1869 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1870 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1871 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1887 } else { 1991 } else {
1888 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1889 } 1993 }
1890 1994
1891 } else { 1995 } else {
1892 return $self->SUPER::key_down ($ev) 1996 return $self->SUPER::invoke_key_down ($ev)
1893 } 1997 }
1894 1998
1895 1 1999 1
1896} 2000}
1897 2001
… …
1921 can_events => 1, 2025 can_events => 1,
1922 @_ 2026 @_
1923 ) 2027 )
1924} 2028}
1925 2029
1926sub activate { }
1927
1928sub button_up { 2030sub invoke_button_up {
1929 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1930 2032
1931 $self->emit ("activate") 2033 $self->emit ("activate")
1932 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1933 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
… …
1983 my ($self) = @_; 2085 my ($self) = @_;
1984 2086
1985 (6) x 2 2087 (6) x 2
1986} 2088}
1987 2089
2090sub toggle {
2091 my ($self) = @_;
2092
2093 $self->{state} = !$self->{state};
2094 $self->emit (changed => $self->{state});
2095 $self->update;
2096}
2097
1988sub button_down { 2098sub invoke_button_down {
1989 my ($self, $ev, $x, $y) = @_; 2099 my ($self, $ev, $x, $y) = @_;
1990 2100
1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2101 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2102 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1993 $self->{state} = !$self->{state}; 2103 $self->toggle;
1994 $self->_emit (changed => $self->{state});
1995 } else { 2104 } else {
1996 return 0 2105 return 0
1997 } 2106 }
1998 2107
1999 1 2108 1
… …
2024package CFClient::UI::Image; 2133package CFClient::UI::Image;
2025 2134
2026our @ISA = CFClient::UI::Base::; 2135our @ISA = CFClient::UI::Base::;
2027 2136
2028use CFClient::OpenGL; 2137use CFClient::OpenGL;
2029use Carp qw/confess/;
2030 2138
2031our %loaded_images; 2139our %texture_cache;
2032 2140
2033sub new { 2141sub new {
2034 my $class = shift; 2142 my $class = shift;
2035 2143
2036 my $self = $class->SUPER::new (can_events => 0, @_); 2144 my $self = $class->SUPER::new (
2145 can_events => 0,
2146 @_,
2147 );
2037 2148
2038 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2149 $self->{path} || $self->{tex}
2150 or Carp::croak "'path' or 'tex' attributes required";
2039 2151
2040 $loaded_images{$self->{image}} ||= 2152 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2041 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2153 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2042 2154
2043 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2155 Scalar::Util::weaken $texture_cache{$self->{path}};
2044 2156
2045 Scalar::Util::weaken $loaded_images{$self->{image}}; 2157 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2046
2047 $self->{aspect} = $tex->{w} / $tex->{h};
2048 2158
2049 $self 2159 $self
2050} 2160}
2051 2161
2162sub STORABLE_freeze {
2163 my ($self, $cloning) = @_;
2164
2165 $self->{path}
2166 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2167
2168 $self->{path}
2169}
2170
2171sub STORABLE_attach {
2172 my ($self, $cloning, $path) = @_;
2173
2174 $self->new (path => $path)
2175}
2176
2052sub size_request { 2177sub size_request {
2053 my ($self) = @_; 2178 my ($self) = @_;
2054 2179
2055 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2056} 2181}
2057 2182
2058sub _draw { 2183sub _draw {
2059 my ($self) = @_; 2184 my ($self) = @_;
2060 2185
… …
2070 } 2195 }
2071 2196
2072 glEnable GL_TEXTURE_2D; 2197 glEnable GL_TEXTURE_2D;
2073 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2198 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2074 2199
2075 $tex->draw_quad_alpha (0, 0, $w, $h); 2200 $tex->draw_quad (0, 0, $w, $h);
2076 2201
2077 glDisable GL_TEXTURE_2D; 2202 glDisable GL_TEXTURE_2D;
2203}
2204
2205#############################################################################
2206
2207package CFClient::UI::ImageButton;
2208
2209our @ISA = CFClient::UI::Image::;
2210
2211use CFClient::OpenGL;
2212
2213my %textures;
2214
2215sub new {
2216 my $class = shift;
2217
2218 my $self = $class->SUPER::new (
2219 padding_x => 4,
2220 padding_y => 4,
2221 fg => [1, 1, 1],
2222 active_fg => [0, 0, 1],
2223 can_hover => 1,
2224 align => 0,
2225 valign => 0,
2226 can_events => 1,
2227 @_
2228 );
2229}
2230
2231sub invoke_button_up {
2232 my ($self, $ev, $x, $y) = @_;
2233
2234 $self->emit ("activate")
2235 if $x >= 0 && $x < $self->{w}
2236 && $y >= 0 && $y < $self->{h};
2237
2238 1
2078} 2239}
2079 2240
2080############################################################################# 2241#############################################################################
2081 2242
2082package CFClient::UI::VGauge; 2243package CFClient::UI::VGauge;
… …
2169 my $ycut1 = max 0, min 1, $ycut; 2330 my $ycut1 = max 0, min 1, $ycut;
2170 my $ycut2 = max 0, min 1, $ycut - 1; 2331 my $ycut2 = max 0, min 1, $ycut - 1;
2171 2332
2172 my $h1 = $self->{h} * (1 - $ycut1); 2333 my $h1 = $self->{h} * (1 - $ycut1);
2173 my $h2 = $self->{h} * (1 - $ycut2); 2334 my $h2 = $self->{h} * (1 - $ycut2);
2335 my $h3 = $self->{h};
2336
2337 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2174 2338
2175 glEnable GL_BLEND; 2339 glEnable GL_BLEND;
2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2340 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2341 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2178 glEnable GL_TEXTURE_2D; 2342 glEnable GL_TEXTURE_2D;
… …
2197 2361
2198 if ($t3) { 2362 if ($t3) {
2199 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2363 glBindTexture GL_TEXTURE_2D, $t3->{name};
2200 glBegin GL_QUADS; 2364 glBegin GL_QUADS;
2201 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2365 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2202 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2366 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2203 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2367 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2204 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2368 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2205 glEnd; 2369 glEnd;
2206 } 2370 }
2207 2371
2208 glDisable GL_BLEND; 2372 glDisable GL_BLEND;
… …
2296 $self->update; 2460 $self->update;
2297 2461
2298 $self 2462 $self
2299} 2463}
2300 2464
2301sub changed { }
2302
2303sub set_range { 2465sub set_range {
2304 my ($self, $range) = @_; 2466 my ($self, $range) = @_;
2305 2467
2306 ($range, $self->{range}) = ($self->{range}, $range); 2468 ($range, $self->{range}) = ($self->{range}, $range);
2307 2469
2308 $self->update
2309 if "@$range" ne "@{$self->{range}}"; 2470 if ("@$range" ne "@{$self->{range}}") {
2471 $self->update;
2472 $self->set_value ($self->{range}[0]);
2473 }
2310} 2474}
2311 2475
2312sub set_value { 2476sub set_value {
2313 my ($self, $value) = @_; 2477 my ($self, $value) = @_;
2314 2478
… …
2325 if $unit; 2489 if $unit;
2326 2490
2327 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2491 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2328 2492
2329 if ($value != $old_value) { 2493 if ($value != $old_value) {
2330 $self->_emit (changed => $value); 2494 $self->emit (changed => $value);
2331 $self->update; 2495 $self->update;
2332 } 2496 }
2333} 2497}
2334 2498
2335sub size_request { 2499sub size_request {
2336 my ($self) = @_; 2500 my ($self) = @_;
2337 2501
2338 ($self->{req_w}, $self->{req_h}) 2502 ($self->{req_w}, $self->{req_h})
2339} 2503}
2340 2504
2341sub button_down { 2505sub invoke_button_down {
2342 my ($self, $ev, $x, $y) = @_; 2506 my ($self, $ev, $x, $y) = @_;
2343 2507
2344 $self->SUPER::button_down ($ev, $x, $y); 2508 $self->SUPER::invoke_button_down ($ev, $x, $y);
2345 2509
2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2510 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2347 2511
2348 $self->mouse_motion ($ev, $x, $y) 2512 $self->invoke_mouse_motion ($ev, $x, $y)
2349} 2513}
2350 2514
2351sub mouse_motion { 2515sub invoke_mouse_motion {
2352 my ($self, $ev, $x, $y) = @_; 2516 my ($self, $ev, $x, $y) = @_;
2353 2517
2354 if ($GRAB == $self) { 2518 if ($GRAB == $self) {
2355 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2519 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2356 2520
… …
2362 } else { 2526 } else {
2363 return 0; 2527 return 0;
2364 } 2528 }
2365 2529
2366 1 2530 1
2531}
2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2367} 2541}
2368 2542
2369sub update { 2543sub update {
2370 my ($self) = @_; 2544 my ($self) = @_;
2371 2545
… …
2461sub set_range { shift->{slider}->set_range (@_) } 2635sub set_range { shift->{slider}->set_range (@_) }
2462sub set_value { shift->{slider}->set_value (@_) } 2636sub set_value { shift->{slider}->set_value (@_) }
2463 2637
2464############################################################################# 2638#############################################################################
2465 2639
2466package CFClient::UI::TextView; 2640package CFClient::UI::TextScroller;
2467 2641
2468our @ISA = CFClient::UI::HBox::; 2642our @ISA = CFClient::UI::HBox::;
2469 2643
2470use CFClient::OpenGL; 2644use CFClient::OpenGL;
2471 2645
2472sub new { 2646sub new {
2473 my $class = shift; 2647 my $class = shift;
2474 2648
2475 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2476 fontsize => 1, 2650 fontsize => 1,
2477 can_events => 0, 2651 can_events => 1,
2652 indent => 0,
2478 #font => default_font 2653 #font => default_font
2479 @_, 2654 @_,
2480 2655
2481 layout => (new CFClient::Layout 1), 2656 layout => (new CFClient::Layout),
2482 par => [], 2657 par => [],
2483 height => 0, 2658 height => 0,
2484 children => [ 2659 children => [
2485 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2486 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2497 2672
2498 $self->{fontsize} = $fontsize; 2673 $self->{fontsize} = $fontsize;
2499 $self->reflow; 2674 $self->reflow;
2500} 2675}
2501 2676
2677sub size_request {
2678 my ($self) = @_;
2679
2680 my ($empty, $slider) = @{ $self->{children} };
2681
2682 local $self->{children} = [$empty, $slider];
2683 $self->SUPER::size_request
2684}
2685
2502sub size_allocate { 2686sub invoke_size_allocate {
2503 my ($self, $w, $h) = @_; 2687 my ($self, $w, $h) = @_;
2504 2688
2505 $self->SUPER::size_allocate ($w, $h); 2689 my ($empty, $slider, @other) = @{ $self->{children} };
2690 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2506 2691
2507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2692 $self->{layout}->set_font ($self->{font}) if $self->{font};
2508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $self->{layout}->set_width ($self->{children}[0]{w}); 2694 $self->{layout}->set_width ($empty->{w});
2695 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 2696
2511 $self->reflow; 2697 $self->reflow;
2512}
2513 2698
2514sub text_size { 2699 local $self->{children} = [$empty, $slider];
2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2515 my ($self, $text, $indent) = @_; 2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2711}
2712
2713sub get_layout {
2714 my ($self, $para) = @_;
2516 2715
2517 my $layout = $self->{layout}; 2716 my $layout = $self->{layout};
2518 2717
2718 $layout->set_font ($self->{font}) if $self->{font};
2719 $layout->set_foreground (@{$para->{fg}});
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2720 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent); 2721 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2722 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($text); 2723 $layout->set_markup ($para->{markup});
2724
2725 $layout->set_shapes (
2726 map
2727 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2728 @{$para->{widget}}
2522 2729 );
2730
2523 $layout->size 2731 $layout
2524} 2732}
2525 2733
2526sub reflow { 2734sub reflow {
2527 my ($self) = @_; 2735 my ($self) = @_;
2528 2736
… …
2537 $self->{children}[1]->set_value ($offset); 2745 $self->{children}[1]->set_value ($offset);
2538} 2746}
2539 2747
2540sub clear { 2748sub clear {
2541 my ($self) = @_; 2749 my ($self) = @_;
2750
2751 my (undef, undef, @other) = @{ $self->{children} };
2752 $self->remove ($_) for @other;
2542 2753
2543 $self->{par} = []; 2754 $self->{par} = [];
2544 $self->{height} = 0; 2755 $self->{height} = 0;
2545 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2756 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2546} 2757}
2547 2758
2548sub add_paragraph { 2759sub add_paragraph {
2549 my ($self, $color, $text, $indent) = @_; 2760 my ($self, $color, $para, $indent) = @_;
2550 2761
2551 for my $line (split /\n/, $text) { 2762 my ($text, @w) = ref $para ? @$para : $para;
2552 my ($w, $h) = $self->text_size ($line); 2763
2553 $self->{height} += $h; 2764 $para = {
2554 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2765 w => 1e10,
2766 wrapped => 1,
2767 fg => $color,
2768 indent => $indent,
2769 markup => $text,
2770 widget => \@w,
2555 } 2771 };
2556 2772
2557 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2773 $self->add (@w) if @w;
2774 push @{$self->{par}}, $para;
2775
2776 $self->{need_reflow}++;
2777 $self->update;
2778}
2779
2780sub scroll_to_bottom {
2781 my ($self) = @_;
2782
2783 $self->{scroll_to_bottom} = 1;
2784 $self->update;
2558} 2785}
2559 2786
2560sub update { 2787sub update {
2561 my ($self) = @_; 2788 my ($self) = @_;
2562 2789
… …
2564 2791
2565 return unless $self->{h} > 0; 2792 return unless $self->{h} > 0;
2566 2793
2567 delete $self->{texture}; 2794 delete $self->{texture};
2568 2795
2569 $ROOT->on_post_alloc ($self, sub { 2796 $ROOT->on_post_alloc ($self => sub {
2570 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2797 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571 2798
2572 if (delete $self->{need_reflow}) { 2799 if (delete $self->{need_reflow}) {
2573 my $height = 0; 2800 my $height = 0;
2574 2801
2575 my $layout = $self->{layout};
2576
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578
2579 for (@{$self->{par}}) { 2802 for my $para (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2803 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2581 $layout->set_width ($W - $_->[3]); 2804 my $layout = $self->get_layout ($para);
2582 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size; 2805 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3]; 2806
2585 $_->[1] = $h; 2807 $para->{w} = $w + $para->{indent};
2808 $para->{h} = $h;
2809 $para->{wrapped} = $layout->has_wrapped;
2586 } 2810 }
2587 2811
2588 $height += $_->[1]; 2812 $height += $para->{h};
2589 } 2813 }
2590 2814
2591 $self->{height} = $height; 2815 $self->{height} = $height;
2592 2816
2593 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2817 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2594 2818
2595 delete $self->{texture}; 2819 delete $self->{texture};
2820 }
2821
2822 if (delete $self->{scroll_to_bottom}) {
2823 $self->{children}[1]->set_value (1e10);
2596 } 2824 }
2597 2825
2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2826 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2599 glClearColor 0, 0, 0, 0; 2827 glClearColor 0, 0, 0, 0;
2600 glClear GL_COLOR_BUFFER_BIT; 2828 glClear GL_COLOR_BUFFER_BIT;
… …
2604 my $y0 = $top; 2832 my $y0 = $top;
2605 my $y1 = $top + $H; 2833 my $y1 = $top + $H;
2606 2834
2607 my $y = 0; 2835 my $y = 0;
2608 2836
2609 my $layout = $self->{layout};
2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612
2613 glEnable GL_BLEND;
2614 #TODO# not correct in windows where rgba is forced off
2615 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2616
2617 for my $par (@{$self->{par}}) { 2837 for my $para (@{$self->{par}}) {
2618 my $h = $par->[1]; 2838 my $h = $para->{h};
2619 2839
2620 if ($y0 < $y + $h && $y < $y1) { 2840 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] });
2622 $layout->set_width ($W - $par->[3]);
2623 $layout->set_markup ($par->[4]);
2624 2841
2625 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2842 my $layout = $self->get_layout ($para);
2626 2843
2627 glRasterPos $par->[3], $y - $y0; 2844 $layout->render ($para->{indent}, $y - $y0);
2628 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2845
2846 if (my @w = @{ $para->{widget} }) {
2847 my @s = $layout->get_shapes;
2848
2849 for (@w) {
2850 my ($dx, $dy) = splice @s, 0, 2, ();
2851
2852 $_->{x} = $dx + $para->{indent};
2853 $_->{y} = $dy + $y - $y0;
2854
2855 $_->draw;
2856 }
2857 }
2629 } 2858 }
2630 2859
2631 $y += $h; 2860 $y += $h;
2632 } 2861 }
2633
2634 glDisable GL_BLEND;
2635 }; 2862 };
2636 }); 2863 });
2864}
2865
2866sub reconfigure {
2867 my ($self) = @_;
2868
2869 $self->SUPER::reconfigure;
2870
2871 $_->{w} = 1e10 for @{ $self->{par} };
2872 $self->reflow;
2637} 2873}
2638 2874
2639sub _draw { 2875sub _draw {
2640 my ($self) = @_; 2876 my ($self) = @_;
2641 2877
… …
2644 glColor 0, 0, 0, 1; 2880 glColor 0, 0, 0, 1;
2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2881 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2646 glDisable GL_TEXTURE_2D; 2882 glDisable GL_TEXTURE_2D;
2647 2883
2648 $self->{children}[1]->draw; 2884 $self->{children}[1]->draw;
2649
2650} 2885}
2651 2886
2652############################################################################# 2887#############################################################################
2653 2888
2654package CFClient::UI::Animator; 2889package CFClient::UI::Animator;
… …
2741 $tooltip .= "\n\n" . (ref $widget) . "\n" 2976 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2977 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n" 2978 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}"; 2979 . "visible $widget->{visible}";
2745 } 2980 }
2981
2982 $tooltip =~ s/^\n+//;
2983 $tooltip =~ s/\n+$//;
2746 2984
2747 $self->add (new CFClient::UI::Label 2985 $self->add (new CFClient::UI::Label
2748 markup => $tooltip, 2986 markup => $tooltip,
2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2987 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750 fontsize => 0.8, 2988 fontsize => 0.8,
… …
2760 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2998 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2761 2999
2762 ($w + 4, $h + 4) 3000 ($w + 4, $h + 4)
2763} 3001}
2764 3002
2765sub size_allocate { 3003sub invoke_size_allocate {
2766 my ($self, $w, $h) = @_; 3004 my ($self, $w, $h) = @_;
2767 3005
2768 $self->SUPER::size_allocate ($w - 4, $h - 4); 3006 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2769} 3007}
2770 3008
2771sub visibility_change { 3009sub invoke_visibility_change {
2772 my ($self, $visible) = @_; 3010 my ($self, $visible) = @_;
2773 3011
2774 return unless $visible; 3012 return unless $visible;
2775 3013
2776 $self->{root}->on_post_alloc ("move_$self" => sub { 3014 $self->{root}->on_post_alloc ("move_$self" => sub {
2777 my $widget = $self->{owner} 3015 my $widget = $self->{owner}
2778 or return; 3016 or return;
2779 3017
3018 if ($widget->{visible}) {
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3019 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781 3020
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3021 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH; 3022 if $x + $self->{w} > $self->{root}{w};
2784 3023
2785 $self->move_abs ($x, $y); 3024 $self->move_abs ($x, $y);
3025 } else {
3026 $self->hide;
3027 }
2786 }); 3028 });
2787} 3029}
2788 3030
2789sub _draw { 3031sub _draw {
2790 my ($self) = @_; 3032 my ($self) = @_;
… …
2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3125 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2884 glDisable GL_TEXTURE_2D; 3126 glDisable GL_TEXTURE_2D;
2885 } 3127 }
2886} 3128}
2887 3129
2888sub DESTROY { 3130sub destroy {
2889 my ($self) = @_; 3131 my ($self) = @_;
2890 3132
2891 $self->{timer}->cancel 3133 $self->{timer}->cancel
2892 if $self->{timer}; 3134 if $self->{timer};
2893 3135
2894 $self->SUPER::DESTROY; 3136 $self->SUPER::destroy;
2895} 3137}
2896 3138
2897############################################################################# 3139#############################################################################
2898 3140
2899package CFClient::UI::Buttonbar; 3141package CFClient::UI::Buttonbar;
… …
2920 ); 3162 );
2921 3163
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3164 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923 3165
2924 for my $item (@{ $self->{items} }) { 3166 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item; 3167 my ($widget, $cb, $tooltip) = @$item;
2926 3168
2927 # handle various types of items, only text for now 3169 # handle various types of items, only text for now
2928 if (!ref $widget) { 3170 if (!ref $widget) {
3171 if ($widget =~ /\t/) {
3172 my ($left, $right) = split /\t/, $widget, 2;
3173
3174 $widget = new CFClient::UI::HBox
3175 can_hover => 1,
3176 can_events => 1,
3177 tooltip => $tooltip,
3178 children => [
3179 (new CFClient::UI::Label markup => $left, expand => 1),
3180 (new CFClient::UI::Label markup => $right, align => +1),
3181 ],
3182 ;
3183
3184 } else {
2929 $widget = new CFClient::UI::Label 3185 $widget = new CFClient::UI::Label
2930 can_hover => 1, 3186 can_hover => 1,
2931 can_events => 1, 3187 can_events => 1,
2932 text => $widget; 3188 markup => $widget,
3189 tooltip => $tooltip;
3190 }
2933 } 3191 }
2934 3192
2935 $self->{item}{$widget} = $item; 3193 $self->{item}{$widget} = $item;
2936 3194
2937 $self->{vbox}->add ($widget); 3195 $self->{vbox}->add ($widget);
… …
2942 3200
2943# popup given the event (must be a mouse button down event currently) 3201# popup given the event (must be a mouse button down event currently)
2944sub popup { 3202sub popup {
2945 my ($self, $ev) = @_; 3203 my ($self, $ev) = @_;
2946 3204
2947 $self->_emit ("popdown"); 3205 $self->emit ("popdown");
2948 3206
2949 # maybe save $GRAB? must be careful about events... 3207 # maybe save $GRAB? must be careful about events...
2950 $GRAB = $self; 3208 $GRAB = $self;
2951 $self->{button} = $ev->{button}; 3209 $self->{button} = $ev->{button};
2952 3210
2953 $self->show; 3211 $self->show;
2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3212 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2955} 3213}
2956 3214
2957sub mouse_motion { 3215sub invoke_mouse_motion {
2958 my ($self, $ev, $x, $y) = @_; 3216 my ($self, $ev, $x, $y) = @_;
2959 3217
2960 # TODO: should use vbox->find_widget or so 3218 # TODO: should use vbox->find_widget or so
2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3219 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2962 $self->{hover} = $self->{item}{$HOVER}; 3220 $self->{hover} = $self->{item}{$HOVER};
2963 3221
2964 0 3222 0
2965} 3223}
2966 3224
2967sub button_up { 3225sub invoke_button_up {
2968 my ($self, $ev, $x, $y) = @_; 3226 my ($self, $ev, $x, $y) = @_;
2969 3227
2970 if ($ev->{button} == $self->{button}) { 3228 if ($ev->{button} == $self->{button}) {
2971 undef $GRAB; 3229 undef $GRAB;
2972 $self->hide; 3230 $self->hide;
2973 3231
2974 $self->_emit ("popdown"); 3232 $self->emit ("popdown");
2975 $self->{hover}[1]->() if $self->{hover}; 3233 $self->{hover}[1]->() if $self->{hover};
2976 } else { 3234 } else {
2977 return 0 3235 return 0
2978 } 3236 }
2979 3237
… …
3006 3264
3007 $self->{current} = $self->{children}[0] 3265 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} }; 3266 if @{ $self->{children} };
3009} 3267}
3010 3268
3269sub get_current_page {
3270 my ($self) = @_;
3271
3272 $self->{current}
3273}
3274
3011sub set_current_page { 3275sub set_current_page {
3012 my ($self, $page_or_widget) = @_; 3276 my ($self, $page_or_widget) = @_;
3013 3277
3014 my $widget = ref $page_or_widget 3278 my $widget = ref $page_or_widget
3015 ? $page_or_widget 3279 ? $page_or_widget
3016 : $self->{children}[$page_or_widget]; 3280 : $self->{children}[$page_or_widget];
3017 3281
3018 $self->{current} = $widget; 3282 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3283 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020 3284
3021 $self->_emit (page_changed => $self->{current}); 3285 $self->emit (page_changed => $self->{current});
3022 3286
3023 $self->realloc; 3287 $self->realloc;
3024} 3288}
3025 3289
3026sub visible_children { 3290sub visible_children {
… …
3031 my ($self) = @_; 3295 my ($self) = @_;
3032 3296
3033 $self->{current}->size_request 3297 $self->{current}->size_request
3034} 3298}
3035 3299
3036sub size_allocate { 3300sub invoke_size_allocate {
3037 my ($self, $w, $h) = @_; 3301 my ($self, $w, $h) = @_;
3038 3302
3039 $self->{current}->configure (0, 0, $w, $h); 3303 $self->{current}->configure (0, 0, $w, $h);
3304
3305 1
3040} 3306}
3041 3307
3042sub _draw { 3308sub _draw {
3043 my ($self) = @_; 3309 my ($self) = @_;
3044 3310
… …
3079 ); 3345 );
3080 3346
3081 $self->{multiplexer}->add ($widget); 3347 $self->{multiplexer}->add ($widget);
3082} 3348}
3083 3349
3350sub get_current_page {
3351 my ($self) = @_;
3352
3353 $self->{multiplexer}->get_current_page
3354}
3355
3084sub set_current_page { 3356sub set_current_page {
3085 my ($self, $page) = @_; 3357 my ($self, $page) = @_;
3086 3358
3087 $self->{multiplexer}->set_current_page ($page); 3359 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current}); 3360 $self->emit (page_changed => $self->{multiplexer}{current});
3361}
3362
3363#############################################################################
3364
3365package CFClient::UI::Combobox;
3366
3367use utf8;
3368
3369our @ISA = CFClient::UI::Button::;
3370
3371sub new {
3372 my $class = shift;
3373
3374 my $self = $class->SUPER::new (
3375 options => [], # [value, title, longdesc], ...
3376 value => undef,
3377 @_,
3378 );
3379
3380 $self->_set_value ($self->{value});
3381
3382 $self
3383}
3384
3385sub invoke_button_down {
3386 my ($self, $ev) = @_;
3387
3388 my @menu_items;
3389
3390 for (@{ $self->{options} }) {
3391 my ($value, $title, $tooltip) = @$_;
3392
3393 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3394 }
3395
3396 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3397}
3398
3399sub _set_value {
3400 my ($self, $value) = @_;
3401
3402 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3403 or return;
3404
3405 $self->{value} = $item->[0];
3406 $self->set_markup ("$item->[1] ⇓");
3407 $self->set_tooltip ($item->[2]);
3408}
3409
3410sub set_value {
3411 my ($self, $value) = @_;
3412
3413 return unless $self->{value} ne $value;
3414
3415 $self->_set_value ($value);
3416 $self->emit (changed => $value);
3089} 3417}
3090 3418
3091############################################################################# 3419#############################################################################
3092 3420
3093package CFClient::UI::Statusbox; 3421package CFClient::UI::Statusbox;
… …
3192 $item->{count}++; 3520 $item->{count}++;
3193 } else { 3521 } else {
3194 $item->{count} = 1; 3522 $item->{count} = 1;
3195 $item->{text} = $item->{tooltip} = $text; 3523 $item->{text} = $item->{tooltip} = $text;
3196 } 3524 }
3197 $item->{id} = ++$self->{id}; 3525 $item->{id} += 0.2;#d#
3198 $item->{timeout} = $timeout; 3526 $item->{timeout} = $timeout;
3199 delete $item->{label}; 3527 delete $item->{label};
3200 } else { 3528 } else {
3201 $self->{item}{$group} = { 3529 $self->{item}{$group} = {
3202 id => ++$self->{id}, 3530 id => ++$self->{id},
… …
3208 count => 1, 3536 count => 1,
3209 %arg, 3537 %arg,
3210 }; 3538 };
3211 } 3539 }
3212 3540
3541 $ROOT->on_refresh (reorder => sub {
3213 $self->reorder; 3542 $self->reorder;
3543 });
3214} 3544}
3215 3545
3216sub reconfigure { 3546sub reconfigure {
3217 my ($self) = @_; 3547 my ($self) = @_;
3218 3548
… …
3221 3551
3222 $self->reorder; 3552 $self->reorder;
3223 $self->SUPER::reconfigure; 3553 $self->SUPER::reconfigure;
3224} 3554}
3225 3555
3226sub DESTROY { 3556sub destroy {
3227 my ($self) = @_; 3557 my ($self) = @_;
3228 3558
3229 $self->{timer}->cancel; 3559 $self->{timer}->cancel;
3230 3560
3231 $self->SUPER::DESTROY; 3561 $self->SUPER::destroy;
3232} 3562}
3233 3563
3234############################################################################# 3564#############################################################################
3235 3565
3236package CFClient::UI::Inventory; 3566package CFClient::UI::Inventory;
3237 3567
3238our @ISA = CFClient::UI::ScrolledWindow::; 3568our @ISA = CFClient::UI::Table::;
3239 3569
3240sub new { 3570sub new {
3241 my $class = shift; 3571 my $class = shift;
3242 3572
3243 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3574 col_expand => [0, 1, 0],
3575 items => [],
3245 @_, 3576 @_,
3246 ); 3577 );
3247 3578
3579 $self->set_sort_order (undef);
3580
3248 $self 3581 $self
3582}
3583
3584sub update_items {
3585 my ($self) = @_;
3586
3587 $self->clear;
3588
3589 my @item = $self->{sort}->(@{ $self->{items} });
3590
3591 my @adds;
3592 my $row = 0;
3593 for my $item ($self->{sort}->(@{ $self->{items} })) {
3594 CFClient::Item::update_widgets $item;
3595
3596 push @adds, 0, $row, $item->{face_widget};
3597 push @adds, 1, $row, $item->{desc_widget};
3598 push @adds, 2, $row, $item->{weight_widget};
3599
3600 $row++;
3601 }
3602
3603 $self->add (@adds);
3604}
3605
3606sub set_sort_order {
3607 my ($self, $order) = @_;
3608
3609 $self->{sort} = $order ||= sub {
3610 sort {
3611 $a->{type} <=> $b->{type}
3612 or $a->{name} cmp $b->{name}
3613 } @_
3614 };
3615
3616 $self->update_items;
3249} 3617}
3250 3618
3251sub set_items { 3619sub set_items {
3252 my ($self, $items) = @_; 3620 my ($self, $items) = @_;
3253 3621
3254 $self->{child}->clear; 3622 $self->{items} = [$items ? values %$items : ()];
3255 return unless $items;
3256
3257 my @items = sort {
3258 ($a->{type} <=> $b->{type})
3259 or ($a->{name} cmp $b->{name})
3260 } @$items;
3261
3262 $self->{real_items} = \@items;
3263
3264 my $row = 0;
3265 for my $item (@items) {
3266 CFClient::Item::update_widgets $item;
3267
3268 $self->{child}->add (0, $row, $item->{face_widget});
3269 $self->{child}->add (1, $row, $item->{desc_widget});
3270 $self->{child}->add (2, $row, $item->{weight_widget});
3271
3272 $row++;
3273 }
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::BindEditor;
3279
3280our @ISA = CFClient::UI::FancyFrame::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287 $self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291 text => "start recording",
3292 tooltip => "Start/Stops recording of actions."
3293 ."All subsequent actions after the recording started will be captured."
3294 ."The actions are displayed after the record was stopped."
3295 ."To bind the action you have to click on the 'Bind' button",
3296 on_activate => sub {
3297 unless ($self->{recording}) {
3298 $self->start;
3299 } else {
3300 $self->stop;
3301 }
3302 });
3303
3304 $vb->add (new CFClient::UI::Label text => "Actions:");
3305 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310 $hb->add (new CFClient::UI::Button
3311 text => "bind",
3312 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313 on_activate => sub {
3314 $self->ask_for_bind;
3315 });
3316
3317 $vb->add (my $hb = new CFClient::UI::HBox);
3318 $hb->add (new CFClient::UI::Button
3319 text => "ok",
3320 expand => 1,
3321 tooltip => "This closes the binding editor and saves the binding",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->commit;
3325 });
3326
3327 $hb->add (new CFClient::UI::Button
3328 text => "cancel",
3329 expand => 1,
3330 tooltip => "This closes the binding editor without saving",
3331 on_activate => sub {
3332 $self->hide;
3333 $self->{binding_cancel}->()
3334 if $self->{binding_cancel};
3335 });
3336
3337 $self->update_binding_widgets; 3623 $self->update_items;
3338
3339 $self
3340}
3341
3342sub commit {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347 ."'. Don't forget 'Save Config'!");
3348 $self->{binding_change}->($mod, $sym, $cmds)
3349 if $self->{binding_change};
3350 } else {
3351 $::STATUSBOX->add ("No action bound, no key or action specified!");
3352 $self->{binding_cancel}->()
3353 if $self->{binding_cancel};
3354 }
3355}
3356
3357sub start {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("stop recording");
3361 $self->{recording} = 1;
3362 $self->clear_command_list;
3363 $::CONN->start_record if $::CONN;
3364}
3365
3366sub stop {
3367 my ($self) = @_;
3368
3369 $self->{rec_btn}->set_text ("start recording");
3370 $self->{recording} = 0;
3371
3372 my $rec;
3373 $rec = $::CONN->stop_record if $::CONN;
3374 return unless ref $rec eq 'ARRAY';
3375 $self->set_command_list ($rec);
3376}
3377
3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3384sub ask_for_bind {
3385 my ($self, $commit) = @_;
3386
3387 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets;
3391 $self->commit if $commit;
3392 });
3393}
3394
3395# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands)
3397# $cb is the callback that is executed on OK
3398# $ccb is the callback that is executed on CANCEL and
3399# when the binding was unsuccessful on OK
3400sub set_binding {
3401 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403 $self->clear_command_list;
3404 $self->{recording} = 0;
3405 $self->{rec_btn}->set_text ("start recording");
3406
3407 $self->{binding} = [$mod, $sym];
3408 $self->{commands} = $cmds;
3409
3410 $self->{binding_change} = $cb;
3411 $self->{binding_cancel} = $ccb;
3412
3413 $self->update_binding_widgets;
3414}
3415
3416# this is a shortcut method that asks for a binding
3417# and then just binds it.
3418sub do_quick_binding {
3419 my ($self, $cmds) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1);
3424}
3425
3426sub update_binding_widgets {
3427 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding;
3429 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430 $self->set_command_list ($cmds);
3431}
3432
3433sub get_binding {
3434 my ($self) = @_;
3435 return (
3436 $self->{binding}->[0],
3437 $self->{binding}->[1],
3438 [ grep { defined $_ } @{$self->{commands}} ]
3439 );
3440}
3441
3442sub clear_command_list {
3443 my ($self) = @_;
3444 $self->{cmdbox}->clear ();
3445}
3446
3447sub set_command_list {
3448 my ($self, $cmds) = @_;
3449
3450 $self->{cmdbox}->clear ();
3451 $self->{commands} = $cmds;
3452
3453 my $idx = 0;
3454
3455 for (@$cmds) {
3456 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458 my $i = $idx;
3459 $hb->add (new CFClient::UI::Label text => $_);
3460 $hb->add (new CFClient::UI::Button
3461 text => "delete",
3462 tooltip => "Deletes the action from the record",
3463 on_activate => sub {
3464 $self->{cmdbox}->remove ($hb);
3465 $cmds->[$i] = undef;
3466 });
3467
3468
3469 $idx++
3470 }
3471} 3624}
3472 3625
3473############################################################################# 3626#############################################################################
3474 3627
3475package CFClient::UI::SpellList; 3628package CFClient::UI::SpellList;
… …
3484 commands => [], 3637 commands => [],
3485 @_, 3638 @_,
3486 ) 3639 )
3487} 3640}
3488 3641
3642my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3643
3644my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3645 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3646my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3648my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3649 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3650my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3651 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3652my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3653 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3495 3654
3496sub rebuild_spell_list { 3655sub rebuild_spell_list {
3497 my ($self) = @_; 3656 my ($self) = @_;
3498 3657
3499 $CFClient::UI::ROOT->on_refresh ($self => sub { 3658 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear; 3659 $self->clear;
3501 3660
3661 return unless $::CONN;
3662
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3663 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3664 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3665 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3666 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3667 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506 3668
3507 my $row = 0; 3669 my $row = 0;
3508 3670
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3671 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_}; 3672 my $spell = $self->{spell}{$_};
3511 3673
3512 $row++; 3674 $row++;
3675
3676 my $spell_cb = sub {
3677 my ($widget, $ev) = @_;
3678
3679 if ($ev->{button} == 1) {
3680 $::CONN->user_send ("cast $spell->{name}");
3681 } elsif ($ev->{button} == 2) {
3682 $::CONN->user_send ("invoke $spell->{name}");
3683 } elsif ($ev->{button} == 3) {
3684 (new CFClient::UI::Menu
3685 items => [
3686 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3687 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3688 ],
3689 )->popup ($ev);
3690 } else {
3691 return 0;
3692 }
3693
3694 1
3695 };
3696
3697 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3698
3699 #TODO: add path info to tooltip
3700 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3513 3701
3514 $self->add (0, $row, new CFClient::UI::Face 3702 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face}, 3703 face => $spell->{face},
3516 can_hover => 1, 3704 can_hover => 1,
3517 can_events => 1, 3705 can_events => 1,
3518 tooltip => $spell->{message}, 3706 tooltip => $tooltip,
3707 on_button_down => $spell_cb,
3519 ); 3708 );
3520 3709
3521 $self->add (1, $row, new CFClient::UI::Label 3710 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1, 3711 expand => 1,
3523 text => $spell->{name}, 3712 text => $spell->{name},
3524 can_hover => 1, 3713 can_hover => 1,
3525 can_events => 1, 3714 can_events => 1,
3526 tooltip => $spell->{message}, 3715 tooltip => $tooltip,
3716 on_button_down => $spell_cb,
3527 ); 3717 );
3528 3718
3719 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3720 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3721 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3722 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 } 3723 }
3540 }); 3724 });
3541} 3725}
3542 3726
3543sub add_spell { 3727sub add_spell {
… …
3549 3733
3550sub remove_spell { 3734sub remove_spell {
3551 my ($self, $spell) = @_; 3735 my ($self, $spell) = @_;
3552 3736
3553 delete $self->{spell}->{$spell->{name}}; 3737 delete $self->{spell}->{$spell->{name}};
3738 $self->rebuild_spell_list;
3739}
3740
3741sub clear_spells {
3742 my ($self) = @_;
3743
3744 $self->{spell} = {};
3554 $self->rebuild_spell_list; 3745 $self->rebuild_spell_list;
3555} 3746}
3556 3747
3557############################################################################# 3748#############################################################################
3558 3749
… …
3595 $coord = $max - $size if $coord > $max - $size; 3786 $coord = $max - $size if $coord > $max - $size;
3596 3787
3597 int $coord + 0.5 3788 int $coord + 0.5
3598} 3789}
3599 3790
3600sub size_allocate { 3791sub invoke_size_allocate {
3601 my ($self, $w, $h) = @_; 3792 my ($self, $w, $h) = @_;
3602 3793
3603 for my $child ($self->children) { 3794 for my $child ($self->children) {
3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3795 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3605 3796
… …
3609 $X = _to_pixel $X, $W, $self->{w}; 3800 $X = _to_pixel $X, $W, $self->{w};
3610 $Y = _to_pixel $Y, $H, $self->{h}; 3801 $Y = _to_pixel $Y, $H, $self->{h};
3611 3802
3612 $child->configure ($X, $Y, $W, $H); 3803 $child->configure ($X, $Y, $W, $H);
3613 } 3804 }
3805
3806 1
3614} 3807}
3615 3808
3616sub coord2local { 3809sub coord2local {
3617 my ($self, $x, $y) = @_; 3810 my ($self, $x, $y) = @_;
3618 3811
… …
3744 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3937 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3745 3938
3746 $w = 0 if $w < 0; 3939 $w = 0 if $w < 0;
3747 $h = 0 if $h < 0; 3940 $h = 0 if $h < 0;
3748 3941
3942 $w = max $widget->{min_w}, $w;
3943 $h = max $widget->{min_h}, $h;
3944
3945 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3946 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3947
3749 $w = int $w + 0.5; 3948 $w = int $w + 0.5;
3750 $h = int $h + 0.5; 3949 $h = int $h + 0.5;
3751 3950
3752 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3951 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753 $widget->{old_w} = $widget->{w}; 3952 $widget->{old_w} = $widget->{w};

Diff Legend

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