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.282 by root, Mon Jun 5 02:25:10 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 {
… …
399 421
400 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
401 423
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 427 }
406} 428}
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
417 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
418 442
443 Carp::confess unless $self->{parent};#d#
444
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 446}
421 447
422sub focus_in { 448sub invoke_focus_in {
423 my ($self) = @_; 449 my ($self) = @_;
424 450
425 return if $FOCUS == $self; 451 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
427 453
428 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
429 455
430 $self->_emit (focus_in => $focus); 456 $self->update;
431 457
432 $focus->update if $focus; 458 0
433 $FOCUS->update;
434} 459}
435 460
436sub focus_out { 461sub invoke_focus_out {
437 my ($self) = @_; 462 my ($self) = @_;
438 463
439 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
440 465
441 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
442 467
443 $self->_emit (focus_out => $focus); 468 $self->update;
444 469
445 $focus->update if $focus; #?
446
447 $::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
448 unless $FOCUS; 471 unless $FOCUS;
449}
450 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
451sub mouse_motion { 0 } 483sub invoke_mouse_motion { 0 }
452sub button_up { 0 } 484sub invoke_button_up { 0 }
453sub key_down { 0 } 485sub invoke_key_down { 0 }
454sub key_up { 0 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
455 488
456sub button_down { 489sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
458 491
459 $self->focus_in; 492 $self->grab_focus;
460 493
461 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
462} 531}
463 532
464sub find_widget { 533sub find_widget {
465 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
466 535
… …
476sub set_parent { 545sub set_parent {
477 my ($self, $parent) = @_; 546 my ($self, $parent) = @_;
478 547
479 Scalar::Util::weaken ($self->{parent} = $parent); 548 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 549 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504} 550}
505 551
506sub realloc { 552sub realloc {
507 my ($self) = @_; 553 my ($self) = @_;
508 554
… …
541 return unless $self->{h} && $self->{w}; 587 return unless $self->{h} && $self->{w};
542 588
543 # update screen rectangle 589 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 590 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 591 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 592
549 # skip widgets that are entirely outside the drawing area 593 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 594 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 595 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 596
… …
591} 635}
592 636
593sub DESTROY { 637sub DESTROY {
594 my ($self) = @_; 638 my ($self) = @_;
595 639
640 return if CFClient::in_destruct;
641
596 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
597 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 646}
599 647
600############################################################################# 648#############################################################################
601 649
602package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
683 if $children; 731 if $children;
684 732
685 $self 733 $self
686} 734}
687 735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
742}
743
688sub add { 744sub add {
689 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
690 746
691 $_->set_parent ($self) 747 $_->set_parent ($self)
692 for @widgets; 748 for @widgets;
… …
767} 823}
768 824
769sub add { 825sub add {
770 my ($self, $child) = @_; 826 my ($self, $child) = @_;
771 827
772 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
775} 830}
776 831
777sub remove { 832sub remove {
778 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
787 842
788sub size_request { 843sub size_request {
789 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
790} 845}
791 846
792sub size_allocate { 847sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
794 849
795 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
796} 853}
797 854
798############################################################################# 855#############################################################################
799 856
800# back-buffered drawing area 857# back-buffered drawing area
… …
816 873
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 875 $self->SUPER::update;
819} 876}
820 877
821sub size_allocate { 878sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
823 880
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
826} 884}
827 885
828sub _render { 886sub _render {
829 my ($self) = @_; 887 my ($self) = @_;
830 888
… …
891 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
892 950
893 ($w, $h) 951 ($w, $h)
894} 952}
895 953
896sub size_allocate { 954sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
898 956
899 my $child = $self->child; 957 my $child = $self->child;
900 958
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 961
904 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
905 $self->update; 963 $self->update;
964
965 1
906} 966}
907 967
908sub set_offset { 968sub set_offset {
909 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
910 970
… …
973 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
974 }, 1034 },
975 ; 1035 ;
976 1036
977 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
979 slider => $slider, 1040 slider => $slider,
980 %arg, 1041 %arg,
981 ); 1042 );
982 1043
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
985 1046
986 $self 1047 $self
987} 1048}
988 1049
1050#TODO# update range on size_allocate depending on child
1051
989sub add { 1052sub add {
990 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
991 1054
992 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
993} 1056}
994 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
995sub update { 1074sub update {
996 my ($self) = @_; 1075 my ($self) = @_;
997 1076
998 $self->SUPER::update; 1077 $self->SUPER::update;
999 1078
1000 # todo: overwrite size_allocate of child 1079 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1080}
1004 1081
1005sub size_allocate { 1082sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
1007 1084
1085 $self->update_slider;
1086
1008 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012} 1088}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1089
1017############################################################################# 1090#############################################################################
1018 1091
1019package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
1020 1093
… …
1071 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);
1072 1145
1073sub new { 1146sub new {
1074 my ($class, %arg) = @_; 1147 my ($class, %arg) = @_;
1075 1148
1076 my $title = delete $arg{title};
1077
1078 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1152 border => 0.6,
1082 can_events => 1, 1153 can_events => 1,
1083 min_w => 16, 1154 min_w => 64,
1084 min_h => 16, 1155 min_h => 32,
1085 %arg, 1156 %arg,
1086 ); 1157 );
1087 1158
1088 $self->{title} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1160 align => 0,
1090 valign => 1, 1161 valign => 1,
1091 text => $title, 1162 text => $self->{title},
1092 fontsize => $self->{border} 1163 fontsize => $self->{border},
1093 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 }
1094 1174
1095 $self 1175 $self
1096} 1176}
1097 1177
1098sub add { 1178sub add {
1099 my ($self, @widgets) = @_; 1179 my ($self, @widgets) = @_;
1100 1180
1101 $self->SUPER::add (@widgets); 1181 $self->SUPER::add (@widgets);
1182 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1183 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1184}
1104 1185
1105sub border { 1186sub border {
1106 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1107} 1188}
1108 1189
1109sub size_request { 1190sub size_request {
1110 my ($self) = @_; 1191 my ($self) = @_;
1111 1192
1112 $self->{title}->size_request 1193 $self->{title_widget}->size_request
1113 if $self->{title}; 1194 if $self->{title_widget};
1195
1196 $self->{close_button}->size_request
1197 if $self->{close_button};
1114 1198
1115 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1116 1200
1117 ( 1201 (
1118 $w + $self->border * 2, 1202 $w + $self->border * 2,
1119 $h + $self->border * 2, 1203 $h + $self->border * 2,
1120 ) 1204 )
1121} 1205}
1122 1206
1123sub size_allocate { 1207sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1125 1209
1126 if ($self->{title}) { 1210 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1211 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1212 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1213 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1214 }
1131 1215
1132 my $border = $self->border; 1216 my $border = $self->border;
1133 1217
1134 $h -= List::Util::max 0, $border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1135 $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;
1136 1233
1137 $self->child->configure ($border, $border, $w, $h); 1234 1
1138} 1235}
1139 1236
1140sub button_down { 1237sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1142 1239
1143 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1241 my $border = $self->border;
1145 1242
… …
1176 1273
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1275
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1279 };
1183 } else { 1280 } else {
1184 return 0; 1281 return 0;
1185 } 1282 }
1186 1283
1187 1 1284 1
1188} 1285}
1189 1286
1190sub button_up { 1287sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1192 1289
1193 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1194} 1291}
1195 1292
1196sub mouse_motion { 1293sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1198 1295
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1297
1201 !!$self->{motion} 1298 ! ! $self->{motion}
1202} 1299}
1203 1300
1204sub _draw { 1301sub _draw {
1205 my ($self) = @_; 1302 my ($self) = @_;
1206 1303
… …
1232 1329
1233 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1234 1331
1235 $child->draw; 1332 $child->draw;
1236 1333
1237 if ($self->{title}) { 1334 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1335 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1336 $self->{title_widget}->_draw;
1337
1338 glTranslate 0, - ($border - $self->{h});
1240 } 1339 }
1340
1341 $self->{close_button}->draw
1342 if $self->{close_button};
1241} 1343}
1242 1344
1243############################################################################# 1345#############################################################################
1244 1346
1245package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1262sub children { 1364sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1366}
1265 1367
1266sub add { 1368sub add {
1267 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1268 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1373 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1271 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1379 $self->realloc;
1380}
1381
1382sub remove {
1383 my ($self, $child) = @_;
1384
1385 # TODO: not yet implemented
1273} 1386}
1274 1387
1275# 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?
1276sub clear { 1389sub clear {
1277 my ($self) = @_; 1390 my ($self) = @_;
… …
1318 (sum @$ws), 1431 (sum @$ws),
1319 (sum @$hs), 1432 (sum @$hs),
1320 ) 1433 )
1321} 1434}
1322 1435
1323sub size_allocate { 1436sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1325 1438
1326 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1327 1440
1328 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1360 } 1473 }
1361 1474
1362 $y += $row_h; 1475 $y += $row_h;
1363 } 1476 }
1364 1477
1478 1
1365} 1479}
1366 1480
1367sub find_widget { 1481sub find_widget {
1368 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1369 1483
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1522 )
1409} 1523}
1410 1524
1411sub size_allocate { 1525sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1413 1527
1414 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1416 1530
1417 my @req; 1531 my @req;
1418 1532
1419 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1421 } else { 1535 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1424 1538
1425 if ($req > $space) { 1539 if ($req > $space) {
1426 # ah well, not enough space 1540 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1428 } else { 1542 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1544
1431 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1432 1546
1433 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1548 for 0 .. $#children;
1435 } 1549 }
1436 } 1550 }
1437 1551
1438 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1439 1553
1440 my $pos = 0; 1554 my $pos = 0;
1441 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1443 $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));
1444 1558
1445 $pos += $alloc; 1559 $pos += $alloc;
1446 } 1560 }
1447 1561
1448 1 1562 1
… …
1521 } 1635 }
1522 1636
1523 $self 1637 $self
1524} 1638}
1525 1639
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1640sub update {
1537 my ($self) = @_; 1641 my ($self) = @_;
1538 1642
1539 delete $self->{texture}; 1643 delete $self->{texture};
1540 $self->SUPER::update; 1644 $self->SUPER::update;
… …
1542 1646
1543sub realloc { 1647sub realloc {
1544 my ($self) = @_; 1648 my ($self) = @_;
1545 1649
1546 delete $self->{ox}; 1650 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc; 1651 $self->SUPER::realloc;
1549} 1652}
1550 1653
1551sub set_text { 1654sub set_text {
1552 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1553 1656
1554 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1556 1659
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1559 1661
1662 delete $self->{size_req};
1560 $self->realloc; 1663 $self->realloc;
1561 $self->update; 1664 $self->update;
1562} 1665}
1563 1666
1564sub set_markup { 1667sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1569 1672
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1674
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1574 1676
1677 delete $self->{size_req};
1575 $self->realloc; 1678 $self->realloc;
1576 $self->update; 1679 $self->update;
1577} 1680}
1578 1681
1579sub size_request { 1682sub size_request {
1580 my ($self) = @_; 1683 my ($self) = @_;
1581 1684
1582 if (exists $self->{req_h}) { 1685 $self->{size_req} ||= do {
1583 @$self{qw(req_w req_h)}
1584 } else {
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1590 1691
1591 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1592 1693
1593 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1594 $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);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1698
1597 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1598 1700
1599 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1600 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1601 } 1703 }
1602 1704
1603 ($w, $h) 1705 [$w, $h]
1604 } 1706 };
1605}
1606 1707
1708 @{ $self->{size_req} }
1709}
1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1607sub size_allocate { 1715sub invoke_size_allocate {
1608 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1609 1717
1610 delete $self->{ox}; 1718 delete $self->{ox};
1611 1719
1612 delete $self->{texture} 1720 delete $self->{texture}
1613 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
1614} 1724}
1615 1725
1616sub set_fontsize { 1726sub set_fontsize {
1617 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1618 1728
1619 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1620 delete $self->{texture}; 1731 delete $self->{texture};
1621 1732
1622 $self->realloc; 1733 $self->realloc;
1623} 1734}
1624 1735
1736sub reconfigure {
1737 my ($self) = @_;
1738
1739 delete $self->{size_req};
1740 delete $self->{texture};
1741
1742 $self->SUPER::reconfigure;
1743}
1744
1625sub _draw { 1745sub _draw {
1626 my ($self) = @_; 1746 my ($self) = @_;
1627 1747
1628 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1629 1749
1630 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1631 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1632 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1633 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1634 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1637 1757
1638 new_from_layout CFClient::Texture $self->{layout} 1758 [$self->{layout}->size]
1639 }; 1759 };
1640 1760
1641 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1644 : ($self->{w} - $tex->{w}) * 0.5); 1764 : ($self->{w} - $size->[0]) * 0.5);
1645 1765
1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1648 : ($self->{h} - $tex->{h}) * 0.5); 1768 : ($self->{h} - $size->[1]) * 0.5);
1649 }; 1769 };
1650 1770
1651 glEnable GL_TEXTURE_2D; 1771 my $w = List::Util::min $self->{w} + 4, $size->[0];
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1772 my $h = List::Util::min $self->{h} + 2, $size->[1];
1653 1773
1654 glColor_premultiply @{$self->{fg}} 1774 $self->{layout}->render ($self->{ox}, $self->{oy});
1655 if $tex->{format} == GL_ALPHA;
1656
1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1658
1659 glDisable GL_TEXTURE_2D;
1660} 1775}
1661 1776
1662############################################################################# 1777#############################################################################
1663 1778
1664package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1678 can_hover => 1, 1793 can_hover => 1,
1679 can_focus => 1, 1794 can_focus => 1,
1680 valign => 0, 1795 valign => 0,
1681 can_events => 1, 1796 can_events => 1,
1682 #text => ... 1797 #text => ...
1798 #hidden => "*",
1683 @_ 1799 @_
1684 ) 1800 )
1685} 1801}
1686 1802
1687sub _set_text { 1803sub _set_text {
… …
1694 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1695 $self->{text} = $text; 1811 $self->{text} = $text;
1696 1812
1697 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1698 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1699 1816
1700 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1701 $self->update; 1820 $self->update;
1702} 1821}
1703 1822
1704sub set_text { 1823sub set_text {
1705 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1706 1825
1707 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1708 $self->_set_text ($text); 1827 $self->_set_text ($text);
1709
1710 $self->realloc;
1711} 1828}
1712 1829
1713sub get_text { 1830sub get_text {
1714 $_[0]{text} 1831 $_[0]{text}
1715} 1832}
… …
1720 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1721 1838
1722 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1723} 1840}
1724 1841
1725sub key_down { 1842sub invoke_key_down {
1726 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1727 1844
1728 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1729 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1730 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1742 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1743 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1744 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1745 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1746 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1747 $self->_emit ('escape'); 1864 $self->emit ('escape');
1748 } elsif ($uni) { 1865 } elsif ($uni) {
1749 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else { 1867 } else {
1751 return 0; 1868 return 0;
1752 } 1869 }
… …
1756 $self->realloc; 1873 $self->realloc;
1757 1874
1758 1 1875 1
1759} 1876}
1760 1877
1761sub focus_in { 1878sub invoke_focus_in {
1762 my ($self) = @_; 1879 my ($self) = @_;
1763 1880
1764 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1765 1882
1766 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1767} 1884}
1768 1885
1769sub button_down { 1886sub invoke_button_down {
1770 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1771 1888
1772 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1773 1890
1774 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1775 1892
1776 # byte-index to char-index 1893 # byte-index to char-index
1777 my $text = $self->{text}; 1894 my $text = $self->{text};
1778 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1779 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1780 1897
1781 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1782 $self->update; 1899 $self->update;
1783 1900
1784 1 1901 1
1785} 1902}
1786 1903
1787sub mouse_motion { 1904sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1789# 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#
1790 1907
1791 0 1908 1
1792} 1909}
1793 1910
1794sub _draw { 1911sub _draw {
1795 my ($self) = @_; 1912 my ($self) = @_;
1796 1913
… …
1837 1954
1838our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1839 1956
1840use CFClient::OpenGL; 1957use CFClient::OpenGL;
1841 1958
1842sub key_down { 1959sub invoke_key_down {
1843 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1844 1961
1845 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1846 1963
1847 if ($sym == 13) { 1964 if ($sym == 13) {
1848 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1849 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1850 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1851 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1852 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1853 $self->update; 1971 $self->update;
1854 1972
1855 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1856 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1857 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1873 } else { 1991 } else {
1874 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1875 } 1993 }
1876 1994
1877 } else { 1995 } else {
1878 return $self->SUPER::key_down ($ev) 1996 return $self->SUPER::invoke_key_down ($ev)
1879 } 1997 }
1880 1998
1881 1 1999 1
1882} 2000}
1883 2001
… …
1907 can_events => 1, 2025 can_events => 1,
1908 @_ 2026 @_
1909 ) 2027 )
1910} 2028}
1911 2029
1912sub activate { }
1913
1914sub button_up { 2030sub invoke_button_up {
1915 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1916 2032
1917 $self->emit ("activate") 2033 $self->emit ("activate")
1918 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1919 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
… …
1933 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2049 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1934 2050
1935 glDisable GL_TEXTURE_2D; 2051 glDisable GL_TEXTURE_2D;
1936 2052
1937 $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
1938} 2090}
1939 2091
1940############################################################################# 2092#############################################################################
1941 2093
1942package CFClient::UI::CheckBox; 2094package CFClient::UI::CheckBox;
… …
1969 my ($self) = @_; 2121 my ($self) = @_;
1970 2122
1971 (6) x 2 2123 (6) x 2
1972} 2124}
1973 2125
2126sub toggle {
2127 my ($self) = @_;
2128
2129 $self->{state} = !$self->{state};
2130 $self->emit (changed => $self->{state});
2131 $self->update;
2132}
2133
1974sub button_down { 2134sub invoke_button_down {
1975 my ($self, $ev, $x, $y) = @_; 2135 my ($self, $ev, $x, $y) = @_;
1976 2136
1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2137 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2138 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979 $self->{state} = !$self->{state}; 2139 $self->toggle;
1980 $self->_emit (changed => $self->{state});
1981 } else { 2140 } else {
1982 return 0 2141 return 0
1983 } 2142 }
1984 2143
1985 1 2144 1
… …
2010package CFClient::UI::Image; 2169package CFClient::UI::Image;
2011 2170
2012our @ISA = CFClient::UI::Base::; 2171our @ISA = CFClient::UI::Base::;
2013 2172
2014use CFClient::OpenGL; 2173use CFClient::OpenGL;
2015use Carp qw/confess/;
2016 2174
2017our %loaded_images; 2175our %texture_cache;
2018 2176
2019sub new { 2177sub new {
2020 my $class = shift; 2178 my $class = shift;
2021 2179
2022 my $self = $class->SUPER::new (can_events => 0, @_); 2180 my $self = $class->SUPER::new (
2181 can_events => 0,
2182 @_,
2183 );
2023 2184
2024 $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";
2025 2187
2026 $loaded_images{$self->{image}} ||= 2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2027 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;
2028 2190
2029 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2030 2192
2031 Scalar::Util::weaken $loaded_images{$self->{image}}; 2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033 $self->{aspect} = $tex->{w} / $tex->{h};
2034 2194
2035 $self 2195 $self
2036} 2196}
2037 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
2038sub size_request { 2216sub size_request {
2039 my ($self) = @_; 2217 my ($self) = @_;
2040 2218
2041 ($self->{tex}->{w}, $self->{tex}->{h}) 2219 ($self->{tex}{w}, $self->{tex}{h})
2042} 2220}
2043 2221
2044sub _draw { 2222sub _draw {
2045 my ($self) = @_; 2223 my ($self) = @_;
2046 2224
… …
2056 } 2234 }
2057 2235
2058 glEnable GL_TEXTURE_2D; 2236 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2238
2061 $tex->draw_quad_alpha (0, 0, $w, $h); 2239 $tex->draw_quad (0, 0, $w, $h);
2062 2240
2063 glDisable GL_TEXTURE_2D; 2241 glDisable GL_TEXTURE_2D;
2064} 2242}
2065 2243
2066############################################################################# 2244#############################################################################
… …
2155 my $ycut1 = max 0, min 1, $ycut; 2333 my $ycut1 = max 0, min 1, $ycut;
2156 my $ycut2 = max 0, min 1, $ycut - 1; 2334 my $ycut2 = max 0, min 1, $ycut - 1;
2157 2335
2158 my $h1 = $self->{h} * (1 - $ycut1); 2336 my $h1 = $self->{h} * (1 - $ycut1);
2159 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);
2160 2341
2161 glEnable GL_BLEND; 2342 glEnable GL_BLEND;
2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2343 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2344 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164 glEnable GL_TEXTURE_2D; 2345 glEnable GL_TEXTURE_2D;
… …
2183 2364
2184 if ($t3) { 2365 if ($t3) {
2185 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2366 glBindTexture GL_TEXTURE_2D, $t3->{name};
2186 glBegin GL_QUADS; 2367 glBegin GL_QUADS;
2187 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2368 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2369 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2370 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2371 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191 glEnd; 2372 glEnd;
2192 } 2373 }
2193 2374
2194 glDisable GL_BLEND; 2375 glDisable GL_BLEND;
… …
2282 $self->update; 2463 $self->update;
2283 2464
2284 $self 2465 $self
2285} 2466}
2286 2467
2287sub changed { }
2288
2289sub set_range { 2468sub set_range {
2290 my ($self, $range) = @_; 2469 my ($self, $range) = @_;
2291 2470
2292 ($range, $self->{range}) = ($self->{range}, $range); 2471 ($range, $self->{range}) = ($self->{range}, $range);
2293 2472
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}"; 2473 if ("@$range" ne "@{$self->{range}}") {
2474 $self->update;
2475 $self->set_value ($self->{range}[0]);
2476 }
2296} 2477}
2297 2478
2298sub set_value { 2479sub set_value {
2299 my ($self, $value) = @_; 2480 my ($self, $value) = @_;
2300 2481
… …
2311 if $unit; 2492 if $unit;
2312 2493
2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2494 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314 2495
2315 if ($value != $old_value) { 2496 if ($value != $old_value) {
2316 $self->_emit (changed => $value); 2497 $self->emit (changed => $value);
2317 $self->update; 2498 $self->update;
2318 } 2499 }
2319} 2500}
2320 2501
2321sub size_request { 2502sub size_request {
2322 my ($self) = @_; 2503 my ($self) = @_;
2323 2504
2324 ($self->{req_w}, $self->{req_h}) 2505 ($self->{req_w}, $self->{req_h})
2325} 2506}
2326 2507
2327sub button_down { 2508sub invoke_button_down {
2328 my ($self, $ev, $x, $y) = @_; 2509 my ($self, $ev, $x, $y) = @_;
2329 2510
2330 $self->SUPER::button_down ($ev, $x, $y); 2511 $self->SUPER::invoke_button_down ($ev, $x, $y);
2331 2512
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2513 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333 2514
2334 $self->mouse_motion ($ev, $x, $y) 2515 $self->invoke_mouse_motion ($ev, $x, $y)
2335} 2516}
2336 2517
2337sub mouse_motion { 2518sub invoke_mouse_motion {
2338 my ($self, $ev, $x, $y) = @_; 2519 my ($self, $ev, $x, $y) = @_;
2339 2520
2340 if ($GRAB == $self) { 2521 if ($GRAB == $self) {
2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2522 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342 2523
… …
2348 } else { 2529 } else {
2349 return 0; 2530 return 0;
2350 } 2531 }
2351 2532
2352 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
2353} 2544}
2354 2545
2355sub update { 2546sub update {
2356 my ($self) = @_; 2547 my ($self) = @_;
2357 2548
… …
2447sub set_range { shift->{slider}->set_range (@_) } 2638sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) } 2639sub set_value { shift->{slider}->set_value (@_) }
2449 2640
2450############################################################################# 2641#############################################################################
2451 2642
2452package CFClient::UI::TextView; 2643package CFClient::UI::TextScroller;
2453 2644
2454our @ISA = CFClient::UI::HBox::; 2645our @ISA = CFClient::UI::HBox::;
2455 2646
2456use CFClient::OpenGL; 2647use CFClient::OpenGL;
2457 2648
2458sub new { 2649sub new {
2459 my $class = shift; 2650 my $class = shift;
2460 2651
2461 my $self = $class->SUPER::new ( 2652 my $self = $class->SUPER::new (
2462 fontsize => 1, 2653 fontsize => 1,
2463 can_events => 0, 2654 can_events => 1,
2655 indent => 0,
2464 #font => default_font 2656 #font => default_font
2465 @_, 2657 @_,
2466 2658
2467 layout => (new CFClient::Layout 1), 2659 layout => (new CFClient::Layout),
2468 par => [], 2660 par => [],
2469 height => 0, 2661 height => 0,
2470 children => [ 2662 children => [
2471 (new CFClient::UI::Empty expand => 1), 2663 (new CFClient::UI::Empty expand => 1),
2472 (new CFClient::UI::Slider vertical => 1), 2664 (new CFClient::UI::Slider vertical => 1),
… …
2483 2675
2484 $self->{fontsize} = $fontsize; 2676 $self->{fontsize} = $fontsize;
2485 $self->reflow; 2677 $self->reflow;
2486} 2678}
2487 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
2488sub size_allocate { 2689sub invoke_size_allocate {
2489 my ($self, $w, $h) = @_; 2690 my ($self, $w, $h) = @_;
2490 2691
2491 $self->SUPER::size_allocate ($w, $h); 2692 my ($empty, $slider, @other) = @{ $self->{children} };
2693 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492 2694
2493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2695 $self->{layout}->set_font ($self->{font}) if $self->{font};
2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2696 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495 $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});
2496 2699
2497 $self->reflow; 2700 $self->reflow;
2498}
2499 2701
2500sub text_size { 2702 local $self->{children} = [$empty, $slider];
2703 $self->SUPER::invoke_size_allocate ($w, $h)
2704}
2705
2706sub invoke_mouse_wheel {
2501 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) = @_;
2502 2718
2503 my $layout = $self->{layout}; 2719 my $layout = $self->{layout};
2504 2720
2721 $layout->set_font ($self->{font}) if $self->{font};
2722 $layout->set_foreground (@{$para->{fg}});
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2723 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $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});
2507 $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}}
2508 2732 );
2733
2509 $layout->size 2734 $layout
2510} 2735}
2511 2736
2512sub reflow { 2737sub reflow {
2513 my ($self) = @_; 2738 my ($self) = @_;
2514 2739
… …
2523 $self->{children}[1]->set_value ($offset); 2748 $self->{children}[1]->set_value ($offset);
2524} 2749}
2525 2750
2526sub clear { 2751sub clear {
2527 my ($self) = @_; 2752 my ($self) = @_;
2753
2754 my (undef, undef, @other) = @{ $self->{children} };
2755 $self->remove ($_) for @other;
2528 2756
2529 $self->{par} = []; 2757 $self->{par} = [];
2530 $self->{height} = 0; 2758 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2759 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532} 2760}
2533 2761
2534sub add_paragraph { 2762sub add_paragraph {
2535 my ($self, $color, $text, $indent) = @_; 2763 my ($self, $color, $para, $indent) = @_;
2536 2764
2537 for my $line (split /\n/, $text) { 2765 my ($text, @w) = ref $para ? @$para : $para;
2538 my ($w, $h) = $self->text_size ($line); 2766
2539 $self->{height} += $h; 2767 $para = {
2540 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,
2541 } 2774 };
2542 2775
2543 $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;
2544} 2788}
2545 2789
2546sub update { 2790sub update {
2547 my ($self) = @_; 2791 my ($self) = @_;
2548 2792
… …
2550 2794
2551 return unless $self->{h} > 0; 2795 return unless $self->{h} > 0;
2552 2796
2553 delete $self->{texture}; 2797 delete $self->{texture};
2554 2798
2555 $ROOT->on_post_alloc ($self, sub { 2799 $ROOT->on_post_alloc ($self => sub {
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2800 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557 2801
2558 if (delete $self->{need_reflow}) { 2802 if (delete $self->{need_reflow}) {
2559 my $height = 0; 2803 my $height = 0;
2560 2804
2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565 for (@{$self->{par}}) { 2805 for my $para (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2806 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2567 $layout->set_width ($W - $_->[3]); 2807 my $layout = $self->get_layout ($para);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size; 2808 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3]; 2809
2571 $_->[1] = $h; 2810 $para->{w} = $w + $para->{indent};
2811 $para->{h} = $h;
2812 $para->{wrapped} = $layout->has_wrapped;
2572 } 2813 }
2573 2814
2574 $height += $_->[1]; 2815 $height += $para->{h};
2575 } 2816 }
2576 2817
2577 $self->{height} = $height; 2818 $self->{height} = $height;
2578 2819
2579 $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]);
2580 2821
2581 delete $self->{texture}; 2822 delete $self->{texture};
2823 }
2824
2825 if (delete $self->{scroll_to_bottom}) {
2826 $self->{children}[1]->set_value (1e10);
2582 } 2827 }
2583 2828
2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2829 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2585 glClearColor 0, 0, 0, 0; 2830 glClearColor 0, 0, 0, 0;
2586 glClear GL_COLOR_BUFFER_BIT; 2831 glClear GL_COLOR_BUFFER_BIT;
… …
2590 my $y0 = $top; 2835 my $y0 = $top;
2591 my $y1 = $top + $H; 2836 my $y1 = $top + $H;
2592 2837
2593 my $y = 0; 2838 my $y = 0;
2594 2839
2595 my $layout = $self->{layout};
2596
2597 $layout->set_font ($self->{font}) if $self->{font};
2598
2599 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602
2603 for my $par (@{$self->{par}}) { 2840 for my $para (@{$self->{par}}) {
2604 my $h = $par->[1]; 2841 my $h = $para->{h};
2605 2842
2606 if ($y0 < $y + $h && $y < $y1) { 2843 if ($y0 < $y + $h && $y < $y1) {
2607 $layout->set_foreground (@{ $par->[2] });
2608 $layout->set_width ($W - $par->[3]);
2609 $layout->set_markup ($par->[4]);
2610 2844
2611 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2845 my $layout = $self->get_layout ($para);
2612 2846
2613 glRasterPos $par->[3], $y - $y0; 2847 $layout->render ($para->{indent}, $y - $y0);
2614 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 }
2615 } 2861 }
2616 2862
2617 $y += $h; 2863 $y += $h;
2618 } 2864 }
2619
2620 glDisable GL_BLEND;
2621 }; 2865 };
2622 }); 2866 });
2867}
2868
2869sub reconfigure {
2870 my ($self) = @_;
2871
2872 $self->SUPER::reconfigure;
2873
2874 $_->{w} = 1e10 for @{ $self->{par} };
2875 $self->reflow;
2623} 2876}
2624 2877
2625sub _draw { 2878sub _draw {
2626 my ($self) = @_; 2879 my ($self) = @_;
2627 2880
… …
2630 glColor 0, 0, 0, 1; 2883 glColor 0, 0, 0, 1;
2631 $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});
2632 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2633 2886
2634 $self->{children}[1]->draw; 2887 $self->{children}[1]->draw;
2635
2636} 2888}
2637 2889
2638############################################################################# 2890#############################################################################
2639 2891
2640package CFClient::UI::Animator; 2892package CFClient::UI::Animator;
… …
2727 $tooltip .= "\n\n" . (ref $widget) . "\n" 2979 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2980 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n" 2981 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}"; 2982 . "visible $widget->{visible}";
2731 } 2983 }
2984
2985 $tooltip =~ s/^\n+//;
2986 $tooltip =~ s/\n+$//;
2732 2987
2733 $self->add (new CFClient::UI::Label 2988 $self->add (new CFClient::UI::Label
2734 markup => $tooltip, 2989 markup => $tooltip,
2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2990 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736 fontsize => 0.8, 2991 fontsize => 0.8,
… …
2746 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3001 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747 3002
2748 ($w + 4, $h + 4) 3003 ($w + 4, $h + 4)
2749} 3004}
2750 3005
2751sub size_allocate { 3006sub invoke_size_allocate {
2752 my ($self, $w, $h) = @_; 3007 my ($self, $w, $h) = @_;
2753 3008
2754 $self->SUPER::size_allocate ($w - 4, $h - 4); 3009 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755} 3010}
2756 3011
2757sub visibility_change { 3012sub invoke_visibility_change {
2758 my ($self, $visible) = @_; 3013 my ($self, $visible) = @_;
2759 3014
2760 return unless $visible; 3015 return unless $visible;
2761 3016
2762 $self->{root}->on_post_alloc ("move_$self" => sub { 3017 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner} 3018 my $widget = $self->{owner}
2764 or return; 3019 or return;
2765 3020
3021 if ($widget->{visible}) {
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3022 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767 3023
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3024 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH; 3025 if $x + $self->{w} > $self->{root}{w};
2770 3026
2771 $self->move_abs ($x, $y); 3027 $self->move_abs ($x, $y);
3028 } else {
3029 $self->hide;
3030 }
2772 }); 3031 });
2773} 3032}
2774 3033
2775sub _draw { 3034sub _draw {
2776 my ($self) = @_; 3035 my ($self) = @_;
… …
2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870 glDisable GL_TEXTURE_2D; 3129 glDisable GL_TEXTURE_2D;
2871 } 3130 }
2872} 3131}
2873 3132
2874sub DESTROY { 3133sub destroy {
2875 my ($self) = @_; 3134 my ($self) = @_;
2876 3135
2877 $self->{timer}->cancel 3136 $self->{timer}->cancel
2878 if $self->{timer}; 3137 if $self->{timer};
2879 3138
2880 $self->SUPER::DESTROY; 3139 $self->SUPER::destroy;
2881} 3140}
2882 3141
2883############################################################################# 3142#############################################################################
2884 3143
2885package CFClient::UI::Buttonbar; 3144package CFClient::UI::Buttonbar;
… …
2906 ); 3165 );
2907 3166
2908 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3167 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2909 3168
2910 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
2911 my ($widget, $cb) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
2912 3171
2913 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
2914 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 {
2915 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
2916 can_hover => 1, 3189 can_hover => 1,
2917 can_events => 1, 3190 can_events => 1,
2918 text => $widget; 3191 markup => $widget,
3192 tooltip => $tooltip;
3193 }
2919 } 3194 }
2920 3195
2921 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
2922 3197
2923 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
2928 3203
2929# 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)
2930sub popup { 3205sub popup {
2931 my ($self, $ev) = @_; 3206 my ($self, $ev) = @_;
2932 3207
2933 $self->_emit ("popdown"); 3208 $self->emit ("popdown");
2934 3209
2935 # maybe save $GRAB? must be careful about events... 3210 # maybe save $GRAB? must be careful about events...
2936 $GRAB = $self; 3211 $GRAB = $self;
2937 $self->{button} = $ev->{button}; 3212 $self->{button} = $ev->{button};
2938 3213
2939 $self->show; 3214 $self->show;
2940 $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);
2941} 3216}
2942 3217
2943sub mouse_motion { 3218sub invoke_mouse_motion {
2944 my ($self, $ev, $x, $y) = @_; 3219 my ($self, $ev, $x, $y) = @_;
2945 3220
2946 # TODO: should use vbox->find_widget or so 3221 # TODO: should use vbox->find_widget or so
2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3222 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948 $self->{hover} = $self->{item}{$HOVER}; 3223 $self->{hover} = $self->{item}{$HOVER};
2949 3224
2950 0 3225 0
2951} 3226}
2952 3227
2953sub button_up { 3228sub invoke_button_up {
2954 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2955 3230
2956 if ($ev->{button} == $self->{button}) { 3231 if ($ev->{button} == $self->{button}) {
2957 undef $GRAB; 3232 undef $GRAB;
2958 $self->hide; 3233 $self->hide;
2959 3234
2960 $self->_emit ("popdown"); 3235 $self->emit ("popdown");
2961 $self->{hover}[1]->() if $self->{hover}; 3236 $self->{hover}[1]->() if $self->{hover};
2962 } else { 3237 } else {
2963 return 0 3238 return 0
2964 } 3239 }
2965 3240
… …
2992 3267
2993 $self->{current} = $self->{children}[0] 3268 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} }; 3269 if @{ $self->{children} };
2995} 3270}
2996 3271
3272sub get_current_page {
3273 my ($self) = @_;
3274
3275 $self->{current}
3276}
3277
2997sub set_current_page { 3278sub set_current_page {
2998 my ($self, $page_or_widget) = @_; 3279 my ($self, $page_or_widget) = @_;
2999 3280
3000 my $widget = ref $page_or_widget 3281 my $widget = ref $page_or_widget
3001 ? $page_or_widget 3282 ? $page_or_widget
3002 : $self->{children}[$page_or_widget]; 3283 : $self->{children}[$page_or_widget];
3003 3284
3004 $self->{current} = $widget; 3285 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3286 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006 3287
3007 $self->_emit (page_changed => $self->{current}); 3288 $self->emit (page_changed => $self->{current});
3008 3289
3009 $self->realloc; 3290 $self->realloc;
3010} 3291}
3011 3292
3012sub visible_children { 3293sub visible_children {
… …
3017 my ($self) = @_; 3298 my ($self) = @_;
3018 3299
3019 $self->{current}->size_request 3300 $self->{current}->size_request
3020} 3301}
3021 3302
3022sub size_allocate { 3303sub invoke_size_allocate {
3023 my ($self, $w, $h) = @_; 3304 my ($self, $w, $h) = @_;
3024 3305
3025 $self->{current}->configure (0, 0, $w, $h); 3306 $self->{current}->configure (0, 0, $w, $h);
3307
3308 1
3026} 3309}
3027 3310
3028sub _draw { 3311sub _draw {
3029 my ($self) = @_; 3312 my ($self) = @_;
3030 3313
… …
3065 ); 3348 );
3066 3349
3067 $self->{multiplexer}->add ($widget); 3350 $self->{multiplexer}->add ($widget);
3068} 3351}
3069 3352
3353sub get_current_page {
3354 my ($self) = @_;
3355
3356 $self->{multiplexer}->get_current_page
3357}
3358
3070sub set_current_page { 3359sub set_current_page {
3071 my ($self, $page) = @_; 3360 my ($self, $page) = @_;
3072 3361
3073 $self->{multiplexer}->set_current_page ($page); 3362 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current}); 3363 $self->emit (page_changed => $self->{multiplexer}{current});
3364}
3365
3366#############################################################################
3367
3368package CFClient::UI::Combobox;
3369
3370use utf8;
3371
3372our @ISA = CFClient::UI::Button::;
3373
3374sub new {
3375 my $class = shift;
3376
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);
3075} 3420}
3076 3421
3077############################################################################# 3422#############################################################################
3078 3423
3079package CFClient::UI::Statusbox; 3424package CFClient::UI::Statusbox;
… …
3178 $item->{count}++; 3523 $item->{count}++;
3179 } else { 3524 } else {
3180 $item->{count} = 1; 3525 $item->{count} = 1;
3181 $item->{text} = $item->{tooltip} = $text; 3526 $item->{text} = $item->{tooltip} = $text;
3182 } 3527 }
3183 $item->{id} = ++$self->{id}; 3528 $item->{id} += 0.2;#d#
3184 $item->{timeout} = $timeout; 3529 $item->{timeout} = $timeout;
3185 delete $item->{label}; 3530 delete $item->{label};
3186 } else { 3531 } else {
3187 $self->{item}{$group} = { 3532 $self->{item}{$group} = {
3188 id => ++$self->{id}, 3533 id => ++$self->{id},
… …
3194 count => 1, 3539 count => 1,
3195 %arg, 3540 %arg,
3196 }; 3541 };
3197 } 3542 }
3198 3543
3544 $ROOT->on_refresh (reorder => sub {
3199 $self->reorder; 3545 $self->reorder;
3546 });
3200} 3547}
3201 3548
3202sub reconfigure { 3549sub reconfigure {
3203 my ($self) = @_; 3550 my ($self) = @_;
3204 3551
… …
3207 3554
3208 $self->reorder; 3555 $self->reorder;
3209 $self->SUPER::reconfigure; 3556 $self->SUPER::reconfigure;
3210} 3557}
3211 3558
3212sub DESTROY { 3559sub destroy {
3213 my ($self) = @_; 3560 my ($self) = @_;
3214 3561
3215 $self->{timer}->cancel; 3562 $self->{timer}->cancel;
3216 3563
3217 $self->SUPER::DESTROY; 3564 $self->SUPER::destroy;
3218} 3565}
3219 3566
3220############################################################################# 3567#############################################################################
3221 3568
3222package CFClient::UI::Inventory; 3569package CFClient::UI::Inventory;
3223 3570
3224our @ISA = CFClient::UI::ScrolledWindow::; 3571our @ISA = CFClient::UI::Table::;
3225 3572
3226sub new { 3573sub new {
3227 my $class = shift; 3574 my $class = shift;
3228 3575
3229 my $self = $class->SUPER::new ( 3576 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3577 col_expand => [0, 1, 0],
3578 items => [],
3231 @_, 3579 @_,
3232 ); 3580 );
3233 3581
3582 $self->set_sort_order (undef);
3583
3234 $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;
3235} 3620}
3236 3621
3237sub set_items { 3622sub set_items {
3238 my ($self, $items) = @_; 3623 my ($self, $items) = @_;
3239 3624
3240 $self->{child}->clear; 3625 $self->{items} = [$items ? values %$items : ()];
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets; 3626 $self->update_items;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457} 3627}
3458 3628
3459############################################################################# 3629#############################################################################
3460 3630
3461package CFClient::UI::SpellList; 3631package CFClient::UI::SpellList;
… …
3470 commands => [], 3640 commands => [],
3471 @_, 3641 @_,
3472 ) 3642 )
3473} 3643}
3474 3644
3475# 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
3476sub add_spell { 3730sub add_spell {
3477 my ($self, $spell) = @_; 3731 my ($self, $spell) = @_;
3732
3478 $self->{spells}->{$spell->{name}} = $spell; 3733 $self->{spell}->{$spell->{name}} = $spell;
3479 3734 $self->rebuild_spell_list;
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507} 3735}
3508 3736
3509sub remove_spell { 3737sub remove_spell {
3510 my ($self, $spell) = @_; 3738 my ($self, $spell) = @_;
3739
3511 delete $self->{spells}->{$spell->{name}}; 3740 delete $self->{spell}->{$spell->{name}};
3741 $self->rebuild_spell_list;
3742}
3743
3744sub clear_spells {
3745 my ($self) = @_;
3746
3747 $self->{spell} = {};
3512 $self->rebuild_spell_list; 3748 $self->rebuild_spell_list;
3513} 3749}
3514 3750
3515############################################################################# 3751#############################################################################
3516 3752
… …
3553 $coord = $max - $size if $coord > $max - $size; 3789 $coord = $max - $size if $coord > $max - $size;
3554 3790
3555 int $coord + 0.5 3791 int $coord + 0.5
3556} 3792}
3557 3793
3558sub size_allocate { 3794sub invoke_size_allocate {
3559 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3560 3796
3561 for my $child ($self->children) { 3797 for my $child ($self->children) {
3562 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)};
3563 3799
… …
3567 $X = _to_pixel $X, $W, $self->{w}; 3803 $X = _to_pixel $X, $W, $self->{w};
3568 $Y = _to_pixel $Y, $H, $self->{h}; 3804 $Y = _to_pixel $Y, $H, $self->{h};
3569 3805
3570 $child->configure ($X, $Y, $W, $H); 3806 $child->configure ($X, $Y, $W, $H);
3571 } 3807 }
3808
3809 1
3572} 3810}
3573 3811
3574sub coord2local { 3812sub coord2local {
3575 my ($self, $x, $y) = @_; 3813 my ($self, $x, $y) = @_;
3576 3814
… …
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3703 3941
3704 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3705 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3706 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};
3950
3707 $w = int $w + 0.5; 3951 $w = int $w + 0.5;
3708 $h = int $h + 0.5; 3952 $h = int $h + 0.5;
3709 3953
3710 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}) {
3711 $widget->{old_w} = $widget->{w}; 3955 $widget->{old_w} = $widget->{w};

Diff Legend

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