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.280 by root, Mon Jun 5 01:22:08 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 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
… …
366 366
367 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
368 } 368 }
369} 369}
370 370
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 371sub children {
376 # nop 372 # nop
377} 373}
378 374
379sub visible_children { 375sub visible_children {
… …
381} 377}
382 378
383sub set_max_size { 379sub set_max_size {
384 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
385 381
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
388 384
389 $self->realloc; 385 $self->realloc;
390} 386}
391 387
392sub set_tooltip { 388sub set_tooltip {
… …
399 395
400 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
401 397
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 401 }
406} 402}
407 403
408# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
409sub coord2local { 405sub coord2local {
… …
417 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
418 414
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 416}
421 417
422sub focus_in { 418sub invoke_focus_in {
423 my ($self) = @_; 419 my ($self) = @_;
424 420
425 return if $FOCUS == $self; 421 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
427 423
428 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
429 425
430 $self->_emit (focus_in => $focus);
431
432 $focus->update if $focus; 426 $focus->update if $focus;
433 $FOCUS->update; 427 $FOCUS->update;
434}
435 428
429 0
430}
431
436sub focus_out { 432sub invoke_focus_out {
437 my ($self) = @_; 433 my ($self) = @_;
438 434
439 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
440 436
441 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
442 438
443 $self->_emit (focus_out => $focus);
444
445 $focus->update if $focus; #? 439 $focus->update if $focus; #?
446 440
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 442 unless $FOCUS;
449}
450 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
451sub mouse_motion { 0 } 453sub invoke_mouse_motion { 1 }
452sub button_up { 0 } 454sub invoke_button_up { 1 }
453sub key_down { 0 } 455sub invoke_key_down { 1 }
454sub key_up { 0 } 456sub invoke_key_up { 1 }
455 457
456sub button_down { 458sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
458 460
459 $self->focus_in; 461 $self->grab_focus;
460 462
461 0 463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462} 479}
463 480
464sub find_widget { 481sub find_widget {
465 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
466 483
… …
476sub set_parent { 493sub set_parent {
477 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
478 495
479 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504} 498}
505 499
506sub realloc { 500sub realloc {
507 my ($self) = @_; 501 my ($self) = @_;
508 502
… …
592 586
593sub DESTROY { 587sub DESTROY {
594 my ($self) = @_; 588 my ($self) = @_;
595 589
596 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
597 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 594}
599 595
600############################################################################# 596#############################################################################
601 597
602package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
767} 763}
768 764
769sub add { 765sub add {
770 my ($self, $child) = @_; 766 my ($self, $child) = @_;
771 767
772 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
775} 770}
776 771
777sub remove { 772sub remove {
778 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
787 782
788sub size_request { 783sub size_request {
789 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
790} 785}
791 786
792sub size_allocate { 787sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
794 789
795 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
796} 793}
797 794
798############################################################################# 795#############################################################################
799 796
800# back-buffered drawing area 797# back-buffered drawing area
… …
816 813
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 815 $self->SUPER::update;
819} 816}
820 817
821sub size_allocate { 818sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
823 820
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
826} 824}
827 825
828sub _render { 826sub _render {
829 my ($self) = @_; 827 my ($self) = @_;
830 828
… …
891 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
892 890
893 ($w, $h) 891 ($w, $h)
894} 892}
895 893
896sub size_allocate { 894sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
898 896
899 my $child = $self->child; 897 my $child = $self->child;
900 898
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 901
904 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
905 $self->update; 903 $self->update;
904
905 1
906} 906}
907 907
908sub set_offset { 908sub set_offset {
909 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
910 910
… …
1000 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1003}
1004 1004
1005sub size_allocate { 1005sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
1007
1008 $self->SUPER::size_allocate ($w, $h);
1009 1007
1010 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1012}
1013 1013
1014#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll 1015# update viewport offset on scroll
1016 1016
… …
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1072
1073sub new { 1073sub new {
1074 my ($class, %arg) = @_; 1074 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1077 1075
1078 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1079 border => 0.6,
… …
1083 min_w => 16, 1081 min_w => 16,
1084 min_h => 16, 1082 min_h => 16,
1085 %arg, 1083 %arg,
1086 ); 1084 );
1087 1085
1088 $self->{title} = new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1087 align => 0,
1090 valign => 1, 1088 valign => 1,
1091 text => $title, 1089 text => $self->{title},
1092 fontsize => $self->{border} 1090 fontsize => $self->{border},
1093 if defined $title; 1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1094 1101
1095 $self 1102 $self
1096} 1103}
1097 1104
1098sub add { 1105sub add {
1099 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1100 1107
1101 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1111}
1104 1112
1105sub border { 1113sub border {
1106 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1107} 1115}
1108 1116
1109sub size_request { 1117sub size_request {
1110 my ($self) = @_; 1118 my ($self) = @_;
1111 1119
1112 $self->{title}->size_request 1120 $self->{title_widget}->size_request
1113 if $self->{title}; 1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1114 1125
1115 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1116 1127
1117 ( 1128 (
1118 $w + $self->border * 2, 1129 $w + $self->border * 2,
1119 $h + $self->border * 2, 1130 $h + $self->border * 2,
1120 ) 1131 )
1121} 1132}
1122 1133
1123sub size_allocate { 1134sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1125 1136
1126 if ($self->{title}) { 1137 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1141 }
1131 1142
1132 my $border = $self->border; 1143 my $border = $self->border;
1133 1144
1134 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1136 1147
1137 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1138}
1139 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1140sub button_down { 1156sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1142 1158
1143 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1160 my $border = $self->border;
1145 1161
… …
1176 1192
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1194
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1196 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1198 };
1183 } else { 1199 } else {
1184 return 0; 1200 return 0;
1185 } 1201 }
1186 1202
1187 1 1203 1
1188} 1204}
1189 1205
1190sub button_up { 1206sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1192 1208
1193 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1194} 1210}
1195 1211
1196sub mouse_motion { 1212sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1198 1214
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1216
1201 !!$self->{motion} 1217 ! ! $self->{motion}
1202} 1218}
1203 1219
1204sub _draw { 1220sub _draw {
1205 my ($self) = @_; 1221 my ($self) = @_;
1206 1222
… …
1232 1248
1233 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1234 1250
1235 $child->draw; 1251 $child->draw;
1236 1252
1237 if ($self->{title}) { 1253 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1254 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1240 } 1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1241} 1262}
1242 1263
1243############################################################################# 1264#############################################################################
1244 1265
1245package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1268 1289
1269 $child->set_parent ($self); 1290 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1271 1292
1272 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1273} 1300}
1274 1301
1275# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1303sub clear {
1277 my ($self) = @_; 1304 my ($self) = @_;
… …
1318 (sum @$ws), 1345 (sum @$ws),
1319 (sum @$hs), 1346 (sum @$hs),
1320 ) 1347 )
1321} 1348}
1322 1349
1323sub size_allocate { 1350sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1325 1352
1326 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1327 1354
1328 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1360 } 1387 }
1361 1388
1362 $y += $row_h; 1389 $y += $row_h;
1363 } 1390 }
1364 1391
1392 1
1365} 1393}
1366 1394
1367sub find_widget { 1395sub find_widget {
1368 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1369 1397
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1436 )
1409} 1437}
1410 1438
1411sub size_allocate { 1439sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1413 1441
1414 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1416 1444
1417 my @req; 1445 my @req;
1418 1446
1419 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1421 } else { 1449 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1424 1452
1425 if ($req > $space) { 1453 if ($req > $space) {
1426 # ah well, not enough space 1454 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1428 } else { 1456 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1458
1431 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1432 1460
1433 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1462 for 0 .. $#children;
1435 } 1463 }
1436 } 1464 }
1437 1465
1438 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1439 1467
1440 my $pos = 0; 1468 my $pos = 0;
1441 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1472
1445 $pos += $alloc; 1473 $pos += $alloc;
1446 } 1474 }
1447 1475
1448 1 1476 1
… …
1538 1566
1539 delete $self->{texture}; 1567 delete $self->{texture};
1540 $self->SUPER::update; 1568 $self->SUPER::update;
1541} 1569}
1542 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1543sub set_text { 1578sub set_text {
1544 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1545 1580
1546 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1548 1583
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1551 1586
1587 delete $self->{size_req};
1552 $self->realloc; 1588 $self->realloc;
1553 $self->update; 1589 $self->update;
1554} 1590}
1555 1591
1556sub set_markup { 1592sub set_markup {
… …
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1599
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1566 1602
1603 delete $self->{size_req};
1567 $self->realloc; 1604 $self->realloc;
1568 $self->update; 1605 $self->update;
1569} 1606}
1570 1607
1571sub size_request { 1608sub size_request {
1572 my ($self) = @_; 1609 my ($self) = @_;
1573 1610
1611 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1617
1580 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1581 1619
1582 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1623
1586 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1587 1625
1588 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1590 } 1631 };
1591 1632
1592 ($w, $h) 1633 @{ $self->{size_req} }
1593} 1634}
1594 1635
1595sub size_allocate { 1636sub invoke_size_allocate {
1596 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1597 1638
1598 delete $self->{ox}; 1639 delete $self->{ox};
1599 1640
1600 delete $self->{texture} 1641 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1602} 1645}
1603 1646
1604sub set_fontsize { 1647sub set_fontsize {
1605 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1606 1649
1607 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1608 delete $self->{texture}; 1651 delete $self->{texture};
1609 1652
1610 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1611} 1662}
1612 1663
1613sub _draw { 1664sub _draw {
1614 my ($self) = @_; 1665 my ($self) = @_;
1615 1666
… …
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1637 }; 1688 };
1638 1689
1639 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1694
1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1641
1642 glColor_premultiply @{$self->{fg}}
1643 if $tex->{format} == GL_ALPHA;
1644
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1646 1703
1647 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1648} 1705}
1649 1706
1650############################################################################# 1707#############################################################################
… …
1666 can_hover => 1, 1723 can_hover => 1,
1667 can_focus => 1, 1724 can_focus => 1,
1668 valign => 0, 1725 valign => 0,
1669 can_events => 1, 1726 can_events => 1,
1670 #text => ... 1727 #text => ...
1728 #hidden => "*",
1671 @_ 1729 @_
1672 ) 1730 )
1673} 1731}
1674 1732
1675sub _set_text { 1733sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 1741 $self->{text} = $text;
1684 1742
1685 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1687 1746
1688 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1689 $self->update; 1750 $self->update;
1690} 1751}
1691 1752
1692sub set_text { 1753sub set_text {
1693 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1694 1755
1695 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1757 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1758}
1700 1759
1701sub get_text { 1760sub get_text {
1702 $_[0]{text} 1761 $_[0]{text}
1703} 1762}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1709 1768
1710 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1711} 1770}
1712 1771
1713sub key_down { 1772sub invoke_key_down {
1714 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1715 1774
1716 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1730 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1731 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 1794 $self->emit ('escape');
1736 } elsif ($uni) { 1795 } elsif ($uni) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 1797 } else {
1739 return 0; 1798 return 0;
1740 } 1799 }
… …
1744 $self->realloc; 1803 $self->realloc;
1745 1804
1746 1 1805 1
1747} 1806}
1748 1807
1749sub focus_in { 1808sub invoke_focus_in {
1750 my ($self) = @_; 1809 my ($self) = @_;
1751 1810
1752 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1753 1812
1754 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1755} 1814}
1756 1815
1757sub button_down { 1816sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1759 1818
1760 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 1820
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 1822
1764 # byte-index to char-index 1823 # byte-index to char-index
1765 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1770 $self->update; 1829 $self->update;
1771 1830
1772 1 1831 1
1773} 1832}
1774 1833
1775sub mouse_motion { 1834sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778 1837
1779 0 1838 1
1780} 1839}
1781 1840
1782sub _draw { 1841sub _draw {
1783 my ($self) = @_; 1842 my ($self) = @_;
1784 1843
… …
1825 1884
1826our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1827 1886
1828use CFClient::OpenGL; 1887use CFClient::OpenGL;
1829 1888
1830sub key_down { 1889sub invoke_key_down {
1831 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1832 1891
1833 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1834 1893
1835 if ($sym == 13) { 1894 if ($sym == 13) {
1836 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1838 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1841 $self->update; 1901 $self->update;
1842 1902
1843 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1861 } else { 1921 } else {
1862 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1863 } 1923 }
1864 1924
1865 } else { 1925 } else {
1866 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1867 } 1927 }
1868 1928
1869 1 1929 1
1870} 1930}
1871 1931
… …
1895 can_events => 1, 1955 can_events => 1,
1896 @_ 1956 @_
1897 ) 1957 )
1898} 1958}
1899 1959
1900sub activate { }
1901
1902sub button_up { 1960sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1904 1962
1905 $self->emit ("activate") 1963 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1921 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1922 1980
1923 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1924 1982
1925 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1926} 2020}
1927 2021
1928############################################################################# 2022#############################################################################
1929 2023
1930package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1957 my ($self) = @_; 2051 my ($self) = @_;
1958 2052
1959 (6) x 2 2053 (6) x 2
1960} 2054}
1961 2055
1962sub button_down { 2056sub invoke_button_down {
1963 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1964 2058
1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1968 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
1969 } else { 2063 } else {
1970 return 0 2064 return 0
1971 } 2065 }
1972 2066
1973 1 2067 1
… …
1998package CFClient::UI::Image; 2092package CFClient::UI::Image;
1999 2093
2000our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
2001 2095
2002use CFClient::OpenGL; 2096use CFClient::OpenGL;
2003use Carp qw/confess/;
2004 2097
2005our %loaded_images; 2098our %texture_cache;
2006 2099
2007sub new { 2100sub new {
2008 my $class = shift; 2101 my $class = shift;
2009 2102
2010 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2011 2107
2012 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
2013 2110
2014 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2015 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2016 2113
2017 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2018 2115
2019 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021 $self->{aspect} = $tex->{w} / $tex->{h};
2022 2117
2023 $self 2118 $self
2024} 2119}
2025 2120
2026sub size_request { 2121sub size_request {
2027 my ($self) = @_; 2122 my ($self) = @_;
2028 2123
2029 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
2030} 2125}
2031 2126
2032sub _draw { 2127sub _draw {
2033 my ($self) = @_; 2128 my ($self) = @_;
2034 2129
… …
2270 $self->update; 2365 $self->update;
2271 2366
2272 $self 2367 $self
2273} 2368}
2274 2369
2275sub changed { }
2276
2277sub set_range { 2370sub set_range {
2278 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2279 2372
2280 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2281 2374
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2284} 2379}
2285 2380
2286sub set_value { 2381sub set_value {
2287 my ($self, $value) = @_; 2382 my ($self, $value) = @_;
2288 2383
… …
2299 if $unit; 2394 if $unit;
2300 2395
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302 2397
2303 if ($value != $old_value) { 2398 if ($value != $old_value) {
2304 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2305 $self->update; 2400 $self->update;
2306 } 2401 }
2307} 2402}
2308 2403
2309sub size_request { 2404sub size_request {
2310 my ($self) = @_; 2405 my ($self) = @_;
2311 2406
2312 ($self->{req_w}, $self->{req_h}) 2407 ($self->{req_w}, $self->{req_h})
2313} 2408}
2314 2409
2315sub button_down { 2410sub invoke_button_down {
2316 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2317 2412
2318 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2319 2414
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321 2416
2322 $self->mouse_motion ($ev, $x, $y) 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2323} 2418}
2324 2419
2325sub mouse_motion { 2420sub invoke_mouse_motion {
2326 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2327 2422
2328 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330 2425
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2437 2532
2438############################################################################# 2533#############################################################################
2439 2534
2440package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2441 2536
2442our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2443 2538
2444use CFClient::OpenGL; 2539use CFClient::OpenGL;
2445 2540
… …
2447 my $class = shift; 2542 my $class = shift;
2448 2543
2449 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2450 fontsize => 1, 2545 fontsize => 1,
2451 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2452 #font => default_font 2548 #font => default_font
2453 @_, 2549 @_,
2454 2550
2455 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2456 par => [], 2552 par => [],
… …
2471 2567
2472 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2569 $self->reflow;
2474} 2570}
2475 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2476sub size_allocate { 2578sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2478 2580
2479 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 2583
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 2588
2485 $self->reflow; 2589 $self->reflow;
2486}
2487 2590
2488sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2489 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2490 2596
2491 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2492 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2496 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2497 $layout->size 2606 $layout
2498} 2607}
2499 2608
2500sub reflow { 2609sub reflow {
2501 my ($self) = @_; 2610 my ($self) = @_;
2502 2611
… …
2511 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2512} 2621}
2513 2622
2514sub clear { 2623sub clear {
2515 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2516 2628
2517 $self->{par} = []; 2629 $self->{par} = [];
2518 $self->{height} = 0; 2630 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 2632}
2521 2633
2522sub add_paragraph { 2634sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2524 2636
2525 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2526 my ($w, $h) = $self->text_size ($line); 2638
2527 $self->{height} += $h; 2639 $para = {
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2529 } 2646 };
2530 2647
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2532} 2660}
2533 2661
2534sub update { 2662sub update {
2535 my ($self) = @_; 2663 my ($self) = @_;
2536 2664
… …
2538 2666
2539 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2540 2668
2541 delete $self->{texture}; 2669 delete $self->{texture};
2542 2670
2543 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 2673
2546 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2547 my $height = 0; 2675 my $height = 0;
2548 2676
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2555 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2559 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2560 } 2685 }
2561 2686
2562 $height += $_->[1]; 2687 $height += $para->{h};
2563 } 2688 }
2564 2689
2565 $self->{height} = $height; 2690 $self->{height} = $height;
2566 2691
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2568 2693
2569 delete $self->{texture}; 2694 delete $self->{texture};
2695 }
2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2570 } 2699 }
2571 2700
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 2702 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
… …
2578 my $y0 = $top; 2707 my $y0 = $top;
2579 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2580 2709
2581 my $y = 0; 2710 my $y = 0;
2582 2711
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590 2715
2591 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 2717 my $h = $para->{h};
2593 2718
2594 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 2720
2596 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2597 $layout->set_markup ($par->[4]);
2598 2722
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2600 2724
2601 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2603 } 2740 }
2604 2741
2605 $y += $h; 2742 $y += $h;
2606 } 2743 }
2607 2744
2608 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2609 }; 2746 };
2610 }); 2747 });
2748}
2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2611} 2757}
2612 2758
2613sub _draw { 2759sub _draw {
2614 my ($self) = @_; 2760 my ($self) = @_;
2615 2761
… …
2618 glColor 0, 0, 0, 1; 2764 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2621 2767
2622 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2623
2624} 2769}
2625 2770
2626############################################################################# 2771#############################################################################
2627 2772
2628package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 2862 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 2863 . "visible $widget->{visible}";
2719 } 2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2720 2868
2721 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2722 markup => $tooltip, 2870 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 2872 fontsize => 0.8,
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 2883
2736 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2737} 2885}
2738 2886
2739sub size_allocate { 2887sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2741 2889
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 2891}
2744 2892
2745sub visibility_change { 2893sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 2894 my ($self, $visible) = @_;
2747 2895
2748 return unless $visible; 2896 return unless $visible;
2749 2897
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 2898 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2752 or return; 2900 or return;
2753 2901
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 2903
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 2905 if $x + $self->{w} > $self->{root}{w};
2758 2906
2759 $self->move_abs ($x, $y); 2907 $self->move_abs ($x, $y);
2760 }); 2908 });
2761} 2909}
2762 2910
… …
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2859 } 3007 }
2860} 3008}
2861 3009
2862sub DESTROY { 3010sub destroy {
2863 my ($self) = @_; 3011 my ($self) = @_;
2864 3012
2865 $self->{timer}->cancel 3013 $self->{timer}->cancel
2866 if $self->{timer}; 3014 if $self->{timer};
2867 3015
2868 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2869} 3017}
2870 3018
2871############################################################################# 3019#############################################################################
2872 3020
2873package CFClient::UI::Buttonbar; 3021package CFClient::UI::Buttonbar;
… …
2894 ); 3042 );
2895 3043
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2897 3045
2898 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2900 3048
2901 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2902 if (!ref $widget) { 3050 if (!ref $widget) {
2903 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2904 can_hover => 1, 3052 can_hover => 1,
2905 can_events => 1, 3053 can_events => 1,
2906 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2907 } 3056 }
2908 3057
2909 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2910 3059
2911 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2916 3065
2917# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
2918sub popup { 3067sub popup {
2919 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2920 3069
2921 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2922 3071
2923 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3073 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2926 3075
2927 $self->show; 3076 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3078}
2930 3079
2931sub mouse_motion { 3080sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2933 3082
2934 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2937 3086
2938 0 3087 0
2939} 3088}
2940 3089
2941sub button_up { 3090sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2943 3092
2944 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3094 undef $GRAB;
2946 $self->hide; 3095 $self->hide;
2947 3096
2948 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3099 } else {
2951 return 0 3100 return 0
2952 } 3101 }
2953 3102
… …
2990 : $self->{children}[$page_or_widget]; 3139 : $self->{children}[$page_or_widget];
2991 3140
2992 $self->{current} = $widget; 3141 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3143
2995 $self->_emit (page_changed => $self->{current}); 3144 $self->emit (page_changed => $self->{current});
2996 3145
2997 $self->realloc; 3146 $self->realloc;
2998} 3147}
2999 3148
3000sub visible_children { 3149sub visible_children {
… …
3005 my ($self) = @_; 3154 my ($self) = @_;
3006 3155
3007 $self->{current}->size_request 3156 $self->{current}->size_request
3008} 3157}
3009 3158
3010sub size_allocate { 3159sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3160 my ($self, $w, $h) = @_;
3012 3161
3013 $self->{current}->configure (0, 0, $w, $h); 3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3014} 3165}
3015 3166
3016sub _draw { 3167sub _draw {
3017 my ($self) = @_; 3168 my ($self) = @_;
3018 3169
… …
3057 3208
3058sub set_current_page { 3209sub set_current_page {
3059 my ($self, $page) = @_; 3210 my ($self, $page) = @_;
3060 3211
3061 $self->{multiplexer}->set_current_page ($page); 3212 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3213 $self->emit (page_changed => $self->{multiplexer}{current});
3214}
3215
3216#############################################################################
3217
3218package CFClient::UI::Combobox;
3219
3220use utf8;
3221
3222our @ISA = CFClient::UI::Button::;
3223
3224sub new {
3225 my $class = shift;
3226
3227 my $self = $class->SUPER::new (
3228 options => [], # [value, title, longdesc], ...
3229 value => undef,
3230 @_,
3231 );
3232
3233 $self->_set_value ($self->{value});
3234
3235 $self
3236}
3237
3238sub invoke_button_down {
3239 my ($self, $ev) = @_;
3240
3241 my @menu_items;
3242
3243 for (@{ $self->{options} }) {
3244 my ($value, $title, $tooltip) = @$_;
3245
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 }
3248
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250}
3251
3252sub _set_value {
3253 my ($self, $value) = @_;
3254
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3256 or return;
3257
3258 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]);
3261}
3262
3263sub set_value {
3264 my ($self, $value) = @_;
3265
3266 return unless $self->{value} ne $value;
3267
3268 $self->_set_value ($value);
3269 $self->emit (changed => $value);
3063} 3270}
3064 3271
3065############################################################################# 3272#############################################################################
3066 3273
3067package CFClient::UI::Statusbox; 3274package CFClient::UI::Statusbox;
… …
3076 @_, 3283 @_,
3077 ); 3284 );
3078 3285
3079 Scalar::Util::weaken (my $this = $self); 3286 Scalar::Util::weaken (my $this = $self);
3080 3287
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { 3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 $this->reorder;
3083 $this->update;
3084 });
3085 3289
3086 $self 3290 $self
3087} 3291}
3088 3292
3089sub reorder { 3293sub reorder {
3090 my ($self) = @_; 3294 my ($self) = @_;
3091 my $NOW = Time::HiRes::time; 3295 my $NOW = Time::HiRes::time;
3296
3297 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} };
3092 3301
3093 while (my ($k, $v) = each %{ $self->{item} }) { 3302 while (my ($k, $v) = each %{ $self->{item} }) {
3094 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3095 } 3304 }
3096 3305
… …
3105 3314
3106 my $count = 10 + 1; 3315 my $count = 10 + 1;
3107 for my $item (@items) { 3316 for my $item (@items) {
3108 last unless --$count; 3317 last unless --$count;
3109 3318
3110 push @widgets, $item->{label} ||= do { 3319 my $label = $item->{label} ||= do {
3111 # TODO: doesn't handle markup well (read as: at all) 3320 # TODO: doesn't handle markup well (read as: at all)
3112 my $short = $item->{count} > 1 3321 my $short = $item->{count} > 1
3113 ? "<b>$item->{count} ×</b> $item->{text}" 3322 ? "<b>$item->{count} ×</b> $item->{text}"
3114 : $item->{text}; 3323 : $item->{text};
3115 3324
… …
3123 tooltip => $item->{tooltip}, 3332 tooltip => $item->{tooltip},
3124 tooltip_font => $::FONT_PROP, 3333 tooltip_font => $::FONT_PROP,
3125 tooltip_width => 0.67, 3334 tooltip_width => 0.67,
3126 fontsize => $item->{fontsize} || $self->{fontsize}, 3335 fontsize => $item->{fontsize} || $self->{fontsize},
3127 max_w => $::WIDTH * 0.44, 3336 max_w => $::WIDTH * 0.44,
3128 fg => $item->{fg}, 3337 fg => [@{ $item->{fg} }],
3129 orig_alpha => $item->{fg}[3] || 1,
3130 can_events => 1, 3338 can_events => 1,
3131 can_hover => 1 3339 can_hover => 1
3132 }; 3340 };
3133 3341
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) { 3342 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2; 3343 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update; 3344 $label->update;
3345 $label->set_max_size (undef, $label->{req_h} * $diff)
3346 if $diff < 1;
3141 $self->{timer}->interval (1/30); 3347 $self->{timer}->interval (1/30);
3348 } else {
3349 $label->{fg}[3] = $item->{fg}[3] || 1;
3142 } 3350 }
3351
3352 push @widgets, $label;
3143 } 3353 }
3144 3354
3145 $self->clear; 3355 $self->clear;
3146 $self->SUPER::add (reverse @widgets); 3356 $self->SUPER::add (reverse @widgets);
3147} 3357}
… …
3163 $item->{count}++; 3373 $item->{count}++;
3164 } else { 3374 } else {
3165 $item->{count} = 1; 3375 $item->{count} = 1;
3166 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
3167 } 3377 }
3168 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
3169 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
3170 delete $item->{label}; 3380 delete $item->{label};
3171 } else { 3381 } else {
3172 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
3173 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
3192 3402
3193 $self->reorder; 3403 $self->reorder;
3194 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
3195} 3405}
3196 3406
3197sub DESTROY { 3407sub destroy {
3198 my ($self) = @_; 3408 my ($self) = @_;
3199 3409
3200 $self->{timer}->cancel; 3410 $self->{timer}->cancel;
3201 3411
3202 $self->SUPER::DESTROY; 3412 $self->SUPER::destroy;
3203} 3413}
3204 3414
3205############################################################################# 3415#############################################################################
3206 3416
3207package CFClient::UI::Inventory; 3417package CFClient::UI::Inventory;
… …
3308 $self->update_binding_widgets; 3518 $self->update_binding_widgets;
3309 3519
3310 $self 3520 $self
3311} 3521}
3312 3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3313sub commit { 3535sub commit {
3314 my ($self) = @_; 3536 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding; 3537 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) { 3538 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3351 my ($self) = @_; 3573 my ($self) = @_;
3352 $self->ask_for_bind (1); 3574 $self->ask_for_bind (1);
3353} 3575}
3354 3576
3355sub ask_for_bind { 3577sub ask_for_bind {
3356 my ($self, $commit) = @_; 3578 my ($self, $commit, $end_cb) = @_;
3357 3579
3358 CFClient::Binder::open_binding_dialog (sub { 3580 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_; 3581 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets; 3583 $self->update_binding_widgets;
3362 $self->commit if $commit; 3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3363 }); 3586 });
3364} 3587}
3365 3588
3366# $mod and $sym are the modifiers and key symbol 3589# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands) 3590# $cmds is a array ref of strings (the commands)
… …
3385} 3608}
3386 3609
3387# this is a shortcut method that asks for a binding 3610# this is a shortcut method that asks for a binding
3388# and then just binds it. 3611# and then just binds it.
3389sub do_quick_binding { 3612sub do_quick_binding {
3390 my ($self, $cmds) = @_; 3613 my ($self, $cmds, $end_cb) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub { 3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1); 3615 $self->ask_for_bind (1, $end_cb);
3395} 3616}
3396 3617
3397sub update_binding_widgets { 3618sub update_binding_widgets {
3398 my ($self) = @_; 3619 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding; 3620 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3455 commands => [], 3676 commands => [],
3456 @_, 3677 @_,
3457 ) 3678 )
3458} 3679}
3459 3680
3460# XXX: Do sorting? Argl... 3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3461sub add_spell { 3766sub add_spell {
3462 my ($self, $spell) = @_; 3767 my ($self, $spell) = @_;
3768
3463 $self->{spells}->{$spell->{name}} = $spell; 3769 $self->{spell}->{$spell->{name}} = $spell;
3464 3770 $self->rebuild_spell_list;
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492} 3771}
3493 3772
3494sub remove_spell { 3773sub remove_spell {
3495 my ($self, $spell) = @_; 3774 my ($self, $spell) = @_;
3775
3496 delete $self->{spells}->{$spell->{name}}; 3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3497 $self->rebuild_spell_list; 3784 $self->rebuild_spell_list;
3498} 3785}
3499 3786
3500############################################################################# 3787#############################################################################
3501 3788
… …
3538 $coord = $max - $size if $coord > $max - $size; 3825 $coord = $max - $size if $coord > $max - $size;
3539 3826
3540 int $coord + 0.5 3827 int $coord + 0.5
3541} 3828}
3542 3829
3543sub size_allocate { 3830sub invoke_size_allocate {
3544 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
3545 3832
3546 for my $child ($self->children) { 3833 for my $child ($self->children) {
3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3548 3835
… …
3552 $X = _to_pixel $X, $W, $self->{w}; 3839 $X = _to_pixel $X, $W, $self->{w};
3553 $Y = _to_pixel $Y, $H, $self->{h}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3554 3841
3555 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3556 } 3843 }
3844
3845 1
3557} 3846}
3558 3847
3559sub coord2local { 3848sub coord2local {
3560 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3561 3850

Diff Legend

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