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.331 by root, Sun Jul 23 04:46:02 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 {
408 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
409 433
434 Carp::confess unless $self->{parent};#d#
435
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 437}
412 438
413# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
414sub coord2global { 440sub coord2global {
415 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
416 442
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 443 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 444}
419 445
420sub focus_in { 446sub invoke_focus_in {
421 my ($self) = @_; 447 my ($self) = @_;
422 448
423 return if $FOCUS == $self; 449 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
425 451
426 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
427 453
428 $self->_emit (focus_in => $focus); 454 $self->update;
429 455
430 $focus->update if $focus; 456 0
431 $FOCUS->update;
432} 457}
433 458
434sub focus_out { 459sub invoke_focus_out {
435 my ($self) = @_; 460 my ($self) = @_;
436 461
437 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
438 463
439 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
440 465
441 $self->_emit (focus_out => $focus); 466 $self->update;
442 467
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 469 unless $FOCUS;
447}
448 470
471 0
472}
473
474sub grab_focus {
475 my ($self) = @_;
476
477 $FOCUS->emit ("focus_out") if $FOCUS;
478 $self->emit ("focus_in");
479}
480
449sub mouse_motion { 0 } 481sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 482sub invoke_button_up { 0 }
451sub key_down { 0 } 483sub invoke_key_down { 0 }
452sub key_up { 0 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
453 486
454sub button_down { 487sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
456 489
457 $self->focus_in; 490 $self->grab_focus;
458 491
459 0 492 0
493}
494
495sub connect {
496 my ($self, $signal, $cb) = @_;
497
498 push @{ $self->{signal_cb}{$signal} }, $cb;
499}
500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
508sub emit {
509 my ($self, $signal, @args) = @_;
510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
518 #d##TODO# stop propagating at first true, do not use sum
519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 522}
461 523
462sub find_widget { 524sub find_widget {
463 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
464 526
… …
474sub set_parent { 536sub set_parent {
475 my ($self, $parent) = @_; 537 my ($self, $parent) = @_;
476 538
477 Scalar::Util::weaken ($self->{parent} = $parent); 539 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 540 $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} 541}
503 542
504sub realloc { 543sub realloc {
505 my ($self) = @_; 544 my ($self) = @_;
506 545
… …
539 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
540 579
541 # update screen rectangle 580 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 581 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 582 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 583
547 # skip widgets that are entirely outside the drawing area 584 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 587
… …
589} 626}
590 627
591sub DESTROY { 628sub DESTROY {
592 my ($self) = @_; 629 my ($self) = @_;
593 630
631 return if CFClient::in_destruct;
632
594 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
595 #$self->deactivate; 634
635 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 637}
597 638
598############################################################################# 639#############################################################################
599 640
600package CFClient::UI::DrawBG; 641package CFClient::UI::DrawBG;
… …
765} 806}
766 807
767sub add { 808sub add {
768 my ($self, $child) = @_; 809 my ($self, $child) = @_;
769 810
770 $self->{children} = []; 811 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 812 $self->SUPER::add ($child);
773} 813}
774 814
775sub remove { 815sub remove {
776 my ($self, $widget) = @_; 816 my ($self, $widget) = @_;
… …
785 825
786sub size_request { 826sub size_request {
787 $_[0]{children}[0]->size_request 827 $_[0]{children}[0]->size_request
788} 828}
789 829
790sub size_allocate { 830sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 831 my ($self, $w, $h) = @_;
792 832
793 $self->{children}[0]->configure (0, 0, $w, $h); 833 $self->{children}[0]->configure (0, 0, $w, $h);
834
835 1
794} 836}
795 837
796############################################################################# 838#############################################################################
797 839
798# back-buffered drawing area 840# back-buffered drawing area
… …
814 856
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 857 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 858 $self->SUPER::update;
817} 859}
818 860
819sub size_allocate { 861sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
821 863
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 864 $self->update;
865
866 $self->SUPER::invoke_size_allocate ($w, $h)
824} 867}
825 868
826sub _render { 869sub _render {
827 my ($self) = @_; 870 my ($self) = @_;
828 871
… …
855 my $tex = $self->{texture} 898 my $tex = $self->{texture}
856 or return; 899 or return;
857 900
858 glEnable GL_TEXTURE_2D; 901 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 902 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; 903 glColor 0, 0, 0, 1;
863 904
864 $tex->draw_quad (0, 0, $w, $h); 905 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865 906
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 907 glDisable GL_TEXTURE_2D;
868} 908}
869 909
870############################################################################# 910#############################################################################
871 911
… …
892 $h = 10 if $self->{scroll_y}; 932 $h = 10 if $self->{scroll_y};
893 933
894 ($w, $h) 934 ($w, $h)
895} 935}
896 936
897sub size_allocate { 937sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 938 my ($self, $w, $h) = @_;
899 939
900 my $child = $self->child; 940 my $child = $self->child;
901 941
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 942 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 943 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 944
905 $self->child->configure (0, 0, $w, $h); 945 $self->child->configure (0, 0, $w, $h);
906 $self->update; 946 $self->update;
947
948 1
907} 949}
908 950
909sub set_offset { 951sub set_offset {
910 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
911 953
… …
974 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
975 }, 1017 },
976 ; 1018 ;
977 1019
978 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
980 slider => $slider, 1023 slider => $slider,
981 %arg, 1024 %arg,
982 ); 1025 );
983 1026
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
986 1029
987 $self 1030 $self
988} 1031}
989 1032
1033#TODO# update range on size_allocate depending on child
1034
990sub add { 1035sub add {
991 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
992 1037
993 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
994} 1039}
995 1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
996sub update { 1057sub update {
997 my ($self) = @_; 1058 my ($self) = @_;
998 1059
999 $self->SUPER::update; 1060 $self->SUPER::update;
1000 1061
1001 # todo: overwrite size_allocate of child 1062 $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} 1063}
1005 1064
1006sub size_allocate { 1065sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
1008 1067
1068 $self->update_slider;
1069
1009 $self->SUPER::size_allocate ($w, $h); 1070 $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} 1071}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1072
1018############################################################################# 1073#############################################################################
1019 1074
1020package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
1021 1076
… …
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1127 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1128
1074sub new { 1129sub new {
1075 my ($class, %arg) = @_; 1130 my ($class, %arg) = @_;
1076 1131
1077 my $title = delete $arg{title};
1078
1079 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1135 border => 0.6,
1083 can_events => 1, 1136 can_events => 1,
1084 min_w => 16, 1137 min_w => 64,
1085 min_h => 16, 1138 min_h => 32,
1086 %arg, 1139 %arg,
1087 ); 1140 );
1088 1141
1089 $self->{title} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1143 align => 0,
1091 valign => 1, 1144 valign => 1,
1092 text => $title, 1145 text => $self->{title},
1093 fontsize => $self->{border} 1146 fontsize => $self->{border},
1094 if defined $title; 1147 if exists $self->{title};
1148
1149 if ($self->{has_close_button}) {
1150 $self->{close_button} =
1151 new CFClient::UI::ImageButton
1152 path => 'x1_close.png',
1153 on_activate => sub { $self->emit ("delete") };
1154
1155 $self->CFClient::UI::Container::add ($self->{close_button});
1156 }
1095 1157
1096 $self 1158 $self
1097} 1159}
1098 1160
1099sub add { 1161sub add {
1100 my ($self, @widgets) = @_; 1162 my ($self, @widgets) = @_;
1101 1163
1102 $self->SUPER::add (@widgets); 1164 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1167}
1105 1168
1106sub border { 1169sub border {
1107 int $_[0]{border} * $::FONTSIZE 1170 int $_[0]{border} * $::FONTSIZE
1108} 1171}
1109 1172
1110sub size_request { 1173sub size_request {
1111 my ($self) = @_; 1174 my ($self) = @_;
1112 1175
1113 $self->{title}->size_request 1176 $self->{title_widget}->size_request
1114 if $self->{title}; 1177 if $self->{title_widget};
1178
1179 $self->{close_button}->size_request
1180 if $self->{close_button};
1115 1181
1116 my ($w, $h) = $self->SUPER::size_request; 1182 my ($w, $h) = $self->SUPER::size_request;
1117 1183
1118 ( 1184 (
1119 $w + $self->border * 2, 1185 $w + $self->border * 2,
1120 $h + $self->border * 2, 1186 $h + $self->border * 2,
1121 ) 1187 )
1122} 1188}
1123 1189
1124sub size_allocate { 1190sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1191 my ($self, $w, $h) = @_;
1126 1192
1127 if ($self->{title}) { 1193 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1194 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1195 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1196 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1197 }
1132 1198
1133 my $border = $self->border; 1199 my $border = $self->border;
1134 1200
1135 $h -= List::Util::max 0, $border * 2; 1201 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1202 $w -= List::Util::max 0, $border * 2;
1203
1204 $self->child->configure ($border, $border, $w, $h);
1205
1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1207 if $self->{close_button};
1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1137 1216
1138 $self->child->configure ($border, $border, $w, $h); 1217 1
1139} 1218}
1140 1219
1141sub button_down { 1220sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1143 1222
1144 my ($w, $h) = @$self{qw(w h)}; 1223 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1224 my $border = $self->border;
1146 1225
… …
1177 1256
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1257 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1258
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1259 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1260 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1261 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1262 };
1184 } else { 1263 } else {
1185 return 0; 1264 return 0;
1186 } 1265 }
1187 1266
1188 1 1267 1
1189} 1268}
1190 1269
1191sub button_up { 1270sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1271 my ($self, $ev, $x, $y) = @_;
1193 1272
1194 !!delete $self->{motion} 1273 ! ! delete $self->{motion}
1195} 1274}
1196 1275
1197sub mouse_motion { 1276sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1277 my ($self, $ev, $x, $y) = @_;
1199 1278
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1279 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1280
1202 !!$self->{motion} 1281 ! ! $self->{motion}
1203} 1282}
1204 1283
1205sub _draw { 1284sub _draw {
1206 my ($self) = @_; 1285 my ($self) = @_;
1207 1286
… …
1233 1312
1234 glDisable GL_TEXTURE_2D; 1313 glDisable GL_TEXTURE_2D;
1235 1314
1236 $child->draw; 1315 $child->draw;
1237 1316
1238 if ($self->{title}) { 1317 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1318 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1319 $self->{title_widget}->_draw;
1320
1321 glTranslate 0, - ($border - $self->{h});
1241 } 1322 }
1323
1324 $self->{close_button}->draw
1325 if $self->{close_button};
1242} 1326}
1243 1327
1244############################################################################# 1328#############################################################################
1245 1329
1246package CFClient::UI::Table; 1330package CFClient::UI::Table;
… …
1269 1353
1270 $child->set_parent ($self); 1354 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1355 $self->{children}[$y][$x] = $child;
1272 1356
1273 $self->realloc; 1357 $self->realloc;
1358}
1359
1360sub remove {
1361 my ($self, $child) = @_;
1362
1363 # TODO: not yet implemented
1274} 1364}
1275 1365
1276# TODO: move to container class maybe? send children a signal on removal? 1366# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1367sub clear {
1278 my ($self) = @_; 1368 my ($self) = @_;
… …
1319 (sum @$ws), 1409 (sum @$ws),
1320 (sum @$hs), 1410 (sum @$hs),
1321 ) 1411 )
1322} 1412}
1323 1413
1324sub size_allocate { 1414sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1415 my ($self, $w, $h) = @_;
1326 1416
1327 my ($ws, $hs) = $self->get_wh; 1417 my ($ws, $hs) = $self->get_wh;
1328 1418
1329 my $req_w = (sum @$ws) || 1; 1419 my $req_w = (sum @$ws) || 1;
… …
1361 } 1451 }
1362 1452
1363 $y += $row_h; 1453 $y += $row_h;
1364 } 1454 }
1365 1455
1456 1
1366} 1457}
1367 1458
1368sub find_widget { 1459sub find_widget {
1369 my ($self, $x, $y) = @_; 1460 my ($self, $x, $y) = @_;
1370 1461
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1498 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1499 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1500 )
1410} 1501}
1411 1502
1412sub size_allocate { 1503sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1414 1505
1415 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1417 1508
1418 my @req; 1509 my @req;
1419 1510
1420 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1422 } else { 1513 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1425 1516
1426 if ($req > $space) { 1517 if ($req > $space) {
1427 # ah well, not enough space 1518 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1429 } else { 1520 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1522
1432 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1433 1524
1434 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1526 for 0 .. $#children;
1436 } 1527 }
1437 } 1528 }
1438 1529
1439 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1440 1531
1441 my $pos = 0; 1532 my $pos = 0;
1442 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1536
1446 $pos += $alloc; 1537 $pos += $alloc;
1447 } 1538 }
1448 1539
1449 1 1540 1
… …
1539 1630
1540 delete $self->{texture}; 1631 delete $self->{texture};
1541 $self->SUPER::update; 1632 $self->SUPER::update;
1542} 1633}
1543 1634
1635sub realloc {
1636 my ($self) = @_;
1637
1638 delete $self->{ox};
1639 $self->SUPER::realloc;
1640}
1641
1544sub set_text { 1642sub set_text {
1545 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1546 1644
1547 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1549 1647
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1552 1649
1650 delete $self->{size_req};
1553 $self->realloc; 1651 $self->realloc;
1554 $self->update; 1652 $self->update;
1555} 1653}
1556 1654
1557sub set_markup { 1655sub set_markup {
… …
1560 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1561 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1562 1660
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1662
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1567 1664
1665 delete $self->{size_req};
1568 $self->realloc; 1666 $self->realloc;
1569 $self->update; 1667 $self->update;
1570} 1668}
1571 1669
1572sub size_request { 1670sub size_request {
1573 my ($self) = @_; 1671 my ($self) = @_;
1574 1672
1673 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1674 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1675 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1676 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1677 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1678 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1679
1581 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1582 1681
1583 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1686
1587 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1588 1688
1589 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1690 $h = List::Util::max $h, $h2;
1691 }
1692
1693 [$w, $h]
1591 } 1694 };
1592 1695
1593 ($w, $h) 1696 @{ $self->{size_req} }
1594} 1697}
1595 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1596sub size_allocate { 1703sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1598 1705
1599 delete $self->{ox}; 1706 delete $self->{ox};
1600 1707
1601 delete $self->{texture} 1708 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1709 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1710
1711 1
1603} 1712}
1604 1713
1605sub set_fontsize { 1714sub set_fontsize {
1606 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1607 1716
1608 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1609 delete $self->{texture}; 1719 delete $self->{texture};
1610 1720
1611 $self->realloc; 1721 $self->realloc;
1612} 1722}
1613 1723
1724sub reconfigure {
1725 my ($self) = @_;
1726
1727 delete $self->{size_req};
1728 delete $self->{texture};
1729
1730 $self->SUPER::reconfigure;
1731}
1732
1614sub _draw { 1733sub _draw {
1615 my ($self) = @_; 1734 my ($self) = @_;
1616 1735
1617 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1618 1737
1619 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1621 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1622 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1623 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626 1745
1627 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1628 }; 1747 };
1629 1748
1630 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1634 1753
1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1638 }; 1757 };
1639 1758
1640 glEnable GL_TEXTURE_2D; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1642 1761
1643 if ($tex->{format} == GL_ALPHA) { 1762 $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} 1763}
1652 1764
1653############################################################################# 1765#############################################################################
1654 1766
1655package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1669 can_hover => 1, 1781 can_hover => 1,
1670 can_focus => 1, 1782 can_focus => 1,
1671 valign => 0, 1783 valign => 0,
1672 can_events => 1, 1784 can_events => 1,
1673 #text => ... 1785 #text => ...
1786 #hidden => "*",
1674 @_ 1787 @_
1675 ) 1788 )
1676} 1789}
1677 1790
1678sub _set_text { 1791sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1798 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1799 $self->{text} = $text;
1687 1800
1688 $text =~ s/./*/g if $self->{hidden}; 1801 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1802 $self->{layout}->set_text ("$text ");
1803 delete $self->{size_req};
1690 1804
1691 $self->_emit (changed => $self->{text}); 1805 $self->emit (changed => $self->{text});
1806
1807 $self->realloc;
1692 $self->update; 1808 $self->update;
1693} 1809}
1694 1810
1695sub set_text { 1811sub set_text {
1696 my ($self, $text) = @_; 1812 my ($self, $text) = @_;
1697 1813
1698 $self->{cursor} = length $text; 1814 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1815 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1816}
1703 1817
1704sub get_text { 1818sub get_text {
1705 $_[0]{text} 1819 $_[0]{text}
1706} 1820}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 1825 my ($w, $h) = $self->SUPER::size_request;
1712 1826
1713 ($w + 1, $h) # add 1 for cursor 1827 ($w + 1, $h) # add 1 for cursor
1714} 1828}
1715 1829
1716sub key_down { 1830sub invoke_key_down {
1717 my ($self, $ev) = @_; 1831 my ($self, $ev) = @_;
1718 1832
1719 my $mod = $ev->{mod}; 1833 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 1835 my $uni = $ev->{unicode};
… …
1733 } elsif ($sym == CFClient::SDLK_HOME) { 1847 } elsif ($sym == CFClient::SDLK_HOME) {
1734 $self->{cursor} = 0; 1848 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) { 1849 } elsif ($sym == CFClient::SDLK_END) {
1736 $self->{cursor} = length $text; 1850 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 1851 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 1852 $self->emit ('escape');
1739 } elsif ($uni) { 1853 } elsif ($uni) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 1854 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 1855 } else {
1742 return 0; 1856 return 0;
1743 } 1857 }
… …
1747 $self->realloc; 1861 $self->realloc;
1748 1862
1749 1 1863 1
1750} 1864}
1751 1865
1752sub focus_in { 1866sub invoke_focus_in {
1753 my ($self) = @_; 1867 my ($self) = @_;
1754 1868
1755 $self->{last_activity} = $::NOW; 1869 $self->{last_activity} = $::NOW;
1756 1870
1757 $self->SUPER::focus_in; 1871 $self->SUPER::invoke_focus_in
1758} 1872}
1759 1873
1760sub button_down { 1874sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1762 1876
1763 $self->SUPER::button_down ($ev, $x, $y); 1877 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 1878
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 1880
1767 # byte-index to char-index 1881 # byte-index to char-index
1768 my $text = $self->{text}; 1882 my $text = $self->{text};
1769 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1771 1885
1772 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1773 $self->update; 1887 $self->update;
1774 1888
1775 1 1889 1
1776} 1890}
1777 1891
1778sub mouse_motion { 1892sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 1893 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1894# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 1895
1782 0 1896 1
1783} 1897}
1784 1898
1785sub _draw { 1899sub _draw {
1786 my ($self) = @_; 1900 my ($self) = @_;
1787 1901
… …
1828 1942
1829our @ISA = CFClient::UI::EntryBase::; 1943our @ISA = CFClient::UI::EntryBase::;
1830 1944
1831use CFClient::OpenGL; 1945use CFClient::OpenGL;
1832 1946
1833sub key_down { 1947sub invoke_key_down {
1834 my ($self, $ev) = @_; 1948 my ($self, $ev) = @_;
1835 1949
1836 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1837 1951
1838 if ($sym == 13) { 1952 if ($sym == 13) {
1839 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1841 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 1958 $self->emit (activate => $txt);
1844 $self->update; 1959 $self->update;
1845 1960
1846 } elsif ($sym == CFClient::SDLK_UP) { 1961 } elsif ($sym == CFClient::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 1962 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 1963 $self->{history_saveback} = $self->get_text;
… …
1864 } else { 1979 } else {
1865 $self->set_text ($self->{history_saveback}); 1980 $self->set_text ($self->{history_saveback});
1866 } 1981 }
1867 1982
1868 } else { 1983 } else {
1869 return $self->SUPER::key_down ($ev) 1984 return $self->SUPER::invoke_key_down ($ev)
1870 } 1985 }
1871 1986
1872 1 1987 1
1873} 1988}
1874 1989
… …
1898 can_events => 1, 2013 can_events => 1,
1899 @_ 2014 @_
1900 ) 2015 )
1901} 2016}
1902 2017
1903sub activate { }
1904
1905sub button_up { 2018sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
1907 2020
1908 $self->emit ("activate") 2021 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
… …
1913} 2026}
1914 2027
1915sub _draw { 2028sub _draw {
1916 my ($self) = @_; 2029 my ($self) = @_;
1917 2030
1918 local $self->{fg} = $self->{fg}; 2031 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 2032
1924 glEnable GL_TEXTURE_2D; 2033 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 2035 glColor 0, 0, 0, 1;
1927 2036
1928 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929 2038
1930 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1931 2040
1932 $self->SUPER::_draw; 2041 $self->SUPER::_draw;
2042}
2043
2044#############################################################################
2045
2046package CFClient::UI::ImageButton;
2047
2048our @ISA = CFClient::UI::Image::;
2049
2050use CFClient::OpenGL;
2051
2052my %textures;
2053
2054sub new {
2055 my $class = shift;
2056
2057 my $self = $class->SUPER::new (
2058 padding_x => 4,
2059 padding_y => 4,
2060 fg => [1, 1, 1],
2061 active_fg => [0, 0, 1],
2062 can_hover => 1,
2063 align => 0,
2064 valign => 0,
2065 can_events => 1,
2066 @_
2067 );
2068}
2069
2070sub invoke_button_up {
2071 my ($self, $ev, $x, $y) = @_;
2072
2073 $self->emit ("activate")
2074 if $x >= 0 && $x < $self->{w}
2075 && $y >= 0 && $y < $self->{h};
2076
2077 1
1933} 2078}
1934 2079
1935############################################################################# 2080#############################################################################
1936 2081
1937package CFClient::UI::CheckBox; 2082package CFClient::UI::CheckBox;
… …
1964 my ($self) = @_; 2109 my ($self) = @_;
1965 2110
1966 (6) x 2 2111 (6) x 2
1967} 2112}
1968 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
1969sub button_down { 2122sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
1971 2124
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2127 $self->toggle;
1975 $self->_emit (changed => $self->{state});
1976 } else { 2128 } else {
1977 return 0 2129 return 0
1978 } 2130 }
1979 2131
1980 1 2132 1
… …
2005package CFClient::UI::Image; 2157package CFClient::UI::Image;
2006 2158
2007our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
2008 2160
2009use CFClient::OpenGL; 2161use CFClient::OpenGL;
2010use Carp qw/confess/;
2011 2162
2012our %loaded_images; 2163our %texture_cache;
2013 2164
2014sub new { 2165sub new {
2015 my $class = shift; 2166 my $class = shift;
2016 2167
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
2018 2172
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2173 $self->{path} || $self->{tex}
2174 or Carp::croak "'path' or 'tex' attributes required";
2020 2175
2021 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2023 2178
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2025 2180
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2182
2030 $self 2183 $self
2031} 2184}
2032 2185
2033sub size_request { 2186sub size_request {
2034 my ($self) = @_; 2187 my ($self) = @_;
2035 2188
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2037} 2190}
2038 2191
2039sub _draw { 2192sub _draw {
2040 my ($self) = @_; 2193 my ($self) = @_;
2041 2194
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2305
2153 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2311
2156 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
… …
2178 2334
2179 if ($t3) { 2335 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2342 glEnd;
2187 } 2343 }
2188 2344
2189 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2277 $self->update; 2433 $self->update;
2278 2434
2279 $self 2435 $self
2280} 2436}
2281 2437
2282sub changed { }
2283
2284sub set_range { 2438sub set_range {
2285 my ($self, $range) = @_; 2439 my ($self, $range) = @_;
2286 2440
2287 ($range, $self->{range}) = ($self->{range}, $range); 2441 ($range, $self->{range}) = ($self->{range}, $range);
2288 2442
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2443 if ("@$range" ne "@{$self->{range}}") {
2444 $self->update;
2445 $self->set_value ($self->{range}[0]);
2446 }
2291} 2447}
2292 2448
2293sub set_value { 2449sub set_value {
2294 my ($self, $value) = @_; 2450 my ($self, $value) = @_;
2295 2451
… …
2306 if $unit; 2462 if $unit;
2307 2463
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2464 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2465
2310 if ($value != $old_value) { 2466 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2467 $self->emit (changed => $value);
2312 $self->update; 2468 $self->update;
2313 } 2469 }
2314} 2470}
2315 2471
2316sub size_request { 2472sub size_request {
2317 my ($self) = @_; 2473 my ($self) = @_;
2318 2474
2319 ($self->{req_w}, $self->{req_h}) 2475 ($self->{req_w}, $self->{req_h})
2320} 2476}
2321 2477
2322sub button_down { 2478sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2324 2480
2325 $self->SUPER::button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2482
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2484
2329 $self->mouse_motion ($ev, $x, $y) 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2486}
2331 2487
2332sub mouse_motion { 2488sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2334 2490
2335 if ($GRAB == $self) { 2491 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2492 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2493
… …
2343 } else { 2499 } else {
2344 return 0; 2500 return 0;
2345 } 2501 }
2346 2502
2347 1 2503 1
2504}
2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2348} 2514}
2349 2515
2350sub update { 2516sub update {
2351 my ($self) = @_; 2517 my ($self) = @_;
2352 2518
… …
2442sub set_range { shift->{slider}->set_range (@_) } 2608sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2609sub set_value { shift->{slider}->set_value (@_) }
2444 2610
2445############################################################################# 2611#############################################################################
2446 2612
2447package CFClient::UI::TextView; 2613package CFClient::UI::TextScroller;
2448 2614
2449our @ISA = CFClient::UI::HBox::; 2615our @ISA = CFClient::UI::HBox::;
2450 2616
2451use CFClient::OpenGL; 2617use CFClient::OpenGL;
2452 2618
2453sub new { 2619sub new {
2454 my $class = shift; 2620 my $class = shift;
2455 2621
2456 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2457 fontsize => 1, 2623 fontsize => 1,
2458 can_events => 0, 2624 can_events => 1,
2625 indent => 0,
2459 #font => default_font 2626 #font => default_font
2460 @_, 2627 @_,
2461 2628
2462 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2463 par => [], 2630 par => [],
2464 height => 0, 2631 height => 0,
2465 children => [ 2632 children => [
2466 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2467 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2478 2645
2479 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2480 $self->reflow; 2647 $self->reflow;
2481} 2648}
2482 2649
2650sub size_request {
2651 my ($self) = @_;
2652
2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2657}
2658
2483sub size_allocate { 2659sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2485 2661
2486 $self->SUPER::size_allocate ($w, $h); 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 2664
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2667 $self->{layout}->set_width ($empty->{w});
2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2669
2492 $self->reflow; 2670 $self->reflow;
2493}
2494 2671
2495sub text_size { 2672 local $self->{children} = [$empty, $slider];
2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2496 my ($self, $text, $indent) = @_; 2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2684}
2685
2686sub get_layout {
2687 my ($self, $para) = @_;
2497 2688
2498 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2499 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2694 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2696 $layout->set_markup ($para->{markup});
2697
2698 $layout->set_shapes (
2699 map
2700 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2701 @{$para->{widget}}
2503 2702 );
2703
2504 $layout->size 2704 $layout
2505} 2705}
2506 2706
2507sub reflow { 2707sub reflow {
2508 my ($self) = @_; 2708 my ($self) = @_;
2509 2709
… …
2518 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2519} 2719}
2520 2720
2521sub clear { 2721sub clear {
2522 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2523 2726
2524 $self->{par} = []; 2727 $self->{par} = [];
2525 $self->{height} = 0; 2728 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 2730}
2528 2731
2529sub add_paragraph { 2732sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2531 2734
2532 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2533 my ($w, $h) = $self->text_size ($line); 2736
2534 $self->{height} += $h; 2737 $para = {
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2738 w => 1e10,
2739 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2536 } 2744 };
2537 2745
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2746 $self->add (@w) if @w;
2747 push @{$self->{par}}, $para;
2748
2749 $self->{need_reflow}++;
2750 $self->update;
2751}
2752
2753sub scroll_to_bottom {
2754 my ($self) = @_;
2755
2756 $self->{scroll_to_bottom} = 1;
2757 $self->update;
2539} 2758}
2540 2759
2541sub update { 2760sub update {
2542 my ($self) = @_; 2761 my ($self) = @_;
2543 2762
… …
2545 2764
2546 return unless $self->{h} > 0; 2765 return unless $self->{h} > 0;
2547 2766
2548 delete $self->{texture}; 2767 delete $self->{texture};
2549 2768
2550 $ROOT->on_post_alloc ($self, sub { 2769 $ROOT->on_post_alloc ($self => sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2771
2553 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2554 my $height = 0; 2773 my $height = 0;
2555 2774
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2562 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2779
2566 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2567 } 2783 }
2568 2784
2569 $height += $_->[1]; 2785 $height += $para->{h};
2570 } 2786 }
2571 2787
2572 $self->{height} = $height; 2788 $self->{height} = $height;
2573 2789
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2790 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2575 2791
2576 delete $self->{texture}; 2792 delete $self->{texture};
2577 } 2793 }
2578 2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2797 }
2798
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2800 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
2582 2802
2583 my $top = int $self->{children}[1]{range}[0]; 2803 my $top = int $self->{children}[1]{range}[0];
2584 2804
2585 my $y0 = $top; 2805 my $y0 = $top;
2586 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2587 2807
2588 my $y = 0; 2808 my $y = 0;
2589 2809
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}}) { 2810 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 2811 my $h = $para->{h};
2600 2812
2601 if ($y0 < $y + $h && $y < $y1) { 2813 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 2814
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2607 2816
2608 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2818
2819 if (my @w = @{ $para->{widget} }) {
2820 my @s = $layout->get_shapes;
2821
2822 for (@w) {
2823 my ($dx, $dy) = splice @s, 0, 2, ();
2824
2825 $_->{x} = $dx + $para->{indent};
2826 $_->{y} = $dy + $y - $y0;
2827
2828 $_->draw;
2829 }
2830 }
2610 } 2831 }
2611 2832
2612 $y += $h; 2833 $y += $h;
2613 } 2834 }
2614
2615 glDisable GL_BLEND;
2616 }; 2835 };
2617 }); 2836 });
2618} 2837}
2619 2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2846}
2847
2620sub _draw { 2848sub _draw {
2621 my ($self) = @_; 2849 my ($self) = @_;
2622 2850
2623 glEnable GL_TEXTURE_2D; 2851 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2852 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2853 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2854 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2628 2856
2629 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2630
2631} 2858}
2632 2859
2633############################################################################# 2860#############################################################################
2634 2861
2635package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 2949 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2950 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 2951 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 2952 . "visible $widget->{visible}";
2726 } 2953 }
2954
2955 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//;
2727 2957
2728 $self->add (new CFClient::UI::Label 2958 $self->add (new CFClient::UI::Label
2729 markup => $tooltip, 2959 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 2961 fontsize => 0.8,
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2971 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 2972
2743 ($w + 4, $h + 4) 2973 ($w + 4, $h + 4)
2744} 2974}
2745 2975
2746sub size_allocate { 2976sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 2977 my ($self, $w, $h) = @_;
2748 2978
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 2979 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 2980}
2751 2981
2752sub visibility_change { 2982sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 2983 my ($self, $visible) = @_;
2754 2984
2755 return unless $visible; 2985 return unless $visible;
2756 2986
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 2987 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2759 or return; 2989 or return;
2760 2990
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 2992
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 2994 if $x + $self->{w} > $self->{root}{w};
2765 2995
2766 $self->move_abs ($x, $y); 2996 $self->move_abs ($x, $y);
2767 }); 2997 });
2768} 2998}
2769 2999
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3088 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 3089
2860 if ($tex) { 3090 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3091 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3093 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3094 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3095 glDisable GL_TEXTURE_2D;
2866 } 3096 }
2867} 3097}
2868 3098
2869sub DESTROY { 3099sub destroy {
2870 my ($self) = @_; 3100 my ($self) = @_;
2871 3101
2872 $self->{timer}->cancel 3102 $self->{timer}->cancel
2873 if $self->{timer}; 3103 if $self->{timer};
2874 3104
2875 $self->SUPER::DESTROY; 3105 $self->SUPER::destroy;
2876} 3106}
2877 3107
2878############################################################################# 3108#############################################################################
2879 3109
2880package CFClient::UI::Buttonbar; 3110package CFClient::UI::Buttonbar;
… …
2901 ); 3131 );
2902 3132
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3133 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2904 3134
2905 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
2907 3137
2908 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
2909 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
2910 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
2911 can_hover => 1, 3155 can_hover => 1,
2912 can_events => 1, 3156 can_events => 1,
2913 text => $widget; 3157 markup => $widget,
3158 tooltip => $tooltip;
3159 }
2914 } 3160 }
2915 3161
2916 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
2917 3163
2918 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
2923 3169
2924# popup given the event (must be a mouse button down event currently) 3170# popup given the event (must be a mouse button down event currently)
2925sub popup { 3171sub popup {
2926 my ($self, $ev) = @_; 3172 my ($self, $ev) = @_;
2927 3173
2928 $self->_emit ("popdown"); 3174 $self->emit ("popdown");
2929 3175
2930 # maybe save $GRAB? must be careful about events... 3176 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3177 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3178 $self->{button} = $ev->{button};
2933 3179
2934 $self->show; 3180 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3181 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3182}
2937 3183
2938sub mouse_motion { 3184sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3185 my ($self, $ev, $x, $y) = @_;
2940 3186
2941 # TODO: should use vbox->find_widget or so 3187 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3188 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3189 $self->{hover} = $self->{item}{$HOVER};
2944 3190
2945 0 3191 0
2946} 3192}
2947 3193
2948sub button_up { 3194sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3195 my ($self, $ev, $x, $y) = @_;
2950 3196
2951 if ($ev->{button} == $self->{button}) { 3197 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3198 undef $GRAB;
2953 $self->hide; 3199 $self->hide;
2954 3200
2955 $self->_emit ("popdown"); 3201 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3202 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3203 } else {
2958 return 0 3204 return 0
2959 } 3205 }
2960 3206
… …
2987 3233
2988 $self->{current} = $self->{children}[0] 3234 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} }; 3235 if @{ $self->{children} };
2990} 3236}
2991 3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3242}
3243
2992sub set_current_page { 3244sub set_current_page {
2993 my ($self, $page_or_widget) = @_; 3245 my ($self, $page_or_widget) = @_;
2994 3246
2995 my $widget = ref $page_or_widget 3247 my $widget = ref $page_or_widget
2996 ? $page_or_widget 3248 ? $page_or_widget
2997 : $self->{children}[$page_or_widget]; 3249 : $self->{children}[$page_or_widget];
2998 3250
2999 $self->{current} = $widget; 3251 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3252 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3253
3002 $self->_emit (page_changed => $self->{current}); 3254 $self->emit (page_changed => $self->{current});
3003 3255
3004 $self->realloc; 3256 $self->realloc;
3005} 3257}
3006 3258
3007sub visible_children { 3259sub visible_children {
… …
3012 my ($self) = @_; 3264 my ($self) = @_;
3013 3265
3014 $self->{current}->size_request 3266 $self->{current}->size_request
3015} 3267}
3016 3268
3017sub size_allocate { 3269sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3270 my ($self, $w, $h) = @_;
3019 3271
3020 $self->{current}->configure (0, 0, $w, $h); 3272 $self->{current}->configure (0, 0, $w, $h);
3273
3274 1
3021} 3275}
3022 3276
3023sub _draw { 3277sub _draw {
3024 my ($self) = @_; 3278 my ($self) = @_;
3025 3279
… …
3060 ); 3314 );
3061 3315
3062 $self->{multiplexer}->add ($widget); 3316 $self->{multiplexer}->add ($widget);
3063} 3317}
3064 3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3323}
3324
3065sub set_current_page { 3325sub set_current_page {
3066 my ($self, $page) = @_; 3326 my ($self, $page) = @_;
3067 3327
3068 $self->{multiplexer}->set_current_page ($page); 3328 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3329 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3330}
3071 3331
3072############################################################################# 3332#############################################################################
3073 3333
3074package CFClient::UI::Statusbox; 3334package CFClient::UI::Combobox;
3075 3335
3336use utf8;
3337
3076our @ISA = CFClient::UI::VBox::; 3338our @ISA = CFClient::UI::Button::;
3077 3339
3078sub new { 3340sub new {
3079 my $class = shift; 3341 my $class = shift;
3080 3342
3081 $class->SUPER::new ( 3343 my $self = $class->SUPER::new (
3344 options => [], # [value, title, longdesc], ...
3345 value => undef,
3346 @_,
3347 );
3348
3349 $self->_set_value ($self->{value});
3350
3351 $self
3352}
3353
3354sub invoke_button_down {
3355 my ($self, $ev) = @_;
3356
3357 my @menu_items;
3358
3359 for (@{ $self->{options} }) {
3360 my ($value, $title, $tooltip) = @$_;
3361
3362 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363 }
3364
3365 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366}
3367
3368sub _set_value {
3369 my ($self, $value) = @_;
3370
3371 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3372 or return;
3373
3374 $self->{value} = $item->[0];
3375 $self->set_markup ("$item->[1] ⇓");
3376 $self->set_tooltip ($item->[2]);
3377}
3378
3379sub set_value {
3380 my ($self, $value) = @_;
3381
3382 return unless $self->{value} ne $value;
3383
3384 $self->_set_value ($value);
3385 $self->emit (changed => $value);
3386}
3387
3388#############################################################################
3389
3390package CFClient::UI::Statusbox;
3391
3392our @ISA = CFClient::UI::VBox::;
3393
3394sub new {
3395 my $class = shift;
3396
3397 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3398 fontsize => 0.8,
3083 @_, 3399 @_,
3084 ) 3400 );
3401
3402 Scalar::Util::weaken (my $this = $self);
3403
3404 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405
3406 $self
3085} 3407}
3086 3408
3087sub reorder { 3409sub reorder {
3088 my ($self) = @_; 3410 my ($self) = @_;
3089 my $NOW = time; 3411 my $NOW = Time::HiRes::time;
3412
3413 # freeze display when hovering over any label
3414 return if $CFClient::UI::TOOLTIP->{owner}
3415 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3416 values %{ $self->{item} };
3090 3417
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3418 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3419 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3420 }
3094 3421
… …
3097 my @items = sort { 3424 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3425 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3426 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3427 } values %{ $self->{item} };
3101 3428
3429 $self->{timer}->interval (1);
3430
3102 my $count = 10 + 1; 3431 my $count = 10 + 1;
3103 for my $item (@items) { 3432 for my $item (@items) {
3104 last unless --$count; 3433 last unless --$count;
3105 3434
3106 push @widgets, $item->{label} ||= do { 3435 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3436 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3437 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3438 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3439 : $item->{text};
3111 3440
… …
3119 tooltip => $item->{tooltip}, 3448 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3449 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3450 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3451 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3452 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3453 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3454 can_events => 1,
3126 can_hover => 1 3455 can_hover => 1
3127 }; 3456 };
3457
3458 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3459 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3460 $label->update;
3461 $label->set_max_size (undef, $label->{req_h} * $diff)
3462 if $diff < 1;
3463 $self->{timer}->interval (1/30);
3464 } else {
3465 $label->{fg}[3] = $item->{fg}[3] || 1;
3466 }
3467
3468 push @widgets, $label;
3128 } 3469 }
3129 3470
3130 $self->clear; 3471 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3472 $self->SUPER::add (reverse @widgets);
3132} 3473}
… …
3137 $text =~ s/^\s+//; 3478 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3479 $text =~ s/\s+$//;
3139 3480
3140 return unless $text; 3481 return unless $text;
3141 3482
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3483 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3484
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3485 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3486
3146 if (my $item = $self->{item}{$group}) { 3487 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3488 if ($item->{text} eq $text) {
3148 $item->{count}++; 3489 $item->{count}++;
3149 } else { 3490 } else {
3150 $item->{count} = 1; 3491 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3492 $item->{text} = $item->{tooltip} = $text;
3152 } 3493 }
3153 $item->{id} = ++$self->{id}; 3494 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3495 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3496 delete $item->{label};
3156 } else { 3497 } else {
3157 $self->{item}{$group} = { 3498 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3499 id => ++$self->{id},
… …
3164 count => 1, 3505 count => 1,
3165 %arg, 3506 %arg,
3166 }; 3507 };
3167 } 3508 }
3168 3509
3510 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 3511 $self->reorder;
3512 });
3170} 3513}
3171 3514
3172sub reconfigure { 3515sub reconfigure {
3173 my ($self) = @_; 3516 my ($self) = @_;
3174 3517
… …
3177 3520
3178 $self->reorder; 3521 $self->reorder;
3179 $self->SUPER::reconfigure; 3522 $self->SUPER::reconfigure;
3180} 3523}
3181 3524
3525sub destroy {
3526 my ($self) = @_;
3527
3528 $self->{timer}->cancel;
3529
3530 $self->SUPER::destroy;
3531}
3532
3182############################################################################# 3533#############################################################################
3183 3534
3184package CFClient::UI::Inventory; 3535package CFClient::UI::Inventory;
3185 3536
3186our @ISA = CFClient::UI::ScrolledWindow::; 3537our @ISA = CFClient::UI::Table::;
3187 3538
3188sub new { 3539sub new {
3189 my $class = shift; 3540 my $class = shift;
3190 3541
3191 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3543 col_expand => [0, 1, 0],
3193 @_, 3544 @_,
3194 ); 3545 );
3195 3546
3196 $self 3547 $self
3197} 3548}
3198 3549
3199sub set_items { 3550sub set_items {
3200 my ($self, $items) = @_; 3551 my ($self, $items) = @_;
3201 3552
3202 $self->{child}->clear; 3553 $self->clear;
3203 return unless $items; 3554 return unless $items;
3204 3555
3205 my @items = sort { 3556 my @items = sort {
3206 ($a->{type} <=> $b->{type}) 3557 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name}) 3558 or ($a->{name} cmp $b->{name})
3208 } @$items; 3559 } values %$items;
3209 3560
3210 $self->{real_items} = \@items; 3561 $self->{real_items} = \@items;
3211 3562
3212 my $row = 0; 3563 my $row = 0;
3213 for my $item (@items) { 3564 for my $item (@items) {
3214 CFClient::Item::update_widgets $item; 3565 CFClient::Item::update_widgets $item;
3215 3566
3216 $self->{child}->add (0, $row, $item->{face_widget}); 3567 $self->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget}); 3568 $self->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget}); 3569 $self->add (2, $row, $item->{weight_widget});
3219 3570
3220 $row++; 3571 $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 } 3572 }
3419} 3573}
3420 3574
3421############################################################################# 3575#############################################################################
3422 3576
… …
3432 commands => [], 3586 commands => [],
3433 @_, 3587 @_,
3434 ) 3588 )
3435} 3589}
3436 3590
3437# XXX: Do sorting? Argl... 3591my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604sub rebuild_spell_list {
3605 my ($self) = @_;
3606
3607 $CFClient::UI::ROOT->on_refresh ($self => sub {
3608 $self->clear;
3609
3610 return unless $::CONN;
3611
3612 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618 my $row = 0;
3619
3620 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621 my $spell = $self->{spell}{$_};
3622
3623 $row++;
3624
3625 my $spell_cb = sub {
3626 my ($widget, $ev) = @_;
3627
3628 if ($ev->{button} == 1) {
3629 $::CONN->user_send ("cast $spell->{name}");
3630 } elsif ($ev->{button} == 2) {
3631 $::CONN->user_send ("invoke $spell->{name}");
3632 } elsif ($ev->{button} == 3) {
3633 (new CFClient::UI::Menu
3634 items => [
3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637 ],
3638 )->popup ($ev);
3639 } else {
3640 return 0;
3641 }
3642
3643 1
3644 };
3645
3646 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648 #TODO: add path info to tooltip
3649 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651 $self->add (0, $row, new CFClient::UI::Face
3652 face => $spell->{face},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (1, $row, new CFClient::UI::Label
3660 expand => 1,
3661 text => $spell->{name},
3662 can_hover => 1,
3663 can_events => 1,
3664 tooltip => $tooltip,
3665 on_button_down => $spell_cb,
3666 );
3667
3668 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672 }
3673 });
3674}
3675
3438sub add_spell { 3676sub add_spell {
3439 my ($self, $spell) = @_; 3677 my ($self, $spell) = @_;
3678
3440 $self->{spells}->{$spell->{name}} = $spell; 3679 $self->{spell}->{$spell->{name}} = $spell;
3441 3680 $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} 3681}
3470 3682
3471sub remove_spell { 3683sub remove_spell {
3472 my ($self, $spell) = @_; 3684 my ($self, $spell) = @_;
3685
3473 delete $self->{spells}->{$spell->{name}}; 3686 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3687 $self->rebuild_spell_list;
3475} 3688}
3476 3689
3690sub clear_spells {
3691 my ($self) = @_;
3692
3693 $self->{spell} = {};
3694 $self->rebuild_spell_list;
3695}
3696
3477############################################################################# 3697#############################################################################
3478 3698
3479package CFClient::UI::Root; 3699package CFClient::UI::Root;
3480 3700
3481our @ISA = CFClient::UI::Container::; 3701our @ISA = CFClient::UI::Container::;
3702
3703use List::Util qw(min max);
3482 3704
3483use CFClient::OpenGL; 3705use CFClient::OpenGL;
3484 3706
3485sub new { 3707sub new {
3486 my $class = shift; 3708 my $class = shift;
… …
3513 $coord = $max - $size if $coord > $max - $size; 3735 $coord = $max - $size if $coord > $max - $size;
3514 3736
3515 int $coord + 0.5 3737 int $coord + 0.5
3516} 3738}
3517 3739
3518sub size_allocate { 3740sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 3741 my ($self, $w, $h) = @_;
3520 3742
3521 for my $child ($self->children) { 3743 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3744 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 3745
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 3749 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 3750 $Y = _to_pixel $Y, $H, $self->{h};
3529 3751
3530 $child->configure ($X, $Y, $W, $H); 3752 $child->configure ($X, $Y, $W, $H);
3531 } 3753 }
3754
3755 1
3532} 3756}
3533 3757
3534sub coord2local { 3758sub coord2local {
3535 my ($self, $x, $y) = @_; 3759 my ($self, $x, $y) = @_;
3536 3760
… …
3621 3845
3622 delete $queue{$widget+0}; 3846 delete $queue{$widget+0};
3623 3847
3624 my ($w, $h) = $widget->size_request; 3848 my ($w, $h) = $widget->size_request;
3625 3849
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3850 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3851 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3852
3853 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3854 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3855
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3856 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3857 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3858
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3859 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3658 3885
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660 3887
3661 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3662 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3663 3896
3664 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3665 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3666 3899
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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