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

Diff Legend

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