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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.330 by root, Sun Jul 23 04:37:51 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
78sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 81 if $FOCUS;
81} 82}
82 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
83sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
84 my ($ev) = @_; 98 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
86 100
87 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
88 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
89 103
90 $GRAB = $widget; 104 $GRAB = $widget;
91 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
92 106
93 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
94 } 108 }
95 109
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 111
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
99 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 }
100} 122}
101 123
102sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
103 my ($ev) = @_; 125 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 126
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 128
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 130
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
111 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 133
113 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 136 $grab->update if $grab;
116 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
117 138
118 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
119 } 141 }
120} 142}
121 143
122sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
123 my ($ev) = @_; 145 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
125 147
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 149
128 if ($widget != $HOVER) { 150 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 151
131 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 153 if $HOVER;
139} 154}
140 155
141# convert position array to integers 156# convert position array to integers
142sub harmonize { 157sub harmonize {
… …
188 203
189 } 204 }
190 } 205 }
191 206
192 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
193} 216}
194 217
195############################################################################# 218#############################################################################
196 219
197package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
271 294
272 return unless $self->{visible}; 295 return unless $self->{visible};
273 296
274 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
275 298
299 delete $self->{visible};
276 delete $self->{root}; 300 delete $self->{root};
277 delete $self->{visible};
278 301
279 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
281 304
282 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
284 307
285 $self->focus_out; 308 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
288} 310}
289 311
290sub set_visibility { 312sub set_visibility {
291 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
314} 336}
315 337
316sub move_abs { 338sub move_abs {
317 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
318 340
319 $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;
320 $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;
321 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
322 344
323 $self->update; 345 $self->update;
324} 346}
325 347
… …
333} 355}
334 356
335sub size_request { 357sub size_request {
336 require Carp; 358 require Carp;
337 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
338} 364}
339 365
340sub configure { 366sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
342 368
… …
366 392
367 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
368 } 394 }
369} 395}
370 396
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 397sub children {
376 # nop 398 # nop
377} 399}
378 400
379sub visible_children { 401sub visible_children {
… …
399 421
400 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
401 423
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 427 }
406} 428}
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
… …
417 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
418 440
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 442}
421 443
422sub focus_in { 444sub invoke_focus_in {
423 my ($self) = @_; 445 my ($self) = @_;
424 446
425 return if $FOCUS == $self; 447 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
427 449
428 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
429 451
430 $self->_emit (focus_in => $focus); 452 $self->update;
431 453
432 $focus->update if $focus; 454 0
433 $FOCUS->update;
434} 455}
435 456
436sub focus_out { 457sub invoke_focus_out {
437 my ($self) = @_; 458 my ($self) = @_;
438 459
439 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
440 461
441 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
442 463
443 $self->_emit (focus_out => $focus); 464 $self->update;
444 465
445 $focus->update if $focus; #?
446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 467 unless $FOCUS;
449}
450 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
451sub mouse_motion { 0 } 479sub invoke_mouse_motion { 0 }
452sub button_up { 0 } 480sub invoke_button_up { 0 }
453sub key_down { 0 } 481sub invoke_key_down { 0 }
454sub key_up { 0 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
455 484
456sub button_down { 485sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
458 487
459 $self->focus_in; 488 $self->grab_focus;
460 489
461 0 490 0
491}
492
493sub connect {
494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462} 513}
463 514
464sub find_widget { 515sub find_widget {
465 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
466 517
… …
476sub set_parent { 527sub set_parent {
477 my ($self, $parent) = @_; 528 my ($self, $parent) = @_;
478 529
479 Scalar::Util::weaken ($self->{parent} = $parent); 530 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 531 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504} 532}
505 533
506sub realloc { 534sub realloc {
507 my ($self) = @_; 535 my ($self) = @_;
508 536
… …
541 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
542 570
543 # update screen rectangle 571 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 574
549 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 578
… …
591} 617}
592 618
593sub DESTROY { 619sub DESTROY {
594 my ($self) = @_; 620 my ($self) = @_;
595 621
622 return if CFClient::in_destruct;
623
596 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
597 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 628}
599 629
600############################################################################# 630#############################################################################
601 631
602package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
767} 797}
768 798
769sub add { 799sub add {
770 my ($self, $child) = @_; 800 my ($self, $child) = @_;
771 801
772 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
775} 804}
776 805
777sub remove { 806sub remove {
778 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
787 816
788sub size_request { 817sub size_request {
789 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
790} 819}
791 820
792sub size_allocate { 821sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
794 823
795 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
796} 827}
797 828
798############################################################################# 829#############################################################################
799 830
800# back-buffered drawing area 831# back-buffered drawing area
… …
816 847
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 849 $self->SUPER::update;
819} 850}
820 851
821sub size_allocate { 852sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
823 854
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
826} 858}
827 859
828sub _render { 860sub _render {
829 my ($self) = @_; 861 my ($self) = @_;
830 862
… …
891 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
892 924
893 ($w, $h) 925 ($w, $h)
894} 926}
895 927
896sub size_allocate { 928sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
898 930
899 my $child = $self->child; 931 my $child = $self->child;
900 932
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 935
904 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
905 $self->update; 937 $self->update;
938
939 1
906} 940}
907 941
908sub set_offset { 942sub set_offset {
909 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
910 944
… …
973 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
974 }, 1008 },
975 ; 1009 ;
976 1010
977 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
979 slider => $slider, 1014 slider => $slider,
980 %arg, 1015 %arg,
981 ); 1016 );
982 1017
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
985 1020
986 $self 1021 $self
987} 1022}
988 1023
1024#TODO# update range on size_allocate depending on child
1025
989sub add { 1026sub add {
990 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
991 1028
992 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
993} 1030}
994 1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
995sub update { 1048sub update {
996 my ($self) = @_; 1049 my ($self) = @_;
997 1050
998 $self->SUPER::update; 1051 $self->SUPER::update;
999 1052
1000 # todo: overwrite size_allocate of child 1053 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1054}
1004 1055
1005sub size_allocate { 1056sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1007 1058
1059 $self->update_slider;
1060
1008 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012} 1062}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1063
1017############################################################################# 1064#############################################################################
1018 1065
1019package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1020 1067
… …
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1119
1073sub new { 1120sub new {
1074 my ($class, %arg) = @_; 1121 my ($class, %arg) = @_;
1075 1122
1076 my $title = delete $arg{title};
1077
1078 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1126 border => 0.6,
1082 can_events => 1, 1127 can_events => 1,
1083 min_w => 16, 1128 min_w => 64,
1084 min_h => 16, 1129 min_h => 32,
1085 %arg, 1130 %arg,
1086 ); 1131 );
1087 1132
1088 $self->{title} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1134 align => 0,
1090 valign => 1, 1135 valign => 1,
1091 text => $title, 1136 text => $self->{title},
1092 fontsize => $self->{border} 1137 fontsize => $self->{border},
1093 if defined $title; 1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
1094 1148
1095 $self 1149 $self
1096} 1150}
1097 1151
1098sub add { 1152sub add {
1099 my ($self, @widgets) = @_; 1153 my ($self, @widgets) = @_;
1100 1154
1101 $self->SUPER::add (@widgets); 1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1158}
1104 1159
1105sub border { 1160sub border {
1106 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1107} 1162}
1108 1163
1109sub size_request { 1164sub size_request {
1110 my ($self) = @_; 1165 my ($self) = @_;
1111 1166
1112 $self->{title}->size_request 1167 $self->{title_widget}->size_request
1113 if $self->{title}; 1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1114 1172
1115 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1116 1174
1117 ( 1175 (
1118 $w + $self->border * 2, 1176 $w + $self->border * 2,
1119 $h + $self->border * 2, 1177 $h + $self->border * 2,
1120 ) 1178 )
1121} 1179}
1122 1180
1123sub size_allocate { 1181sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1125 1183
1126 if ($self->{title}) { 1184 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1185 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1186 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1188 }
1131 1189
1132 my $border = $self->border; 1190 my $border = $self->border;
1133 1191
1134 $h -= List::Util::max 0, $border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1193 $w -= List::Util::max 0, $border * 2;
1194
1195 $self->child->configure ($border, $border, $w, $h);
1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1136 1207
1137 $self->child->configure ($border, $border, $w, $h); 1208 1
1138} 1209}
1139 1210
1140sub button_down { 1211sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1142 1213
1143 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1215 my $border = $self->border;
1145 1216
… …
1176 1247
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1249
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1251 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1253 };
1183 } else { 1254 } else {
1184 return 0; 1255 return 0;
1185 } 1256 }
1186 1257
1187 1 1258 1
1188} 1259}
1189 1260
1190sub button_up { 1261sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1192 1263
1193 !!delete $self->{motion} 1264 ! ! delete $self->{motion}
1194} 1265}
1195 1266
1196sub mouse_motion { 1267sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1198 1269
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1271
1201 !!$self->{motion} 1272 ! ! $self->{motion}
1202} 1273}
1203 1274
1204sub _draw { 1275sub _draw {
1205 my ($self) = @_; 1276 my ($self) = @_;
1206 1277
… …
1232 1303
1233 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1234 1305
1235 $child->draw; 1306 $child->draw;
1236 1307
1237 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1240 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1241} 1317}
1242 1318
1243############################################################################# 1319#############################################################################
1244 1320
1245package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1268 1344
1269 $child->set_parent ($self); 1345 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1271 1347
1272 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1273} 1355}
1274 1356
1275# TODO: move to container class maybe? send children a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1358sub clear {
1277 my ($self) = @_; 1359 my ($self) = @_;
… …
1318 (sum @$ws), 1400 (sum @$ws),
1319 (sum @$hs), 1401 (sum @$hs),
1320 ) 1402 )
1321} 1403}
1322 1404
1323sub size_allocate { 1405sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1325 1407
1326 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1327 1409
1328 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1360 } 1442 }
1361 1443
1362 $y += $row_h; 1444 $y += $row_h;
1363 } 1445 }
1364 1446
1447 1
1365} 1448}
1366 1449
1367sub find_widget { 1450sub find_widget {
1368 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1369 1452
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1491 )
1409} 1492}
1410 1493
1411sub size_allocate { 1494sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1413 1496
1414 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1416 1499
1417 my @req; 1500 my @req;
1418 1501
1419 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1421 } else { 1504 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1424 1507
1425 if ($req > $space) { 1508 if ($req > $space) {
1426 # ah well, not enough space 1509 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1428 } else { 1511 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1513
1431 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1432 1515
1433 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1517 for 0 .. $#children;
1435 } 1518 }
1436 } 1519 }
1437 1520
1438 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1439 1522
1440 my $pos = 0; 1523 my $pos = 0;
1441 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1527
1445 $pos += $alloc; 1528 $pos += $alloc;
1446 } 1529 }
1447 1530
1448 1 1531 1
… …
1551 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1552 1635
1553 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1555 1638
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1640
1558 delete $self->{req_h}; 1641 delete $self->{size_req};
1559
1560 $self->realloc; 1642 $self->realloc;
1561 $self->update; 1643 $self->update;
1562} 1644}
1563 1645
1564sub set_markup { 1646sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1569 1651
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1653
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1655
1574 delete $self->{req_h}; 1656 delete $self->{size_req};
1575
1576 $self->realloc; 1657 $self->realloc;
1577 $self->update; 1658 $self->update;
1578} 1659}
1579 1660
1580sub size_request { 1661sub size_request {
1581 my ($self) = @_; 1662 my ($self) = @_;
1582 1663
1583 if (exists $self->{req_h}) { 1664 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591 1670
1592 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1593 1672
1594 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1595 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597 1677
1598 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1599 1679
1600 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1602 } 1682 }
1603 1683
1604 ($w, $h) 1684 [$w, $h]
1605 } 1685 };
1606}
1607 1686
1687 @{ $self->{size_req} }
1688}
1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1608sub size_allocate { 1694sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1610 1696
1611 delete $self->{ox}; 1697 delete $self->{ox};
1612 1698
1613 delete $self->{texture} 1699 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1615} 1703}
1616 1704
1617sub set_fontsize { 1705sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1619 1707
1620 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1621 delete $self->{texture}; 1710 delete $self->{texture};
1622 1711
1623 $self->realloc; 1712 $self->realloc;
1624} 1713}
1625 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1626sub _draw { 1724sub _draw {
1627 my ($self) = @_; 1725 my ($self) = @_;
1628 1726
1629 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1630 1728
1631 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1633 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1634 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638 1736
1639 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1640 }; 1738 };
1641 1739
1642 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1646 1744
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1650 }; 1748 };
1651 1749
1652 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 1752
1655 glColor_premultiply @{$self->{fg}} 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1659
1660 glDisable GL_TEXTURE_2D;
1661} 1754}
1662 1755
1663############################################################################# 1756#############################################################################
1664 1757
1665package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1679 can_hover => 1, 1772 can_hover => 1,
1680 can_focus => 1, 1773 can_focus => 1,
1681 valign => 0, 1774 valign => 0,
1682 can_events => 1, 1775 can_events => 1,
1683 #text => ... 1776 #text => ...
1777 #hidden => "*",
1684 @_ 1778 @_
1685 ) 1779 )
1686} 1780}
1687 1781
1688sub _set_text { 1782sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1790 $self->{text} = $text;
1697 1791
1698 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1794 delete $self->{size_req};
1701 1795
1702 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1703 1797
1704 $self->realloc; 1798 $self->realloc;
1705 $self->update; 1799 $self->update;
1706} 1800}
1707 1801
… …
1722 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1723 1817
1724 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1725} 1819}
1726 1820
1727sub key_down { 1821sub invoke_key_down {
1728 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1729 1823
1730 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1744 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1745 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1747 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 1843 $self->emit ('escape');
1750 } elsif ($uni) { 1844 } elsif ($uni) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 1846 } else {
1753 return 0; 1847 return 0;
1754 } 1848 }
… …
1758 $self->realloc; 1852 $self->realloc;
1759 1853
1760 1 1854 1
1761} 1855}
1762 1856
1763sub focus_in { 1857sub invoke_focus_in {
1764 my ($self) = @_; 1858 my ($self) = @_;
1765 1859
1766 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1767 1861
1768 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1769} 1863}
1770 1864
1771sub button_down { 1865sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1773 1867
1774 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 1869
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 1871
1778 # byte-index to char-index 1872 # byte-index to char-index
1779 my $text = $self->{text}; 1873 my $text = $self->{text};
1780 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1781 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1782 1876
1783 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1784 $self->update; 1878 $self->update;
1785 1879
1786 1 1880 1
1787} 1881}
1788 1882
1789sub mouse_motion { 1883sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792 1886
1793 0 1887 1
1794} 1888}
1795 1889
1796sub _draw { 1890sub _draw {
1797 my ($self) = @_; 1891 my ($self) = @_;
1798 1892
… …
1839 1933
1840our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1841 1935
1842use CFClient::OpenGL; 1936use CFClient::OpenGL;
1843 1937
1844sub key_down { 1938sub invoke_key_down {
1845 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1846 1940
1847 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1848 1942
1849 if ($sym == 13) { 1943 if ($sym == 13) {
1850 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1852 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1855 $self->update; 1950 $self->update;
1856 1951
1857 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1875 } else { 1970 } else {
1876 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1877 } 1972 }
1878 1973
1879 } else { 1974 } else {
1880 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1881 } 1976 }
1882 1977
1883 1 1978 1
1884} 1979}
1885 1980
… …
1909 can_events => 1, 2004 can_events => 1,
1910 @_ 2005 @_
1911 ) 2006 )
1912} 2007}
1913 2008
1914sub activate { }
1915
1916sub button_up { 2009sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1918 2011
1919 $self->emit ("activate") 2012 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936 2029
1937 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1938 2031
1939 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
2033}
2034
2035#############################################################################
2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
1940} 2069}
1941 2070
1942############################################################################# 2071#############################################################################
1943 2072
1944package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1971 my ($self) = @_; 2100 my ($self) = @_;
1972 2101
1973 (6) x 2 2102 (6) x 2
1974} 2103}
1975 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1976sub button_down { 2113sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1978 2115
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2118 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2119 } else {
1984 return 0 2120 return 0
1985 } 2121 }
1986 2122
1987 1 2123 1
… …
2012package CFClient::UI::Image; 2148package CFClient::UI::Image;
2013 2149
2014our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
2015 2151
2016use CFClient::OpenGL; 2152use CFClient::OpenGL;
2017use Carp qw/confess/;
2018 2153
2019our %loaded_images; 2154our %texture_cache;
2020 2155
2021sub new { 2156sub new {
2022 my $class = shift; 2157 my $class = shift;
2023 2158
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2025 2163
2026 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
2027 2166
2028 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2029 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2030 2169
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2032 2171
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2173
2037 $self 2174 $self
2038} 2175}
2039 2176
2040sub size_request { 2177sub size_request {
2041 my ($self) = @_; 2178 my ($self) = @_;
2042 2179
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2044} 2181}
2045 2182
2046sub _draw { 2183sub _draw {
2047 my ($self) = @_; 2184 my ($self) = @_;
2048 2185
… …
2157 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2296
2160 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2161 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2162 2302
2163 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2185 2325
2186 if ($t3) { 2326 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2333 glEnd;
2194 } 2334 }
2195 2335
2196 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2284 $self->update; 2424 $self->update;
2285 2425
2286 $self 2426 $self
2287} 2427}
2288 2428
2289sub changed { }
2290
2291sub set_range { 2429sub set_range {
2292 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2293 2431
2294 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2295 2433
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2298} 2438}
2299 2439
2300sub set_value { 2440sub set_value {
2301 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2302 2442
… …
2313 if $unit; 2453 if $unit;
2314 2454
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2456
2317 if ($value != $old_value) { 2457 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2319 $self->update; 2459 $self->update;
2320 } 2460 }
2321} 2461}
2322 2462
2323sub size_request { 2463sub size_request {
2324 my ($self) = @_; 2464 my ($self) = @_;
2325 2465
2326 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2327} 2467}
2328 2468
2329sub button_down { 2469sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2331 2471
2332 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2473
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2475
2336 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2477}
2338 2478
2339sub mouse_motion { 2479sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2341 2481
2342 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2484
… …
2350 } else { 2490 } else {
2351 return 0; 2491 return 0;
2352 } 2492 }
2353 2493
2354 1 2494 1
2495}
2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2355} 2505}
2356 2506
2357sub update { 2507sub update {
2358 my ($self) = @_; 2508 my ($self) = @_;
2359 2509
… …
2449sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2451 2601
2452############################################################################# 2602#############################################################################
2453 2603
2454package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2455 2605
2456our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2457 2607
2458use CFClient::OpenGL; 2608use CFClient::OpenGL;
2459 2609
2460sub new { 2610sub new {
2461 my $class = shift; 2611 my $class = shift;
2462 2612
2463 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2464 fontsize => 1, 2614 fontsize => 1,
2465 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2466 #font => default_font 2617 #font => default_font
2467 @_, 2618 @_,
2468 2619
2469 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2470 par => [], 2621 par => [],
2471 height => 0, 2622 height => 0,
2472 children => [ 2623 children => [
2473 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2474 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2485 2636
2486 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2487 $self->reflow; 2638 $self->reflow;
2488} 2639}
2489 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2490sub size_allocate { 2650sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2492 2652
2493 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 2655
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 2660
2499 $self->reflow; 2661 $self->reflow;
2500}
2501 2662
2502sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2503 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2504 2679
2505 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2506 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2510 2693 );
2694
2511 $layout->size 2695 $layout
2512} 2696}
2513 2697
2514sub reflow { 2698sub reflow {
2515 my ($self) = @_; 2699 my ($self) = @_;
2516 2700
… …
2525 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2526} 2710}
2527 2711
2528sub clear { 2712sub clear {
2529 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2530 2717
2531 $self->{par} = []; 2718 $self->{par} = [];
2532 $self->{height} = 0; 2719 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 2721}
2535 2722
2536sub add_paragraph { 2723sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2538 2725
2539 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2540 my ($w, $h) = $self->text_size ($line); 2727
2541 $self->{height} += $h; 2728 $para = {
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2543 } 2735 };
2544 2736
2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2546} 2749}
2547 2750
2548sub update { 2751sub update {
2549 my ($self) = @_; 2752 my ($self) = @_;
2550 2753
… …
2552 2755
2553 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2554 2757
2555 delete $self->{texture}; 2758 delete $self->{texture};
2556 2759
2557 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 2762
2560 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2561 my $height = 0; 2764 my $height = 0;
2562 2765
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2569 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3]; 2770
2573 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2574 } 2774 }
2575 2775
2576 $height += $_->[1]; 2776 $height += $para->{h};
2577 } 2777 }
2578 2778
2579 $self->{height} = $height; 2779 $self->{height} = $height;
2580 2780
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2582 2782
2583 delete $self->{texture}; 2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2584 } 2788 }
2585 2789
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 2791 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
… …
2592 my $y0 = $top; 2796 my $y0 = $top;
2593 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2594 2798
2595 my $y = 0; 2799 my $y = 0;
2596 2800
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604
2605 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 2802 my $h = $para->{h};
2607 2803
2608 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]);
2611 $layout->set_markup ($par->[4]);
2612 2805
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2614 2807
2615 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2617 } 2822 }
2618 2823
2619 $y += $h; 2824 $y += $h;
2620 } 2825 }
2621
2622 glDisable GL_BLEND;
2623 }; 2826 };
2624 }); 2827 });
2828}
2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2625} 2837}
2626 2838
2627sub _draw { 2839sub _draw {
2628 my ($self) = @_; 2840 my ($self) = @_;
2629 2841
… …
2632 glColor 0, 0, 0, 1; 2844 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2635 2847
2636 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2637
2638} 2849}
2639 2850
2640############################################################################# 2851#############################################################################
2641 2852
2642package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2733 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2734 2948
2735 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2736 markup => $tooltip, 2950 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 2963
2750 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2751} 2965}
2752 2966
2753sub size_allocate { 2967sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2755 2969
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 2971}
2758 2972
2759sub visibility_change { 2973sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2761 2975
2762 return unless $visible; 2976 return unless $visible;
2763 2977
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2766 or return; 2980 or return;
2767 2981
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 2983
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2772 2986
2773 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2774 }); 2988 });
2775} 2989}
2776 2990
… …
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2873 } 3087 }
2874} 3088}
2875 3089
2876sub DESTROY { 3090sub destroy {
2877 my ($self) = @_; 3091 my ($self) = @_;
2878 3092
2879 $self->{timer}->cancel 3093 $self->{timer}->cancel
2880 if $self->{timer}; 3094 if $self->{timer};
2881 3095
2882 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2883} 3097}
2884 3098
2885############################################################################# 3099#############################################################################
2886 3100
2887package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2908 ); 3122 );
2909 3123
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2911 3125
2912 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2914 3128
2915 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2916 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2917 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2918 can_hover => 1, 3146 can_hover => 1,
2919 can_events => 1, 3147 can_events => 1,
2920 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2921 } 3151 }
2922 3152
2923 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2924 3154
2925 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2930 3160
2931# popup given the event (must be a mouse button down event currently) 3161# popup given the event (must be a mouse button down event currently)
2932sub popup { 3162sub popup {
2933 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2934 3164
2935 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2936 3166
2937 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3168 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2940 3170
2941 $self->show; 3171 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3173}
2944 3174
2945sub mouse_motion { 3175sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2947 3177
2948 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2951 3181
2952 0 3182 0
2953} 3183}
2954 3184
2955sub button_up { 3185sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2957 3187
2958 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3189 undef $GRAB;
2960 $self->hide; 3190 $self->hide;
2961 3191
2962 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3194 } else {
2965 return 0 3195 return 0
2966 } 3196 }
2967 3197
… …
2994 3224
2995 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3226 if @{ $self->{children} };
2997} 3227}
2998 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
2999sub set_current_page { 3235sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
3001 3237
3002 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3239 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
3005 3241
3006 $self->{current} = $widget; 3242 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3244
3009 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
3010 3246
3011 $self->realloc; 3247 $self->realloc;
3012} 3248}
3013 3249
3014sub visible_children { 3250sub visible_children {
… …
3019 my ($self) = @_; 3255 my ($self) = @_;
3020 3256
3021 $self->{current}->size_request 3257 $self->{current}->size_request
3022} 3258}
3023 3259
3024sub size_allocate { 3260sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3026 3262
3027 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3028} 3266}
3029 3267
3030sub _draw { 3268sub _draw {
3031 my ($self) = @_; 3269 my ($self) = @_;
3032 3270
… …
3067 ); 3305 );
3068 3306
3069 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3070} 3308}
3071 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3072sub set_current_page { 3316sub set_current_page {
3073 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3074 3318
3075 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3320 $self->emit (page_changed => $self->{multiplexer}{current});
3321}
3322
3323#############################################################################
3324
3325package CFClient::UI::Combobox;
3326
3327use utf8;
3328
3329our @ISA = CFClient::UI::Button::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3077} 3377}
3078 3378
3079############################################################################# 3379#############################################################################
3080 3380
3081package CFClient::UI::Statusbox; 3381package CFClient::UI::Statusbox;
… …
3180 $item->{count}++; 3480 $item->{count}++;
3181 } else { 3481 } else {
3182 $item->{count} = 1; 3482 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3184 } 3484 }
3185 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3487 delete $item->{label};
3188 } else { 3488 } else {
3189 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3196 count => 1, 3496 count => 1,
3197 %arg, 3497 %arg,
3198 }; 3498 };
3199 } 3499 }
3200 3500
3501 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 3502 $self->reorder;
3503 });
3202} 3504}
3203 3505
3204sub reconfigure { 3506sub reconfigure {
3205 my ($self) = @_; 3507 my ($self) = @_;
3206 3508
… …
3209 3511
3210 $self->reorder; 3512 $self->reorder;
3211 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3212} 3514}
3213 3515
3214sub DESTROY { 3516sub destroy {
3215 my ($self) = @_; 3517 my ($self) = @_;
3216 3518
3217 $self->{timer}->cancel; 3519 $self->{timer}->cancel;
3218 3520
3219 $self->SUPER::DESTROY; 3521 $self->SUPER::destroy;
3220} 3522}
3221 3523
3222############################################################################# 3524#############################################################################
3223 3525
3224package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3225 3527
3226our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3227 3529
3228sub new { 3530sub new {
3229 my $class = shift; 3531 my $class = shift;
3230 3532
3231 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3233 @_, 3535 @_,
3234 ); 3536 );
3235 3537
3236 $self 3538 $self
3237} 3539}
3238 3540
3239sub set_items { 3541sub set_items {
3240 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3241 3543
3242 $self->{child}->clear; 3544 $self->clear;
3243 return unless $items; 3545 return unless $items;
3244 3546
3245 my @items = sort { 3547 my @items = sort {
3246 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3248 } @$items; 3550 } values %$items;
3249 3551
3250 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3251 3553
3252 my $row = 0; 3554 my $row = 0;
3253 for my $item (@items) { 3555 for my $item (@items) {
3254 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3255 3557
3256 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3259 3561
3260 $row++; 3562 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 } 3563 }
3459} 3564}
3460 3565
3461############################################################################# 3566#############################################################################
3462 3567
… …
3472 commands => [], 3577 commands => [],
3473 @_, 3578 @_,
3474 ) 3579 )
3475} 3580}
3476 3581
3477# XXX: Do sorting? Argl... 3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3478sub add_spell { 3667sub add_spell {
3479 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3480 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3481 3671 $self->rebuild_spell_list;
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509} 3672}
3510 3673
3511sub remove_spell { 3674sub remove_spell {
3512 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3513 delete $self->{spells}->{$spell->{name}}; 3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3514 $self->rebuild_spell_list; 3685 $self->rebuild_spell_list;
3515} 3686}
3516 3687
3517############################################################################# 3688#############################################################################
3518 3689
… …
3555 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3556 3727
3557 int $coord + 0.5 3728 int $coord + 0.5
3558} 3729}
3559 3730
3560sub size_allocate { 3731sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3562 3733
3563 for my $child ($self->children) { 3734 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 3736
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3571 3742
3572 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3573 } 3744 }
3745
3746 1
3574} 3747}
3575 3748
3576sub coord2local { 3749sub coord2local {
3577 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3578 3751
… …
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3705 3878
3706 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3707 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3708 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3709 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3710 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3711 3890
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w}; 3892 $widget->{old_w} = $widget->{w};

Diff Legend

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