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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 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}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $self->{x} = List::Util::max 0, int $x; 319 $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; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
… …
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
… …
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop 376 # nop
377} 377}
378 378
379sub visible_children { 379sub visible_children {
… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
397 399
398 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
399 401
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 405 }
404} 406}
405 407
406# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
407sub coord2local { 409sub coord2local {
… …
415 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
416 418
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 420}
419 421
420sub focus_in { 422sub invoke_focus_in {
421 my ($self) = @_; 423 my ($self) = @_;
422 424
423 return if $FOCUS == $self; 425 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
425 427
426 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus); 430 $self->update;
429 431
430 $focus->update if $focus; 432 0
431 $FOCUS->update;
432} 433}
433 434
434sub focus_out { 435sub invoke_focus_out {
435 my ($self) = @_; 436 my ($self) = @_;
436 437
437 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
438 439
439 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
440 441
441 $self->_emit (focus_out => $focus); 442 $self->update;
442 443
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 445 unless $FOCUS;
447}
448 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
449sub mouse_motion { 0 } 457sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 458sub invoke_button_up { 0 }
451sub key_down { 0 } 459sub invoke_key_down { 0 }
452sub key_up { 0 } 460sub invoke_key_up { 0 }
453 461
454sub button_down { 462sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
456 464
457 $self->focus_in; 465 $self->grab_focus;
458 466
459 0 467 0
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480
481 #d##TODO# stop propagating at first true, do not use sum
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 485}
461 486
462sub find_widget { 487sub find_widget {
463 my ($self, $x, $y) = @_; 488 my ($self, $x, $y) = @_;
464 489
… …
474sub set_parent { 499sub set_parent {
475 my ($self, $parent) = @_; 500 my ($self, $parent) = @_;
476 501
477 Scalar::Util::weaken ($self->{parent} = $parent); 502 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 503 $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} 504}
503 505
504sub realloc { 506sub realloc {
505 my ($self) = @_; 507 my ($self) = @_;
506 508
… …
539 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
540 542
541 # update screen rectangle 543 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 546
547 # skip widgets that are entirely outside the drawing area 547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 550
… …
589} 589}
590 590
591sub DESTROY { 591sub DESTROY {
592 my ($self) = @_; 592 my ($self) = @_;
593 593
594 return if CFClient::in_destruct;
595
594 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
595 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 600}
597 601
598############################################################################# 602#############################################################################
599 603
600package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
765} 769}
766 770
767sub add { 771sub add {
768 my ($self, $child) = @_; 772 my ($self, $child) = @_;
769 773
770 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
773} 776}
774 777
775sub remove { 778sub remove {
776 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
785 788
786sub size_request { 789sub size_request {
787 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
788} 791}
789 792
790sub size_allocate { 793sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
792 795
793 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
794} 799}
795 800
796############################################################################# 801#############################################################################
797 802
798# back-buffered drawing area 803# back-buffered drawing area
… …
814 819
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 821 $self->SUPER::update;
817} 822}
818 823
819sub size_allocate { 824sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
821 826
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
824} 830}
825 831
826sub _render { 832sub _render {
827 my ($self) = @_; 833 my ($self) = @_;
828 834
… …
855 my $tex = $self->{texture} 861 my $tex = $self->{texture}
856 or return; 862 or return;
857 863
858 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862 glColor 0, 0, 0, 1; 866 glColor 0, 0, 0, 1;
863 867
864 $tex->draw_quad (0, 0, $w, $h); 868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865 869
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 870 glDisable GL_TEXTURE_2D;
868} 871}
869 872
870############################################################################# 873#############################################################################
871 874
… …
892 $h = 10 if $self->{scroll_y}; 895 $h = 10 if $self->{scroll_y};
893 896
894 ($w, $h) 897 ($w, $h)
895} 898}
896 899
897sub size_allocate { 900sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
899 902
900 my $child = $self->child; 903 my $child = $self->child;
901 904
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 907
905 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
906 $self->update; 909 $self->update;
910
911 1
907} 912}
908 913
909sub set_offset { 914sub set_offset {
910 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
911 916
… …
985 $self->add ($child) if $child; 990 $self->add ($child) if $child;
986 991
987 $self 992 $self
988} 993}
989 994
995#TODO# update range on size_allocate depending on child
996
990sub add { 997sub add {
991 my ($self, $widget) = @_; 998 my ($self, $widget) = @_;
992 999
993 $self->{vp}->add ($self->{child} = $widget); 1000 $self->{vp}->add ($self->{child} = $widget);
994} 1001}
995 1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
996sub update { 1017sub update {
997 my ($self) = @_; 1018 my ($self) = @_;
998 1019
999 $self->SUPER::update; 1020 $self->SUPER::update;
1000 1021
1001 # todo: overwrite size_allocate of child 1022 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1023}
1005 1024
1006sub size_allocate { 1025sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
1008 1027
1028 $self->update_slider;
1029
1009 $self->SUPER::size_allocate ($w, $h); 1030 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1031}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1032
1018############################################################################# 1033#############################################################################
1019 1034
1020package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1021 1036
… …
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1088
1074sub new { 1089sub new {
1075 my ($class, %arg) = @_; 1090 my ($class, %arg) = @_;
1076 1091
1077 my $title = delete $arg{title};
1078
1079 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1095 border => 0.6,
1083 can_events => 1, 1096 can_events => 1,
1084 min_w => 16, 1097 min_w => 64,
1085 min_h => 16, 1098 min_h => 32,
1086 %arg, 1099 %arg,
1087 ); 1100 );
1088 1101
1089 $self->{title} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1103 align => 0,
1091 valign => 1, 1104 valign => 1,
1092 text => $title, 1105 text => $self->{title},
1093 fontsize => $self->{border} 1106 fontsize => $self->{border},
1094 if defined $title; 1107 if exists $self->{title};
1108
1109 if ($self->{has_close_button}) {
1110 $self->{close_button} =
1111 new CFClient::UI::ImageButton
1112 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") };
1114
1115 $self->CFClient::UI::Container::add ($self->{close_button});
1116 }
1095 1117
1096 $self 1118 $self
1097} 1119}
1098 1120
1099sub add { 1121sub add {
1100 my ($self, @widgets) = @_; 1122 my ($self, @widgets) = @_;
1101 1123
1102 $self->SUPER::add (@widgets); 1124 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1127}
1105 1128
1106sub border { 1129sub border {
1107 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
1108} 1131}
1109 1132
1110sub size_request { 1133sub size_request {
1111 my ($self) = @_; 1134 my ($self) = @_;
1112 1135
1113 $self->{title}->size_request 1136 $self->{title_widget}->size_request
1114 if $self->{title}; 1137 if $self->{title_widget};
1138
1139 $self->{close_button}->size_request
1140 if $self->{close_button};
1115 1141
1116 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
1117 1143
1118 ( 1144 (
1119 $w + $self->border * 2, 1145 $w + $self->border * 2,
1120 $h + $self->border * 2, 1146 $h + $self->border * 2,
1121 ) 1147 )
1122} 1148}
1123 1149
1124sub size_allocate { 1150sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1126 1152
1127 if ($self->{title}) { 1153 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1154 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1155 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1157 }
1132 1158
1133 my $border = $self->border; 1159 my $border = $self->border;
1134 1160
1135 $h -= List::Util::max 0, $border * 2; 1161 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1162 $w -= List::Util::max 0, $border * 2;
1163
1164 $self->child->configure ($border, $border, $w, $h);
1165
1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1167 if $self->{close_button};
1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1137 1176
1138 $self->child->configure ($border, $border, $w, $h); 1177 1
1139} 1178}
1140 1179
1141sub button_down { 1180sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1143 1182
1144 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1184 my $border = $self->border;
1146 1185
… …
1177 1216
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1218
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1220 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1222 };
1184 } else { 1223 } else {
1185 return 0; 1224 return 0;
1186 } 1225 }
1187 1226
1188 1 1227 1
1189} 1228}
1190 1229
1191sub button_up { 1230sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1193 1232
1194 !!delete $self->{motion} 1233 ! ! delete $self->{motion}
1195} 1234}
1196 1235
1197sub mouse_motion { 1236sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1199 1238
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1240
1202 !!$self->{motion} 1241 ! ! $self->{motion}
1203} 1242}
1204 1243
1205sub _draw { 1244sub _draw {
1206 my ($self) = @_; 1245 my ($self) = @_;
1207 1246
… …
1233 1272
1234 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1235 1274
1236 $child->draw; 1275 $child->draw;
1237 1276
1238 if ($self->{title}) { 1277 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1278 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1241 } 1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1242} 1286}
1243 1287
1244############################################################################# 1288#############################################################################
1245 1289
1246package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1269 1313
1270 $child->set_parent ($self); 1314 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1272 1316
1273 $self->realloc; 1317 $self->realloc;
1318}
1319
1320sub remove {
1321 my ($self, $child) = @_;
1322
1323 # TODO: not yet implemented
1274} 1324}
1275 1325
1276# TODO: move to container class maybe? send children a signal on removal? 1326# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1327sub clear {
1278 my ($self) = @_; 1328 my ($self) = @_;
… …
1319 (sum @$ws), 1369 (sum @$ws),
1320 (sum @$hs), 1370 (sum @$hs),
1321 ) 1371 )
1322} 1372}
1323 1373
1324sub size_allocate { 1374sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1326 1376
1327 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1328 1378
1329 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1361 } 1411 }
1362 1412
1363 $y += $row_h; 1413 $y += $row_h;
1364 } 1414 }
1365 1415
1416 1
1366} 1417}
1367 1418
1368sub find_widget { 1419sub find_widget {
1369 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1370 1421
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1460 )
1410} 1461}
1411 1462
1412sub size_allocate { 1463sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1464 my ($self, $w, $h) = @_;
1414 1465
1415 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1417 1468
1418 my @req; 1469 my @req;
1419 1470
1420 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1422 } else { 1473 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1425 1476
1426 if ($req > $space) { 1477 if ($req > $space) {
1427 # ah well, not enough space 1478 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1429 } else { 1480 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1482
1432 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1433 1484
1434 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1486 for 0 .. $#children;
1436 } 1487 }
1437 } 1488 }
1438 1489
1439 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1440 1491
1441 my $pos = 0; 1492 my $pos = 0;
1442 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1496
1446 $pos += $alloc; 1497 $pos += $alloc;
1447 } 1498 }
1448 1499
1449 1 1500 1
… …
1539 1590
1540 delete $self->{texture}; 1591 delete $self->{texture};
1541 $self->SUPER::update; 1592 $self->SUPER::update;
1542} 1593}
1543 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1544sub set_text { 1602sub set_text {
1545 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1546 1604
1547 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1549 1607
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1552 1609
1610 delete $self->{size_req};
1553 $self->realloc; 1611 $self->realloc;
1554 $self->update; 1612 $self->update;
1555} 1613}
1556 1614
1557sub set_markup { 1615sub set_markup {
… …
1560 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1561 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1562 1620
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1622
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1567 1624
1625 delete $self->{size_req};
1568 $self->realloc; 1626 $self->realloc;
1569 $self->update; 1627 $self->update;
1570} 1628}
1571 1629
1572sub size_request { 1630sub size_request {
1573 my ($self) = @_; 1631 my ($self) = @_;
1574 1632
1633 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1639
1581 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1582 1641
1583 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1646
1587 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1588 1648
1589 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1591 } 1654 };
1592 1655
1593 ($w, $h) 1656 @{ $self->{size_req} }
1594} 1657}
1595 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1596sub size_allocate { 1663sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1598 1665
1599 delete $self->{ox}; 1666 delete $self->{ox};
1600 1667
1601 delete $self->{texture} 1668 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1603} 1672}
1604 1673
1605sub set_fontsize { 1674sub set_fontsize {
1606 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1607 1676
1608 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1609 delete $self->{texture}; 1679 delete $self->{texture};
1610 1680
1611 $self->realloc; 1681 $self->realloc;
1612} 1682}
1613 1683
1684sub reconfigure {
1685 my ($self) = @_;
1686
1687 delete $self->{size_req};
1688 delete $self->{texture};
1689
1690 $self->SUPER::reconfigure;
1691}
1692
1614sub _draw { 1693sub _draw {
1615 my ($self) = @_; 1694 my ($self) = @_;
1616 1695
1617 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1618 1697
1619 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1621 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1622 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1623 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626 1705
1627 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1628 }; 1707 };
1629 1708
1630 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1634 1713
1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1638 }; 1717 };
1639 1718
1640 glEnable GL_TEXTURE_2D; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1642 1721
1643 if ($tex->{format} == GL_ALPHA) { 1722 $self->{layout}->render ($self->{ox}, $self->{oy});
1644 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1646 } else {
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1648 }
1649
1650 glDisable GL_TEXTURE_2D;
1651} 1723}
1652 1724
1653############################################################################# 1725#############################################################################
1654 1726
1655package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1669 can_hover => 1, 1741 can_hover => 1,
1670 can_focus => 1, 1742 can_focus => 1,
1671 valign => 0, 1743 valign => 0,
1672 can_events => 1, 1744 can_events => 1,
1673 #text => ... 1745 #text => ...
1746 #hidden => "*",
1674 @_ 1747 @_
1675 ) 1748 )
1676} 1749}
1677 1750
1678sub _set_text { 1751sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1759 $self->{text} = $text;
1687 1760
1688 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1690 1764
1691 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1692 $self->update; 1768 $self->update;
1693} 1769}
1694 1770
1695sub set_text { 1771sub set_text {
1696 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1697 1773
1698 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1775 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1776}
1703 1777
1704sub get_text { 1778sub get_text {
1705 $_[0]{text} 1779 $_[0]{text}
1706} 1780}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1712 1786
1713 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1714} 1788}
1715 1789
1716sub key_down { 1790sub invoke_key_down {
1717 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1718 1792
1719 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1733 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1734 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1736 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 1812 $self->emit ('escape');
1739 } elsif ($uni) { 1813 } elsif ($uni) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 1815 } else {
1742 return 0; 1816 return 0;
1743 } 1817 }
… …
1747 $self->realloc; 1821 $self->realloc;
1748 1822
1749 1 1823 1
1750} 1824}
1751 1825
1752sub focus_in { 1826sub invoke_focus_in {
1753 my ($self) = @_; 1827 my ($self) = @_;
1754 1828
1755 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1756 1830
1757 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1758} 1832}
1759 1833
1760sub button_down { 1834sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1762 1836
1763 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 1838
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 1840
1767 # byte-index to char-index 1841 # byte-index to char-index
1768 my $text = $self->{text}; 1842 my $text = $self->{text};
1769 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1770 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1771 1845
1772 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1773 $self->update; 1847 $self->update;
1774 1848
1775 1 1849 1
1776} 1850}
1777 1851
1778sub mouse_motion { 1852sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1854# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 1855
1782 0 1856 1
1783} 1857}
1784 1858
1785sub _draw { 1859sub _draw {
1786 my ($self) = @_; 1860 my ($self) = @_;
1787 1861
… …
1828 1902
1829our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1830 1904
1831use CFClient::OpenGL; 1905use CFClient::OpenGL;
1832 1906
1833sub key_down { 1907sub invoke_key_down {
1834 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1835 1909
1836 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1837 1911
1838 if ($sym == 13) { 1912 if ($sym == 13) {
1839 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1841 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1844 $self->update; 1919 $self->update;
1845 1920
1846 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1864 } else { 1939 } else {
1865 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1866 } 1941 }
1867 1942
1868 } else { 1943 } else {
1869 return $self->SUPER::key_down ($ev) 1944 return $self->SUPER::invoke_key_down ($ev)
1870 } 1945 }
1871 1946
1872 1 1947 1
1873} 1948}
1874 1949
… …
1898 can_events => 1, 1973 can_events => 1,
1899 @_ 1974 @_
1900 ) 1975 )
1901} 1976}
1902 1977
1903sub activate { }
1904
1905sub button_up { 1978sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1907 1980
1908 $self->emit ("activate") 1981 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
… …
1913} 1986}
1914 1987
1915sub _draw { 1988sub _draw {
1916 my ($self) = @_; 1989 my ($self) = @_;
1917 1990
1918 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 1992
1924 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1927 1996
1928 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929 1998
1930 glDisable GL_TEXTURE_2D; 1999 glDisable GL_TEXTURE_2D;
1931 2000
1932 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
2002}
2003
2004#############################################################################
2005
2006package CFClient::UI::ImageButton;
2007
2008our @ISA = CFClient::UI::Image::;
2009
2010use CFClient::OpenGL;
2011
2012my %textures;
2013
2014sub new {
2015 my $class = shift;
2016
2017 my $self = $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1,
2023 align => 0,
2024 valign => 0,
2025 can_events => 1,
2026 @_
2027 );
2028}
2029
2030sub invoke_button_up {
2031 my ($self, $ev, $x, $y) = @_;
2032
2033 $self->emit ("activate")
2034 if $x >= 0 && $x < $self->{w}
2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1933} 2038}
1934 2039
1935############################################################################# 2040#############################################################################
1936 2041
1937package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
… …
1964 my ($self) = @_; 2069 my ($self) = @_;
1965 2070
1966 (6) x 2 2071 (6) x 2
1967} 2072}
1968 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1969sub button_down { 2082sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1971 2084
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2087 $self->toggle;
1975 $self->_emit (changed => $self->{state});
1976 } else { 2088 } else {
1977 return 0 2089 return 0
1978 } 2090 }
1979 2091
1980 1 2092 1
… …
2005package CFClient::UI::Image; 2117package CFClient::UI::Image;
2006 2118
2007our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
2008 2120
2009use CFClient::OpenGL; 2121use CFClient::OpenGL;
2010use Carp qw/confess/;
2011 2122
2012our %loaded_images; 2123our %texture_cache;
2013 2124
2014sub new { 2125sub new {
2015 my $class = shift; 2126 my $class = shift;
2016 2127
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2018 2132
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
2020 2135
2021 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2023 2138
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2025 2140
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2142
2030 $self 2143 $self
2031} 2144}
2032 2145
2033sub size_request { 2146sub size_request {
2034 my ($self) = @_; 2147 my ($self) = @_;
2035 2148
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
2037} 2150}
2038 2151
2039sub _draw { 2152sub _draw {
2040 my ($self) = @_; 2153 my ($self) = @_;
2041 2154
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2265
2153 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2271
2156 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
… …
2178 2294
2179 if ($t3) { 2295 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2302 glEnd;
2187 } 2303 }
2188 2304
2189 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2277 $self->update; 2393 $self->update;
2278 2394
2279 $self 2395 $self
2280} 2396}
2281 2397
2282sub changed { }
2283
2284sub set_range { 2398sub set_range {
2285 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2286 2400
2287 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2288 2402
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2403 if ("@$range" ne "@{$self->{range}}") {
2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2291} 2407}
2292 2408
2293sub set_value { 2409sub set_value {
2294 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2295 2411
… …
2306 if $unit; 2422 if $unit;
2307 2423
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2425
2310 if ($value != $old_value) { 2426 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2312 $self->update; 2428 $self->update;
2313 } 2429 }
2314} 2430}
2315 2431
2316sub size_request { 2432sub size_request {
2317 my ($self) = @_; 2433 my ($self) = @_;
2318 2434
2319 ($self->{req_w}, $self->{req_h}) 2435 ($self->{req_w}, $self->{req_h})
2320} 2436}
2321 2437
2322sub button_down { 2438sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2324 2440
2325 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2442
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2444
2329 $self->mouse_motion ($ev, $x, $y) 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2446}
2331 2447
2332sub mouse_motion { 2448sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2334 2450
2335 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2453
… …
2442sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2444 2560
2445############################################################################# 2561#############################################################################
2446 2562
2447package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2448 2564
2449our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2450 2566
2451use CFClient::OpenGL; 2567use CFClient::OpenGL;
2452 2568
… …
2454 my $class = shift; 2570 my $class = shift;
2455 2571
2456 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2457 fontsize => 1, 2573 fontsize => 1,
2458 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2459 #font => default_font 2576 #font => default_font
2460 @_, 2577 @_,
2461 2578
2462 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2463 par => [], 2580 par => [],
2464 height => 0, 2581 height => 0,
2465 children => [ 2582 children => [
2466 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2467 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2478 2595
2479 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2480 $self->reflow; 2597 $self->reflow;
2481} 2598}
2482 2599
2600sub size_request {
2601 my ($self) = @_;
2602
2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2607}
2608
2483sub size_allocate { 2609sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2485 2611
2486 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 2614
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2619
2492 $self->reflow; 2620 $self->reflow;
2493}
2494 2621
2495sub text_size { 2622 local $self->{children} = [$empty, $slider];
2496 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2497 2628
2498 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2499 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2636 $layout->set_markup ($para->{markup});
2637
2638 $layout->set_shapes (
2639 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}}
2503 2642 );
2643
2504 $layout->size 2644 $layout
2505} 2645}
2506 2646
2507sub reflow { 2647sub reflow {
2508 my ($self) = @_; 2648 my ($self) = @_;
2509 2649
… …
2518 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2519} 2659}
2520 2660
2521sub clear { 2661sub clear {
2522 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2523 2666
2524 $self->{par} = []; 2667 $self->{par} = [];
2525 $self->{height} = 0; 2668 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 2670}
2528 2671
2529sub add_paragraph { 2672sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2531 2674
2532 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2533 my ($w, $h) = $self->text_size ($line); 2676
2534 $self->{height} += $h; 2677 $para = {
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2678 w => 1e10,
2679 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2536 } 2684 };
2537 2685
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2686 $self->add (@w) if @w;
2687 push @{$self->{par}}, $para;
2688
2689 $self->{need_reflow}++;
2690 $self->update;
2691}
2692
2693sub scroll_to_bottom {
2694 my ($self) = @_;
2695
2696 $self->{scroll_to_bottom} = 1;
2697 $self->update;
2539} 2698}
2540 2699
2541sub update { 2700sub update {
2542 my ($self) = @_; 2701 my ($self) = @_;
2543 2702
… …
2545 2704
2546 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2547 2706
2548 delete $self->{texture}; 2707 delete $self->{texture};
2549 2708
2550 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2711
2553 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2554 my $height = 0; 2713 my $height = 0;
2555 2714
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2562 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2719
2566 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2567 } 2723 }
2568 2724
2569 $height += $_->[1]; 2725 $height += $para->{h};
2570 } 2726 }
2571 2727
2572 $self->{height} = $height; 2728 $self->{height} = $height;
2573 2729
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2575 2731
2576 delete $self->{texture}; 2732 delete $self->{texture};
2577 } 2733 }
2578 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2582 2742
2583 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2584 2744
2585 my $y0 = $top; 2745 my $y0 = $top;
2586 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2587 2747
2588 my $y = 0; 2748 my $y = 0;
2589 2749
2590 my $layout = $self->{layout};
2591
2592 $layout->set_font ($self->{font}) if $self->{font};
2593
2594 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off
2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597
2598 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 2751 my $h = $para->{h};
2600 2752
2601 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] });
2603 $layout->set_width ($W - $par->[3]);
2604 $layout->set_markup ($par->[4]);
2605 2754
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2607 2756
2608 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2758
2759 if (my @w = @{ $para->{widget} }) {
2760 my @s = $layout->get_shapes;
2761
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 }
2610 } 2771 }
2611 2772
2612 $y += $h; 2773 $y += $h;
2613 } 2774 }
2614
2615 glDisable GL_BLEND;
2616 }; 2775 };
2617 }); 2776 });
2618} 2777}
2619 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2620sub _draw { 2788sub _draw {
2621 my ($self) = @_; 2789 my ($self) = @_;
2622 2790
2623 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2794 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2628 2796
2629 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2630
2631} 2798}
2632 2799
2633############################################################################# 2800#############################################################################
2634 2801
2635package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 2889 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 2891 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 2892 . "visible $widget->{visible}";
2726 } 2893 }
2894
2895 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//;
2727 2897
2728 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2729 markup => $tooltip, 2899 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 2901 fontsize => 0.8,
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 2912
2743 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2744} 2914}
2745 2915
2746sub size_allocate { 2916sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2748 2918
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 2920}
2751 2921
2752sub visibility_change { 2922sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 2923 my ($self, $visible) = @_;
2754 2924
2755 return unless $visible; 2925 return unless $visible;
2756 2926
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 2927 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2759 or return; 2929 or return;
2760 2930
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 2932
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 2934 if $x + $self->{w} > $self->{root}{w};
2765 2935
2766 $self->move_abs ($x, $y); 2936 $self->move_abs ($x, $y);
2767 }); 2937 });
2768} 2938}
2769 2939
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 3029
2860 if ($tex) { 3030 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2866 } 3036 }
2867} 3037}
2868 3038
2869sub DESTROY { 3039sub destroy {
2870 my ($self) = @_; 3040 my ($self) = @_;
2871 3041
2872 $self->{timer}->cancel 3042 $self->{timer}->cancel
2873 if $self->{timer}; 3043 if $self->{timer};
2874 3044
2875 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2876} 3046}
2877 3047
2878############################################################################# 3048#############################################################################
2879 3049
2880package CFClient::UI::Buttonbar; 3050package CFClient::UI::Buttonbar;
… …
2901 ); 3071 );
2902 3072
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2904 3074
2905 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2907 3077
2908 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2909 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
2910 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2911 can_hover => 1, 3095 can_hover => 1,
2912 can_events => 1, 3096 can_events => 1,
2913 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2914 } 3100 }
2915 3101
2916 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2917 3103
2918 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2923 3109
2924# popup given the event (must be a mouse button down event currently) 3110# popup given the event (must be a mouse button down event currently)
2925sub popup { 3111sub popup {
2926 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2927 3113
2928 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2929 3115
2930 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3117 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2933 3119
2934 $self->show; 3120 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3121 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3122}
2937 3123
2938sub mouse_motion { 3124sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2940 3126
2941 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2944 3130
2945 0 3131 0
2946} 3132}
2947 3133
2948sub button_up { 3134sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2950 3136
2951 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3138 undef $GRAB;
2953 $self->hide; 3139 $self->hide;
2954 3140
2955 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3143 } else {
2958 return 0 3144 return 0
2959 } 3145 }
2960 3146
… …
2987 3173
2988 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} }; 3175 if @{ $self->{children} };
2990} 3176}
2991 3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
2992sub set_current_page { 3184sub set_current_page {
2993 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
2994 3186
2995 my $widget = ref $page_or_widget 3187 my $widget = ref $page_or_widget
2996 ? $page_or_widget 3188 ? $page_or_widget
2997 : $self->{children}[$page_or_widget]; 3189 : $self->{children}[$page_or_widget];
2998 3190
2999 $self->{current} = $widget; 3191 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3193
3002 $self->_emit (page_changed => $self->{current}); 3194 $self->emit (page_changed => $self->{current});
3003 3195
3004 $self->realloc; 3196 $self->realloc;
3005} 3197}
3006 3198
3007sub visible_children { 3199sub visible_children {
… …
3012 my ($self) = @_; 3204 my ($self) = @_;
3013 3205
3014 $self->{current}->size_request 3206 $self->{current}->size_request
3015} 3207}
3016 3208
3017sub size_allocate { 3209sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3210 my ($self, $w, $h) = @_;
3019 3211
3020 $self->{current}->configure (0, 0, $w, $h); 3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3021} 3215}
3022 3216
3023sub _draw { 3217sub _draw {
3024 my ($self) = @_; 3218 my ($self) = @_;
3025 3219
… …
3060 ); 3254 );
3061 3255
3062 $self->{multiplexer}->add ($widget); 3256 $self->{multiplexer}->add ($widget);
3063} 3257}
3064 3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3065sub set_current_page { 3265sub set_current_page {
3066 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3067 3267
3068 $self->{multiplexer}->set_current_page ($page); 3268 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3269 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3270}
3071 3271
3072############################################################################# 3272#############################################################################
3073 3273
3074package CFClient::UI::Statusbox; 3274package CFClient::UI::Combobox;
3075 3275
3276use utf8;
3277
3076our @ISA = CFClient::UI::VBox::; 3278our @ISA = CFClient::UI::Button::;
3077 3279
3078sub new { 3280sub new {
3079 my $class = shift; 3281 my $class = shift;
3080 3282
3081 $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
3284 options => [], # [value, title, longdesc], ...
3285 value => undef,
3286 @_,
3287 );
3288
3289 $self->_set_value ($self->{value});
3290
3291 $self
3292}
3293
3294sub invoke_button_down {
3295 my ($self, $ev) = @_;
3296
3297 my @menu_items;
3298
3299 for (@{ $self->{options} }) {
3300 my ($value, $title, $tooltip) = @$_;
3301
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 }
3304
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306}
3307
3308sub _set_value {
3309 my ($self, $value) = @_;
3310
3311 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3312 or return;
3313
3314 $self->{value} = $item->[0];
3315 $self->set_markup ("$item->[1] ⇓");
3316 $self->set_tooltip ($item->[2]);
3317}
3318
3319sub set_value {
3320 my ($self, $value) = @_;
3321
3322 return unless $self->{value} ne $value;
3323
3324 $self->_set_value ($value);
3325 $self->emit (changed => $value);
3326}
3327
3328#############################################################################
3329
3330package CFClient::UI::Statusbox;
3331
3332our @ISA = CFClient::UI::VBox::;
3333
3334sub new {
3335 my $class = shift;
3336
3337 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3338 fontsize => 0.8,
3083 @_, 3339 @_,
3084 ) 3340 );
3341
3342 Scalar::Util::weaken (my $this = $self);
3343
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345
3346 $self
3085} 3347}
3086 3348
3087sub reorder { 3349sub reorder {
3088 my ($self) = @_; 3350 my ($self) = @_;
3089 my $NOW = time; 3351 my $NOW = Time::HiRes::time;
3352
3353 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} };
3090 3357
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3360 }
3094 3361
… …
3097 my @items = sort { 3364 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
3101 3368
3369 $self->{timer}->interval (1);
3370
3102 my $count = 10 + 1; 3371 my $count = 10 + 1;
3103 for my $item (@items) { 3372 for my $item (@items) {
3104 last unless --$count; 3373 last unless --$count;
3105 3374
3106 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3379 : $item->{text};
3111 3380
… …
3119 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3394 can_events => 1,
3126 can_hover => 1 3395 can_hover => 1
3127 }; 3396 };
3397
3398 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3399 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3400 $label->update;
3401 $label->set_max_size (undef, $label->{req_h} * $diff)
3402 if $diff < 1;
3403 $self->{timer}->interval (1/30);
3404 } else {
3405 $label->{fg}[3] = $item->{fg}[3] || 1;
3406 }
3407
3408 push @widgets, $label;
3128 } 3409 }
3129 3410
3130 $self->clear; 3411 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
3132} 3413}
… …
3137 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
3139 3420
3140 return unless $text; 3421 return unless $text;
3141 3422
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3424
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3426
3146 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
3148 $item->{count}++; 3429 $item->{count}++;
3149 } else { 3430 } else {
3150 $item->{count} = 1; 3431 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
3152 } 3433 }
3153 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3436 delete $item->{label};
3156 } else { 3437 } else {
3157 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
3164 count => 1, 3445 count => 1,
3165 %arg, 3446 %arg,
3166 }; 3447 };
3167 } 3448 }
3168 3449
3450 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 3451 $self->reorder;
3452 });
3170} 3453}
3171 3454
3172sub reconfigure { 3455sub reconfigure {
3173 my ($self) = @_; 3456 my ($self) = @_;
3174 3457
… …
3177 3460
3178 $self->reorder; 3461 $self->reorder;
3179 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
3180} 3463}
3181 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
3182############################################################################# 3473#############################################################################
3183 3474
3184package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3185 3476
3186our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3187 3478
3188sub new { 3479sub new {
3189 my $class = shift; 3480 my $class = shift;
3190 3481
3191 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3193 @_, 3484 @_,
3194 ); 3485 );
3195 3486
3196 $self 3487 $self
3197} 3488}
3198 3489
3199sub set_items { 3490sub set_items {
3200 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3201 3492
3202 $self->{child}->clear; 3493 $self->clear;
3203 return unless $items; 3494 return unless $items;
3204 3495
3205 my @items = sort { 3496 my @items = sort {
3206 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3208 } @$items; 3499 } values %$items;
3209 3500
3210 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3211 3502
3212 my $row = 0; 3503 my $row = 0;
3213 for my $item (@items) { 3504 for my $item (@items) {
3214 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3215 3506
3216 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3219 3510
3220 $row++; 3511 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 } 3512 }
3419} 3513}
3420 3514
3421############################################################################# 3515#############################################################################
3422 3516
… …
3432 commands => [], 3526 commands => [],
3433 @_, 3527 @_,
3434 ) 3528 )
3435} 3529}
3436 3530
3437# XXX: Do sorting? Argl... 3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544sub rebuild_spell_list {
3545 my ($self) = @_;
3546
3547 $CFClient::UI::ROOT->on_refresh ($self => sub {
3548 $self->clear;
3549
3550 return unless $::CONN;
3551
3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558 my $row = 0;
3559
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_};
3562
3563 $row++;
3564
3565 my $spell_cb = sub {
3566 my ($widget, $ev) = @_;
3567
3568 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu
3574 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ],
3578 )->popup ($ev);
3579 } else {
3580 return 0;
3581 }
3582
3583 1
3584 };
3585
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591 $self->add (0, $row, new CFClient::UI::Face
3592 face => $spell->{face},
3593 can_hover => 1,
3594 can_events => 1,
3595 tooltip => $tooltip,
3596 on_button_down => $spell_cb,
3597 );
3598
3599 $self->add (1, $row, new CFClient::UI::Label
3600 expand => 1,
3601 text => $spell->{name},
3602 can_hover => 1,
3603 can_events => 1,
3604 tooltip => $tooltip,
3605 on_button_down => $spell_cb,
3606 );
3607
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612 }
3613 });
3614}
3615
3438sub add_spell { 3616sub add_spell {
3439 my ($self, $spell) = @_; 3617 my ($self, $spell) = @_;
3618
3440 $self->{spells}->{$spell->{name}} = $spell; 3619 $self->{spell}->{$spell->{name}} = $spell;
3441 3620 $self->rebuild_spell_list;
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469} 3621}
3470 3622
3471sub remove_spell { 3623sub remove_spell {
3472 my ($self, $spell) = @_; 3624 my ($self, $spell) = @_;
3625
3473 delete $self->{spells}->{$spell->{name}}; 3626 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3627 $self->rebuild_spell_list;
3475} 3628}
3476 3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3477############################################################################# 3637#############################################################################
3478 3638
3479package CFClient::UI::Root; 3639package CFClient::UI::Root;
3480 3640
3481our @ISA = CFClient::UI::Container::; 3641our @ISA = CFClient::UI::Container::;
3642
3643use List::Util qw(min max);
3482 3644
3483use CFClient::OpenGL; 3645use CFClient::OpenGL;
3484 3646
3485sub new { 3647sub new {
3486 my $class = shift; 3648 my $class = shift;
… …
3513 $coord = $max - $size if $coord > $max - $size; 3675 $coord = $max - $size if $coord > $max - $size;
3514 3676
3515 int $coord + 0.5 3677 int $coord + 0.5
3516} 3678}
3517 3679
3518sub size_allocate { 3680sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3520 3682
3521 for my $child ($self->children) { 3683 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3684 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 3685
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 3689 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3529 3691
3530 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3531 } 3693 }
3694
3695 1
3532} 3696}
3533 3697
3534sub coord2local { 3698sub coord2local {
3535 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3536 3700
… …
3621 3785
3622 delete $queue{$widget+0}; 3786 delete $queue{$widget+0};
3623 3787
3624 my ($w, $h) = $widget->size_request; 3788 my ($w, $h) = $widget->size_request;
3625 3789
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3790 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3791 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3792
3793 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3794 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3795
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3796 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3797 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3798
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3799 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3658 3825
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3660 3827
3661 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3662 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3663 3836
3664 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3665 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3666 3839
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {

Diff Legend

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