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