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.279 by root, Mon Jun 5 00:17:47 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 {
… …
381} 403}
382 404
383sub set_max_size { 405sub set_max_size {
384 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
385 407
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
388} 412}
389 413
390sub set_tooltip { 414sub set_tooltip {
391 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
392 416
… …
397 421
398 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
399 423
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 427 }
404} 428}
405 429
406# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
407sub coord2local { 431sub coord2local {
… …
415 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
416 440
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 442}
419 443
420sub focus_in { 444sub invoke_focus_in {
421 my ($self) = @_; 445 my ($self) = @_;
422 446
423 return if $FOCUS == $self; 447 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
425 449
426 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
427 451
428 $self->_emit (focus_in => $focus); 452 $self->update;
429 453
430 $focus->update if $focus; 454 0
431 $FOCUS->update;
432} 455}
433 456
434sub focus_out { 457sub invoke_focus_out {
435 my ($self) = @_; 458 my ($self) = @_;
436 459
437 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
438 461
439 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
440 463
441 $self->_emit (focus_out => $focus); 464 $self->update;
442 465
443 $focus->update if $focus; #?
444
445 $::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
446 unless $FOCUS; 467 unless $FOCUS;
447}
448 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
449sub mouse_motion { 0 } 479sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 480sub invoke_button_up { 0 }
451sub key_down { 0 } 481sub invoke_key_down { 0 }
452sub key_up { 0 } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
453 484
454sub button_down { 485sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
456 487
457 $self->focus_in; 488 $self->grab_focus;
458 489
459 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
460} 513}
461 514
462sub find_widget { 515sub find_widget {
463 my ($self, $x, $y) = @_; 516 my ($self, $x, $y) = @_;
464 517
… …
474sub set_parent { 527sub set_parent {
475 my ($self, $parent) = @_; 528 my ($self, $parent) = @_;
476 529
477 Scalar::Util::weaken ($self->{parent} = $parent); 530 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 531 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 532}
503 533
504sub realloc { 534sub realloc {
505 my ($self) = @_; 535 my ($self) = @_;
506 536
… …
539 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
540 570
541 # update screen rectangle 571 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 572 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 573 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 574
547 # skip widgets that are entirely outside the drawing area 575 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 578
… …
589} 617}
590 618
591sub DESTROY { 619sub DESTROY {
592 my ($self) = @_; 620 my ($self) = @_;
593 621
622 return if CFClient::in_destruct;
623
594 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
595 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 628}
597 629
598############################################################################# 630#############################################################################
599 631
600package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
765} 797}
766 798
767sub add { 799sub add {
768 my ($self, $child) = @_; 800 my ($self, $child) = @_;
769 801
770 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
773} 804}
774 805
775sub remove { 806sub remove {
776 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
785 816
786sub size_request { 817sub size_request {
787 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
788} 819}
789 820
790sub size_allocate { 821sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
792 823
793 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
794} 827}
795 828
796############################################################################# 829#############################################################################
797 830
798# back-buffered drawing area 831# back-buffered drawing area
… …
814 847
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 849 $self->SUPER::update;
817} 850}
818 851
819sub size_allocate { 852sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
821 854
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
824} 858}
825 859
826sub _render { 860sub _render {
827 my ($self) = @_; 861 my ($self) = @_;
828 862
… …
889 $h = 10 if $self->{scroll_y}; 923 $h = 10 if $self->{scroll_y};
890 924
891 ($w, $h) 925 ($w, $h)
892} 926}
893 927
894sub size_allocate { 928sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
896 930
897 my $child = $self->child; 931 my $child = $self->child;
898 932
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901 935
902 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
903 $self->update; 937 $self->update;
938
939 1
904} 940}
905 941
906sub set_offset { 942sub set_offset {
907 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
908 944
… …
971 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
972 }, 1008 },
973 ; 1009 ;
974 1010
975 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
977 slider => $slider, 1014 slider => $slider,
978 %arg, 1015 %arg,
979 ); 1016 );
980 1017
981 $self->SUPER::add ($self->{vp}, $self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child; 1019 $self->add ($child) if $child;
983 1020
984 $self 1021 $self
985} 1022}
986 1023
1024#TODO# update range on size_allocate depending on child
1025
987sub add { 1026sub add {
988 my ($self, $widget) = @_; 1027 my ($self, $widget) = @_;
989 1028
990 $self->{vp}->add ($self->{child} = $widget); 1029 $self->{vp}->add ($self->{child} = $widget);
991} 1030}
992 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
993sub update { 1048sub update {
994 my ($self) = @_; 1049 my ($self) = @_;
995 1050
996 $self->SUPER::update; 1051 $self->SUPER::update;
997 1052
998 # todo: overwrite size_allocate of child 1053 $self->update_slider;
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001} 1054}
1002 1055
1003sub size_allocate { 1056sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
1005 1058
1059 $self->update_slider;
1060
1006 $self->SUPER::size_allocate ($w, $h); 1061 $self->SUPER::invoke_size_allocate ($w, $h)
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010} 1062}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1063
1015############################################################################# 1064#############################################################################
1016 1065
1017package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
1018 1067
… …
1069 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);
1070 1119
1071sub new { 1120sub new {
1072 my ($class, %arg) = @_; 1121 my ($class, %arg) = @_;
1073 1122
1074 my $title = delete $arg{title};
1075
1076 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1126 border => 0.6,
1080 can_events => 1, 1127 can_events => 1,
1081 min_w => 16, 1128 min_w => 64,
1082 min_h => 16, 1129 min_h => 32,
1083 %arg, 1130 %arg,
1084 ); 1131 );
1085 1132
1086 $self->{title} = new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1134 align => 0,
1088 valign => 1, 1135 valign => 1,
1089 text => $title, 1136 text => $self->{title},
1090 fontsize => $self->{border} 1137 fontsize => $self->{border},
1091 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 }
1092 1148
1093 $self 1149 $self
1094} 1150}
1095 1151
1096sub add { 1152sub add {
1097 my ($self, @widgets) = @_; 1153 my ($self, @widgets) = @_;
1098 1154
1099 $self->SUPER::add (@widgets); 1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1158}
1102 1159
1103sub border { 1160sub border {
1104 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1105} 1162}
1106 1163
1107sub size_request { 1164sub size_request {
1108 my ($self) = @_; 1165 my ($self) = @_;
1109 1166
1110 $self->{title}->size_request 1167 $self->{title_widget}->size_request
1111 if $self->{title}; 1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1112 1172
1113 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1114 1174
1115 ( 1175 (
1116 $w + $self->border * 2, 1176 $w + $self->border * 2,
1117 $h + $self->border * 2, 1177 $h + $self->border * 2,
1118 ) 1178 )
1119} 1179}
1120 1180
1121sub size_allocate { 1181sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1123 1183
1124 if ($self->{title}) { 1184 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1185 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1186 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1188 }
1129 1189
1130 my $border = $self->border; 1190 my $border = $self->border;
1131 1191
1132 $h -= List::Util::max 0, $border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1133 $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;
1134 1207
1135 $self->child->configure ($border, $border, $w, $h); 1208 1
1136} 1209}
1137 1210
1138sub button_down { 1211sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1140 1213
1141 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1215 my $border = $self->border;
1143 1216
… …
1174 1247
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1249
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1251 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1253 };
1181 } else { 1254 } else {
1182 return 0; 1255 return 0;
1183 } 1256 }
1184 1257
1185 1 1258 1
1186} 1259}
1187 1260
1188sub button_up { 1261sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1190 1263
1191 !!delete $self->{motion} 1264 ! ! delete $self->{motion}
1192} 1265}
1193 1266
1194sub mouse_motion { 1267sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1196 1269
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1271
1199 !!$self->{motion} 1272 ! ! $self->{motion}
1200} 1273}
1201 1274
1202sub _draw { 1275sub _draw {
1203 my ($self) = @_; 1276 my ($self) = @_;
1204 1277
… …
1230 1303
1231 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1232 1305
1233 $child->draw; 1306 $child->draw;
1234 1307
1235 if ($self->{title}) { 1308 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1309 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1238 } 1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1239} 1317}
1240 1318
1241############################################################################# 1319#############################################################################
1242 1320
1243package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1266 1344
1267 $child->set_parent ($self); 1345 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1269 1347
1270 $self->realloc; 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1271} 1355}
1272 1356
1273# 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?
1274sub clear { 1358sub clear {
1275 my ($self) = @_; 1359 my ($self) = @_;
… …
1316 (sum @$ws), 1400 (sum @$ws),
1317 (sum @$hs), 1401 (sum @$hs),
1318 ) 1402 )
1319} 1403}
1320 1404
1321sub size_allocate { 1405sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1323 1407
1324 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1325 1409
1326 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1358 } 1442 }
1359 1443
1360 $y += $row_h; 1444 $y += $row_h;
1361 } 1445 }
1362 1446
1447 1
1363} 1448}
1364 1449
1365sub find_widget { 1450sub find_widget {
1366 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1367 1452
… …
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 ) 1491 )
1407} 1492}
1408 1493
1409sub size_allocate { 1494sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1411 1496
1412 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1414 1499
1415 my @req; 1500 my @req;
1416 1501
1417 if ($self->{homogeneous}) { 1502 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1503 @req = ($space / (@children || 1)) x @children;
1419 } else { 1504 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1506 my $req = List::Util::sum @req;
1422 1507
1423 if ($req > $space) { 1508 if ($req > $space) {
1424 # ah well, not enough space 1509 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1510 $_ *= $space / $req for @req;
1426 } else { 1511 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1513
1429 $space = ($space - $req) / $expand; # remaining space to give away 1514 $space = ($space - $req) / $expand; # remaining space to give away
1430 1515
1431 $req[$_] += $space * $children->[$_]{expand} 1516 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1517 for 0 .. $#children;
1433 } 1518 }
1434 } 1519 }
1435 1520
1436 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1437 1522
1438 my $pos = 0; 1523 my $pos = 0;
1439 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1441 $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));
1442 1527
1443 $pos += $alloc; 1528 $pos += $alloc;
1444 } 1529 }
1445 1530
1446 1 1531 1
… …
1536 1621
1537 delete $self->{texture}; 1622 delete $self->{texture};
1538 $self->SUPER::update; 1623 $self->SUPER::update;
1539} 1624}
1540 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1541sub set_text { 1633sub set_text {
1542 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1543 1635
1544 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1546 1638
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1549 1640
1641 delete $self->{size_req};
1550 $self->realloc; 1642 $self->realloc;
1551 $self->update; 1643 $self->update;
1552} 1644}
1553 1645
1554sub set_markup { 1646sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1559 1651
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1653
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1564 1655
1656 delete $self->{size_req};
1565 $self->realloc; 1657 $self->realloc;
1566 $self->update; 1658 $self->update;
1567} 1659}
1568 1660
1569sub size_request { 1661sub size_request {
1570 my ($self) = @_; 1662 my ($self) = @_;
1571 1663
1664 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1670
1578 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1579 1672
1580 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1581 $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);
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1677
1584 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1585 1679
1586 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1588 } 1685 };
1589 1686
1590 ($w, $h) 1687 @{ $self->{size_req} }
1591} 1688}
1592 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1593sub size_allocate { 1694sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1595 1696
1596 delete $self->{ox}; 1697 delete $self->{ox};
1597 1698
1598 delete $self->{texture} 1699 delete $self->{texture}
1599 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
1600} 1703}
1601 1704
1602sub set_fontsize { 1705sub set_fontsize {
1603 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1604 1707
1605 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1606 delete $self->{texture}; 1710 delete $self->{texture};
1607 1711
1608 $self->realloc; 1712 $self->realloc;
1609} 1713}
1610 1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1722}
1723
1611sub _draw { 1724sub _draw {
1612 my ($self) = @_; 1725 my ($self) = @_;
1613 1726
1614 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1615 1728
1616 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1736
1624 new_from_layout CFClient::Texture $self->{layout} 1737 [$self->{layout}->size]
1625 }; 1738 };
1626 1739
1627 unless (exists $self->{ox}) { 1740 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 1743 : ($self->{w} - $size->[0]) * 0.5);
1631 1744
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1747 : ($self->{h} - $size->[1]) * 0.5);
1635 }; 1748 };
1636 1749
1637 glEnable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1639 1752
1640 glColor_premultiply @{$self->{fg}} 1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644
1645 glDisable GL_TEXTURE_2D;
1646} 1754}
1647 1755
1648############################################################################# 1756#############################################################################
1649 1757
1650package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1664 can_hover => 1, 1772 can_hover => 1,
1665 can_focus => 1, 1773 can_focus => 1,
1666 valign => 0, 1774 valign => 0,
1667 can_events => 1, 1775 can_events => 1,
1668 #text => ... 1776 #text => ...
1777 #hidden => "*",
1669 @_ 1778 @_
1670 ) 1779 )
1671} 1780}
1672 1781
1673sub _set_text { 1782sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1790 $self->{text} = $text;
1682 1791
1683 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1685 1795
1686 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1687 $self->update; 1799 $self->update;
1688} 1800}
1689 1801
1690sub set_text { 1802sub set_text {
1691 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1692 1804
1693 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1806 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1807}
1698 1808
1699sub get_text { 1809sub get_text {
1700 $_[0]{text} 1810 $_[0]{text}
1701} 1811}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1707 1817
1708 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1709} 1819}
1710 1820
1711sub key_down { 1821sub invoke_key_down {
1712 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1713 1823
1714 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1843 $self->emit ('escape');
1734 } elsif ($uni) { 1844 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1846 } else {
1737 return 0; 1847 return 0;
1738 } 1848 }
… …
1742 $self->realloc; 1852 $self->realloc;
1743 1853
1744 1 1854 1
1745} 1855}
1746 1856
1747sub focus_in { 1857sub invoke_focus_in {
1748 my ($self) = @_; 1858 my ($self) = @_;
1749 1859
1750 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1751 1861
1752 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1753} 1863}
1754 1864
1755sub button_down { 1865sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1757 1867
1758 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1869
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1871
1762 # byte-index to char-index 1872 # byte-index to char-index
1763 my $text = $self->{text}; 1873 my $text = $self->{text};
1764 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1766 1876
1767 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1768 $self->update; 1878 $self->update;
1769 1879
1770 1 1880 1
1771} 1881}
1772 1882
1773sub mouse_motion { 1883sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1775# 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#
1776 1886
1777 0 1887 1
1778} 1888}
1779 1889
1780sub _draw { 1890sub _draw {
1781 my ($self) = @_; 1891 my ($self) = @_;
1782 1892
… …
1823 1933
1824our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1825 1935
1826use CFClient::OpenGL; 1936use CFClient::OpenGL;
1827 1937
1828sub key_down { 1938sub invoke_key_down {
1829 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1830 1940
1831 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1832 1942
1833 if ($sym == 13) { 1943 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1836 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1839 $self->update; 1950 $self->update;
1840 1951
1841 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1970 } else {
1860 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1861 } 1972 }
1862 1973
1863 } else { 1974 } else {
1864 return $self->SUPER::key_down ($ev) 1975 return $self->SUPER::invoke_key_down ($ev)
1865 } 1976 }
1866 1977
1867 1 1978 1
1868} 1979}
1869 1980
… …
1893 can_events => 1, 2004 can_events => 1,
1894 @_ 2005 @_
1895 ) 2006 )
1896} 2007}
1897 2008
1898sub activate { }
1899
1900sub button_up { 2009sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1902 2011
1903 $self->emit ("activate") 2012 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
… …
1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2028 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1920 2029
1921 glDisable GL_TEXTURE_2D; 2030 glDisable GL_TEXTURE_2D;
1922 2031
1923 $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
1924} 2069}
1925 2070
1926############################################################################# 2071#############################################################################
1927 2072
1928package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
… …
1955 my ($self) = @_; 2100 my ($self) = @_;
1956 2101
1957 (6) x 2 2102 (6) x 2
1958} 2103}
1959 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1960sub button_down { 2113sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1962 2115
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2118 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2119 } else {
1968 return 0 2120 return 0
1969 } 2121 }
1970 2122
1971 1 2123 1
… …
1996package CFClient::UI::Image; 2148package CFClient::UI::Image;
1997 2149
1998our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1999 2151
2000use CFClient::OpenGL; 2152use CFClient::OpenGL;
2001use Carp qw/confess/;
2002 2153
2003our %loaded_images; 2154our %texture_cache;
2004 2155
2005sub new { 2156sub new {
2006 my $class = shift; 2157 my $class = shift;
2007 2158
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
2009 2163
2010 $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";
2011 2166
2012 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2013 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;
2014 2169
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
2016 2171
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2173
2021 $self 2174 $self
2022} 2175}
2023 2176
2024sub size_request { 2177sub size_request {
2025 my ($self) = @_; 2178 my ($self) = @_;
2026 2179
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
2028} 2181}
2029 2182
2030sub _draw { 2183sub _draw {
2031 my ($self) = @_; 2184 my ($self) = @_;
2032 2185
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2296
2144 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2145 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);
2146 2302
2147 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
… …
2169 2325
2170 if ($t3) { 2326 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2333 glEnd;
2178 } 2334 }
2179 2335
2180 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2268 $self->update; 2424 $self->update;
2269 2425
2270 $self 2426 $self
2271} 2427}
2272 2428
2273sub changed { }
2274
2275sub set_range { 2429sub set_range {
2276 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2277 2431
2278 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2279 2433
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2282} 2438}
2283 2439
2284sub set_value { 2440sub set_value {
2285 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2286 2442
… …
2297 if $unit; 2453 if $unit;
2298 2454
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2456
2301 if ($value != $old_value) { 2457 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2303 $self->update; 2459 $self->update;
2304 } 2460 }
2305} 2461}
2306 2462
2307sub size_request { 2463sub size_request {
2308 my ($self) = @_; 2464 my ($self) = @_;
2309 2465
2310 ($self->{req_w}, $self->{req_h}) 2466 ($self->{req_w}, $self->{req_h})
2311} 2467}
2312 2468
2313sub button_down { 2469sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2315 2471
2316 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2473
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2475
2320 $self->mouse_motion ($ev, $x, $y) 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2477}
2322 2478
2323sub mouse_motion { 2479sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2325 2481
2326 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2484
… …
2334 } else { 2490 } else {
2335 return 0; 2491 return 0;
2336 } 2492 }
2337 2493
2338 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
2339} 2505}
2340 2506
2341sub update { 2507sub update {
2342 my ($self) = @_; 2508 my ($self) = @_;
2343 2509
… …
2433sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2435 2601
2436############################################################################# 2602#############################################################################
2437 2603
2438package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2439 2605
2440our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2441 2607
2442use CFClient::OpenGL; 2608use CFClient::OpenGL;
2443 2609
2444sub new { 2610sub new {
2445 my $class = shift; 2611 my $class = shift;
2446 2612
2447 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2448 fontsize => 1, 2614 fontsize => 1,
2449 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2450 #font => default_font 2617 #font => default_font
2451 @_, 2618 @_,
2452 2619
2453 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2454 par => [], 2621 par => [],
2455 height => 0, 2622 height => 0,
2456 children => [ 2623 children => [
2457 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2469 2636
2470 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2471 $self->reflow; 2638 $self->reflow;
2472} 2639}
2473 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
2474sub size_allocate { 2650sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2476 2652
2477 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 2655
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $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});
2482 2660
2483 $self->reflow; 2661 $self->reflow;
2484}
2485 2662
2486sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2487 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) = @_;
2488 2679
2489 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2490 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $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});
2493 $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}}
2494 2693 );
2694
2495 $layout->size 2695 $layout
2496} 2696}
2497 2697
2498sub reflow { 2698sub reflow {
2499 my ($self) = @_; 2699 my ($self) = @_;
2500 2700
… …
2509 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2510} 2710}
2511 2711
2512sub clear { 2712sub clear {
2513 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2514 2717
2515 $self->{par} = []; 2718 $self->{par} = [];
2516 $self->{height} = 0; 2719 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 2721}
2519 2722
2520sub add_paragraph { 2723sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2522 2725
2523 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2524 my ($w, $h) = $self->text_size ($line); 2727
2525 $self->{height} += $h; 2728 $para = {
2526 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,
2527 } 2735 };
2528 2736
2529 $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;
2530} 2749}
2531 2750
2532sub update { 2751sub update {
2533 my ($self) = @_; 2752 my ($self) = @_;
2534 2753
… …
2536 2755
2537 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2538 2757
2539 delete $self->{texture}; 2758 delete $self->{texture};
2540 2759
2541 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 2762
2544 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2545 my $height = 0; 2764 my $height = 0;
2546 2765
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2553 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3]; 2770
2557 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2558 } 2774 }
2559 2775
2560 $height += $_->[1]; 2776 $height += $para->{h};
2561 } 2777 }
2562 2778
2563 $self->{height} = $height; 2779 $self->{height} = $height;
2564 2780
2565 $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]);
2566 2782
2567 delete $self->{texture}; 2783 delete $self->{texture};
2784 }
2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2568 } 2788 }
2569 2789
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 2791 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
… …
2576 my $y0 = $top; 2796 my $y0 = $top;
2577 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2578 2798
2579 my $y = 0; 2799 my $y = 0;
2580 2800
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588
2589 for my $par (@{$self->{par}}) { 2801 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 2802 my $h = $para->{h};
2591 2803
2592 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] });
2594 $layout->set_width ($W - $par->[3]);
2595 $layout->set_markup ($par->[4]);
2596 2805
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2598 2807
2599 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2600 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 }
2601 } 2822 }
2602 2823
2603 $y += $h; 2824 $y += $h;
2604 } 2825 }
2605
2606 glDisable GL_BLEND;
2607 }; 2826 };
2608 }); 2827 });
2828}
2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2609} 2837}
2610 2838
2611sub _draw { 2839sub _draw {
2612 my ($self) = @_; 2840 my ($self) = @_;
2613 2841
… …
2616 glColor 0, 0, 0, 1; 2844 glColor 0, 0, 0, 1;
2617 $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});
2618 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2619 2847
2620 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2621
2622} 2849}
2623 2850
2624############################################################################# 2851#############################################################################
2625 2852
2626package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 2942 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 2943 . "visible $widget->{visible}";
2717 } 2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2718 2948
2719 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2720 markup => $tooltip, 2950 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 2952 fontsize => 0.8,
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 2963
2734 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2735} 2965}
2736 2966
2737sub size_allocate { 2967sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2739 2969
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 2971}
2742 2972
2743sub visibility_change { 2973sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 2974 my ($self, $visible) = @_;
2745 2975
2746 return unless $visible; 2976 return unless $visible;
2747 2977
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 2978 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2750 or return; 2980 or return;
2751 2981
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 2983
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 2985 if $x + $self->{w} > $self->{root}{w};
2756 2986
2757 $self->move_abs ($x, $y); 2987 $self->move_abs ($x, $y);
2758 }); 2988 });
2759} 2989}
2760 2990
… …
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2857 } 3087 }
2858} 3088}
2859 3089
2860sub DESTROY { 3090sub destroy {
2861 my ($self) = @_; 3091 my ($self) = @_;
2862 3092
2863 $self->{timer}->cancel 3093 $self->{timer}->cancel
2864 if $self->{timer}; 3094 if $self->{timer};
2865 3095
2866 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2867} 3097}
2868 3098
2869############################################################################# 3099#############################################################################
2870 3100
2871package CFClient::UI::Buttonbar; 3101package CFClient::UI::Buttonbar;
… …
2892 ); 3122 );
2893 3123
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2895 3125
2896 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2898 3128
2899 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2900 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 {
2901 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2902 can_hover => 1, 3146 can_hover => 1,
2903 can_events => 1, 3147 can_events => 1,
2904 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2905 } 3151 }
2906 3152
2907 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2908 3154
2909 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2914 3160
2915# 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)
2916sub popup { 3162sub popup {
2917 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2918 3164
2919 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2920 3166
2921 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3168 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2924 3170
2925 $self->show; 3171 $self->show;
2926 $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);
2927} 3173}
2928 3174
2929sub mouse_motion { 3175sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2931 3177
2932 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2935 3181
2936 0 3182 0
2937} 3183}
2938 3184
2939sub button_up { 3185sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2941 3187
2942 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3189 undef $GRAB;
2944 $self->hide; 3190 $self->hide;
2945 3191
2946 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3194 } else {
2949 return 0 3195 return 0
2950 } 3196 }
2951 3197
… …
2978 3224
2979 $self->{current} = $self->{children}[0] 3225 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3226 if @{ $self->{children} };
2981} 3227}
2982 3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
2983sub set_current_page { 3235sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3236 my ($self, $page_or_widget) = @_;
2985 3237
2986 my $widget = ref $page_or_widget 3238 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3239 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3240 : $self->{children}[$page_or_widget];
2989 3241
2990 $self->{current} = $widget; 3242 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3244
2993 $self->_emit (page_changed => $self->{current}); 3245 $self->emit (page_changed => $self->{current});
2994 3246
2995 $self->realloc; 3247 $self->realloc;
2996} 3248}
2997 3249
2998sub visible_children { 3250sub visible_children {
… …
3003 my ($self) = @_; 3255 my ($self) = @_;
3004 3256
3005 $self->{current}->size_request 3257 $self->{current}->size_request
3006} 3258}
3007 3259
3008sub size_allocate { 3260sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3261 my ($self, $w, $h) = @_;
3010 3262
3011 $self->{current}->configure (0, 0, $w, $h); 3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3012} 3266}
3013 3267
3014sub _draw { 3268sub _draw {
3015 my ($self) = @_; 3269 my ($self) = @_;
3016 3270
… …
3051 ); 3305 );
3052 3306
3053 $self->{multiplexer}->add ($widget); 3307 $self->{multiplexer}->add ($widget);
3054} 3308}
3055 3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3056sub set_current_page { 3316sub set_current_page {
3057 my ($self, $page) = @_; 3317 my ($self, $page) = @_;
3058 3318
3059 $self->{multiplexer}->set_current_page ($page); 3319 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3320 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3321}
3062 3322
3063############################################################################# 3323#############################################################################
3064 3324
3065package CFClient::UI::Statusbox; 3325package CFClient::UI::Combobox;
3066 3326
3327use utf8;
3328
3067our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFClient::UI::Button::;
3068 3330
3069sub new { 3331sub new {
3070 my $class = shift; 3332 my $class = shift;
3071 3333
3072 $class->SUPER::new ( 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);
3377}
3378
3379#############################################################################
3380
3381package CFClient::UI::Statusbox;
3382
3383our @ISA = CFClient::UI::VBox::;
3384
3385sub new {
3386 my $class = shift;
3387
3388 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3389 fontsize => 0.8,
3074 @_, 3390 @_,
3075 ) 3391 );
3392
3393 Scalar::Util::weaken (my $this = $self);
3394
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396
3397 $self
3076} 3398}
3077 3399
3078sub reorder { 3400sub reorder {
3079 my ($self) = @_; 3401 my ($self) = @_;
3080 my $NOW = time; 3402 my $NOW = Time::HiRes::time;
3403
3404 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} };
3081 3408
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3411 }
3085 3412
… …
3088 my @items = sort { 3415 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
3092 3419
3420 $self->{timer}->interval (1);
3421
3093 my $count = 10 + 1; 3422 my $count = 10 + 1;
3094 for my $item (@items) { 3423 for my $item (@items) {
3095 last unless --$count; 3424 last unless --$count;
3096 3425
3097 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3430 : $item->{text};
3102 3431
… …
3110 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3445 can_events => 1,
3117 can_hover => 1 3446 can_hover => 1
3118 }; 3447 };
3448
3449 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3450 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3451 $label->update;
3452 $label->set_max_size (undef, $label->{req_h} * $diff)
3453 if $diff < 1;
3454 $self->{timer}->interval (1/30);
3455 } else {
3456 $label->{fg}[3] = $item->{fg}[3] || 1;
3457 }
3458
3459 push @widgets, $label;
3119 } 3460 }
3120 3461
3121 $self->clear; 3462 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
3123} 3464}
… …
3128 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
3130 3471
3131 return unless $text; 3472 return unless $text;
3132 3473
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3475
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3477
3137 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
3139 $item->{count}++; 3480 $item->{count}++;
3140 } else { 3481 } else {
3141 $item->{count} = 1; 3482 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
3143 } 3484 }
3144 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
3146 delete $item->{label}; 3487 delete $item->{label};
3147 } else { 3488 } else {
3148 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
3149 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
3155 count => 1, 3496 count => 1,
3156 %arg, 3497 %arg,
3157 }; 3498 };
3158 } 3499 }
3159 3500
3501 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 3502 $self->reorder;
3503 });
3161} 3504}
3162 3505
3163sub reconfigure { 3506sub reconfigure {
3164 my ($self) = @_; 3507 my ($self) = @_;
3165 3508
… …
3168 3511
3169 $self->reorder; 3512 $self->reorder;
3170 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
3171} 3514}
3172 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
3173############################################################################# 3524#############################################################################
3174 3525
3175package CFClient::UI::Inventory; 3526package CFClient::UI::Inventory;
3176 3527
3177our @ISA = CFClient::UI::ScrolledWindow::; 3528our @ISA = CFClient::UI::Table::;
3178 3529
3179sub new { 3530sub new {
3180 my $class = shift; 3531 my $class = shift;
3181 3532
3182 my $self = $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3534 col_expand => [0, 1, 0],
3184 @_, 3535 @_,
3185 ); 3536 );
3186 3537
3187 $self 3538 $self
3188} 3539}
3189 3540
3190sub set_items { 3541sub set_items {
3191 my ($self, $items) = @_; 3542 my ($self, $items) = @_;
3192 3543
3193 $self->{child}->clear; 3544 $self->clear;
3194 return unless $items; 3545 return unless $items;
3195 3546
3196 my @items = sort { 3547 my @items = sort {
3197 ($a->{type} <=> $b->{type}) 3548 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name}) 3549 or ($a->{name} cmp $b->{name})
3199 } @$items; 3550 } values %$items;
3200 3551
3201 $self->{real_items} = \@items; 3552 $self->{real_items} = \@items;
3202 3553
3203 my $row = 0; 3554 my $row = 0;
3204 for my $item (@items) { 3555 for my $item (@items) {
3205 CFClient::Item::update_widgets $item; 3556 CFClient::Item::update_widgets $item;
3206 3557
3207 $self->{child}->add (0, $row, $item->{face_widget}); 3558 $self->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget}); 3559 $self->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget}); 3560 $self->add (2, $row, $item->{weight_widget});
3210 3561
3211 $row++; 3562 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 } 3563 }
3410} 3564}
3411 3565
3412############################################################################# 3566#############################################################################
3413 3567
… …
3423 commands => [], 3577 commands => [],
3424 @_, 3578 @_,
3425 ) 3579 )
3426} 3580}
3427 3581
3428# 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
3429sub add_spell { 3667sub add_spell {
3430 my ($self, $spell) = @_; 3668 my ($self, $spell) = @_;
3669
3431 $self->{spells}->{$spell->{name}} = $spell; 3670 $self->{spell}->{$spell->{name}} = $spell;
3432 3671 $self->rebuild_spell_list;
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460} 3672}
3461 3673
3462sub remove_spell { 3674sub remove_spell {
3463 my ($self, $spell) = @_; 3675 my ($self, $spell) = @_;
3676
3464 delete $self->{spells}->{$spell->{name}}; 3677 delete $self->{spell}->{$spell->{name}};
3465 $self->rebuild_spell_list; 3678 $self->rebuild_spell_list;
3466} 3679}
3467 3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3468############################################################################# 3688#############################################################################
3469 3689
3470package CFClient::UI::Root; 3690package CFClient::UI::Root;
3471 3691
3472our @ISA = CFClient::UI::Container::; 3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3473 3695
3474use CFClient::OpenGL; 3696use CFClient::OpenGL;
3475 3697
3476sub new { 3698sub new {
3477 my $class = shift; 3699 my $class = shift;
… …
3504 $coord = $max - $size if $coord > $max - $size; 3726 $coord = $max - $size if $coord > $max - $size;
3505 3727
3506 int $coord + 0.5 3728 int $coord + 0.5
3507} 3729}
3508 3730
3509sub size_allocate { 3731sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
3511 3733
3512 for my $child ($self->children) { 3734 for my $child ($self->children) {
3513 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)};
3514 3736
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 3740 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 3741 $Y = _to_pixel $Y, $H, $self->{h};
3520 3742
3521 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3522 } 3744 }
3745
3746 1
3523} 3747}
3524 3748
3525sub coord2local { 3749sub coord2local {
3526 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3527 3751
… …
3612 3836
3613 delete $queue{$widget+0}; 3837 delete $queue{$widget+0};
3614 3838
3615 my ($w, $h) = $widget->size_request; 3839 my ($w, $h) = $widget->size_request;
3616 3840
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3842 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3843
3844 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3845 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3846
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3847 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3848 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3849
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3649 3876
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651 3878
3652 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
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};
3654 3887
3655 $w = int $w + 0.5; 3888 $w = int $w + 0.5;
3656 $h = int $h + 0.5; 3889 $h = int $h + 0.5;
3657 3890
3658 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}) {

Diff Legend

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