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

Diff Legend

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