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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.334 by root, Sun Jul 23 16:11:12 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
443 Carp::confess unless $self->{parent};#d#
444
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 446}
419 447
420sub focus_in { 448sub invoke_focus_in {
421 my ($self) = @_; 449 my ($self) = @_;
422 450
423 return if $FOCUS == $self; 451 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
425 453
426 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
427 455
428 $self->_emit (focus_in => $focus); 456 $self->update;
429 457
430 $focus->update if $focus; 458 0
431 $FOCUS->update;
432} 459}
433 460
434sub focus_out { 461sub invoke_focus_out {
435 my ($self) = @_; 462 my ($self) = @_;
436 463
437 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
438 465
439 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
440 467
441 $self->_emit (focus_out => $focus); 468 $self->update;
442 469
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 470 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 471 unless $FOCUS;
447}
448 472
473 0
474}
475
476sub grab_focus {
477 my ($self) = @_;
478
479 $FOCUS->emit ("focus_out") if $FOCUS;
480 $self->emit ("focus_in");
481}
482
449sub mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 484sub invoke_button_up { 0 }
451sub key_down { 0 } 485sub invoke_key_down { 0 }
452sub key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
453 488
454sub button_down { 489sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
456 491
457 $self->focus_in; 492 $self->grab_focus;
458 493
459 0 494 0
495}
496
497sub connect {
498 my ($self, $signal, $cb) = @_;
499
500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
514
515sub emit {
516 my ($self, $signal, @args) = @_;
517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
527 #d##TODO# stop propagating at first true, do not use sum
528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 531}
461 532
462sub find_widget { 533sub find_widget {
463 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
464 535
… …
474sub set_parent { 545sub set_parent {
475 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
476 547
477 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 549 $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} 550}
503 551
504sub realloc { 552sub realloc {
505 my ($self) = @_; 553 my ($self) = @_;
506 554
… …
539 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
540 588
541 # update screen rectangle 589 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 592
547 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 596
… …
589} 635}
590 636
591sub DESTROY { 637sub DESTROY {
592 my ($self) = @_; 638 my ($self) = @_;
593 639
640 return if CFClient::in_destruct;
641
594 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
595 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 646}
597 647
598############################################################################# 648#############################################################################
599 649
600package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
681 if $children; 731 if $children;
682 732
683 $self 733 $self
684} 734}
685 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
686sub add { 744sub add {
687 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
688 746
689 $_->set_parent ($self) 747 $_->set_parent ($self)
690 for @widgets; 748 for @widgets;
… …
765} 823}
766 824
767sub add { 825sub add {
768 my ($self, $child) = @_; 826 my ($self, $child) = @_;
769 827
770 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
773} 830}
774 831
775sub remove { 832sub remove {
776 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
785 842
786sub size_request { 843sub size_request {
787 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
788} 845}
789 846
790sub size_allocate { 847sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
792 849
793 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
794} 853}
795 854
796############################################################################# 855#############################################################################
797 856
798# back-buffered drawing area 857# back-buffered drawing area
… …
814 873
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 875 $self->SUPER::update;
817} 876}
818 877
819sub size_allocate { 878sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
821 880
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
824} 884}
825 885
826sub _render { 886sub _render {
827 my ($self) = @_; 887 my ($self) = @_;
828 888
… …
889 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
890 950
891 ($w, $h) 951 ($w, $h)
892} 952}
893 953
894sub size_allocate { 954sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
896 956
897 my $child = $self->child; 957 my $child = $self->child;
898 958
899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
901 961
902 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
903 $self->update; 963 $self->update;
964
965 1
904} 966}
905 967
906sub set_offset { 968sub set_offset {
907 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
908 970
… …
971 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
972 }, 1034 },
973 ; 1035 ;
974 1036
975 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
976 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
977 slider => $slider, 1040 slider => $slider,
978 %arg, 1041 %arg,
979 ); 1042 );
980 1043
981 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
983 1046
984 $self 1047 $self
985} 1048}
986 1049
1050#TODO# update range on size_allocate depending on child
1051
987sub add { 1052sub add {
988 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
989 1054
990 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
991} 1056}
992 1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
1066}
1067
1068sub update_slider {
1069 my ($self) = @_;
1070
1071 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1072}
1073
993sub update { 1074sub update {
994 my ($self) = @_; 1075 my ($self) = @_;
995 1076
996 $self->SUPER::update; 1077 $self->SUPER::update;
997 1078
998 # todo: overwrite size_allocate of child 1079 $self->update_slider;
999 my $child = $self->{vp}->child;
1000 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1001} 1080}
1002 1081
1003sub size_allocate { 1082sub invoke_size_allocate {
1004 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1005 1084
1085 $self->update_slider;
1086
1006 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1007
1008 my $child = $self->{vp}->child;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010} 1088}
1011
1012#TODO# update range on size_allocate depending on child
1013# update viewport offset on scroll
1014 1089
1015############################################################################# 1090#############################################################################
1016 1091
1017package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1018 1093
… …
1069 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1070 1145
1071sub new { 1146sub new {
1072 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1073 1148
1074 my $title = delete $arg{title};
1075
1076 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1152 border => 0.6,
1080 can_events => 1, 1153 can_events => 1,
1081 min_w => 16, 1154 min_w => 64,
1082 min_h => 16, 1155 min_h => 32,
1083 %arg, 1156 %arg,
1084 ); 1157 );
1085 1158
1086 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1087 align => 0, 1160 align => 0,
1088 valign => 1, 1161 valign => 1,
1089 text => $title, 1162 text => $self->{title},
1090 fontsize => $self->{border} 1163 fontsize => $self->{border},
1091 if defined $title; 1164 if exists $self->{title};
1165
1166 if ($self->{has_close_button}) {
1167 $self->{close_button} =
1168 new CFClient::UI::ImageButton
1169 path => 'x1_close.png',
1170 on_activate => sub { $self->emit ("delete") };
1171
1172 $self->CFClient::UI::Container::add ($self->{close_button});
1173 }
1092 1174
1093 $self 1175 $self
1094} 1176}
1095 1177
1096sub add { 1178sub add {
1097 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1098 1180
1099 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1100 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1101} 1184}
1102 1185
1103sub border { 1186sub border {
1104 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1105} 1188}
1106 1189
1107sub size_request { 1190sub size_request {
1108 my ($self) = @_; 1191 my ($self) = @_;
1109 1192
1110 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1111 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1112 1198
1113 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1114 1200
1115 ( 1201 (
1116 $w + $self->border * 2, 1202 $w + $self->border * 2,
1117 $h + $self->border * 2, 1203 $h + $self->border * 2,
1118 ) 1204 )
1119} 1205}
1120 1206
1121sub size_allocate { 1207sub invoke_size_allocate {
1122 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1123 1209
1124 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1125 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1126 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1127 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1128 } 1214 }
1129 1215
1130 my $border = $self->border; 1216 my $border = $self->border;
1131 1217
1132 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1133 $w -= List::Util::max 0, $border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1220
1221 $self->child->configure ($border, $border, $w, $h);
1222
1223 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1224 if $self->{close_button};
1225
1226 1
1227}
1228
1229sub invoke_delete {
1230 my ($self) = @_;
1231
1232 $self->hide;
1134 1233
1135 $self->child->configure ($border, $border, $w, $h); 1234 1
1136} 1235}
1137 1236
1138sub button_down { 1237sub invoke_button_down {
1139 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1140 1239
1141 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1142 my $border = $self->border; 1241 my $border = $self->border;
1143 1242
… …
1174 1273
1175 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1176 1275
1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1178 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1180 }; 1279 };
1181 } else { 1280 } else {
1182 return 0; 1281 return 0;
1183 } 1282 }
1184 1283
1185 1 1284 1
1186} 1285}
1187 1286
1188sub button_up { 1287sub invoke_button_up {
1189 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1190 1289
1191 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1192} 1291}
1193 1292
1194sub mouse_motion { 1293sub invoke_mouse_motion {
1195 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1196 1295
1197 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198 1297
1199 !!$self->{motion} 1298 ! ! $self->{motion}
1200} 1299}
1201 1300
1202sub _draw { 1301sub _draw {
1203 my ($self) = @_; 1302 my ($self) = @_;
1204 1303
… …
1230 1329
1231 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1232 1331
1233 $child->draw; 1332 $child->draw;
1234 1333
1235 if ($self->{title}) { 1334 if ($self->{title_widget}) {
1236 glTranslate 0, $border - $self->{h}; 1335 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw; 1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1238 } 1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1239} 1343}
1240 1344
1241############################################################################# 1345#############################################################################
1242 1346
1243package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1260sub children { 1364sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1262} 1366}
1263 1367
1264sub add { 1368sub add {
1265 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1266 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1267 $child->set_parent ($self); 1373 $child->set_parent ($self);
1268 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1269 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1270 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1271} 1386}
1272 1387
1273# TODO: move to container class maybe? send children a signal on removal? 1388# TODO: move to container class maybe? send children a signal on removal?
1274sub clear { 1389sub clear {
1275 my ($self) = @_; 1390 my ($self) = @_;
… …
1316 (sum @$ws), 1431 (sum @$ws),
1317 (sum @$hs), 1432 (sum @$hs),
1318 ) 1433 )
1319} 1434}
1320 1435
1321sub size_allocate { 1436sub invoke_size_allocate {
1322 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1323 1438
1324 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1325 1440
1326 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1358 } 1473 }
1359 1474
1360 $y += $row_h; 1475 $y += $row_h;
1361 } 1476 }
1362 1477
1478 1
1363} 1479}
1364 1480
1365sub find_widget { 1481sub find_widget {
1366 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1367 1483
… …
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 ) 1522 )
1407} 1523}
1408 1524
1409sub size_allocate { 1525sub invoke_size_allocate {
1410 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1411 1527
1412 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1413 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1414 1530
1415 my @req; 1531 my @req;
1416 1532
1417 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1418 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1419 } else { 1535 } else {
1420 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1421 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1422 1538
1423 if ($req > $space) { 1539 if ($req > $space) {
1424 # ah well, not enough space 1540 # ah well, not enough space
1425 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1426 } else { 1542 } else {
1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1428 1544
1429 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1430 1546
1431 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1432 for 0 .. $#$children; 1548 for 0 .. $#children;
1433 } 1549 }
1434 } 1550 }
1435 1551
1436 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1437 1553
1438 my $pos = 0; 1554 my $pos = 0;
1439 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1440 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1557 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1442 1558
1443 $pos += $alloc; 1559 $pos += $alloc;
1444 } 1560 }
1445 1561
1446 1 1562 1
… …
1519 } 1635 }
1520 1636
1521 $self 1637 $self
1522} 1638}
1523 1639
1524sub escape($) {
1525 local $_ = $_[0];
1526
1527 s/&/&amp;/g;
1528 s/>/&gt;/g;
1529 s/</&lt;/g;
1530
1531 $_
1532}
1533
1534sub update { 1640sub update {
1535 my ($self) = @_; 1641 my ($self) = @_;
1536 1642
1537 delete $self->{texture}; 1643 delete $self->{texture};
1538 $self->SUPER::update; 1644 $self->SUPER::update;
1539} 1645}
1540 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1541sub set_text { 1654sub set_text {
1542 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1543 1656
1544 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1545 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1546 1659
1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1548 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1549 1661
1662 delete $self->{size_req};
1550 $self->realloc; 1663 $self->realloc;
1551 $self->update; 1664 $self->update;
1552} 1665}
1553 1666
1554sub set_markup { 1667sub set_markup {
… …
1557 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1558 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1559 1672
1560 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1561 1674
1562 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1563 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1564 1676
1677 delete $self->{size_req};
1565 $self->realloc; 1678 $self->realloc;
1566 $self->update; 1679 $self->update;
1567} 1680}
1568 1681
1569sub size_request { 1682sub size_request {
1570 my ($self) = @_; 1683 my ($self) = @_;
1571 1684
1685 $self->{size_req} ||= do {
1572 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1573 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1574 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1575 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1577 1691
1578 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1579 1693
1580 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1581 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1582 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 1698
1584 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1585 1700
1586 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1587 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1588 } 1706 };
1589 1707
1590 ($w, $h) 1708 @{ $self->{size_req} }
1591} 1709}
1592 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1593sub size_allocate { 1715sub invoke_size_allocate {
1594 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1595 1717
1596 delete $self->{ox}; 1718 delete $self->{ox};
1597 1719
1598 delete $self->{texture} 1720 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1600} 1724}
1601 1725
1602sub set_fontsize { 1726sub set_fontsize {
1603 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1604 1728
1605 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1606 delete $self->{texture}; 1731 delete $self->{texture};
1607 1732
1608 $self->realloc; 1733 $self->realloc;
1609} 1734}
1610 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1611sub _draw { 1745sub _draw {
1612 my ($self) = @_; 1746 my ($self) = @_;
1613 1747
1614 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1615 1749
1616 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1617 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1618 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1619 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1620 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1621 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1757
1624 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1625 }; 1759 };
1626 1760
1627 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1630 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1631 1765
1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1634 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1635 }; 1769 };
1636 1770
1637 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1639 1773
1640 glColor_premultiply @{$self->{fg}} 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1641 if $tex->{format} == GL_ALPHA;
1642
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644
1645 glDisable GL_TEXTURE_2D;
1646} 1775}
1647 1776
1648############################################################################# 1777#############################################################################
1649 1778
1650package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1664 can_hover => 1, 1793 can_hover => 1,
1665 can_focus => 1, 1794 can_focus => 1,
1666 valign => 0, 1795 valign => 0,
1667 can_events => 1, 1796 can_events => 1,
1668 #text => ... 1797 #text => ...
1798 #hidden => "*",
1669 @_ 1799 @_
1670 ) 1800 )
1671} 1801}
1672 1802
1673sub _set_text { 1803sub _set_text {
… …
1680 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1681 $self->{text} = $text; 1811 $self->{text} = $text;
1682 1812
1683 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1684 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1685 1816
1686 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1687 $self->update; 1820 $self->update;
1688} 1821}
1689 1822
1690sub set_text { 1823sub set_text {
1691 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1692 1825
1693 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1694 $self->_set_text ($text); 1827 $self->_set_text ($text);
1695
1696 $self->realloc;
1697} 1828}
1698 1829
1699sub get_text { 1830sub get_text {
1700 $_[0]{text} 1831 $_[0]{text}
1701} 1832}
… …
1706 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1707 1838
1708 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1709} 1840}
1710 1841
1711sub key_down { 1842sub invoke_key_down {
1712 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1713 1844
1714 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1715 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1716 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1728 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1729 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1730 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1731 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1732 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1733 $self->_emit ('escape'); 1864 $self->emit ('escape');
1734 } elsif ($uni) { 1865 } elsif ($uni) {
1735 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else { 1867 } else {
1737 return 0; 1868 return 0;
1738 } 1869 }
… …
1742 $self->realloc; 1873 $self->realloc;
1743 1874
1744 1 1875 1
1745} 1876}
1746 1877
1747sub focus_in { 1878sub invoke_focus_in {
1748 my ($self) = @_; 1879 my ($self) = @_;
1749 1880
1750 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1751 1882
1752 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1753} 1884}
1754 1885
1755sub button_down { 1886sub invoke_button_down {
1756 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1757 1888
1758 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1759 1890
1760 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1761 1892
1762 # byte-index to char-index 1893 # byte-index to char-index
1763 my $text = $self->{text}; 1894 my $text = $self->{text};
1764 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1765 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1766 1897
1767 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1768 $self->update; 1899 $self->update;
1769 1900
1770 1 1901 1
1771} 1902}
1772 1903
1773sub mouse_motion { 1904sub invoke_mouse_motion {
1774 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1906# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776 1907
1777 0 1908 1
1778} 1909}
1779 1910
1780sub _draw { 1911sub _draw {
1781 my ($self) = @_; 1912 my ($self) = @_;
1782 1913
… …
1823 1954
1824our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1825 1956
1826use CFClient::OpenGL; 1957use CFClient::OpenGL;
1827 1958
1828sub key_down { 1959sub invoke_key_down {
1829 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1830 1961
1831 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1832 1963
1833 if ($sym == 13) { 1964 if ($sym == 13) {
1834 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1835 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1836 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1837 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1838 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1839 $self->update; 1971 $self->update;
1840 1972
1841 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1842 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1843 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1859 } else { 1991 } else {
1860 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1861 } 1993 }
1862 1994
1863 } else { 1995 } else {
1864 return $self->SUPER::key_down ($ev) 1996 return $self->SUPER::invoke_key_down ($ev)
1865 } 1997 }
1866 1998
1867 1 1999 1
1868} 2000}
1869 2001
… …
1893 can_events => 1, 2025 can_events => 1,
1894 @_ 2026 @_
1895 ) 2027 )
1896} 2028}
1897 2029
1898sub activate { }
1899
1900sub button_up { 2030sub invoke_button_up {
1901 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1902 2032
1903 $self->emit ("activate") 2033 $self->emit ("activate")
1904 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1905 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
… …
1919 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1920 2050
1921 glDisable GL_TEXTURE_2D; 2051 glDisable GL_TEXTURE_2D;
1922 2052
1923 $self->SUPER::_draw; 2053 $self->SUPER::_draw;
2054}
2055
2056#############################################################################
2057
2058package CFClient::UI::ImageButton;
2059
2060our @ISA = CFClient::UI::Image::;
2061
2062use CFClient::OpenGL;
2063
2064my %textures;
2065
2066sub new {
2067 my $class = shift;
2068
2069 my $self = $class->SUPER::new (
2070 padding_x => 4,
2071 padding_y => 4,
2072 fg => [1, 1, 1],
2073 active_fg => [0, 0, 1],
2074 can_hover => 1,
2075 align => 0,
2076 valign => 0,
2077 can_events => 1,
2078 @_
2079 );
2080}
2081
2082sub invoke_button_up {
2083 my ($self, $ev, $x, $y) = @_;
2084
2085 $self->emit ("activate")
2086 if $x >= 0 && $x < $self->{w}
2087 && $y >= 0 && $y < $self->{h};
2088
2089 1
1924} 2090}
1925 2091
1926############################################################################# 2092#############################################################################
1927 2093
1928package CFClient::UI::CheckBox; 2094package CFClient::UI::CheckBox;
… …
1955 my ($self) = @_; 2121 my ($self) = @_;
1956 2122
1957 (6) x 2 2123 (6) x 2
1958} 2124}
1959 2125
2126sub toggle {
2127 my ($self) = @_;
2128
2129 $self->{state} = !$self->{state};
2130 $self->emit (changed => $self->{state});
2131 $self->update;
2132}
2133
1960sub button_down { 2134sub invoke_button_down {
1961 my ($self, $ev, $x, $y) = @_; 2135 my ($self, $ev, $x, $y) = @_;
1962 2136
1963 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2137 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1964 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2138 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1965 $self->{state} = !$self->{state}; 2139 $self->toggle;
1966 $self->_emit (changed => $self->{state});
1967 } else { 2140 } else {
1968 return 0 2141 return 0
1969 } 2142 }
1970 2143
1971 1 2144 1
… …
1996package CFClient::UI::Image; 2169package CFClient::UI::Image;
1997 2170
1998our @ISA = CFClient::UI::Base::; 2171our @ISA = CFClient::UI::Base::;
1999 2172
2000use CFClient::OpenGL; 2173use CFClient::OpenGL;
2001use Carp qw/confess/;
2002 2174
2003our %loaded_images; 2175our %texture_cache;
2004 2176
2005sub new { 2177sub new {
2006 my $class = shift; 2178 my $class = shift;
2007 2179
2008 my $self = $class->SUPER::new (can_events => 0, @_); 2180 my $self = $class->SUPER::new (
2181 can_events => 0,
2182 @_,
2183 );
2009 2184
2010 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
2011 2187
2012 $loaded_images{$self->{image}} ||= 2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2013 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2014 2190
2015 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2016 2192
2017 Scalar::Util::weaken $loaded_images{$self->{image}}; 2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2018
2019 $self->{aspect} = $tex->{w} / $tex->{h};
2020 2194
2021 $self 2195 $self
2022} 2196}
2023 2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2201 warn "freeze<$self>\n";#d#
2202
2203 $self->{path}
2204 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206 $self->{path}
2207}
2208
2209sub STORABLE_attach {
2210 my ($self, $cloning, $path) = @_;
2211 warn "attach<@_>\n";#d#
2212
2213 $self->new (path => $path)
2214}
2215
2024sub size_request { 2216sub size_request {
2025 my ($self) = @_; 2217 my ($self) = @_;
2026 2218
2027 ($self->{tex}->{w}, $self->{tex}->{h}) 2219 ($self->{tex}{w}, $self->{tex}{h})
2028} 2220}
2029 2221
2030sub _draw { 2222sub _draw {
2031 my ($self) = @_; 2223 my ($self) = @_;
2032 2224
… …
2042 } 2234 }
2043 2235
2044 glEnable GL_TEXTURE_2D; 2236 glEnable GL_TEXTURE_2D;
2045 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2046 2238
2047 $tex->draw_quad_alpha (0, 0, $w, $h); 2239 $tex->draw_quad (0, 0, $w, $h);
2048 2240
2049 glDisable GL_TEXTURE_2D; 2241 glDisable GL_TEXTURE_2D;
2050} 2242}
2051 2243
2052############################################################################# 2244#############################################################################
… …
2141 my $ycut1 = max 0, min 1, $ycut; 2333 my $ycut1 = max 0, min 1, $ycut;
2142 my $ycut2 = max 0, min 1, $ycut - 1; 2334 my $ycut2 = max 0, min 1, $ycut - 1;
2143 2335
2144 my $h1 = $self->{h} * (1 - $ycut1); 2336 my $h1 = $self->{h} * (1 - $ycut1);
2145 my $h2 = $self->{h} * (1 - $ycut2); 2337 my $h2 = $self->{h} * (1 - $ycut2);
2338 my $h3 = $self->{h};
2339
2340 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2146 2341
2147 glEnable GL_BLEND; 2342 glEnable GL_BLEND;
2148 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2343 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2149 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2344 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2150 glEnable GL_TEXTURE_2D; 2345 glEnable GL_TEXTURE_2D;
… …
2169 2364
2170 if ($t3) { 2365 if ($t3) {
2171 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2366 glBindTexture GL_TEXTURE_2D, $t3->{name};
2172 glBegin GL_QUADS; 2367 glBegin GL_QUADS;
2173 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2368 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2174 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2369 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2175 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2370 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2176 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2371 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2177 glEnd; 2372 glEnd;
2178 } 2373 }
2179 2374
2180 glDisable GL_BLEND; 2375 glDisable GL_BLEND;
… …
2268 $self->update; 2463 $self->update;
2269 2464
2270 $self 2465 $self
2271} 2466}
2272 2467
2273sub changed { }
2274
2275sub set_range { 2468sub set_range {
2276 my ($self, $range) = @_; 2469 my ($self, $range) = @_;
2277 2470
2278 ($range, $self->{range}) = ($self->{range}, $range); 2471 ($range, $self->{range}) = ($self->{range}, $range);
2279 2472
2280 $self->update
2281 if "@$range" ne "@{$self->{range}}"; 2473 if ("@$range" ne "@{$self->{range}}") {
2474 $self->update;
2475 $self->set_value ($self->{range}[0]);
2476 }
2282} 2477}
2283 2478
2284sub set_value { 2479sub set_value {
2285 my ($self, $value) = @_; 2480 my ($self, $value) = @_;
2286 2481
… …
2297 if $unit; 2492 if $unit;
2298 2493
2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2494 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2300 2495
2301 if ($value != $old_value) { 2496 if ($value != $old_value) {
2302 $self->_emit (changed => $value); 2497 $self->emit (changed => $value);
2303 $self->update; 2498 $self->update;
2304 } 2499 }
2305} 2500}
2306 2501
2307sub size_request { 2502sub size_request {
2308 my ($self) = @_; 2503 my ($self) = @_;
2309 2504
2310 ($self->{req_w}, $self->{req_h}) 2505 ($self->{req_w}, $self->{req_h})
2311} 2506}
2312 2507
2313sub button_down { 2508sub invoke_button_down {
2314 my ($self, $ev, $x, $y) = @_; 2509 my ($self, $ev, $x, $y) = @_;
2315 2510
2316 $self->SUPER::button_down ($ev, $x, $y); 2511 $self->SUPER::invoke_button_down ($ev, $x, $y);
2317 2512
2318 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2513 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2319 2514
2320 $self->mouse_motion ($ev, $x, $y) 2515 $self->invoke_mouse_motion ($ev, $x, $y)
2321} 2516}
2322 2517
2323sub mouse_motion { 2518sub invoke_mouse_motion {
2324 my ($self, $ev, $x, $y) = @_; 2519 my ($self, $ev, $x, $y) = @_;
2325 2520
2326 if ($GRAB == $self) { 2521 if ($GRAB == $self) {
2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2522 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2328 2523
… …
2334 } else { 2529 } else {
2335 return 0; 2530 return 0;
2336 } 2531 }
2337 2532
2338 1 2533 1
2534}
2535
2536sub invoke_mouse_wheel {
2537 my ($self, $ev) = @_;
2538
2539 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2540
2541 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2542
2543 ! ! $delta
2339} 2544}
2340 2545
2341sub update { 2546sub update {
2342 my ($self) = @_; 2547 my ($self) = @_;
2343 2548
… …
2433sub set_range { shift->{slider}->set_range (@_) } 2638sub set_range { shift->{slider}->set_range (@_) }
2434sub set_value { shift->{slider}->set_value (@_) } 2639sub set_value { shift->{slider}->set_value (@_) }
2435 2640
2436############################################################################# 2641#############################################################################
2437 2642
2438package CFClient::UI::TextView; 2643package CFClient::UI::TextScroller;
2439 2644
2440our @ISA = CFClient::UI::HBox::; 2645our @ISA = CFClient::UI::HBox::;
2441 2646
2442use CFClient::OpenGL; 2647use CFClient::OpenGL;
2443 2648
2444sub new { 2649sub new {
2445 my $class = shift; 2650 my $class = shift;
2446 2651
2447 my $self = $class->SUPER::new ( 2652 my $self = $class->SUPER::new (
2448 fontsize => 1, 2653 fontsize => 1,
2449 can_events => 0, 2654 can_events => 1,
2655 indent => 0,
2450 #font => default_font 2656 #font => default_font
2451 @_, 2657 @_,
2452 2658
2453 layout => (new CFClient::Layout 1), 2659 layout => (new CFClient::Layout),
2454 par => [], 2660 par => [],
2455 height => 0, 2661 height => 0,
2456 children => [ 2662 children => [
2457 (new CFClient::UI::Empty expand => 1), 2663 (new CFClient::UI::Empty expand => 1),
2458 (new CFClient::UI::Slider vertical => 1), 2664 (new CFClient::UI::Slider vertical => 1),
… …
2469 2675
2470 $self->{fontsize} = $fontsize; 2676 $self->{fontsize} = $fontsize;
2471 $self->reflow; 2677 $self->reflow;
2472} 2678}
2473 2679
2680sub size_request {
2681 my ($self) = @_;
2682
2683 my ($empty, $slider) = @{ $self->{children} };
2684
2685 local $self->{children} = [$empty, $slider];
2686 $self->SUPER::size_request
2687}
2688
2474sub size_allocate { 2689sub invoke_size_allocate {
2475 my ($self, $w, $h) = @_; 2690 my ($self, $w, $h) = @_;
2476 2691
2477 $self->SUPER::size_allocate ($w, $h); 2692 my ($empty, $slider, @other) = @{ $self->{children} };
2693 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2478 2694
2479 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2695 $self->{layout}->set_font ($self->{font}) if $self->{font};
2480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2696 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2481 $self->{layout}->set_width ($self->{children}[0]{w}); 2697 $self->{layout}->set_width ($empty->{w});
2698 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2482 2699
2483 $self->reflow; 2700 $self->reflow;
2484}
2485 2701
2486sub text_size { 2702 local $self->{children} = [$empty, $slider];
2703 $self->SUPER::invoke_size_allocate ($w, $h)
2704}
2705
2706sub invoke_mouse_wheel {
2487 my ($self, $text, $indent) = @_; 2707 my ($self, $ev) = @_;
2708
2709 return 0 unless $ev->{dy}; # only vertical movements
2710
2711 $self->{children}[1]->emit (mouse_wheel => $ev);
2712
2713 1
2714}
2715
2716sub get_layout {
2717 my ($self, $para) = @_;
2488 2718
2489 my $layout = $self->{layout}; 2719 my $layout = $self->{layout};
2490 2720
2721 $layout->set_font ($self->{font}) if $self->{font};
2722 $layout->set_foreground (@{$para->{fg}});
2491 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2723 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2492 $layout->set_width ($self->{children}[0]{w} - $indent); 2724 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2725 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($text); 2726 $layout->set_markup ($para->{markup});
2727
2728 $layout->set_shapes (
2729 map
2730 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2731 @{$para->{widget}}
2494 2732 );
2733
2495 $layout->size 2734 $layout
2496} 2735}
2497 2736
2498sub reflow { 2737sub reflow {
2499 my ($self) = @_; 2738 my ($self) = @_;
2500 2739
… …
2509 $self->{children}[1]->set_value ($offset); 2748 $self->{children}[1]->set_value ($offset);
2510} 2749}
2511 2750
2512sub clear { 2751sub clear {
2513 my ($self) = @_; 2752 my ($self) = @_;
2753
2754 my (undef, undef, @other) = @{ $self->{children} };
2755 $self->remove ($_) for @other;
2514 2756
2515 $self->{par} = []; 2757 $self->{par} = [];
2516 $self->{height} = 0; 2758 $self->{height} = 0;
2517 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2759 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2518} 2760}
2519 2761
2520sub add_paragraph { 2762sub add_paragraph {
2521 my ($self, $color, $text, $indent) = @_; 2763 my ($self, $color, $para, $indent) = @_;
2522 2764
2523 for my $line (split /\n/, $text) { 2765 my ($text, @w) = ref $para ? @$para : $para;
2524 my ($w, $h) = $self->text_size ($line); 2766
2525 $self->{height} += $h; 2767 $para = {
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2768 w => 1e10,
2769 wrapped => 1,
2770 fg => $color,
2771 indent => $indent,
2772 markup => $text,
2773 widget => \@w,
2527 } 2774 };
2528 2775
2529 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2776 $self->add (@w) if @w;
2777 push @{$self->{par}}, $para;
2778
2779 $self->{need_reflow}++;
2780 $self->update;
2781}
2782
2783sub scroll_to_bottom {
2784 my ($self) = @_;
2785
2786 $self->{scroll_to_bottom} = 1;
2787 $self->update;
2530} 2788}
2531 2789
2532sub update { 2790sub update {
2533 my ($self) = @_; 2791 my ($self) = @_;
2534 2792
… …
2536 2794
2537 return unless $self->{h} > 0; 2795 return unless $self->{h} > 0;
2538 2796
2539 delete $self->{texture}; 2797 delete $self->{texture};
2540 2798
2541 $ROOT->on_post_alloc ($self, sub { 2799 $ROOT->on_post_alloc ($self => sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2800 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543 2801
2544 if (delete $self->{need_reflow}) { 2802 if (delete $self->{need_reflow}) {
2545 my $height = 0; 2803 my $height = 0;
2546 2804
2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2551 for (@{$self->{par}}) { 2805 for my $para (@{$self->{par}}) {
2552 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2806 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2553 $layout->set_width ($W - $_->[3]); 2807 my $layout = $self->get_layout ($para);
2554 $layout->set_markup ($_->[4]);
2555 my ($w, $h) = $layout->size; 2808 my ($w, $h) = $layout->size;
2556 $_->[0] = $w + $_->[3]; 2809
2557 $_->[1] = $h; 2810 $para->{w} = $w + $para->{indent};
2811 $para->{h} = $h;
2812 $para->{wrapped} = $layout->has_wrapped;
2558 } 2813 }
2559 2814
2560 $height += $_->[1]; 2815 $height += $para->{h};
2561 } 2816 }
2562 2817
2563 $self->{height} = $height; 2818 $self->{height} = $height;
2564 2819
2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2820 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2566 2821
2567 delete $self->{texture}; 2822 delete $self->{texture};
2823 }
2824
2825 if (delete $self->{scroll_to_bottom}) {
2826 $self->{children}[1]->set_value (1e10);
2568 } 2827 }
2569 2828
2570 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2829 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2571 glClearColor 0, 0, 0, 0; 2830 glClearColor 0, 0, 0, 0;
2572 glClear GL_COLOR_BUFFER_BIT; 2831 glClear GL_COLOR_BUFFER_BIT;
… …
2576 my $y0 = $top; 2835 my $y0 = $top;
2577 my $y1 = $top + $H; 2836 my $y1 = $top + $H;
2578 2837
2579 my $y = 0; 2838 my $y = 0;
2580 2839
2581 my $layout = $self->{layout};
2582
2583 $layout->set_font ($self->{font}) if $self->{font};
2584
2585 glEnable GL_BLEND;
2586 #TODO# not correct in windows where rgba is forced off
2587 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2588
2589 for my $par (@{$self->{par}}) { 2840 for my $para (@{$self->{par}}) {
2590 my $h = $par->[1]; 2841 my $h = $para->{h};
2591 2842
2592 if ($y0 < $y + $h && $y < $y1) { 2843 if ($y0 < $y + $h && $y < $y1) {
2593 $layout->set_foreground (@{ $par->[2] });
2594 $layout->set_width ($W - $par->[3]);
2595 $layout->set_markup ($par->[4]);
2596 2844
2597 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2845 my $layout = $self->get_layout ($para);
2598 2846
2599 glRasterPos $par->[3], $y - $y0; 2847 $layout->render ($para->{indent}, $y - $y0);
2600 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2848
2849 if (my @w = @{ $para->{widget} }) {
2850 my @s = $layout->get_shapes;
2851
2852 for (@w) {
2853 my ($dx, $dy) = splice @s, 0, 2, ();
2854
2855 $_->{x} = $dx + $para->{indent};
2856 $_->{y} = $dy + $y - $y0;
2857
2858 $_->draw;
2859 }
2860 }
2601 } 2861 }
2602 2862
2603 $y += $h; 2863 $y += $h;
2604 } 2864 }
2605
2606 glDisable GL_BLEND;
2607 }; 2865 };
2608 }); 2866 });
2867}
2868
2869sub reconfigure {
2870 my ($self) = @_;
2871
2872 $self->SUPER::reconfigure;
2873
2874 $_->{w} = 1e10 for @{ $self->{par} };
2875 $self->reflow;
2609} 2876}
2610 2877
2611sub _draw { 2878sub _draw {
2612 my ($self) = @_; 2879 my ($self) = @_;
2613 2880
… …
2616 glColor 0, 0, 0, 1; 2883 glColor 0, 0, 0, 1;
2617 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2884 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2618 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2619 2886
2620 $self->{children}[1]->draw; 2887 $self->{children}[1]->draw;
2621
2622} 2888}
2623 2889
2624############################################################################# 2890#############################################################################
2625 2891
2626package CFClient::UI::Animator; 2892package CFClient::UI::Animator;
… …
2713 $tooltip .= "\n\n" . (ref $widget) . "\n" 2979 $tooltip .= "\n\n" . (ref $widget) . "\n"
2714 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2980 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2715 . "req $widget->{req_w} $widget->{req_h}\n" 2981 . "req $widget->{req_w} $widget->{req_h}\n"
2716 . "visible $widget->{visible}"; 2982 . "visible $widget->{visible}";
2717 } 2983 }
2984
2985 $tooltip =~ s/^\n+//;
2986 $tooltip =~ s/\n+$//;
2718 2987
2719 $self->add (new CFClient::UI::Label 2988 $self->add (new CFClient::UI::Label
2720 markup => $tooltip, 2989 markup => $tooltip,
2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2990 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2722 fontsize => 0.8, 2991 fontsize => 0.8,
… …
2732 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3001 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2733 3002
2734 ($w + 4, $h + 4) 3003 ($w + 4, $h + 4)
2735} 3004}
2736 3005
2737sub size_allocate { 3006sub invoke_size_allocate {
2738 my ($self, $w, $h) = @_; 3007 my ($self, $w, $h) = @_;
2739 3008
2740 $self->SUPER::size_allocate ($w - 4, $h - 4); 3009 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2741} 3010}
2742 3011
2743sub visibility_change { 3012sub invoke_visibility_change {
2744 my ($self, $visible) = @_; 3013 my ($self, $visible) = @_;
2745 3014
2746 return unless $visible; 3015 return unless $visible;
2747 3016
2748 $self->{root}->on_post_alloc ("move_$self" => sub { 3017 $self->{root}->on_post_alloc ("move_$self" => sub {
2749 my $widget = $self->{owner} 3018 my $widget = $self->{owner}
2750 or return; 3019 or return;
2751 3020
3021 if ($widget->{visible}) {
2752 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3022 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2753 3023
2754 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3024 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2755 if $x + $self->{w} > $::WIDTH; 3025 if $x + $self->{w} > $self->{root}{w};
2756 3026
2757 $self->move_abs ($x, $y); 3027 $self->move_abs ($x, $y);
3028 } else {
3029 $self->hide;
3030 }
2758 }); 3031 });
2759} 3032}
2760 3033
2761sub _draw { 3034sub _draw {
2762 my ($self) = @_; 3035 my ($self) = @_;
… …
2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2856 glDisable GL_TEXTURE_2D; 3129 glDisable GL_TEXTURE_2D;
2857 } 3130 }
2858} 3131}
2859 3132
2860sub DESTROY { 3133sub destroy {
2861 my ($self) = @_; 3134 my ($self) = @_;
2862 3135
2863 $self->{timer}->cancel 3136 $self->{timer}->cancel
2864 if $self->{timer}; 3137 if $self->{timer};
2865 3138
2866 $self->SUPER::DESTROY; 3139 $self->SUPER::destroy;
2867} 3140}
2868 3141
2869############################################################################# 3142#############################################################################
2870 3143
2871package CFClient::UI::Buttonbar; 3144package CFClient::UI::Buttonbar;
… …
2892 ); 3165 );
2893 3166
2894 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3167 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2895 3168
2896 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
2897 my ($widget, $cb) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
2898 3171
2899 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
2900 if (!ref $widget) { 3173 if (!ref $widget) {
3174 if ($widget =~ /\t/) {
3175 my ($left, $right) = split /\t/, $widget, 2;
3176
3177 $widget = new CFClient::UI::HBox
3178 can_hover => 1,
3179 can_events => 1,
3180 tooltip => $tooltip,
3181 children => [
3182 (new CFClient::UI::Label markup => $left, expand => 1),
3183 (new CFClient::UI::Label markup => $right, align => +1),
3184 ],
3185 ;
3186
3187 } else {
2901 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
2902 can_hover => 1, 3189 can_hover => 1,
2903 can_events => 1, 3190 can_events => 1,
2904 text => $widget; 3191 markup => $widget,
3192 tooltip => $tooltip;
3193 }
2905 } 3194 }
2906 3195
2907 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
2908 3197
2909 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
2914 3203
2915# popup given the event (must be a mouse button down event currently) 3204# popup given the event (must be a mouse button down event currently)
2916sub popup { 3205sub popup {
2917 my ($self, $ev) = @_; 3206 my ($self, $ev) = @_;
2918 3207
2919 $self->_emit ("popdown"); 3208 $self->emit ("popdown");
2920 3209
2921 # maybe save $GRAB? must be careful about events... 3210 # maybe save $GRAB? must be careful about events...
2922 $GRAB = $self; 3211 $GRAB = $self;
2923 $self->{button} = $ev->{button}; 3212 $self->{button} = $ev->{button};
2924 3213
2925 $self->show; 3214 $self->show;
2926 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3215 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2927} 3216}
2928 3217
2929sub mouse_motion { 3218sub invoke_mouse_motion {
2930 my ($self, $ev, $x, $y) = @_; 3219 my ($self, $ev, $x, $y) = @_;
2931 3220
2932 # TODO: should use vbox->find_widget or so 3221 # TODO: should use vbox->find_widget or so
2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3222 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2934 $self->{hover} = $self->{item}{$HOVER}; 3223 $self->{hover} = $self->{item}{$HOVER};
2935 3224
2936 0 3225 0
2937} 3226}
2938 3227
2939sub button_up { 3228sub invoke_button_up {
2940 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2941 3230
2942 if ($ev->{button} == $self->{button}) { 3231 if ($ev->{button} == $self->{button}) {
2943 undef $GRAB; 3232 undef $GRAB;
2944 $self->hide; 3233 $self->hide;
2945 3234
2946 $self->_emit ("popdown"); 3235 $self->emit ("popdown");
2947 $self->{hover}[1]->() if $self->{hover}; 3236 $self->{hover}[1]->() if $self->{hover};
2948 } else { 3237 } else {
2949 return 0 3238 return 0
2950 } 3239 }
2951 3240
… …
2978 3267
2979 $self->{current} = $self->{children}[0] 3268 $self->{current} = $self->{children}[0]
2980 if @{ $self->{children} }; 3269 if @{ $self->{children} };
2981} 3270}
2982 3271
3272sub get_current_page {
3273 my ($self) = @_;
3274
3275 $self->{current}
3276}
3277
2983sub set_current_page { 3278sub set_current_page {
2984 my ($self, $page_or_widget) = @_; 3279 my ($self, $page_or_widget) = @_;
2985 3280
2986 my $widget = ref $page_or_widget 3281 my $widget = ref $page_or_widget
2987 ? $page_or_widget 3282 ? $page_or_widget
2988 : $self->{children}[$page_or_widget]; 3283 : $self->{children}[$page_or_widget];
2989 3284
2990 $self->{current} = $widget; 3285 $self->{current} = $widget;
2991 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3286 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2992 3287
2993 $self->_emit (page_changed => $self->{current}); 3288 $self->emit (page_changed => $self->{current});
2994 3289
2995 $self->realloc; 3290 $self->realloc;
2996} 3291}
2997 3292
2998sub visible_children { 3293sub visible_children {
… …
3003 my ($self) = @_; 3298 my ($self) = @_;
3004 3299
3005 $self->{current}->size_request 3300 $self->{current}->size_request
3006} 3301}
3007 3302
3008sub size_allocate { 3303sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3304 my ($self, $w, $h) = @_;
3010 3305
3011 $self->{current}->configure (0, 0, $w, $h); 3306 $self->{current}->configure (0, 0, $w, $h);
3307
3308 1
3012} 3309}
3013 3310
3014sub _draw { 3311sub _draw {
3015 my ($self) = @_; 3312 my ($self) = @_;
3016 3313
… …
3051 ); 3348 );
3052 3349
3053 $self->{multiplexer}->add ($widget); 3350 $self->{multiplexer}->add ($widget);
3054} 3351}
3055 3352
3353sub get_current_page {
3354 my ($self) = @_;
3355
3356 $self->{multiplexer}->get_current_page
3357}
3358
3056sub set_current_page { 3359sub set_current_page {
3057 my ($self, $page) = @_; 3360 my ($self, $page) = @_;
3058 3361
3059 $self->{multiplexer}->set_current_page ($page); 3362 $self->{multiplexer}->set_current_page ($page);
3060 $self->_emit (page_changed => $self->{multiplexer}{current}); 3363 $self->emit (page_changed => $self->{multiplexer}{current});
3061} 3364}
3062 3365
3063############################################################################# 3366#############################################################################
3064 3367
3065package CFClient::UI::Statusbox; 3368package CFClient::UI::Combobox;
3066 3369
3370use utf8;
3371
3067our @ISA = CFClient::UI::VBox::; 3372our @ISA = CFClient::UI::Button::;
3068 3373
3069sub new { 3374sub new {
3070 my $class = shift; 3375 my $class = shift;
3071 3376
3072 $class->SUPER::new ( 3377 my $self = $class->SUPER::new (
3378 options => [], # [value, title, longdesc], ...
3379 value => undef,
3380 @_,
3381 );
3382
3383 $self->_set_value ($self->{value});
3384
3385 $self
3386}
3387
3388sub invoke_button_down {
3389 my ($self, $ev) = @_;
3390
3391 my @menu_items;
3392
3393 for (@{ $self->{options} }) {
3394 my ($value, $title, $tooltip) = @$_;
3395
3396 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397 }
3398
3399 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400}
3401
3402sub _set_value {
3403 my ($self, $value) = @_;
3404
3405 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3406 or return;
3407
3408 $self->{value} = $item->[0];
3409 $self->set_markup ("$item->[1] ⇓");
3410 $self->set_tooltip ($item->[2]);
3411}
3412
3413sub set_value {
3414 my ($self, $value) = @_;
3415
3416 return unless $self->{value} ne $value;
3417
3418 $self->_set_value ($value);
3419 $self->emit (changed => $value);
3420}
3421
3422#############################################################################
3423
3424package CFClient::UI::Statusbox;
3425
3426our @ISA = CFClient::UI::VBox::;
3427
3428sub new {
3429 my $class = shift;
3430
3431 my $self = $class->SUPER::new (
3073 fontsize => 0.8, 3432 fontsize => 0.8,
3074 @_, 3433 @_,
3075 ) 3434 );
3435
3436 Scalar::Util::weaken (my $this = $self);
3437
3438 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439
3440 $self
3076} 3441}
3077 3442
3078sub reorder { 3443sub reorder {
3079 my ($self) = @_; 3444 my ($self) = @_;
3080 my $NOW = time; 3445 my $NOW = Time::HiRes::time;
3446
3447 # freeze display when hovering over any label
3448 return if $CFClient::UI::TOOLTIP->{owner}
3449 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3450 values %{ $self->{item} };
3081 3451
3082 while (my ($k, $v) = each %{ $self->{item} }) { 3452 while (my ($k, $v) = each %{ $self->{item} }) {
3083 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3453 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3084 } 3454 }
3085 3455
… …
3088 my @items = sort { 3458 my @items = sort {
3089 $a->{pri} <=> $b->{pri} 3459 $a->{pri} <=> $b->{pri}
3090 or $b->{id} <=> $a->{id} 3460 or $b->{id} <=> $a->{id}
3091 } values %{ $self->{item} }; 3461 } values %{ $self->{item} };
3092 3462
3463 $self->{timer}->interval (1);
3464
3093 my $count = 10 + 1; 3465 my $count = 10 + 1;
3094 for my $item (@items) { 3466 for my $item (@items) {
3095 last unless --$count; 3467 last unless --$count;
3096 3468
3097 push @widgets, $item->{label} ||= do { 3469 my $label = $item->{label} ||= do {
3098 # TODO: doesn't handle markup well (read as: at all) 3470 # TODO: doesn't handle markup well (read as: at all)
3099 my $short = $item->{count} > 1 3471 my $short = $item->{count} > 1
3100 ? "<b>$item->{count} ×</b> $item->{text}" 3472 ? "<b>$item->{count} ×</b> $item->{text}"
3101 : $item->{text}; 3473 : $item->{text};
3102 3474
… …
3110 tooltip => $item->{tooltip}, 3482 tooltip => $item->{tooltip},
3111 tooltip_font => $::FONT_PROP, 3483 tooltip_font => $::FONT_PROP,
3112 tooltip_width => 0.67, 3484 tooltip_width => 0.67,
3113 fontsize => $item->{fontsize} || $self->{fontsize}, 3485 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44, 3486 max_w => $::WIDTH * 0.44,
3115 fg => $item->{fg}, 3487 fg => [@{ $item->{fg} }],
3116 can_events => 1, 3488 can_events => 1,
3117 can_hover => 1 3489 can_hover => 1
3118 }; 3490 };
3491
3492 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3493 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3494 $label->update;
3495 $label->set_max_size (undef, $label->{req_h} * $diff)
3496 if $diff < 1;
3497 $self->{timer}->interval (1/30);
3498 } else {
3499 $label->{fg}[3] = $item->{fg}[3] || 1;
3500 }
3501
3502 push @widgets, $label;
3119 } 3503 }
3120 3504
3121 $self->clear; 3505 $self->clear;
3122 $self->SUPER::add (reverse @widgets); 3506 $self->SUPER::add (reverse @widgets);
3123} 3507}
… …
3128 $text =~ s/^\s+//; 3512 $text =~ s/^\s+//;
3129 $text =~ s/\s+$//; 3513 $text =~ s/\s+$//;
3130 3514
3131 return unless $text; 3515 return unless $text;
3132 3516
3133 my $timeout = time + ((delete $arg{timeout}) || 60); 3517 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3134 3518
3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3519 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3136 3520
3137 if (my $item = $self->{item}{$group}) { 3521 if (my $item = $self->{item}{$group}) {
3138 if ($item->{text} eq $text) { 3522 if ($item->{text} eq $text) {
3139 $item->{count}++; 3523 $item->{count}++;
3140 } else { 3524 } else {
3141 $item->{count} = 1; 3525 $item->{count} = 1;
3142 $item->{text} = $item->{tooltip} = $text; 3526 $item->{text} = $item->{tooltip} = $text;
3143 } 3527 }
3144 $item->{id} = ++$self->{id}; 3528 $item->{id} += 0.2;#d#
3145 $item->{timeout} = $timeout; 3529 $item->{timeout} = $timeout;
3146 delete $item->{label}; 3530 delete $item->{label};
3147 } else { 3531 } else {
3148 $self->{item}{$group} = { 3532 $self->{item}{$group} = {
3149 id => ++$self->{id}, 3533 id => ++$self->{id},
… …
3155 count => 1, 3539 count => 1,
3156 %arg, 3540 %arg,
3157 }; 3541 };
3158 } 3542 }
3159 3543
3544 $ROOT->on_refresh (reorder => sub {
3160 $self->reorder; 3545 $self->reorder;
3546 });
3161} 3547}
3162 3548
3163sub reconfigure { 3549sub reconfigure {
3164 my ($self) = @_; 3550 my ($self) = @_;
3165 3551
… …
3168 3554
3169 $self->reorder; 3555 $self->reorder;
3170 $self->SUPER::reconfigure; 3556 $self->SUPER::reconfigure;
3171} 3557}
3172 3558
3559sub destroy {
3560 my ($self) = @_;
3561
3562 $self->{timer}->cancel;
3563
3564 $self->SUPER::destroy;
3565}
3566
3173############################################################################# 3567#############################################################################
3174 3568
3175package CFClient::UI::Inventory; 3569package CFClient::UI::Inventory;
3176 3570
3177our @ISA = CFClient::UI::ScrolledWindow::; 3571our @ISA = CFClient::UI::Table::;
3178 3572
3179sub new { 3573sub new {
3180 my $class = shift; 3574 my $class = shift;
3181 3575
3182 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
3183 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3577 col_expand => [0, 1, 0],
3578 items => [],
3184 @_, 3579 @_,
3185 ); 3580 );
3186 3581
3582 $self->set_sort_order (undef);
3583
3187 $self 3584 $self
3585}
3586
3587sub update_items {
3588 my ($self) = @_;
3589
3590 $self->clear;
3591
3592 my @item = $self->{sort}->(@{ $self->{items} });
3593
3594 my @adds;
3595 my $row = 0;
3596 for my $item ($self->{sort}->(@{ $self->{items} })) {
3597 CFClient::Item::update_widgets $item;
3598
3599 push @adds, 0, $row, $item->{face_widget};
3600 push @adds, 1, $row, $item->{desc_widget};
3601 push @adds, 2, $row, $item->{weight_widget};
3602
3603 $row++;
3604 }
3605
3606 $self->add (@adds);
3607}
3608
3609sub set_sort_order {
3610 my ($self, $order) = @_;
3611
3612 $self->{sort} = $order ||= sub {
3613 sort {
3614 $a->{type} <=> $b->{type}
3615 or $a->{name} cmp $b->{name}
3616 } @_
3617 };
3618
3619 $self->update_items;
3188} 3620}
3189 3621
3190sub set_items { 3622sub set_items {
3191 my ($self, $items) = @_; 3623 my ($self, $items) = @_;
3192 3624
3193 $self->{child}->clear; 3625 $self->{items} = [$items ? values %$items : ()];
3194 return unless $items;
3195
3196 my @items = sort {
3197 ($a->{type} <=> $b->{type})
3198 or ($a->{name} cmp $b->{name})
3199 } @$items;
3200
3201 $self->{real_items} = \@items;
3202
3203 my $row = 0;
3204 for my $item (@items) {
3205 CFClient::Item::update_widgets $item;
3206
3207 $self->{child}->add (0, $row, $item->{face_widget});
3208 $self->{child}->add (1, $row, $item->{desc_widget});
3209 $self->{child}->add (2, $row, $item->{weight_widget});
3210
3211 $row++;
3212 }
3213}
3214
3215#############################################################################
3216
3217package CFClient::UI::BindEditor;
3218
3219our @ISA = CFClient::UI::FancyFrame::;
3220
3221sub new {
3222 my $class = shift;
3223
3224 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3225
3226 $self->add (my $vb = new CFClient::UI::VBox);
3227
3228
3229 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3230 text => "start recording",
3231 tooltip => "Start/Stops recording of actions."
3232 ."All subsequent actions after the recording started will be captured."
3233 ."The actions are displayed after the record was stopped."
3234 ."To bind the action you have to click on the 'Bind' button",
3235 on_activate => sub {
3236 unless ($self->{recording}) {
3237 $self->start;
3238 } else {
3239 $self->stop;
3240 }
3241 });
3242
3243 $vb->add (new CFClient::UI::Label text => "Actions:");
3244 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3245
3246 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3247 $vb->add (my $hb = new CFClient::UI::HBox);
3248 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3249 $hb->add (new CFClient::UI::Button
3250 text => "bind",
3251 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3252 on_activate => sub {
3253 $self->ask_for_bind;
3254 });
3255
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add (new CFClient::UI::Button
3258 text => "ok",
3259 expand => 1,
3260 tooltip => "This closes the binding editor and saves the binding",
3261 on_activate => sub {
3262 $self->hide;
3263 $self->commit;
3264 });
3265
3266 $hb->add (new CFClient::UI::Button
3267 text => "cancel",
3268 expand => 1,
3269 tooltip => "This closes the binding editor without saving",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->{binding_cancel}->()
3273 if $self->{binding_cancel};
3274 });
3275
3276 $self->update_binding_widgets; 3626 $self->update_items;
3277
3278 $self
3279}
3280
3281sub commit {
3282 my ($self) = @_;
3283 my ($mod, $sym, $cmds) = $self->get_binding;
3284 if ($sym != 0 && @$cmds > 0) {
3285 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3286 ."'. Don't forget 'Save Config'!");
3287 $self->{binding_change}->($mod, $sym, $cmds)
3288 if $self->{binding_change};
3289 } else {
3290 $::STATUSBOX->add ("No action bound, no key or action specified!");
3291 $self->{binding_cancel}->()
3292 if $self->{binding_cancel};
3293 }
3294}
3295
3296sub start {
3297 my ($self) = @_;
3298
3299 $self->{rec_btn}->set_text ("stop recording");
3300 $self->{recording} = 1;
3301 $self->clear_command_list;
3302 $::CONN->start_record if $::CONN;
3303}
3304
3305sub stop {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("start recording");
3309 $self->{recording} = 0;
3310
3311 my $rec;
3312 $rec = $::CONN->stop_record if $::CONN;
3313 return unless ref $rec eq 'ARRAY';
3314 $self->set_command_list ($rec);
3315}
3316
3317
3318sub ask_for_bind_and_commit {
3319 my ($self) = @_;
3320 $self->ask_for_bind (1);
3321}
3322
3323sub ask_for_bind {
3324 my ($self, $commit) = @_;
3325
3326 CFClient::Binder::open_binding_dialog (sub {
3327 my ($mod, $sym) = @_;
3328 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3329 $self->update_binding_widgets;
3330 $self->commit if $commit;
3331 });
3332}
3333
3334# $mod and $sym are the modifiers and key symbol
3335# $cmds is a array ref of strings (the commands)
3336# $cb is the callback that is executed on OK
3337# $ccb is the callback that is executed on CANCEL and
3338# when the binding was unsuccessful on OK
3339sub set_binding {
3340 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3341
3342 $self->clear_command_list;
3343 $self->{recording} = 0;
3344 $self->{rec_btn}->set_text ("start recording");
3345
3346 $self->{binding} = [$mod, $sym];
3347 $self->{commands} = $cmds;
3348
3349 $self->{binding_change} = $cb;
3350 $self->{binding_cancel} = $ccb;
3351
3352 $self->update_binding_widgets;
3353}
3354
3355# this is a shortcut method that asks for a binding
3356# and then just binds it.
3357sub do_quick_binding {
3358 my ($self, $cmds) = @_;
3359 $self->set_binding (undef, undef, $cmds, sub {
3360 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3361 });
3362 $self->ask_for_bind (1);
3363}
3364
3365sub update_binding_widgets {
3366 my ($self) = @_;
3367 my ($mod, $sym, $cmds) = $self->get_binding;
3368 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3369 $self->set_command_list ($cmds);
3370}
3371
3372sub get_binding {
3373 my ($self) = @_;
3374 return (
3375 $self->{binding}->[0],
3376 $self->{binding}->[1],
3377 [ grep { defined $_ } @{$self->{commands}} ]
3378 );
3379}
3380
3381sub clear_command_list {
3382 my ($self) = @_;
3383 $self->{cmdbox}->clear ();
3384}
3385
3386sub set_command_list {
3387 my ($self, $cmds) = @_;
3388
3389 $self->{cmdbox}->clear ();
3390 $self->{commands} = $cmds;
3391
3392 my $idx = 0;
3393
3394 for (@$cmds) {
3395 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3396
3397 my $i = $idx;
3398 $hb->add (new CFClient::UI::Label text => $_);
3399 $hb->add (new CFClient::UI::Button
3400 text => "delete",
3401 tooltip => "Deletes the action from the record",
3402 on_activate => sub {
3403 $self->{cmdbox}->remove ($hb);
3404 $cmds->[$i] = undef;
3405 });
3406
3407
3408 $idx++
3409 }
3410} 3627}
3411 3628
3412############################################################################# 3629#############################################################################
3413 3630
3414package CFClient::UI::SpellList; 3631package CFClient::UI::SpellList;
… …
3423 commands => [], 3640 commands => [],
3424 @_, 3641 @_,
3425 ) 3642 )
3426} 3643}
3427 3644
3428# XXX: Do sorting? Argl... 3645my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658sub rebuild_spell_list {
3659 my ($self) = @_;
3660
3661 $CFClient::UI::ROOT->on_refresh ($self => sub {
3662 $self->clear;
3663
3664 return unless $::CONN;
3665
3666 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672 my $row = 0;
3673
3674 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675 my $spell = $self->{spell}{$_};
3676
3677 $row++;
3678
3679 my $spell_cb = sub {
3680 my ($widget, $ev) = @_;
3681
3682 if ($ev->{button} == 1) {
3683 $::CONN->user_send ("cast $spell->{name}");
3684 } elsif ($ev->{button} == 2) {
3685 $::CONN->user_send ("invoke $spell->{name}");
3686 } elsif ($ev->{button} == 3) {
3687 (new CFClient::UI::Menu
3688 items => [
3689 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691 ],
3692 )->popup ($ev);
3693 } else {
3694 return 0;
3695 }
3696
3697 1
3698 };
3699
3700 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702 #TODO: add path info to tooltip
3703 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705 $self->add (0, $row, new CFClient::UI::Face
3706 face => $spell->{face},
3707 can_hover => 1,
3708 can_events => 1,
3709 tooltip => $tooltip,
3710 on_button_down => $spell_cb,
3711 );
3712
3713 $self->add (1, $row, new CFClient::UI::Label
3714 expand => 1,
3715 text => $spell->{name},
3716 can_hover => 1,
3717 can_events => 1,
3718 tooltip => $tooltip,
3719 on_button_down => $spell_cb,
3720 );
3721
3722 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726 }
3727 });
3728}
3729
3429sub add_spell { 3730sub add_spell {
3430 my ($self, $spell) = @_; 3731 my ($self, $spell) = @_;
3732
3431 $self->{spells}->{$spell->{name}} = $spell; 3733 $self->{spell}->{$spell->{name}} = $spell;
3432 3734 $self->rebuild_spell_list;
3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3434 face => $spell->{face},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message});
3438
3439 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3440 text => $spell->{name},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message},
3444 expand => 1);
3445
3446 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3447 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3448 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3449 expand => 1);
3450
3451 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3452 text => "bind to key",
3453 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3454}
3455
3456sub rebuild_spell_list {
3457 my ($self) = @_;
3458 $self->{tbl_idx} = 0;
3459 $self->add_spell ($_) for values %{$self->{spells}};
3460} 3735}
3461 3736
3462sub remove_spell { 3737sub remove_spell {
3463 my ($self, $spell) = @_; 3738 my ($self, $spell) = @_;
3739
3464 delete $self->{spells}->{$spell->{name}}; 3740 delete $self->{spell}->{$spell->{name}};
3465 $self->rebuild_spell_list; 3741 $self->rebuild_spell_list;
3466} 3742}
3467 3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3748 $self->rebuild_spell_list;
3749}
3750
3468############################################################################# 3751#############################################################################
3469 3752
3470package CFClient::UI::Root; 3753package CFClient::UI::Root;
3471 3754
3472our @ISA = CFClient::UI::Container::; 3755our @ISA = CFClient::UI::Container::;
3756
3757use List::Util qw(min max);
3473 3758
3474use CFClient::OpenGL; 3759use CFClient::OpenGL;
3475 3760
3476sub new { 3761sub new {
3477 my $class = shift; 3762 my $class = shift;
… …
3504 $coord = $max - $size if $coord > $max - $size; 3789 $coord = $max - $size if $coord > $max - $size;
3505 3790
3506 int $coord + 0.5 3791 int $coord + 0.5
3507} 3792}
3508 3793
3509sub size_allocate { 3794sub invoke_size_allocate {
3510 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3511 3796
3512 for my $child ($self->children) { 3797 for my $child ($self->children) {
3513 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3798 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3514 3799
… …
3518 $X = _to_pixel $X, $W, $self->{w}; 3803 $X = _to_pixel $X, $W, $self->{w};
3519 $Y = _to_pixel $Y, $H, $self->{h}; 3804 $Y = _to_pixel $Y, $H, $self->{h};
3520 3805
3521 $child->configure ($X, $Y, $W, $H); 3806 $child->configure ($X, $Y, $W, $H);
3522 } 3807 }
3808
3809 1
3523} 3810}
3524 3811
3525sub coord2local { 3812sub coord2local {
3526 my ($self, $x, $y) = @_; 3813 my ($self, $x, $y) = @_;
3527 3814
… …
3612 3899
3613 delete $queue{$widget+0}; 3900 delete $queue{$widget+0};
3614 3901
3615 my ($w, $h) = $widget->size_request; 3902 my ($w, $h) = $widget->size_request;
3616 3903
3617 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3904 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3618 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3905 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3906
3907 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3908 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3619 3909
3620 $w = $widget->{force_w} if exists $widget->{force_w}; 3910 $w = $widget->{force_w} if exists $widget->{force_w};
3621 $h = $widget->{force_h} if exists $widget->{force_h}; 3911 $h = $widget->{force_h} if exists $widget->{force_h};
3622 3912
3623 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3913 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3649 3939
3650 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3651 3941
3652 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3653 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3944
3945 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h;
3947
3948 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3654 3950
3655 $w = int $w + 0.5; 3951 $w = int $w + 0.5;
3656 $h = int $h + 0.5; 3952 $h = int $h + 0.5;
3657 3953
3658 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3954 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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