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.317 by root, Sun Jul 2 18:52: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}
… …
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 { 1 }
450sub button_up { 0 } 458sub invoke_button_up { 1 }
451sub key_down { 0 } 459sub invoke_key_down { 1 }
452sub key_up { 0 } 460sub invoke_key_up { 1 }
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 1
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 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
460} 483}
461 484
462sub find_widget { 485sub find_widget {
463 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
464 487
… …
474sub set_parent { 497sub set_parent {
475 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
476 499
477 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 501 $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} 502}
503 503
504sub realloc { 504sub realloc {
505 my ($self) = @_; 505 my ($self) = @_;
506 506
… …
539 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540 540
541 # update screen rectangle 541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 544
547 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 548
… …
590 588
591sub DESTROY { 589sub DESTROY {
592 my ($self) = @_; 590 my ($self) = @_;
593 591
594 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
595 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 596}
597 597
598############################################################################# 598#############################################################################
599 599
600package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
765} 765}
766 766
767sub add { 767sub add {
768 my ($self, $child) = @_; 768 my ($self, $child) = @_;
769 769
770 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
771
772 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
773} 772}
774 773
775sub remove { 774sub remove {
776 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
785 784
786sub size_request { 785sub size_request {
787 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
788} 787}
789 788
790sub size_allocate { 789sub invoke_size_allocate {
791 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
792 791
793 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
794} 795}
795 796
796############################################################################# 797#############################################################################
797 798
798# back-buffered drawing area 799# back-buffered drawing area
… …
814 815
815 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
816 $self->SUPER::update; 817 $self->SUPER::update;
817} 818}
818 819
819sub size_allocate { 820sub invoke_size_allocate {
820 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
821 822
822 $self->SUPER::size_allocate ($w, $h);
823 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
824} 826}
825 827
826sub _render { 828sub _render {
827 my ($self) = @_; 829 my ($self) = @_;
828 830
… …
855 my $tex = $self->{texture} 857 my $tex = $self->{texture}
856 or return; 858 or return;
857 859
858 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 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; 862 glColor 0, 0, 0, 1;
863 863
864 $tex->draw_quad (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865 865
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
868} 867}
869 868
870############################################################################# 869#############################################################################
871 870
… …
892 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
893 892
894 ($w, $h) 893 ($w, $h)
895} 894}
896 895
897sub size_allocate { 896sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
899 898
900 my $child = $self->child; 899 my $child = $self->child;
901 900
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 903
905 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
906 $self->update; 905 $self->update;
906
907 1
907} 908}
908 909
909sub set_offset { 910sub set_offset {
910 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
911 912
… …
985 $self->add ($child) if $child; 986 $self->add ($child) if $child;
986 987
987 $self 988 $self
988} 989}
989 990
991#TODO# update range on size_allocate depending on child
992
990sub add { 993sub add {
991 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
992 995
993 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
994} 997}
995 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
996sub update { 1005sub update {
997 my ($self) = @_; 1006 my ($self) = @_;
998 1007
999 $self->SUPER::update; 1008 $self->SUPER::update;
1000 1009
1001 # todo: overwrite size_allocate of child 1010 $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} 1011}
1005 1012
1006sub size_allocate { 1013sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1008 1015
1016 $self->update_slider;
1017
1009 $self->SUPER::size_allocate ($w, $h); 1018 $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} 1019}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1020
1018############################################################################# 1021#############################################################################
1019 1022
1020package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1021 1024
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1076
1074sub new { 1077sub new {
1075 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1079
1079 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1083 border => 0.6,
… …
1084 min_w => 16, 1085 min_w => 16,
1085 min_h => 16, 1086 min_h => 16,
1086 %arg, 1087 %arg,
1087 ); 1088 );
1088 1089
1089 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1091 align => 0,
1091 valign => 1, 1092 valign => 1,
1092 text => $title, 1093 text => $self->{title},
1093 fontsize => $self->{border} 1094 fontsize => $self->{border},
1094 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1095 1105
1096 $self 1106 $self
1097} 1107}
1098 1108
1099sub add { 1109sub add {
1100 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1101 1111
1102 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1115}
1105 1116
1106sub border { 1117sub border {
1107 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1108} 1119}
1109 1120
1110sub size_request { 1121sub size_request {
1111 my ($self) = @_; 1122 my ($self) = @_;
1112 1123
1113 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1114 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1115 1129
1116 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1117 1131
1118 ( 1132 (
1119 $w + $self->border * 2, 1133 $w + $self->border * 2,
1120 $h + $self->border * 2, 1134 $h + $self->border * 2,
1121 ) 1135 )
1122} 1136}
1123 1137
1124sub size_allocate { 1138sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1126 1140
1127 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1145 }
1132 1146
1133 my $border = $self->border; 1147 my $border = $self->border;
1134 1148
1135 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1151
1152 $self->child->configure ($border, $border, $w, $h);
1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1137 1164
1138 $self->child->configure ($border, $border, $w, $h); 1165 1
1139} 1166}
1140 1167
1141sub button_down { 1168sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1143 1170
1144 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1172 my $border = $self->border;
1146 1173
… …
1177 1204
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1206
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1210 };
1184 } else { 1211 } else {
1185 return 0; 1212 return 0;
1186 } 1213 }
1187 1214
1188 1 1215 1
1189} 1216}
1190 1217
1191sub button_up { 1218sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1193 1220
1194 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1195} 1222}
1196 1223
1197sub mouse_motion { 1224sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1199 1226
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1228
1202 !!$self->{motion} 1229 ! ! $self->{motion}
1203} 1230}
1204 1231
1205sub _draw { 1232sub _draw {
1206 my ($self) = @_; 1233 my ($self) = @_;
1207 1234
… …
1233 1260
1234 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1235 1262
1236 $child->draw; 1263 $child->draw;
1237 1264
1238 if ($self->{title}) { 1265 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1241 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1242} 1274}
1243 1275
1244############################################################################# 1276#############################################################################
1245 1277
1246package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1269 1301
1270 $child->set_parent ($self); 1302 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1272 1304
1273 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1274} 1312}
1275 1313
1276# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1315sub clear {
1278 my ($self) = @_; 1316 my ($self) = @_;
… …
1319 (sum @$ws), 1357 (sum @$ws),
1320 (sum @$hs), 1358 (sum @$hs),
1321 ) 1359 )
1322} 1360}
1323 1361
1324sub size_allocate { 1362sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1326 1364
1327 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1328 1366
1329 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1361 } 1399 }
1362 1400
1363 $y += $row_h; 1401 $y += $row_h;
1364 } 1402 }
1365 1403
1404 1
1366} 1405}
1367 1406
1368sub find_widget { 1407sub find_widget {
1369 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1370 1409
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1448 )
1410} 1449}
1411 1450
1412sub size_allocate { 1451sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1414 1453
1415 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1417 1456
1418 my @req; 1457 my @req;
1419 1458
1420 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1422 } else { 1461 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1425 1464
1426 if ($req > $space) { 1465 if ($req > $space) {
1427 # ah well, not enough space 1466 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1429 } else { 1468 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1470
1432 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1433 1472
1434 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1474 for 0 .. $#children;
1436 } 1475 }
1437 } 1476 }
1438 1477
1439 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1440 1479
1441 my $pos = 0; 1480 my $pos = 0;
1442 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1484
1446 $pos += $alloc; 1485 $pos += $alloc;
1447 } 1486 }
1448 1487
1449 1 1488 1
… …
1539 1578
1540 delete $self->{texture}; 1579 delete $self->{texture};
1541 $self->SUPER::update; 1580 $self->SUPER::update;
1542} 1581}
1543 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1544sub set_text { 1590sub set_text {
1545 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1546 1592
1547 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1549 1595
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1552 1598
1599 delete $self->{size_req};
1553 $self->realloc; 1600 $self->realloc;
1554 $self->update; 1601 $self->update;
1555} 1602}
1556 1603
1557sub set_markup { 1604sub set_markup {
… …
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1611
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1567 1614
1615 delete $self->{size_req};
1568 $self->realloc; 1616 $self->realloc;
1569 $self->update; 1617 $self->update;
1570} 1618}
1571 1619
1572sub size_request { 1620sub size_request {
1573 my ($self) = @_; 1621 my ($self) = @_;
1574 1622
1623 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1629
1581 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1582 1631
1583 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1635
1587 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1588 1637
1589 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1591 } 1643 };
1592 1644
1593 ($w, $h) 1645 @{ $self->{size_req} }
1594} 1646}
1595 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1596sub size_allocate { 1652sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1598 1654
1599 delete $self->{ox}; 1655 delete $self->{ox};
1600 1656
1601 delete $self->{texture} 1657 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1603} 1661}
1604 1662
1605sub set_fontsize { 1663sub set_fontsize {
1606 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1607 1665
1608 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1609 delete $self->{texture}; 1668 delete $self->{texture};
1610 1669
1611 $self->realloc; 1670 $self->realloc;
1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1612} 1679}
1613 1680
1614sub _draw { 1681sub _draw {
1615 my ($self) = @_; 1682 my ($self) = @_;
1616 1683
… …
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1638 }; 1705 };
1639 1706
1640 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1642 1711
1643 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1644 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1646 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1648 } 1719 }
1649 1720
1650 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1651} 1722}
1652 1723
… …
1669 can_hover => 1, 1740 can_hover => 1,
1670 can_focus => 1, 1741 can_focus => 1,
1671 valign => 0, 1742 valign => 0,
1672 can_events => 1, 1743 can_events => 1,
1673 #text => ... 1744 #text => ...
1745 #hidden => "*",
1674 @_ 1746 @_
1675 ) 1747 )
1676} 1748}
1677 1749
1678sub _set_text { 1750sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1758 $self->{text} = $text;
1687 1759
1688 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1690 1763
1691 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1692 $self->update; 1767 $self->update;
1693} 1768}
1694 1769
1695sub set_text { 1770sub set_text {
1696 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1697 1772
1698 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1774 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1775}
1703 1776
1704sub get_text { 1777sub get_text {
1705 $_[0]{text} 1778 $_[0]{text}
1706} 1779}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1712 1785
1713 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1714} 1787}
1715 1788
1716sub key_down { 1789sub invoke_key_down {
1717 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1718 1791
1719 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1733 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1734 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1736 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 1811 $self->emit ('escape');
1739 } elsif ($uni) { 1812 } elsif ($uni) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 1814 } else {
1742 return 0; 1815 return 0;
1743 } 1816 }
… …
1747 $self->realloc; 1820 $self->realloc;
1748 1821
1749 1 1822 1
1750} 1823}
1751 1824
1752sub focus_in { 1825sub invoke_focus_in {
1753 my ($self) = @_; 1826 my ($self) = @_;
1754 1827
1755 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1756 1829
1757 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1758} 1831}
1759 1832
1760sub button_down { 1833sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1762 1835
1763 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 1837
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 1839
1767 # byte-index to char-index 1840 # byte-index to char-index
1768 my $text = $self->{text}; 1841 my $text = $self->{text};
… …
1773 $self->update; 1846 $self->update;
1774 1847
1775 1 1848 1
1776} 1849}
1777 1850
1778sub mouse_motion { 1851sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 1854
1782 0 1855 1
1783} 1856}
1784 1857
1785sub _draw { 1858sub _draw {
1786 my ($self) = @_; 1859 my ($self) = @_;
1787 1860
… …
1828 1901
1829our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1830 1903
1831use CFClient::OpenGL; 1904use CFClient::OpenGL;
1832 1905
1833sub key_down { 1906sub invoke_key_down {
1834 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1835 1908
1836 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1837 1910
1838 if ($sym == 13) { 1911 if ($sym == 13) {
1839 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1841 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1844 $self->update; 1918 $self->update;
1845 1919
1846 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1864 } else { 1938 } else {
1865 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1866 } 1940 }
1867 1941
1868 } else { 1942 } else {
1869 return $self->SUPER::key_down ($ev) 1943 return $self->SUPER::invoke_key_down ($ev)
1870 } 1944 }
1871 1945
1872 1 1946 1
1873} 1947}
1874 1948
… …
1898 can_events => 1, 1972 can_events => 1,
1899 @_ 1973 @_
1900 ) 1974 )
1901} 1975}
1902 1976
1903sub activate { }
1904
1905sub button_up { 1977sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1907 1979
1908 $self->emit ("activate") 1980 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
… …
1913} 1985}
1914 1986
1915sub _draw { 1987sub _draw {
1916 my ($self) = @_; 1988 my ($self) = @_;
1917 1989
1918 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 1991
1924 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1927 1995
1928 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929 1997
1930 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1931 1999
1932 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
2001}
2002
2003#############################################################################
2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
1933} 2037}
1934 2038
1935############################################################################# 2039#############################################################################
1936 2040
1937package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
… …
1964 my ($self) = @_; 2068 my ($self) = @_;
1965 2069
1966 (6) x 2 2070 (6) x 2
1967} 2071}
1968 2072
1969sub button_down { 2073sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2074 my ($self, $ev, $x, $y) = @_;
1971 2075
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2078 $self->{state} = !$self->{state};
1975 $self->_emit (changed => $self->{state}); 2079 $self->emit (changed => $self->{state});
1976 } else { 2080 } else {
1977 return 0 2081 return 0
1978 } 2082 }
1979 2083
1980 1 2084 1
… …
2005package CFClient::UI::Image; 2109package CFClient::UI::Image;
2006 2110
2007our @ISA = CFClient::UI::Base::; 2111our @ISA = CFClient::UI::Base::;
2008 2112
2009use CFClient::OpenGL; 2113use CFClient::OpenGL;
2010use Carp qw/confess/;
2011 2114
2012our %loaded_images; 2115our %texture_cache;
2013 2116
2014sub new { 2117sub new {
2015 my $class = shift; 2118 my $class = shift;
2016 2119
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
2018 2124
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2125 $self->{path}
2126 or Carp::croak "required attribute 'path' not set";
2020 2127
2021 $loaded_images{$self->{image}} ||= 2128 $self->{tex} = $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2023 2130
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2131 Scalar::Util::weaken $texture_cache{$self->{path}};
2025 2132
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2134
2030 $self 2135 $self
2031} 2136}
2032 2137
2033sub size_request { 2138sub size_request {
2034 my ($self) = @_; 2139 my ($self) = @_;
2035 2140
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2141 ($self->{tex}{w}, $self->{tex}{h})
2037} 2142}
2038 2143
2039sub _draw { 2144sub _draw {
2040 my ($self) = @_; 2145 my ($self) = @_;
2041 2146
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2255 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2256 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2257
2153 my $h1 = $self->{h} * (1 - $ycut1); 2258 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2259 my $h2 = $self->{h} * (1 - $ycut2);
2260 my $h3 = $self->{h};
2261
2262 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2263
2156 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2265 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2266 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2267 glEnable GL_TEXTURE_2D;
… …
2178 2286
2179 if ($t3) { 2287 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2288 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2289 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2290 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2291 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2292 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2293 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2294 glEnd;
2187 } 2295 }
2188 2296
2189 glDisable GL_BLEND; 2297 glDisable GL_BLEND;
… …
2277 $self->update; 2385 $self->update;
2278 2386
2279 $self 2387 $self
2280} 2388}
2281 2389
2282sub changed { }
2283
2284sub set_range { 2390sub set_range {
2285 my ($self, $range) = @_; 2391 my ($self, $range) = @_;
2286 2392
2287 ($range, $self->{range}) = ($self->{range}, $range); 2393 ($range, $self->{range}) = ($self->{range}, $range);
2288 2394
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2395 if ("@$range" ne "@{$self->{range}}") {
2396 $self->update;
2397 $self->set_value ($self->{range}[0]);
2398 }
2291} 2399}
2292 2400
2293sub set_value { 2401sub set_value {
2294 my ($self, $value) = @_; 2402 my ($self, $value) = @_;
2295 2403
… …
2306 if $unit; 2414 if $unit;
2307 2415
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2416 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2417
2310 if ($value != $old_value) { 2418 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2419 $self->emit (changed => $value);
2312 $self->update; 2420 $self->update;
2313 } 2421 }
2314} 2422}
2315 2423
2316sub size_request { 2424sub size_request {
2317 my ($self) = @_; 2425 my ($self) = @_;
2318 2426
2319 ($self->{req_w}, $self->{req_h}) 2427 ($self->{req_w}, $self->{req_h})
2320} 2428}
2321 2429
2322sub button_down { 2430sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
2324 2432
2325 $self->SUPER::button_down ($ev, $x, $y); 2433 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2434
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2435 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2436
2329 $self->mouse_motion ($ev, $x, $y) 2437 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2438}
2331 2439
2332sub mouse_motion { 2440sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2334 2442
2335 if ($GRAB == $self) { 2443 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2444 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2445
… …
2442sub set_range { shift->{slider}->set_range (@_) } 2550sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2551sub set_value { shift->{slider}->set_value (@_) }
2444 2552
2445############################################################################# 2553#############################################################################
2446 2554
2447package CFClient::UI::TextView; 2555package CFClient::UI::TextScroller;
2448 2556
2449our @ISA = CFClient::UI::HBox::; 2557our @ISA = CFClient::UI::HBox::;
2450 2558
2451use CFClient::OpenGL; 2559use CFClient::OpenGL;
2452 2560
… …
2454 my $class = shift; 2562 my $class = shift;
2455 2563
2456 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2457 fontsize => 1, 2565 fontsize => 1,
2458 can_events => 0, 2566 can_events => 0,
2567 indent => 0,
2459 #font => default_font 2568 #font => default_font
2460 @_, 2569 @_,
2461 2570
2462 layout => (new CFClient::Layout 1), 2571 layout => (new CFClient::Layout 1),
2463 par => [], 2572 par => [],
… …
2478 2587
2479 $self->{fontsize} = $fontsize; 2588 $self->{fontsize} = $fontsize;
2480 $self->reflow; 2589 $self->reflow;
2481} 2590}
2482 2591
2592sub size_request {
2593 my ($self) = @_;
2594
2595 my ($empty, $slider) = @{ $self->{children} };
2596
2597 local $self->{children} = [$empty, $slider];
2598 $self->SUPER::size_request
2599}
2600
2483sub size_allocate { 2601sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 2602 my ($self, $w, $h) = @_;
2485 2603
2486 $self->SUPER::size_allocate ($w, $h); 2604 my ($empty, $slider, @other) = @{ $self->{children} };
2605 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 2606
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2607 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2608 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2609 $self->{layout}->set_width ($empty->{w});
2610 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2611
2492 $self->reflow; 2612 $self->reflow;
2493}
2494 2613
2495sub text_size { 2614 local $self->{children} = [$empty, $slider];
2496 my ($self, $text, $indent) = @_; 2615 $self->SUPER::invoke_size_allocate ($w, $h)
2616}
2617
2618sub get_layout {
2619 my ($self, $para) = @_;
2497 2620
2498 my $layout = $self->{layout}; 2621 my $layout = $self->{layout};
2499 2622
2623 $layout->set_font ($self->{font}) if $self->{font};
2624 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2625 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2626 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2627 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2628 $layout->set_markup ($para->{markup});
2629
2630 $layout->set_shapes (
2631 map
2632 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2633 @{$para->{widget}}
2503 2634 );
2635
2504 $layout->size 2636 $layout
2505} 2637}
2506 2638
2507sub reflow { 2639sub reflow {
2508 my ($self) = @_; 2640 my ($self) = @_;
2509 2641
… …
2518 $self->{children}[1]->set_value ($offset); 2650 $self->{children}[1]->set_value ($offset);
2519} 2651}
2520 2652
2521sub clear { 2653sub clear {
2522 my ($self) = @_; 2654 my ($self) = @_;
2655
2656 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other;
2523 2658
2524 $self->{par} = []; 2659 $self->{par} = [];
2525 $self->{height} = 0; 2660 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 2662}
2528 2663
2529sub add_paragraph { 2664sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 2665 my ($self, $color, $para, $indent) = @_;
2531 2666
2532 for my $line (split /\n/, $text) { 2667 my ($text, @w) = ref $para ? @$para : $para;
2533 my ($w, $h) = $self->text_size ($line); 2668
2534 $self->{height} += $h; 2669 $para = {
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2670 w => 1e10,
2671 wrapped => 1,
2672 fg => $color,
2673 indent => $indent,
2674 markup => $text,
2675 widget => \@w,
2536 } 2676 };
2537 2677
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2678 $self->add (@w) if @w;
2679 push @{$self->{par}}, $para;
2680
2681 $self->{need_reflow}++;
2682 $self->update;
2683}
2684
2685sub scroll_to_bottom {
2686 my ($self) = @_;
2687
2688 $self->{scroll_to_bottom} = 1;
2689 $self->update;
2539} 2690}
2540 2691
2541sub update { 2692sub update {
2542 my ($self) = @_; 2693 my ($self) = @_;
2543 2694
… …
2545 2696
2546 return unless $self->{h} > 0; 2697 return unless $self->{h} > 0;
2547 2698
2548 delete $self->{texture}; 2699 delete $self->{texture};
2549 2700
2550 $ROOT->on_post_alloc ($self, sub { 2701 $ROOT->on_post_alloc ($self => sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2703
2553 if (delete $self->{need_reflow}) { 2704 if (delete $self->{need_reflow}) {
2554 my $height = 0; 2705 my $height = 0;
2555 2706
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) { 2707 for my $para (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2562 $layout->set_width ($W - $_->[3]); 2709 my $layout = $self->get_layout ($para);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2710 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2711
2566 $_->[1] = $h; 2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2567 } 2715 }
2568 2716
2569 $height += $_->[1]; 2717 $height += $para->{h};
2570 } 2718 }
2571 2719
2572 $self->{height} = $height; 2720 $self->{height} = $height;
2573 2721
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2722 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2575 2723
2576 delete $self->{texture}; 2724 delete $self->{texture};
2577 } 2725 }
2578 2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2729 }
2730
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2732 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2733 glClear GL_COLOR_BUFFER_BIT;
2582 2734
2583 my $top = int $self->{children}[1]{range}[0]; 2735 my $top = int $self->{children}[1]{range}[0];
2584 2736
2585 my $y0 = $top; 2737 my $y0 = $top;
2586 my $y1 = $top + $H; 2738 my $y1 = $top + $H;
2587 2739
2588 my $y = 0; 2740 my $y = 0;
2589
2590 my $layout = $self->{layout};
2591
2592 $layout->set_font ($self->{font}) if $self->{font};
2593 2741
2594 glEnable GL_BLEND; 2742 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off 2743 #TODO# not correct in windows where rgba is forced off
2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597 2745
2598 for my $par (@{$self->{par}}) { 2746 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 2747 my $h = $para->{h};
2600 2748
2601 if ($y0 < $y + $h && $y < $y1) { 2749 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] }); 2750
2603 $layout->set_width ($W - $par->[3]); 2751 my $layout = $self->get_layout ($para);
2604 $layout->set_markup ($par->[4]);
2605 2752
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2607 2754
2608 glRasterPos $par->[3], $y - $y0; 2755 glRasterPos $para->{indent}, $y - $y0;
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757
2758 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes;
2760
2761 glDisable GL_BLEND;
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 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 }
2610 } 2773 }
2611 2774
2612 $y += $h; 2775 $y += $h;
2613 } 2776 }
2614 2777
2615 glDisable GL_BLEND; 2778 glDisable GL_BLEND;
2616 }; 2779 };
2617 }); 2780 });
2618} 2781}
2619 2782
2783sub reconfigure {
2784 my ($self) = @_;
2785
2786 $self->SUPER::reconfigure;
2787
2788 $_->{w} = 1e10 for @{ $self->{par} };
2789 $self->reflow;
2790}
2791
2620sub _draw { 2792sub _draw {
2621 my ($self) = @_; 2793 my ($self) = @_;
2622 2794
2623 glEnable GL_TEXTURE_2D; 2795 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2796 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2797 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2798 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2799 glDisable GL_TEXTURE_2D;
2628 2800
2629 $self->{children}[1]->draw; 2801 $self->{children}[1]->draw;
2630
2631} 2802}
2632 2803
2633############################################################################# 2804#############################################################################
2634 2805
2635package CFClient::UI::Animator; 2806package CFClient::UI::Animator;
… …
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 2893 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2894 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 2895 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 2896 . "visible $widget->{visible}";
2726 } 2897 }
2898
2899 $tooltip =~ s/^\n+//;
2900 $tooltip =~ s/\n+$//;
2727 2901
2728 $self->add (new CFClient::UI::Label 2902 $self->add (new CFClient::UI::Label
2729 markup => $tooltip, 2903 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2904 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 2905 fontsize => 0.8,
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2915 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 2916
2743 ($w + 4, $h + 4) 2917 ($w + 4, $h + 4)
2744} 2918}
2745 2919
2746sub size_allocate { 2920sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 2921 my ($self, $w, $h) = @_;
2748 2922
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 2923 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 2924}
2751 2925
2752sub visibility_change { 2926sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 2927 my ($self, $visible) = @_;
2754 2928
2755 return unless $visible; 2929 return unless $visible;
2756 2930
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 2931 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2759 or return; 2933 or return;
2760 2934
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2935 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 2936
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2937 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 2938 if $x + $self->{w} > $self->{root}{w};
2765 2939
2766 $self->move_abs ($x, $y); 2940 $self->move_abs ($x, $y);
2767 }); 2941 });
2768} 2942}
2769 2943
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3032 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 3033
2860 if ($tex) { 3034 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3035 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3037 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3038 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3039 glDisable GL_TEXTURE_2D;
2866 } 3040 }
2867} 3041}
2868 3042
2869sub DESTROY { 3043sub destroy {
2870 my ($self) = @_; 3044 my ($self) = @_;
2871 3045
2872 $self->{timer}->cancel 3046 $self->{timer}->cancel
2873 if $self->{timer}; 3047 if $self->{timer};
2874 3048
2875 $self->SUPER::DESTROY; 3049 $self->SUPER::destroy;
2876} 3050}
2877 3051
2878############################################################################# 3052#############################################################################
2879 3053
2880package CFClient::UI::Buttonbar; 3054package CFClient::UI::Buttonbar;
… …
2901 ); 3075 );
2902 3076
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3077 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2904 3078
2905 for my $item (@{ $self->{items} }) { 3079 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3080 my ($widget, $cb, $tooltip) = @$item;
2907 3081
2908 # handle various types of items, only text for now 3082 # handle various types of items, only text for now
2909 if (!ref $widget) { 3083 if (!ref $widget) {
2910 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2911 can_hover => 1, 3085 can_hover => 1,
2912 can_events => 1, 3086 can_events => 1,
2913 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip
2914 } 3089 }
2915 3090
2916 $self->{item}{$widget} = $item; 3091 $self->{item}{$widget} = $item;
2917 3092
2918 $self->{vbox}->add ($widget); 3093 $self->{vbox}->add ($widget);
… …
2923 3098
2924# popup given the event (must be a mouse button down event currently) 3099# popup given the event (must be a mouse button down event currently)
2925sub popup { 3100sub popup {
2926 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2927 3102
2928 $self->_emit ("popdown"); 3103 $self->emit ("popdown");
2929 3104
2930 # maybe save $GRAB? must be careful about events... 3105 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3106 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3107 $self->{button} = $ev->{button};
2933 3108
2934 $self->show; 3109 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3110 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3111}
2937 3112
2938sub mouse_motion { 3113sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3114 my ($self, $ev, $x, $y) = @_;
2940 3115
2941 # TODO: should use vbox->find_widget or so 3116 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3117 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3118 $self->{hover} = $self->{item}{$HOVER};
2944 3119
2945 0 3120 0
2946} 3121}
2947 3122
2948sub button_up { 3123sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3124 my ($self, $ev, $x, $y) = @_;
2950 3125
2951 if ($ev->{button} == $self->{button}) { 3126 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3127 undef $GRAB;
2953 $self->hide; 3128 $self->hide;
2954 3129
2955 $self->_emit ("popdown"); 3130 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3131 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3132 } else {
2958 return 0 3133 return 0
2959 } 3134 }
2960 3135
… …
2997 : $self->{children}[$page_or_widget]; 3172 : $self->{children}[$page_or_widget];
2998 3173
2999 $self->{current} = $widget; 3174 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3175 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3176
3002 $self->_emit (page_changed => $self->{current}); 3177 $self->emit (page_changed => $self->{current});
3003 3178
3004 $self->realloc; 3179 $self->realloc;
3005} 3180}
3006 3181
3007sub visible_children { 3182sub visible_children {
… …
3012 my ($self) = @_; 3187 my ($self) = @_;
3013 3188
3014 $self->{current}->size_request 3189 $self->{current}->size_request
3015} 3190}
3016 3191
3017sub size_allocate { 3192sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3193 my ($self, $w, $h) = @_;
3019 3194
3020 $self->{current}->configure (0, 0, $w, $h); 3195 $self->{current}->configure (0, 0, $w, $h);
3196
3197 1
3021} 3198}
3022 3199
3023sub _draw { 3200sub _draw {
3024 my ($self) = @_; 3201 my ($self) = @_;
3025 3202
… …
3064 3241
3065sub set_current_page { 3242sub set_current_page {
3066 my ($self, $page) = @_; 3243 my ($self, $page) = @_;
3067 3244
3068 $self->{multiplexer}->set_current_page ($page); 3245 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3246 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3247}
3071 3248
3072############################################################################# 3249#############################################################################
3073 3250
3074package CFClient::UI::Statusbox; 3251package CFClient::UI::Combobox;
3075 3252
3253use utf8;
3254
3076our @ISA = CFClient::UI::VBox::; 3255our @ISA = CFClient::UI::Button::;
3077 3256
3078sub new { 3257sub new {
3079 my $class = shift; 3258 my $class = shift;
3080 3259
3081 $class->SUPER::new ( 3260 my $self = $class->SUPER::new (
3261 options => [], # [value, title, longdesc], ...
3262 value => undef,
3263 @_,
3264 );
3265
3266 $self->_set_value ($self->{value});
3267
3268 $self
3269}
3270
3271sub invoke_button_down {
3272 my ($self, $ev) = @_;
3273
3274 my @menu_items;
3275
3276 for (@{ $self->{options} }) {
3277 my ($value, $title, $tooltip) = @$_;
3278
3279 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3280 }
3281
3282 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3283}
3284
3285sub _set_value {
3286 my ($self, $value) = @_;
3287
3288 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3289 or return;
3290
3291 $self->{value} = $item->[0];
3292 $self->set_markup ("$item->[1] ⇓");
3293 $self->set_tooltip ($item->[2]);
3294}
3295
3296sub set_value {
3297 my ($self, $value) = @_;
3298
3299 return unless $self->{value} ne $value;
3300
3301 $self->_set_value ($value);
3302 $self->emit (changed => $value);
3303}
3304
3305#############################################################################
3306
3307package CFClient::UI::Statusbox;
3308
3309our @ISA = CFClient::UI::VBox::;
3310
3311sub new {
3312 my $class = shift;
3313
3314 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3315 fontsize => 0.8,
3083 @_, 3316 @_,
3084 ) 3317 );
3318
3319 Scalar::Util::weaken (my $this = $self);
3320
3321 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3322
3323 $self
3085} 3324}
3086 3325
3087sub reorder { 3326sub reorder {
3088 my ($self) = @_; 3327 my ($self) = @_;
3089 my $NOW = time; 3328 my $NOW = Time::HiRes::time;
3329
3330 # freeze display when hovering over any label
3331 return if $CFClient::UI::TOOLTIP->{owner}
3332 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3333 values %{ $self->{item} };
3090 3334
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3335 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3336 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3337 }
3094 3338
… …
3097 my @items = sort { 3341 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3342 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3343 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3344 } values %{ $self->{item} };
3101 3345
3346 $self->{timer}->interval (1);
3347
3102 my $count = 10 + 1; 3348 my $count = 10 + 1;
3103 for my $item (@items) { 3349 for my $item (@items) {
3104 last unless --$count; 3350 last unless --$count;
3105 3351
3106 push @widgets, $item->{label} ||= do { 3352 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3353 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3354 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3355 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3356 : $item->{text};
3111 3357
… …
3119 tooltip => $item->{tooltip}, 3365 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3366 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3367 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3368 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3369 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3370 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3371 can_events => 1,
3126 can_hover => 1 3372 can_hover => 1
3127 }; 3373 };
3374
3375 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3376 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3377 $label->update;
3378 $label->set_max_size (undef, $label->{req_h} * $diff)
3379 if $diff < 1;
3380 $self->{timer}->interval (1/30);
3381 } else {
3382 $label->{fg}[3] = $item->{fg}[3] || 1;
3383 }
3384
3385 push @widgets, $label;
3128 } 3386 }
3129 3387
3130 $self->clear; 3388 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3389 $self->SUPER::add (reverse @widgets);
3132} 3390}
… …
3137 $text =~ s/^\s+//; 3395 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3396 $text =~ s/\s+$//;
3139 3397
3140 return unless $text; 3398 return unless $text;
3141 3399
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3400 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3401
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3402 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3403
3146 if (my $item = $self->{item}{$group}) { 3404 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3405 if ($item->{text} eq $text) {
3148 $item->{count}++; 3406 $item->{count}++;
3149 } else { 3407 } else {
3150 $item->{count} = 1; 3408 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3409 $item->{text} = $item->{tooltip} = $text;
3152 } 3410 }
3153 $item->{id} = ++$self->{id}; 3411 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3412 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3413 delete $item->{label};
3156 } else { 3414 } else {
3157 $self->{item}{$group} = { 3415 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3416 id => ++$self->{id},
… …
3164 count => 1, 3422 count => 1,
3165 %arg, 3423 %arg,
3166 }; 3424 };
3167 } 3425 }
3168 3426
3427 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 3428 $self->reorder;
3429 });
3170} 3430}
3171 3431
3172sub reconfigure { 3432sub reconfigure {
3173 my ($self) = @_; 3433 my ($self) = @_;
3174 3434
3175 delete $_->{label} 3435 delete $_->{label}
3176 for values %{ $self->{item} || {} }; 3436 for values %{ $self->{item} || {} };
3177 3437
3178 $self->reorder; 3438 $self->reorder;
3179 $self->SUPER::reconfigure; 3439 $self->SUPER::reconfigure;
3440}
3441
3442sub destroy {
3443 my ($self) = @_;
3444
3445 $self->{timer}->cancel;
3446
3447 $self->SUPER::destroy;
3180} 3448}
3181 3449
3182############################################################################# 3450#############################################################################
3183 3451
3184package CFClient::UI::Inventory; 3452package CFClient::UI::Inventory;
… …
3203 return unless $items; 3471 return unless $items;
3204 3472
3205 my @items = sort { 3473 my @items = sort {
3206 ($a->{type} <=> $b->{type}) 3474 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name}) 3475 or ($a->{name} cmp $b->{name})
3208 } @$items; 3476 } values %$items;
3209 3477
3210 $self->{real_items} = \@items; 3478 $self->{real_items} = \@items;
3211 3479
3212 my $row = 0; 3480 my $row = 0;
3213 for my $item (@items) { 3481 for my $item (@items) {
… …
3216 $self->{child}->add (0, $row, $item->{face_widget}); 3484 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget}); 3485 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget}); 3486 $self->{child}->add (2, $row, $item->{weight_widget});
3219 3487
3220 $row++; 3488 $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 } 3489 }
3419} 3490}
3420 3491
3421############################################################################# 3492#############################################################################
3422 3493
… …
3432 commands => [], 3503 commands => [],
3433 @_, 3504 @_,
3434 ) 3505 )
3435} 3506}
3436 3507
3437# XXX: Do sorting? Argl... 3508my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3509
3510my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3511 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3512my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3513 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3514my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3515 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3516my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3517 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3518my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3519 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3520
3521sub rebuild_spell_list {
3522 my ($self) = @_;
3523
3524 $CFClient::UI::ROOT->on_refresh ($self => sub {
3525 $self->clear;
3526
3527 return unless $::CONN;
3528
3529 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3530 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3531 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3532 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3533 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3534
3535 my $row = 0;
3536
3537 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3538 my $spell = $self->{spell}{$_};
3539
3540 $row++;
3541
3542 my $spell_cb = sub {
3543 my ($widget, $ev) = @_;
3544
3545 if ($ev->{button} == 1) {
3546 $::CONN->user_send ("cast $spell->{name}");
3547 } elsif ($ev->{button} == 2) {
3548 $::CONN->user_send ("invoke $spell->{name}");
3549 } elsif ($ev->{button} == 3) {
3550 (new CFClient::UI::Menu
3551 items => [
3552 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3553 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3554 ],
3555 )->popup ($ev);
3556 } else {
3557 return 0;
3558 }
3559
3560 1
3561 };
3562
3563 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3564
3565 #TODO: add path info to tooltip
3566 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3567
3568 $self->add (0, $row, new CFClient::UI::Face
3569 face => $spell->{face},
3570 can_hover => 1,
3571 can_events => 1,
3572 tooltip => $tooltip,
3573 on_button_down => $spell_cb,
3574 );
3575
3576 $self->add (1, $row, new CFClient::UI::Label
3577 expand => 1,
3578 text => $spell->{name},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $tooltip,
3582 on_button_down => $spell_cb,
3583 );
3584
3585 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3586 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3587 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3588 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3589 }
3590 });
3591}
3592
3438sub add_spell { 3593sub add_spell {
3439 my ($self, $spell) = @_; 3594 my ($self, $spell) = @_;
3595
3440 $self->{spells}->{$spell->{name}} = $spell; 3596 $self->{spell}->{$spell->{name}} = $spell;
3441 3597 $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} 3598}
3470 3599
3471sub remove_spell { 3600sub remove_spell {
3472 my ($self, $spell) = @_; 3601 my ($self, $spell) = @_;
3602
3473 delete $self->{spells}->{$spell->{name}}; 3603 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3604 $self->rebuild_spell_list;
3475} 3605}
3476 3606
3607sub clear_spells {
3608 my ($self) = @_;
3609
3610 $self->{spell} = {};
3611 $self->rebuild_spell_list;
3612}
3613
3477############################################################################# 3614#############################################################################
3478 3615
3479package CFClient::UI::Root; 3616package CFClient::UI::Root;
3480 3617
3481our @ISA = CFClient::UI::Container::; 3618our @ISA = CFClient::UI::Container::;
3619
3620use List::Util qw(min max);
3482 3621
3483use CFClient::OpenGL; 3622use CFClient::OpenGL;
3484 3623
3485sub new { 3624sub new {
3486 my $class = shift; 3625 my $class = shift;
… …
3513 $coord = $max - $size if $coord > $max - $size; 3652 $coord = $max - $size if $coord > $max - $size;
3514 3653
3515 int $coord + 0.5 3654 int $coord + 0.5
3516} 3655}
3517 3656
3518sub size_allocate { 3657sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 3658 my ($self, $w, $h) = @_;
3520 3659
3521 for my $child ($self->children) { 3660 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3661 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 3662
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 3666 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 3667 $Y = _to_pixel $Y, $H, $self->{h};
3529 3668
3530 $child->configure ($X, $Y, $W, $H); 3669 $child->configure ($X, $Y, $W, $H);
3531 } 3670 }
3671
3672 1
3532} 3673}
3533 3674
3534sub coord2local { 3675sub coord2local {
3535 my ($self, $x, $y) = @_; 3676 my ($self, $x, $y) = @_;
3536 3677
… …
3621 3762
3622 delete $queue{$widget+0}; 3763 delete $queue{$widget+0};
3623 3764
3624 my ($w, $h) = $widget->size_request; 3765 my ($w, $h) = $widget->size_request;
3625 3766
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3767 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3768 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3769
3770 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3771 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3772
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3773 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3774 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3775
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3776 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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