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.311 by root, Fri Jun 23 22:35:16 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 my $focus = $FOCUS; $FOCUS = $self;
427 429
428 $self->_emit (focus_in => $focus);
429
430 $focus->update if $focus; 430 $focus->update if $focus;
431 $FOCUS->update; 431 $FOCUS->update;
432}
433 432
433 0
434}
435
434sub focus_out { 436sub invoke_focus_out {
435 my ($self) = @_; 437 my ($self) = @_;
436 438
437 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
438 440
439 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
440 442
441 $self->_emit (focus_out => $focus);
442
443 $focus->update if $focus; #? 443 $focus->update if $focus; #?
444 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 446 unless $FOCUS;
447}
448 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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
590 590
591sub DESTROY { 591sub DESTROY {
592 my ($self) = @_; 592 my ($self) = @_;
593 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
1001 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1007}
1005 1008
1006sub size_allocate { 1009sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1010 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010 1011
1011 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
1013} 1016}
1014 1017
1015#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll 1019# update viewport offset on scroll
1017 1020
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->hide };
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;
1137 1151
1138 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1139}
1140 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1141sub button_down { 1160sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1143 1162
1144 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1164 my $border = $self->border;
1146 1165
1177 1196
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1198
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1200 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1202 };
1184 } else { 1203 } else {
1185 return 0; 1204 return 0;
1186 } 1205 }
1187 1206
1188 1 1207 1
1189} 1208}
1190 1209
1191sub button_up { 1210sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1193 1212
1194 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1195} 1214}
1196 1215
1197sub mouse_motion { 1216sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1199 1218
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1220
1202 !!$self->{motion} 1221 ! ! $self->{motion}
1203} 1222}
1204 1223
1205sub _draw { 1224sub _draw {
1206 my ($self) = @_; 1225 my ($self) = @_;
1207 1226
1233 1252
1234 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1235 1254
1236 $child->draw; 1255 $child->draw;
1237 1256
1238 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1241 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1242} 1266}
1243 1267
1244############################################################################# 1268#############################################################################
1245 1269
1246package CFClient::UI::Table; 1270package CFClient::UI::Table;
1269 1293
1270 $child->set_parent ($self); 1294 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1272 1296
1273 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1274} 1304}
1275 1305
1276# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1307sub clear {
1278 my ($self) = @_; 1308 my ($self) = @_;
1319 (sum @$ws), 1349 (sum @$ws),
1320 (sum @$hs), 1350 (sum @$hs),
1321 ) 1351 )
1322} 1352}
1323 1353
1324sub size_allocate { 1354sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1326 1356
1327 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1328 1358
1329 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
1361 } 1391 }
1362 1392
1363 $y += $row_h; 1393 $y += $row_h;
1364 } 1394 }
1365 1395
1396 1
1366} 1397}
1367 1398
1368sub find_widget { 1399sub find_widget {
1369 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1370 1401
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1440 )
1410} 1441}
1411 1442
1412sub size_allocate { 1443sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1414 1445
1415 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1417 1448
1418 my @req; 1449 my @req;
1419 1450
1420 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1422 } else { 1453 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1425 1456
1426 if ($req > $space) { 1457 if ($req > $space) {
1427 # ah well, not enough space 1458 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1429 } else { 1460 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1462
1432 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1433 1464
1434 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1466 for 0 .. $#children;
1436 } 1467 }
1437 } 1468 }
1438 1469
1439 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1440 1471
1441 my $pos = 0; 1472 my $pos = 0;
1442 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1476
1446 $pos += $alloc; 1477 $pos += $alloc;
1447 } 1478 }
1448 1479
1449 1 1480 1
1539 1570
1540 delete $self->{texture}; 1571 delete $self->{texture};
1541 $self->SUPER::update; 1572 $self->SUPER::update;
1542} 1573}
1543 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1544sub set_text { 1582sub set_text {
1545 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1546 1584
1547 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1549 1587
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1552 1590
1591 delete $self->{size_req};
1553 $self->realloc; 1592 $self->realloc;
1554 $self->update; 1593 $self->update;
1555} 1594}
1556 1595
1557sub set_markup { 1596sub set_markup {
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1603
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1567 1606
1607 delete $self->{size_req};
1568 $self->realloc; 1608 $self->realloc;
1569 $self->update; 1609 $self->update;
1570} 1610}
1571 1611
1572sub size_request { 1612sub size_request {
1573 my ($self) = @_; 1613 my ($self) = @_;
1574 1614
1615 $self->{size_req} ||= do {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1621
1581 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1582 1623
1583 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1627
1587 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1588 1629
1589 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1591 } 1635 };
1592 1636
1593 ($w, $h) 1637 @{ $self->{size_req} }
1594} 1638}
1595 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1596sub size_allocate { 1644sub invoke_size_allocate {
1597 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1598 1646
1599 delete $self->{ox}; 1647 delete $self->{ox};
1600 1648
1601 delete $self->{texture} 1649 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1603} 1653}
1604 1654
1605sub set_fontsize { 1655sub set_fontsize {
1606 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1607 1657
1608 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1609 delete $self->{texture}; 1659 delete $self->{texture};
1610 1660
1611 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1612} 1670}
1613 1671
1614sub _draw { 1672sub _draw {
1615 my ($self) = @_; 1673 my ($self) = @_;
1616 1674
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1638 }; 1696 };
1639 1697
1640 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1642 1702
1643 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1644 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1646 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1648 } 1710 }
1649 1711
1650 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1651} 1713}
1652 1714
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
1969sub button_down { 2064sub invoke_button_down {
1970 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1971 2066
1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1974 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1975 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
1976 } else { 2071 } else {
1977 return 0 2072 return 0
1978 } 2073 }
1979 2074
1980 1 2075 1
2005package CFClient::UI::Image; 2100package CFClient::UI::Image;
2006 2101
2007our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
2008 2103
2009use CFClient::OpenGL; 2104use CFClient::OpenGL;
2010use Carp qw/confess/;
2011 2105
2012our %loaded_images; 2106our %texture_cache;
2013 2107
2014sub new { 2108sub new {
2015 my $class = shift; 2109 my $class = shift;
2016 2110
2017 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2018 2115
2019 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2020 2118
2021 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2022 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2023 2121
2024 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2025 2123
2026 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2027
2028 $self->{aspect} = $tex->{w} / $tex->{h};
2029 2125
2030 $self 2126 $self
2031} 2127}
2032 2128
2033sub size_request { 2129sub size_request {
2034 my ($self) = @_; 2130 my ($self) = @_;
2035 2131
2036 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
2037} 2133}
2038 2134
2039sub _draw { 2135sub _draw {
2040 my ($self) = @_; 2136 my ($self) = @_;
2041 2137
2277 $self->update; 2373 $self->update;
2278 2374
2279 $self 2375 $self
2280} 2376}
2281 2377
2282sub changed { }
2283
2284sub set_range { 2378sub set_range {
2285 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2286 2380
2287 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2288 2382
2289 $self->update
2290 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2291} 2387}
2292 2388
2293sub set_value { 2389sub set_value {
2294 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2295 2391
2306 if $unit; 2402 if $unit;
2307 2403
2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2309 2405
2310 if ($value != $old_value) { 2406 if ($value != $old_value) {
2311 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2312 $self->update; 2408 $self->update;
2313 } 2409 }
2314} 2410}
2315 2411
2316sub size_request { 2412sub size_request {
2317 my ($self) = @_; 2413 my ($self) = @_;
2318 2414
2319 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2320} 2416}
2321 2417
2322sub button_down { 2418sub invoke_button_down {
2323 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2324 2420
2325 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2326 2422
2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2328 2424
2329 $self->mouse_motion ($ev, $x, $y) 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2330} 2426}
2331 2427
2332sub mouse_motion { 2428sub invoke_mouse_motion {
2333 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2334 2430
2335 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2336 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2337 2433
2442sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2443sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2444 2540
2445############################################################################# 2541#############################################################################
2446 2542
2447package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2448 2544
2449our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2450 2546
2451use CFClient::OpenGL; 2547use CFClient::OpenGL;
2452 2548
2454 my $class = shift; 2550 my $class = shift;
2455 2551
2456 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2457 fontsize => 1, 2553 fontsize => 1,
2458 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2459 #font => default_font 2556 #font => default_font
2460 @_, 2557 @_,
2461 2558
2462 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2463 par => [], 2560 par => [],
2478 2575
2479 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2480 $self->reflow; 2577 $self->reflow;
2481} 2578}
2482 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2483sub size_allocate { 2586sub invoke_size_allocate {
2484 my ($self, $w, $h) = @_; 2587 my ($self, $w, $h) = @_;
2485 2588
2486 $self->SUPER::size_allocate ($w, $h); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2487 2591
2488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2489 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2490 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2491 2596
2492 $self->reflow; 2597 $self->reflow;
2493}
2494 2598
2495sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2496 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2497 2604
2498 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2499 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2500 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2501 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2502 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2503 2618 );
2619
2504 $layout->size 2620 $layout
2505} 2621}
2506 2622
2507sub reflow { 2623sub reflow {
2508 my ($self) = @_; 2624 my ($self) = @_;
2509 2625
2518 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2519} 2635}
2520 2636
2521sub clear { 2637sub clear {
2522 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2523 2642
2524 $self->{par} = []; 2643 $self->{par} = [];
2525 $self->{height} = 0; 2644 $self->{height} = 0;
2526 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2527} 2646}
2528 2647
2529sub add_paragraph { 2648sub add_paragraph {
2530 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2531 2650
2532 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2533 my ($w, $h) = $self->text_size ($line); 2652
2534 $self->{height} += $h; 2653 $para = {
2535 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2536 } 2660 };
2537 2661
2538 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2539} 2674}
2540 2675
2541sub update { 2676sub update {
2542 my ($self) = @_; 2677 my ($self) = @_;
2543 2678
2545 2680
2546 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2547 2682
2548 delete $self->{texture}; 2683 delete $self->{texture};
2549 2684
2550 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2551 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2552 2687
2553 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2554 my $height = 0; 2689 my $height = 0;
2555 2690
2556 my $layout = $self->{layout};
2557
2558 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2559
2560 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2561 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2562 $layout->set_width ($W - $_->[3]); 2693 my $layout = $self->get_layout ($para);
2563 $layout->set_markup ($_->[4]);
2564 my ($w, $h) = $layout->size; 2694 my ($w, $h) = $layout->size;
2565 $_->[0] = $w + $_->[3]; 2695
2566 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2567 } 2699 }
2568 2700
2569 $height += $_->[1]; 2701 $height += $para->{h};
2570 } 2702 }
2571 2703
2572 $self->{height} = $height; 2704 $self->{height} = $height;
2573 2705
2574 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2575 2707
2576 delete $self->{texture}; 2708 delete $self->{texture};
2577 } 2709 }
2578 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2716 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2582 2718
2583 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2584 2720
2585 my $y0 = $top; 2721 my $y0 = $top;
2586 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2587 2723
2588 my $y = 0; 2724 my $y = 0;
2589
2590 my $layout = $self->{layout};
2591
2592 $layout->set_font ($self->{font}) if $self->{font};
2593 2725
2594 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2595 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2596 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2597 2729
2598 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2599 my $h = $par->[1]; 2731 my $h = $para->{h};
2600 2732
2601 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2602 $layout->set_foreground (@{ $par->[2] }); 2734
2603 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2604 $layout->set_markup ($par->[4]);
2605 2736
2606 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2607 2738
2608 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2609 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2610 } 2754 }
2611 2755
2612 $y += $h; 2756 $y += $h;
2613 } 2757 }
2614 2758
2615 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2616 }; 2760 };
2617 }); 2761 });
2618} 2762}
2619 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2620sub _draw { 2773sub _draw {
2621 my ($self) = @_; 2774 my ($self) = @_;
2622 2775
2623 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2628 2781
2629 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2630
2631} 2783}
2632 2784
2633############################################################################# 2785#############################################################################
2634 2786
2635package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
2722 $tooltip .= "\n\n" . (ref $widget) . "\n" 2874 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2875 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n" 2876 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}"; 2877 . "visible $widget->{visible}";
2726 } 2878 }
2879
2880 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//;
2727 2882
2728 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2729 markup => $tooltip, 2884 markup => $tooltip,
2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2731 fontsize => 0.8, 2886 fontsize => 0.8,
2741 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2742 2897
2743 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2744} 2899}
2745 2900
2746sub size_allocate { 2901sub invoke_size_allocate {
2747 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2748 2903
2749 $self->SUPER::size_allocate ($w - 4, $h - 4); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2750} 2905}
2751 2906
2752sub visibility_change { 2907sub invoke_visibility_change {
2753 my ($self, $visible) = @_; 2908 my ($self, $visible) = @_;
2754 2909
2755 return unless $visible; 2910 return unless $visible;
2756 2911
2757 $self->{root}->on_post_alloc ("move_$self" => sub { 2912 $self->{root}->on_post_alloc ("move_$self" => sub {
2759 or return; 2914 or return;
2760 2915
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762 2917
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH; 2919 if $x + $self->{w} > $self->{root}{w};
2765 2920
2766 $self->move_abs ($x, $y); 2921 $self->move_abs ($x, $y);
2767 }); 2922 });
2768} 2923}
2769 2924
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 3014
2860 if ($tex) { 3015 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2866 } 3021 }
2867} 3022}
2868 3023
2869sub DESTROY { 3024sub destroy {
2870 my ($self) = @_; 3025 my ($self) = @_;
2871 3026
2872 $self->{timer}->cancel 3027 $self->{timer}->cancel
2873 if $self->{timer}; 3028 if $self->{timer};
2874 3029
2875 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2876} 3031}
2877 3032
2878############################################################################# 3033#############################################################################
2879 3034
2880package CFClient::UI::Buttonbar; 3035package CFClient::UI::Buttonbar;
2901 ); 3056 );
2902 3057
2903 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2904 3059
2905 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2906 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2907 3062
2908 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2909 if (!ref $widget) { 3064 if (!ref $widget) {
2910 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2911 can_hover => 1, 3066 can_hover => 1,
2912 can_events => 1, 3067 can_events => 1,
2913 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2914 } 3070 }
2915 3071
2916 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2917 3073
2918 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
2923 3079
2924# popup given the event (must be a mouse button down event currently) 3080# popup given the event (must be a mouse button down event currently)
2925sub popup { 3081sub popup {
2926 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
2927 3083
2928 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
2929 3085
2930 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2931 $GRAB = $self; 3087 $GRAB = $self;
2932 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2933 3089
2934 $self->show; 3090 $self->show;
2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2936} 3092}
2937 3093
2938sub mouse_motion { 3094sub invoke_mouse_motion {
2939 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2940 3096
2941 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2943 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2944 3100
2945 0 3101 0
2946} 3102}
2947 3103
2948sub button_up { 3104sub invoke_button_up {
2949 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2950 3106
2951 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2952 undef $GRAB; 3108 undef $GRAB;
2953 $self->hide; 3109 $self->hide;
2954 3110
2955 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
2956 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
2957 } else { 3113 } else {
2958 return 0 3114 return 0
2959 } 3115 }
2960 3116
2997 : $self->{children}[$page_or_widget]; 3153 : $self->{children}[$page_or_widget];
2998 3154
2999 $self->{current} = $widget; 3155 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001 3157
3002 $self->_emit (page_changed => $self->{current}); 3158 $self->emit (page_changed => $self->{current});
3003 3159
3004 $self->realloc; 3160 $self->realloc;
3005} 3161}
3006 3162
3007sub visible_children { 3163sub visible_children {
3012 my ($self) = @_; 3168 my ($self) = @_;
3013 3169
3014 $self->{current}->size_request 3170 $self->{current}->size_request
3015} 3171}
3016 3172
3017sub size_allocate { 3173sub invoke_size_allocate {
3018 my ($self, $w, $h) = @_; 3174 my ($self, $w, $h) = @_;
3019 3175
3020 $self->{current}->configure (0, 0, $w, $h); 3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3021} 3179}
3022 3180
3023sub _draw { 3181sub _draw {
3024 my ($self) = @_; 3182 my ($self) = @_;
3025 3183
3064 3222
3065sub set_current_page { 3223sub set_current_page {
3066 my ($self, $page) = @_; 3224 my ($self, $page) = @_;
3067 3225
3068 $self->{multiplexer}->set_current_page ($page); 3226 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current}); 3227 $self->emit (page_changed => $self->{multiplexer}{current});
3070} 3228}
3071 3229
3072############################################################################# 3230#############################################################################
3073 3231
3074package CFClient::UI::Statusbox; 3232package CFClient::UI::Combobox;
3075 3233
3234use utf8;
3235
3076our @ISA = CFClient::UI::VBox::; 3236our @ISA = CFClient::UI::Button::;
3077 3237
3078sub new { 3238sub new {
3079 my $class = shift; 3239 my $class = shift;
3080 3240
3081 $class->SUPER::new ( 3241 my $self = $class->SUPER::new (
3242 options => [], # [value, title, longdesc], ...
3243 value => undef,
3244 @_,
3245 );
3246
3247 $self->_set_value ($self->{value});
3248
3249 $self
3250}
3251
3252sub invoke_button_down {
3253 my ($self, $ev) = @_;
3254
3255 my @menu_items;
3256
3257 for (@{ $self->{options} }) {
3258 my ($value, $title, $tooltip) = @$_;
3259
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 }
3262
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264}
3265
3266sub _set_value {
3267 my ($self, $value) = @_;
3268
3269 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3270 or return;
3271
3272 $self->{value} = $item->[0];
3273 $self->set_markup ("$item->[1] ⇓");
3274 $self->set_tooltip ($item->[2]);
3275}
3276
3277sub set_value {
3278 my ($self, $value) = @_;
3279
3280 return unless $self->{value} ne $value;
3281
3282 $self->_set_value ($value);
3283 $self->emit (changed => $value);
3284}
3285
3286#############################################################################
3287
3288package CFClient::UI::Statusbox;
3289
3290our @ISA = CFClient::UI::VBox::;
3291
3292sub new {
3293 my $class = shift;
3294
3295 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3296 fontsize => 0.8,
3083 @_, 3297 @_,
3084 ) 3298 );
3299
3300 Scalar::Util::weaken (my $this = $self);
3301
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303
3304 $self
3085} 3305}
3086 3306
3087sub reorder { 3307sub reorder {
3088 my ($self) = @_; 3308 my ($self) = @_;
3089 my $NOW = time; 3309 my $NOW = Time::HiRes::time;
3310
3311 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} };
3090 3315
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3318 }
3094 3319
3097 my @items = sort { 3322 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3323 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3324 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3325 } values %{ $self->{item} };
3101 3326
3327 $self->{timer}->interval (1);
3328
3102 my $count = 10 + 1; 3329 my $count = 10 + 1;
3103 for my $item (@items) { 3330 for my $item (@items) {
3104 last unless --$count; 3331 last unless --$count;
3105 3332
3106 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3335 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3336 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3337 : $item->{text};
3111 3338
3119 tooltip => $item->{tooltip}, 3346 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3347 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3348 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3349 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3350 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3351 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3352 can_events => 1,
3126 can_hover => 1 3353 can_hover => 1
3127 }; 3354 };
3355
3356 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3357 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3358 $label->update;
3359 $label->set_max_size (undef, $label->{req_h} * $diff)
3360 if $diff < 1;
3361 $self->{timer}->interval (1/30);
3362 } else {
3363 $label->{fg}[3] = $item->{fg}[3] || 1;
3364 }
3365
3366 push @widgets, $label;
3128 } 3367 }
3129 3368
3130 $self->clear; 3369 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3370 $self->SUPER::add (reverse @widgets);
3132} 3371}
3137 $text =~ s/^\s+//; 3376 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3377 $text =~ s/\s+$//;
3139 3378
3140 return unless $text; 3379 return unless $text;
3141 3380
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3381 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3382
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3383 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3384
3146 if (my $item = $self->{item}{$group}) { 3385 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3386 if ($item->{text} eq $text) {
3148 $item->{count}++; 3387 $item->{count}++;
3149 } else { 3388 } else {
3150 $item->{count} = 1; 3389 $item->{count} = 1;
3151 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
3152 } 3391 }
3153 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
3154 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
3155 delete $item->{label}; 3394 delete $item->{label};
3156 } else { 3395 } else {
3157 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
3158 id => ++$self->{id}, 3397 id => ++$self->{id},
3177 3416
3178 $self->reorder; 3417 $self->reorder;
3179 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
3180} 3419}
3181 3420
3421sub destroy {
3422 my ($self) = @_;
3423
3424 $self->{timer}->cancel;
3425
3426 $self->SUPER::destroy;
3427}
3428
3182############################################################################# 3429#############################################################################
3183 3430
3184package CFClient::UI::Inventory; 3431package CFClient::UI::Inventory;
3185 3432
3186our @ISA = CFClient::UI::ScrolledWindow::; 3433our @ISA = CFClient::UI::ScrolledWindow::;
3285 $self->update_binding_widgets; 3532 $self->update_binding_widgets;
3286 3533
3287 $self 3534 $self
3288} 3535}
3289 3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3290sub commit { 3549sub commit {
3291 my ($self) = @_; 3550 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding; 3551 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) { 3552 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3328 my ($self) = @_; 3587 my ($self) = @_;
3329 $self->ask_for_bind (1); 3588 $self->ask_for_bind (1);
3330} 3589}
3331 3590
3332sub ask_for_bind { 3591sub ask_for_bind {
3333 my ($self, $commit) = @_; 3592 my ($self, $commit, $end_cb) = @_;
3334 3593
3335 CFClient::Binder::open_binding_dialog (sub { 3594 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_; 3595 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets; 3597 $self->update_binding_widgets;
3339 $self->commit if $commit; 3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3340 }); 3600 });
3341} 3601}
3342 3602
3343# $mod and $sym are the modifiers and key symbol 3603# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands) 3604# $cmds is a array ref of strings (the commands)
3362} 3622}
3363 3623
3364# this is a shortcut method that asks for a binding 3624# this is a shortcut method that asks for a binding
3365# and then just binds it. 3625# and then just binds it.
3366sub do_quick_binding { 3626sub do_quick_binding {
3367 my ($self, $cmds) = @_; 3627 my ($self, $cmds, $end_cb) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub { 3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1); 3629 $self->ask_for_bind (1, $end_cb);
3372} 3630}
3373 3631
3374sub update_binding_widgets { 3632sub update_binding_widgets {
3375 my ($self) = @_; 3633 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding; 3634 my ($mod, $sym, $cmds) = $self->get_binding;
3432 commands => [], 3690 commands => [],
3433 @_, 3691 @_,
3434 ) 3692 )
3435} 3693}
3436 3694
3437# XXX: Do sorting? Argl... 3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3438sub add_spell { 3780sub add_spell {
3439 my ($self, $spell) = @_; 3781 my ($self, $spell) = @_;
3782
3440 $self->{spells}->{$spell->{name}} = $spell; 3783 $self->{spell}->{$spell->{name}} = $spell;
3441 3784 $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} 3785}
3470 3786
3471sub remove_spell { 3787sub remove_spell {
3472 my ($self, $spell) = @_; 3788 my ($self, $spell) = @_;
3789
3473 delete $self->{spells}->{$spell->{name}}; 3790 delete $self->{spell}->{$spell->{name}};
3474 $self->rebuild_spell_list; 3791 $self->rebuild_spell_list;
3475} 3792}
3476 3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3477############################################################################# 3801#############################################################################
3478 3802
3479package CFClient::UI::Root; 3803package CFClient::UI::Root;
3480 3804
3481our @ISA = CFClient::UI::Container::; 3805our @ISA = CFClient::UI::Container::;
3806
3807use List::Util qw(min max);
3482 3808
3483use CFClient::OpenGL; 3809use CFClient::OpenGL;
3484 3810
3485sub new { 3811sub new {
3486 my $class = shift; 3812 my $class = shift;
3513 $coord = $max - $size if $coord > $max - $size; 3839 $coord = $max - $size if $coord > $max - $size;
3514 3840
3515 int $coord + 0.5 3841 int $coord + 0.5
3516} 3842}
3517 3843
3518sub size_allocate { 3844sub invoke_size_allocate {
3519 my ($self, $w, $h) = @_; 3845 my ($self, $w, $h) = @_;
3520 3846
3521 for my $child ($self->children) { 3847 for my $child ($self->children) {
3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3523 3849
3527 $X = _to_pixel $X, $W, $self->{w}; 3853 $X = _to_pixel $X, $W, $self->{w};
3528 $Y = _to_pixel $Y, $H, $self->{h}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
3529 3855
3530 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3531 } 3857 }
3858
3859 1
3532} 3860}
3533 3861
3534sub coord2local { 3862sub coord2local {
3535 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3536 3864
3621 3949
3622 delete $queue{$widget+0}; 3950 delete $queue{$widget+0};
3623 3951
3624 my ($w, $h) = $widget->size_request; 3952 my ($w, $h) = $widget->size_request;
3625 3953
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3954 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3955 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3956
3957 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3958 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3959
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3960 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3961 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3962
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3963 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines