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.322 by root, Wed Jul 5 01:53:24 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
… …
1497 #font => default_font 1536 #font => default_font
1498 #text => initial text 1537 #text => initial text
1499 #markup => initial narkup 1538 #markup => initial narkup
1500 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1501 ellipsise => 3, # end 1540 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1503 fontsize => 1, 1542 fontsize => 1,
1504 align => -1, 1543 align => -1,
1505 valign => -1, 1544 valign => -1,
1506 padding_x => 2, 1545 padding_x => 2,
1507 padding_y => 2, 1546 padding_y => 2,
1508 can_events => 0, 1547 can_events => 0,
1509 %arg 1548 %arg
1510 ); 1549 );
1511 1550
1512 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1514 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1554 $self->{template} = $layout;
1516 } 1555 }
1517 1556
1518 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
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;
1551 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1552 1597
1598 delete $self->{size_req};
1553 $self->realloc; 1599 $self->realloc;
1554 $self->update; 1600 $self->update;
1555} 1601}
1556 1602
1557sub set_markup { 1603sub set_markup {
… …
1560 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1561 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1562 1608
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1610
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1567 1612
1613 delete $self->{size_req};
1568 $self->realloc; 1614 $self->realloc;
1569 $self->update; 1615 $self->update;
1570} 1616}
1571 1617
1572sub size_request { 1618sub size_request {
1573 my ($self) = @_; 1619 my ($self) = @_;
1574 1620
1621 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1627
1581 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1582 1629
1583 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1633
1587 my ($w2, $h2) = $self->{template}->size; 1634 my ($w2, $h2) = $self->{template}->size;
1588 1635
1589 $w = List::Util::max $w, $w2; 1636 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1637 $h = List::Util::max $h, $h2;
1638 }
1639
1640 [$w, $h]
1591 } 1641 };
1592 1642
1593 ($w, $h) 1643 @{ $self->{size_req} }
1594} 1644}
1595 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1596sub size_allocate { 1650sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1598 1652
1599 delete $self->{ox}; 1653 delete $self->{ox};
1600 1654
1601 delete $self->{texture} 1655 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1656 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1657
1658 1
1603} 1659}
1604 1660
1605sub set_fontsize { 1661sub set_fontsize {
1606 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1607 1663
1608 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1609 delete $self->{texture}; 1666 delete $self->{texture};
1610 1667
1611 $self->realloc; 1668 $self->realloc;
1612} 1669}
1613 1670
1671sub reconfigure {
1672 my ($self) = @_;
1673
1674 delete $self->{size_req};
1675 delete $self->{texture};
1676
1677 $self->SUPER::reconfigure;
1678}
1679
1614sub _draw { 1680sub _draw {
1615 my ($self) = @_; 1681 my ($self) = @_;
1616 1682
1617 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1618 1684
1619 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1620 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1621 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1622 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1623 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1626 1692
1627 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1628 }; 1694 };
1629 1695
1630 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1633 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1634 1700
1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1638 }; 1704 };
1639 1705
1640 glEnable GL_TEXTURE_2D; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1642 1708
1643 if ($tex->{format} == GL_ALPHA) { 1709 $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} 1710}
1652 1711
1653############################################################################# 1712#############################################################################
1654 1713
1655package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
1669 can_hover => 1, 1728 can_hover => 1,
1670 can_focus => 1, 1729 can_focus => 1,
1671 valign => 0, 1730 valign => 0,
1672 can_events => 1, 1731 can_events => 1,
1673 #text => ... 1732 #text => ...
1733 #hidden => "*",
1674 @_ 1734 @_
1675 ) 1735 )
1676} 1736}
1677 1737
1678sub _set_text { 1738sub _set_text {
… …
1685 $self->{last_activity} = $::NOW; 1745 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1746 $self->{text} = $text;
1687 1747
1688 $text =~ s/./*/g if $self->{hidden}; 1748 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1749 $self->{layout}->set_text ("$text ");
1750 delete $self->{size_req};
1690 1751
1691 $self->_emit (changed => $self->{text}); 1752 $self->emit (changed => $self->{text});
1753
1754 $self->realloc;
1692 $self->update; 1755 $self->update;
1693} 1756}
1694 1757
1695sub set_text { 1758sub set_text {
1696 my ($self, $text) = @_; 1759 my ($self, $text) = @_;
1697 1760
1698 $self->{cursor} = length $text; 1761 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1762 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1763}
1703 1764
1704sub get_text { 1765sub get_text {
1705 $_[0]{text} 1766 $_[0]{text}
1706} 1767}
… …
1711 my ($w, $h) = $self->SUPER::size_request; 1772 my ($w, $h) = $self->SUPER::size_request;
1712 1773
1713 ($w + 1, $h) # add 1 for cursor 1774 ($w + 1, $h) # add 1 for cursor
1714} 1775}
1715 1776
1716sub key_down { 1777sub invoke_key_down {
1717 my ($self, $ev) = @_; 1778 my ($self, $ev) = @_;
1718 1779
1719 my $mod = $ev->{mod}; 1780 my $mod = $ev->{mod};
1720 my $sym = $ev->{sym}; 1781 my $sym = $ev->{sym};
1721 my $uni = $ev->{unicode}; 1782 my $uni = $ev->{unicode};
… …
1733 } elsif ($sym == CFClient::SDLK_HOME) { 1794 } elsif ($sym == CFClient::SDLK_HOME) {
1734 $self->{cursor} = 0; 1795 $self->{cursor} = 0;
1735 } elsif ($sym == CFClient::SDLK_END) { 1796 } elsif ($sym == CFClient::SDLK_END) {
1736 $self->{cursor} = length $text; 1797 $self->{cursor} = length $text;
1737 } elsif ($uni == 27) { 1798 } elsif ($uni == 27) {
1738 $self->_emit ('escape'); 1799 $self->emit ('escape');
1739 } elsif ($uni) { 1800 } elsif ($uni) {
1740 substr $text, $self->{cursor}++, 0, chr $uni; 1801 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else { 1802 } else {
1742 return 0; 1803 return 0;
1743 } 1804 }
… …
1747 $self->realloc; 1808 $self->realloc;
1748 1809
1749 1 1810 1
1750} 1811}
1751 1812
1752sub focus_in { 1813sub invoke_focus_in {
1753 my ($self) = @_; 1814 my ($self) = @_;
1754 1815
1755 $self->{last_activity} = $::NOW; 1816 $self->{last_activity} = $::NOW;
1756 1817
1757 $self->SUPER::focus_in; 1818 $self->SUPER::invoke_focus_in
1758} 1819}
1759 1820
1760sub button_down { 1821sub invoke_button_down {
1761 my ($self, $ev, $x, $y) = @_; 1822 my ($self, $ev, $x, $y) = @_;
1762 1823
1763 $self->SUPER::button_down ($ev, $x, $y); 1824 $self->SUPER::invoke_button_down ($ev, $x, $y);
1764 1825
1765 my $idx = $self->{layout}->xy_to_index ($x, $y); 1826 my $idx = $self->{layout}->xy_to_index ($x, $y);
1766 1827
1767 # byte-index to char-index 1828 # byte-index to char-index
1768 my $text = $self->{text}; 1829 my $text = $self->{text};
… …
1773 $self->update; 1834 $self->update;
1774 1835
1775 1 1836 1
1776} 1837}
1777 1838
1778sub mouse_motion { 1839sub invoke_mouse_motion {
1779 my ($self, $ev, $x, $y) = @_; 1840 my ($self, $ev, $x, $y) = @_;
1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1841# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781 1842
1782 0 1843 1
1783} 1844}
1784 1845
1785sub _draw { 1846sub _draw {
1786 my ($self) = @_; 1847 my ($self) = @_;
1787 1848
… …
1828 1889
1829our @ISA = CFClient::UI::EntryBase::; 1890our @ISA = CFClient::UI::EntryBase::;
1830 1891
1831use CFClient::OpenGL; 1892use CFClient::OpenGL;
1832 1893
1833sub key_down { 1894sub invoke_key_down {
1834 my ($self, $ev) = @_; 1895 my ($self, $ev) = @_;
1835 1896
1836 my $sym = $ev->{sym}; 1897 my $sym = $ev->{sym};
1837 1898
1838 if ($sym == 13) { 1899 if ($sym == 13) {
1839 unshift @{$self->{history}}, 1900 unshift @{$self->{history}},
1840 my $txt = $self->get_text; 1901 my $txt = $self->get_text;
1902
1841 $self->{history_pointer} = -1; 1903 $self->{history_pointer} = -1;
1842 $self->{history_saveback} = ''; 1904 $self->{history_saveback} = '';
1843 $self->_emit (activate => $txt); 1905 $self->emit (activate => $txt);
1844 $self->update; 1906 $self->update;
1845 1907
1846 } elsif ($sym == CFClient::SDLK_UP) { 1908 } elsif ($sym == CFClient::SDLK_UP) {
1847 if ($self->{history_pointer} < 0) { 1909 if ($self->{history_pointer} < 0) {
1848 $self->{history_saveback} = $self->get_text; 1910 $self->{history_saveback} = $self->get_text;
… …
1864 } else { 1926 } else {
1865 $self->set_text ($self->{history_saveback}); 1927 $self->set_text ($self->{history_saveback});
1866 } 1928 }
1867 1929
1868 } else { 1930 } else {
1869 return $self->SUPER::key_down ($ev) 1931 return $self->SUPER::invoke_key_down ($ev)
1870 } 1932 }
1871 1933
1872 1 1934 1
1873} 1935}
1874 1936
… …
1898 can_events => 1, 1960 can_events => 1,
1899 @_ 1961 @_
1900 ) 1962 )
1901} 1963}
1902 1964
1903sub activate { }
1904
1905sub button_up { 1965sub invoke_button_up {
1906 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1907 1967
1908 $self->emit ("activate") 1968 $self->emit ("activate")
1909 if $x >= 0 && $x < $self->{w} 1969 if $x >= 0 && $x < $self->{w}
1910 && $y >= 0 && $y < $self->{h}; 1970 && $y >= 0 && $y < $self->{h};
… …
1913} 1973}
1914 1974
1915sub _draw { 1975sub _draw {
1916 my ($self) = @_; 1976 my ($self) = @_;
1917 1977
1918 local $self->{fg} = $self->{fg}; 1978 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 1979
1924 glEnable GL_TEXTURE_2D; 1980 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1981 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 1982 glColor 0, 0, 0, 1;
1927 1983
1928 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1984 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1929 1985
1930 glDisable GL_TEXTURE_2D; 1986 glDisable GL_TEXTURE_2D;
1931 1987
1932 $self->SUPER::_draw; 1988 $self->SUPER::_draw;
1989}
1990
1991#############################################################################
1992
1993package CFClient::UI::ImageButton;
1994
1995our @ISA = CFClient::UI::Image::;
1996
1997use CFClient::OpenGL;
1998
1999my %textures;
2000
2001sub new {
2002 my $class = shift;
2003
2004 my $self = $class->SUPER::new (
2005 padding_x => 4,
2006 padding_y => 4,
2007 fg => [1, 1, 1],
2008 active_fg => [0, 0, 1],
2009 can_hover => 1,
2010 align => 0,
2011 valign => 0,
2012 can_events => 1,
2013 @_
2014 );
2015}
2016
2017sub invoke_button_up {
2018 my ($self, $ev, $x, $y) = @_;
2019
2020 $self->emit ("activate")
2021 if $x >= 0 && $x < $self->{w}
2022 && $y >= 0 && $y < $self->{h};
2023
2024 1
1933} 2025}
1934 2026
1935############################################################################# 2027#############################################################################
1936 2028
1937package CFClient::UI::CheckBox; 2029package CFClient::UI::CheckBox;
… …
1964 my ($self) = @_; 2056 my ($self) = @_;
1965 2057
1966 (6) x 2 2058 (6) x 2
1967} 2059}
1968 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
1969sub button_down { 2069sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
1971 2071
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2074 $self->toggle;
1975 $self->_emit (changed => $self->{state});
1976 } else { 2075 } else {
1977 return 0 2076 return 0
1978 } 2077 }
1979 2078
1980 1 2079 1
… …
2005package CFClient::UI::Image; 2104package CFClient::UI::Image;
2006 2105
2007our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
2008 2107
2009use CFClient::OpenGL; 2108use CFClient::OpenGL;
2010use Carp qw/confess/;
2011 2109
2012our %loaded_images; 2110our %texture_cache;
2013 2111
2014sub new { 2112sub new {
2015 my $class = shift; 2113 my $class = shift;
2016 2114
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
2018 2119
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
2020 2122
2021 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2023 2125
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
2025 2127
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2129
2030 $self 2130 $self
2031} 2131}
2032 2132
2033sub size_request { 2133sub size_request {
2034 my ($self) = @_; 2134 my ($self) = @_;
2035 2135
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
2037} 2137}
2038 2138
2039sub _draw { 2139sub _draw {
2040 my ($self) = @_; 2140 my ($self) = @_;
2041 2141
… …
2150 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2151 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2152 2252
2153 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2154 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2155 2258
2156 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2159 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2178 2281
2179 if ($t3) { 2282 if ($t3) {
2180 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2181 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2182 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2183 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2184 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2185 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2186 glEnd; 2289 glEnd;
2187 } 2290 }
2188 2291
2189 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2277 $self->update; 2380 $self->update;
2278 2381
2279 $self 2382 $self
2280} 2383}
2281 2384
2282sub changed { }
2283
2284sub set_range { 2385sub set_range {
2285 my ($self, $range) = @_; 2386 my ($self, $range) = @_;
2286 2387
2287 ($range, $self->{range}) = ($self->{range}, $range); 2388 ($range, $self->{range}) = ($self->{range}, $range);
2288 2389
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2390 if ("@$range" ne "@{$self->{range}}") {
2391 $self->update;
2392 $self->set_value ($self->{range}[0]);
2393 }
2291} 2394}
2292 2395
2293sub set_value { 2396sub set_value {
2294 my ($self, $value) = @_; 2397 my ($self, $value) = @_;
2295 2398
… …
2306 if $unit; 2409 if $unit;
2307 2410
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2411 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2412
2310 if ($value != $old_value) { 2413 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2414 $self->emit (changed => $value);
2312 $self->update; 2415 $self->update;
2313 } 2416 }
2314} 2417}
2315 2418
2316sub size_request { 2419sub size_request {
2317 my ($self) = @_; 2420 my ($self) = @_;
2318 2421
2319 ($self->{req_w}, $self->{req_h}) 2422 ($self->{req_w}, $self->{req_h})
2320} 2423}
2321 2424
2322sub button_down { 2425sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
2324 2427
2325 $self->SUPER::button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2429
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2431
2329 $self->mouse_motion ($ev, $x, $y) 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2433}
2331 2434
2332sub mouse_motion { 2435sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2334 2437
2335 if ($GRAB == $self) { 2438 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2439 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2440
… …
2442sub set_range { shift->{slider}->set_range (@_) } 2545sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2546sub set_value { shift->{slider}->set_value (@_) }
2444 2547
2445############################################################################# 2548#############################################################################
2446 2549
2447package CFClient::UI::TextView; 2550package CFClient::UI::TextScroller;
2448 2551
2449our @ISA = CFClient::UI::HBox::; 2552our @ISA = CFClient::UI::HBox::;
2450 2553
2451use CFClient::OpenGL; 2554use CFClient::OpenGL;
2452 2555
… …
2454 my $class = shift; 2557 my $class = shift;
2455 2558
2456 my $self = $class->SUPER::new ( 2559 my $self = $class->SUPER::new (
2457 fontsize => 1, 2560 fontsize => 1,
2458 can_events => 0, 2561 can_events => 0,
2562 indent => 0,
2459 #font => default_font 2563 #font => default_font
2460 @_, 2564 @_,
2461 2565
2462 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2463 par => [], 2567 par => [],
2464 height => 0, 2568 height => 0,
2465 children => [ 2569 children => [
2466 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2467 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2478 2582
2479 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2480 $self->reflow; 2584 $self->reflow;
2481} 2585}
2482 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2483sub size_allocate { 2596sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2485 2598
2486 $self->SUPER::size_allocate ($w, $h); 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 2601
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2606
2492 $self->reflow; 2607 $self->reflow;
2493}
2494 2608
2495sub text_size { 2609 local $self->{children} = [$empty, $slider];
2496 my ($self, $text, $indent) = @_; 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2611}
2612
2613sub get_layout {
2614 my ($self, $para) = @_;
2497 2615
2498 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2499 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2503 2629 );
2630
2504 $layout->size 2631 $layout
2505} 2632}
2506 2633
2507sub reflow { 2634sub reflow {
2508 my ($self) = @_; 2635 my ($self) = @_;
2509 2636
… …
2518 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2519} 2646}
2520 2647
2521sub clear { 2648sub clear {
2522 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2523 2653
2524 $self->{par} = []; 2654 $self->{par} = [];
2525 $self->{height} = 0; 2655 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 2657}
2528 2658
2529sub add_paragraph { 2659sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2531 2661
2532 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2533 my ($w, $h) = $self->text_size ($line); 2663
2534 $self->{height} += $h; 2664 $para = {
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2536 } 2671 };
2537 2672
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2539} 2685}
2540 2686
2541sub update { 2687sub update {
2542 my ($self) = @_; 2688 my ($self) = @_;
2543 2689
… …
2545 2691
2546 return unless $self->{h} > 0; 2692 return unless $self->{h} > 0;
2547 2693
2548 delete $self->{texture}; 2694 delete $self->{texture};
2549 2695
2550 $ROOT->on_post_alloc ($self, sub { 2696 $ROOT->on_post_alloc ($self => sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2698
2553 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2554 my $height = 0; 2700 my $height = 0;
2555 2701
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2562 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2706
2566 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2567 } 2710 }
2568 2711
2569 $height += $_->[1]; 2712 $height += $para->{h};
2570 } 2713 }
2571 2714
2572 $self->{height} = $height; 2715 $self->{height} = $height;
2573 2716
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2575 2718
2576 delete $self->{texture}; 2719 delete $self->{texture};
2577 } 2720 }
2578 2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2724 }
2725
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2727 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
2582 2729
2583 my $top = int $self->{children}[1]{range}[0]; 2730 my $top = int $self->{children}[1]{range}[0];
2584 2731
2585 my $y0 = $top; 2732 my $y0 = $top;
2586 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2587 2734
2588 my $y = 0; 2735 my $y = 0;
2589 2736
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}}) { 2737 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 2738 my $h = $para->{h};
2600 2739
2601 if ($y0 < $y + $h && $y < $y1) { 2740 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 2741
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2607 2743
2608 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2610 } 2758 }
2611 2759
2612 $y += $h; 2760 $y += $h;
2613 } 2761 }
2614
2615 glDisable GL_BLEND;
2616 }; 2762 };
2617 }); 2763 });
2618} 2764}
2619 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2620sub _draw { 2775sub _draw {
2621 my ($self) = @_; 2776 my ($self) = @_;
2622 2777
2623 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2628 2783
2629 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2630
2631} 2785}
2632 2786
2633############################################################################# 2787#############################################################################
2634 2788
2635package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 2878 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 2879 . "visible $widget->{visible}";
2726 } 2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2727 2884
2728 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2729 markup => $tooltip, 2886 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 2888 fontsize => 0.8,
… …
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 2899
2743 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2744} 2901}
2745 2902
2746sub size_allocate { 2903sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2748 2905
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 2907}
2751 2908
2752sub visibility_change { 2909sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2754 2911
2755 return unless $visible; 2912 return unless $visible;
2756 2913
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2759 or return; 2916 or return;
2760 2917
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 2919
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 2921 if $x + $self->{w} > $self->{root}{w};
2765 2922
2766 $self->move_abs ($x, $y); 2923 $self->move_abs ($x, $y);
2767 }); 2924 });
2768} 2925}
2769 2926
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 3016
2860 if ($tex) { 3017 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2866 } 3023 }
2867} 3024}
2868 3025
2869sub DESTROY { 3026sub destroy {
2870 my ($self) = @_; 3027 my ($self) = @_;
2871 3028
2872 $self->{timer}->cancel 3029 $self->{timer}->cancel
2873 if $self->{timer}; 3030 if $self->{timer};
2874 3031
2875 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2876} 3033}
2877 3034
2878############################################################################# 3035#############################################################################
2879 3036
2880package CFClient::UI::Buttonbar; 3037package CFClient::UI::Buttonbar;
… …
2901 ); 3058 );
2902 3059
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2904 3061
2905 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2907 3064
2908 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2909 if (!ref $widget) { 3066 if (!ref $widget) {
3067 if ($widget =~ /\t/) {
3068 my ($left, $right) = split /\t/, $widget, 2;
3069
3070 $widget = new CFClient::UI::HBox
3071 can_hover => 1,
3072 can_events => 1,
3073 tooltip => $tooltip,
3074 children => [
3075 (new CFClient::UI::Label markup => $left, expand => 1),
3076 (new CFClient::UI::Label markup => $right, align => +1),
3077 ],
3078 ;
3079
3080 } else {
2910 $widget = new CFClient::UI::Label 3081 $widget = new CFClient::UI::Label
2911 can_hover => 1, 3082 can_hover => 1,
2912 can_events => 1, 3083 can_events => 1,
2913 text => $widget; 3084 markup => $widget,
3085 tooltip => $tooltip;
3086 }
2914 } 3087 }
2915 3088
2916 $self->{item}{$widget} = $item; 3089 $self->{item}{$widget} = $item;
2917 3090
2918 $self->{vbox}->add ($widget); 3091 $self->{vbox}->add ($widget);
… …
2923 3096
2924# popup given the event (must be a mouse button down event currently) 3097# popup given the event (must be a mouse button down event currently)
2925sub popup { 3098sub popup {
2926 my ($self, $ev) = @_; 3099 my ($self, $ev) = @_;
2927 3100
2928 $self->_emit ("popdown"); 3101 $self->emit ("popdown");
2929 3102
2930 # maybe save $GRAB? must be careful about events... 3103 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3104 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3105 $self->{button} = $ev->{button};
2933 3106
2934 $self->show; 3107 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3108 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3109}
2937 3110
2938sub mouse_motion { 3111sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3112 my ($self, $ev, $x, $y) = @_;
2940 3113
2941 # TODO: should use vbox->find_widget or so 3114 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3115 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3116 $self->{hover} = $self->{item}{$HOVER};
2944 3117
2945 0 3118 0
2946} 3119}
2947 3120
2948sub button_up { 3121sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3122 my ($self, $ev, $x, $y) = @_;
2950 3123
2951 if ($ev->{button} == $self->{button}) { 3124 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3125 undef $GRAB;
2953 $self->hide; 3126 $self->hide;
2954 3127
2955 $self->_emit ("popdown"); 3128 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3129 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3130 } else {
2958 return 0 3131 return 0
2959 } 3132 }
2960 3133
… …
2987 3160
2988 $self->{current} = $self->{children}[0] 3161 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} }; 3162 if @{ $self->{children} };
2990} 3163}
2991 3164
3165sub get_current_page {
3166 my ($self) = @_;
3167
3168 $self->{current}
3169}
3170
2992sub set_current_page { 3171sub set_current_page {
2993 my ($self, $page_or_widget) = @_; 3172 my ($self, $page_or_widget) = @_;
2994 3173
2995 my $widget = ref $page_or_widget 3174 my $widget = ref $page_or_widget
2996 ? $page_or_widget 3175 ? $page_or_widget
2997 : $self->{children}[$page_or_widget]; 3176 : $self->{children}[$page_or_widget];
2998 3177
2999 $self->{current} = $widget; 3178 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3179 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3180
3002 $self->_emit (page_changed => $self->{current}); 3181 $self->emit (page_changed => $self->{current});
3003 3182
3004 $self->realloc; 3183 $self->realloc;
3005} 3184}
3006 3185
3007sub visible_children { 3186sub visible_children {
… …
3012 my ($self) = @_; 3191 my ($self) = @_;
3013 3192
3014 $self->{current}->size_request 3193 $self->{current}->size_request
3015} 3194}
3016 3195
3017sub size_allocate { 3196sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3197 my ($self, $w, $h) = @_;
3019 3198
3020 $self->{current}->configure (0, 0, $w, $h); 3199 $self->{current}->configure (0, 0, $w, $h);
3200
3201 1
3021} 3202}
3022 3203
3023sub _draw { 3204sub _draw {
3024 my ($self) = @_; 3205 my ($self) = @_;
3025 3206
… …
3060 ); 3241 );
3061 3242
3062 $self->{multiplexer}->add ($widget); 3243 $self->{multiplexer}->add ($widget);
3063} 3244}
3064 3245
3246sub get_current_page {
3247 my ($self) = @_;
3248
3249 $self->{multiplexer}->get_current_page
3250}
3251
3065sub set_current_page { 3252sub set_current_page {
3066 my ($self, $page) = @_; 3253 my ($self, $page) = @_;
3067 3254
3068 $self->{multiplexer}->set_current_page ($page); 3255 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3256 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3257}
3071 3258
3072############################################################################# 3259#############################################################################
3073 3260
3074package CFClient::UI::Statusbox; 3261package CFClient::UI::Combobox;
3075 3262
3263use utf8;
3264
3076our @ISA = CFClient::UI::VBox::; 3265our @ISA = CFClient::UI::Button::;
3077 3266
3078sub new { 3267sub new {
3079 my $class = shift; 3268 my $class = shift;
3080 3269
3081 $class->SUPER::new ( 3270 my $self = $class->SUPER::new (
3271 options => [], # [value, title, longdesc], ...
3272 value => undef,
3273 @_,
3274 );
3275
3276 $self->_set_value ($self->{value});
3277
3278 $self
3279}
3280
3281sub invoke_button_down {
3282 my ($self, $ev) = @_;
3283
3284 my @menu_items;
3285
3286 for (@{ $self->{options} }) {
3287 my ($value, $title, $tooltip) = @$_;
3288
3289 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3290 }
3291
3292 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3293}
3294
3295sub _set_value {
3296 my ($self, $value) = @_;
3297
3298 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3299 or return;
3300
3301 $self->{value} = $item->[0];
3302 $self->set_markup ("$item->[1] ⇓");
3303 $self->set_tooltip ($item->[2]);
3304}
3305
3306sub set_value {
3307 my ($self, $value) = @_;
3308
3309 return unless $self->{value} ne $value;
3310
3311 $self->_set_value ($value);
3312 $self->emit (changed => $value);
3313}
3314
3315#############################################################################
3316
3317package CFClient::UI::Statusbox;
3318
3319our @ISA = CFClient::UI::VBox::;
3320
3321sub new {
3322 my $class = shift;
3323
3324 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3325 fontsize => 0.8,
3083 @_, 3326 @_,
3084 ) 3327 );
3328
3329 Scalar::Util::weaken (my $this = $self);
3330
3331 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3332
3333 $self
3085} 3334}
3086 3335
3087sub reorder { 3336sub reorder {
3088 my ($self) = @_; 3337 my ($self) = @_;
3089 my $NOW = time; 3338 my $NOW = Time::HiRes::time;
3339
3340 # freeze display when hovering over any label
3341 return if $CFClient::UI::TOOLTIP->{owner}
3342 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3343 values %{ $self->{item} };
3090 3344
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3345 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3346 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3347 }
3094 3348
… …
3097 my @items = sort { 3351 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3352 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3353 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3354 } values %{ $self->{item} };
3101 3355
3356 $self->{timer}->interval (1);
3357
3102 my $count = 10 + 1; 3358 my $count = 10 + 1;
3103 for my $item (@items) { 3359 for my $item (@items) {
3104 last unless --$count; 3360 last unless --$count;
3105 3361
3106 push @widgets, $item->{label} ||= do { 3362 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3363 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3364 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3365 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3366 : $item->{text};
3111 3367
… …
3119 tooltip => $item->{tooltip}, 3375 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3376 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3377 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3378 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3379 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3380 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3381 can_events => 1,
3126 can_hover => 1 3382 can_hover => 1
3127 }; 3383 };
3384
3385 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3386 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3387 $label->update;
3388 $label->set_max_size (undef, $label->{req_h} * $diff)
3389 if $diff < 1;
3390 $self->{timer}->interval (1/30);
3391 } else {
3392 $label->{fg}[3] = $item->{fg}[3] || 1;
3393 }
3394
3395 push @widgets, $label;
3128 } 3396 }
3129 3397
3130 $self->clear; 3398 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3399 $self->SUPER::add (reverse @widgets);
3132} 3400}
… …
3137 $text =~ s/^\s+//; 3405 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3406 $text =~ s/\s+$//;
3139 3407
3140 return unless $text; 3408 return unless $text;
3141 3409
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3410 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3411
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3412 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3413
3146 if (my $item = $self->{item}{$group}) { 3414 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3415 if ($item->{text} eq $text) {
3148 $item->{count}++; 3416 $item->{count}++;
3149 } else { 3417 } else {
3150 $item->{count} = 1; 3418 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3419 $item->{text} = $item->{tooltip} = $text;
3152 } 3420 }
3153 $item->{id} = ++$self->{id}; 3421 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3422 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3423 delete $item->{label};
3156 } else { 3424 } else {
3157 $self->{item}{$group} = { 3425 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3426 id => ++$self->{id},
… …
3164 count => 1, 3432 count => 1,
3165 %arg, 3433 %arg,
3166 }; 3434 };
3167 } 3435 }
3168 3436
3437 $ROOT->on_refresh (reorder => sub {
3169 $self->reorder; 3438 $self->reorder;
3439 });
3170} 3440}
3171 3441
3172sub reconfigure { 3442sub reconfigure {
3173 my ($self) = @_; 3443 my ($self) = @_;
3174 3444
… …
3177 3447
3178 $self->reorder; 3448 $self->reorder;
3179 $self->SUPER::reconfigure; 3449 $self->SUPER::reconfigure;
3180} 3450}
3181 3451
3452sub destroy {
3453 my ($self) = @_;
3454
3455 $self->{timer}->cancel;
3456
3457 $self->SUPER::destroy;
3458}
3459
3182############################################################################# 3460#############################################################################
3183 3461
3184package CFClient::UI::Inventory; 3462package CFClient::UI::Inventory;
3185 3463
3186our @ISA = CFClient::UI::ScrolledWindow::; 3464our @ISA = CFClient::UI::Table::;
3187 3465
3188sub new { 3466sub new {
3189 my $class = shift; 3467 my $class = shift;
3190 3468
3191 my $self = $class->SUPER::new ( 3469 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3470 col_expand => [0, 1, 0],
3193 @_, 3471 @_,
3194 ); 3472 );
3195 3473
3196 $self 3474 $self
3197} 3475}
3198 3476
3199sub set_items { 3477sub set_items {
3200 my ($self, $items) = @_; 3478 my ($self, $items) = @_;
3201 3479
3202 $self->{child}->clear; 3480 $self->clear;
3203 return unless $items; 3481 return unless $items;
3204 3482
3205 my @items = sort { 3483 my @items = sort {
3206 ($a->{type} <=> $b->{type}) 3484 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name}) 3485 or ($a->{name} cmp $b->{name})
3208 } @$items; 3486 } values %$items;
3209 3487
3210 $self->{real_items} = \@items; 3488 $self->{real_items} = \@items;
3211 3489
3212 my $row = 0; 3490 my $row = 0;
3213 for my $item (@items) { 3491 for my $item (@items) {
3214 CFClient::Item::update_widgets $item; 3492 CFClient::Item::update_widgets $item;
3215 3493
3216 $self->{child}->add (0, $row, $item->{face_widget}); 3494 $self->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget}); 3495 $self->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget}); 3496 $self->add (2, $row, $item->{weight_widget});
3219 3497
3220 $row++; 3498 $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 } 3499 }
3419} 3500}
3420 3501
3421############################################################################# 3502#############################################################################
3422 3503
… …
3432 commands => [], 3513 commands => [],
3433 @_, 3514 @_,
3434 ) 3515 )
3435} 3516}
3436 3517
3437# XXX: Do sorting? Argl... 3518my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3519
3520my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3521 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3522my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3523 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3524my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3525 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3526my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3527 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3528my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3529 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3530
3531sub rebuild_spell_list {
3532 my ($self) = @_;
3533
3534 $CFClient::UI::ROOT->on_refresh ($self => sub {
3535 $self->clear;
3536
3537 return unless $::CONN;
3538
3539 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3540 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3541 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3542 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3543 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3544
3545 my $row = 0;
3546
3547 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3548 my $spell = $self->{spell}{$_};
3549
3550 $row++;
3551
3552 my $spell_cb = sub {
3553 my ($widget, $ev) = @_;
3554
3555 if ($ev->{button} == 1) {
3556 $::CONN->user_send ("cast $spell->{name}");
3557 } elsif ($ev->{button} == 2) {
3558 $::CONN->user_send ("invoke $spell->{name}");
3559 } elsif ($ev->{button} == 3) {
3560 (new CFClient::UI::Menu
3561 items => [
3562 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3563 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3564 ],
3565 )->popup ($ev);
3566 } else {
3567 return 0;
3568 }
3569
3570 1
3571 };
3572
3573 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3574
3575 #TODO: add path info to tooltip
3576 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3577
3578 $self->add (0, $row, new CFClient::UI::Face
3579 face => $spell->{face},
3580 can_hover => 1,
3581 can_events => 1,
3582 tooltip => $tooltip,
3583 on_button_down => $spell_cb,
3584 );
3585
3586 $self->add (1, $row, new CFClient::UI::Label
3587 expand => 1,
3588 text => $spell->{name},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3598 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3599 }
3600 });
3601}
3602
3438sub add_spell { 3603sub add_spell {
3439 my ($self, $spell) = @_; 3604 my ($self, $spell) = @_;
3605
3440 $self->{spells}->{$spell->{name}} = $spell; 3606 $self->{spell}->{$spell->{name}} = $spell;
3441 3607 $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} 3608}
3470 3609
3471sub remove_spell { 3610sub remove_spell {
3472 my ($self, $spell) = @_; 3611 my ($self, $spell) = @_;
3612
3473 delete $self->{spells}->{$spell->{name}}; 3613 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3614 $self->rebuild_spell_list;
3475} 3615}
3476 3616
3617sub clear_spells {
3618 my ($self) = @_;
3619
3620 $self->{spell} = {};
3621 $self->rebuild_spell_list;
3622}
3623
3477############################################################################# 3624#############################################################################
3478 3625
3479package CFClient::UI::Root; 3626package CFClient::UI::Root;
3480 3627
3481our @ISA = CFClient::UI::Container::; 3628our @ISA = CFClient::UI::Container::;
3629
3630use List::Util qw(min max);
3482 3631
3483use CFClient::OpenGL; 3632use CFClient::OpenGL;
3484 3633
3485sub new { 3634sub new {
3486 my $class = shift; 3635 my $class = shift;
… …
3513 $coord = $max - $size if $coord > $max - $size; 3662 $coord = $max - $size if $coord > $max - $size;
3514 3663
3515 int $coord + 0.5 3664 int $coord + 0.5
3516} 3665}
3517 3666
3518sub size_allocate { 3667sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 3668 my ($self, $w, $h) = @_;
3520 3669
3521 for my $child ($self->children) { 3670 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3671 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 3672
… …
3527 $X = _to_pixel $X, $W, $self->{w}; 3676 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 3677 $Y = _to_pixel $Y, $H, $self->{h};
3529 3678
3530 $child->configure ($X, $Y, $W, $H); 3679 $child->configure ($X, $Y, $W, $H);
3531 } 3680 }
3681
3682 1
3532} 3683}
3533 3684
3534sub coord2local { 3685sub coord2local {
3535 my ($self, $x, $y) = @_; 3686 my ($self, $x, $y) = @_;
3536 3687
… …
3621 3772
3622 delete $queue{$widget+0}; 3773 delete $queue{$widget+0};
3623 3774
3624 my ($w, $h) = $widget->size_request; 3775 my ($w, $h) = $widget->size_request;
3625 3776
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3777 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3778 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3779
3780 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3781 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3782
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3783 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3784 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3785
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3786 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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