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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 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 {
… …
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 image => '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->{children};
1416 1444
… …
1553 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1555 1583
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1586
1558 delete $self->{req_h}; 1587 delete $self->{size_req};
1559
1560 $self->realloc; 1588 $self->realloc;
1561 $self->update; 1589 $self->update;
1562} 1590}
1563 1591
1564sub set_markup { 1592sub set_markup {
… …
1569 1597
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1599
1572 $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;
1573 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1602
1574 delete $self->{req_h}; 1603 delete $self->{size_req};
1575
1576 $self->realloc; 1604 $self->realloc;
1577 $self->update; 1605 $self->update;
1578} 1606}
1579 1607
1580sub size_request { 1608sub size_request {
1581 my ($self) = @_; 1609 my ($self) = @_;
1582 1610
1583 if (exists $self->{req_h}) { 1611 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
… …
1599 1625
1600 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1602 } 1628 }
1603 1629
1604 ($w, $h) 1630 [$w, $h]
1605 } 1631 };
1606}
1607 1632
1633 @{ $self->{size_req} }
1634}
1635
1608sub size_allocate { 1636sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1610 1638
1611 delete $self->{ox}; 1639 delete $self->{ox};
1612 1640
1613 delete $self->{texture} 1641 delete $self->{texture}
1614 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
1615} 1645}
1616 1646
1617sub set_fontsize { 1647sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1619 1649
1620 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1621 delete $self->{texture}; 1651 delete $self->{texture};
1622 1652
1623 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1624} 1662}
1625 1663
1626sub _draw { 1664sub _draw {
1627 my ($self) = @_; 1665 my ($self) = @_;
1628 1666
… …
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1650 }; 1688 };
1651 1689
1652 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 {
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654
1655 glColor_premultiply @{$self->{fg}}
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1659 1703
1660 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1661} 1705}
1662 1706
1663############################################################################# 1707#############################################################################
… …
1679 can_hover => 1, 1723 can_hover => 1,
1680 can_focus => 1, 1724 can_focus => 1,
1681 valign => 0, 1725 valign => 0,
1682 can_events => 1, 1726 can_events => 1,
1683 #text => ... 1727 #text => ...
1728 #hidden => "*",
1684 @_ 1729 @_
1685 ) 1730 )
1686} 1731}
1687 1732
1688sub _set_text { 1733sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1741 $self->{text} = $text;
1697 1742
1698 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1745 delete $self->{size_req};
1701 1746
1702 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1703 1748
1704 $self->realloc; 1749 $self->realloc;
1705 $self->update; 1750 $self->update;
1706} 1751}
1707 1752
… …
1722 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1723 1768
1724 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1725} 1770}
1726 1771
1727sub key_down { 1772sub invoke_key_down {
1728 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1729 1774
1730 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1744 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1745 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1747 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 1794 $self->emit ('escape');
1750 } elsif ($uni) { 1795 } elsif ($uni) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 1797 } else {
1753 return 0; 1798 return 0;
1754 } 1799 }
… …
1758 $self->realloc; 1803 $self->realloc;
1759 1804
1760 1 1805 1
1761} 1806}
1762 1807
1763sub focus_in { 1808sub invoke_focus_in {
1764 my ($self) = @_; 1809 my ($self) = @_;
1765 1810
1766 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1767 1812
1768 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1769} 1814}
1770 1815
1771sub button_down { 1816sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1773 1818
1774 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 1820
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 1822
1778 # byte-index to char-index 1823 # byte-index to char-index
1779 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1784 $self->update; 1829 $self->update;
1785 1830
1786 1 1831 1
1787} 1832}
1788 1833
1789sub mouse_motion { 1834sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1791# 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#
1792 1837
1793 0 1838 1
1794} 1839}
1795 1840
1796sub _draw { 1841sub _draw {
1797 my ($self) = @_; 1842 my ($self) = @_;
1798 1843
… …
1839 1884
1840our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1841 1886
1842use CFClient::OpenGL; 1887use CFClient::OpenGL;
1843 1888
1844sub key_down { 1889sub invoke_key_down {
1845 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1846 1891
1847 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1848 1893
1849 if ($sym == 13) { 1894 if ($sym == 13) {
1850 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1852 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1855 $self->update; 1901 $self->update;
1856 1902
1857 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1875 } else { 1921 } else {
1876 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1877 } 1923 }
1878 1924
1879 } else { 1925 } else {
1880 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1881 } 1927 }
1882 1928
1883 1 1929 1
1884} 1930}
1885 1931
… …
1909 can_events => 1, 1955 can_events => 1,
1910 @_ 1956 @_
1911 ) 1957 )
1912} 1958}
1913 1959
1914sub activate { }
1915
1916sub button_up { 1960sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1918 1962
1919 $self->emit ("activate") 1963 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936 1980
1937 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1938 1982
1939 $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
1940} 2020}
1941 2021
1942############################################################################# 2022#############################################################################
1943 2023
1944package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1971 my ($self) = @_; 2051 my ($self) = @_;
1972 2052
1973 (6) x 2 2053 (6) x 2
1974} 2054}
1975 2055
1976sub button_down { 2056sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1978 2058
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1982 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
1983 } else { 2063 } else {
1984 return 0 2064 return 0
1985 } 2065 }
1986 2066
1987 1 2067 1
… …
2284 $self->update; 2364 $self->update;
2285 2365
2286 $self 2366 $self
2287} 2367}
2288 2368
2289sub changed { }
2290
2291sub set_range { 2369sub set_range {
2292 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2293 2371
2294 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2295 2373
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2374 if ("@$range" ne "@{$self->{range}}") {
2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2298} 2378}
2299 2379
2300sub set_value { 2380sub set_value {
2301 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2302 2382
… …
2313 if $unit; 2393 if $unit;
2314 2394
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2396
2317 if ($value != $old_value) { 2397 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2319 $self->update; 2399 $self->update;
2320 } 2400 }
2321} 2401}
2322 2402
2323sub size_request { 2403sub size_request {
2324 my ($self) = @_; 2404 my ($self) = @_;
2325 2405
2326 ($self->{req_w}, $self->{req_h}) 2406 ($self->{req_w}, $self->{req_h})
2327} 2407}
2328 2408
2329sub button_down { 2409sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2331 2411
2332 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2413
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2415
2336 $self->mouse_motion ($ev, $x, $y) 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2417}
2338 2418
2339sub mouse_motion { 2419sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2341 2421
2342 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2424
… …
2449sub set_range { shift->{slider}->set_range (@_) } 2529sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2530sub set_value { shift->{slider}->set_value (@_) }
2451 2531
2452############################################################################# 2532#############################################################################
2453 2533
2454package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2455 2535
2456our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2457 2537
2458use CFClient::OpenGL; 2538use CFClient::OpenGL;
2459 2539
… …
2461 my $class = shift; 2541 my $class = shift;
2462 2542
2463 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2464 fontsize => 1, 2544 fontsize => 1,
2465 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2466 #font => default_font 2547 #font => default_font
2467 @_, 2548 @_,
2468 2549
2469 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2470 par => [], 2551 par => [],
… …
2485 2566
2486 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2487 $self->reflow; 2568 $self->reflow;
2488} 2569}
2489 2570
2490sub size_allocate { 2571sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2492
2493 $self->SUPER::size_allocate ($w, $h);
2494 2573
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 2578
2499 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2500} 2582}
2501 2583
2502sub text_size { 2584sub text_size {
2503 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2504 2586
2505 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2506 2588
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 2590 $layout->set_width ($self->{children}[0]{w} - $indent);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2510 2593
2511 $layout->size 2594 $layout->size
2512} 2595}
2513 2596
… …
2552 2635
2553 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2554 2637
2555 delete $self->{texture}; 2638 delete $self->{texture};
2556 2639
2557 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 2642
2560 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2561 my $height = 0; 2644 my $height = 0;
2562 2645
… …
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566 2649
2567 for (@{$self->{par}}) { 2650 for (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2569 $layout->set_width ($W - $_->[3]); 2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2570 $layout->set_markup ($_->[4]); 2654 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size; 2655 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3]; 2656 $_->[0] = $w + $_->[3];
2573 $_->[1] = $h; 2657 $_->[1] = $h;
2574 } 2658 }
… …
2577 } 2661 }
2578 2662
2579 $self->{height} = $height; 2663 $self->{height} = $height;
2580 2664
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2582 2666
2583 delete $self->{texture}; 2667 delete $self->{texture};
2584 } 2668 }
2585 2669
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 2671 glClearColor 0, 0, 0, 0;
… …
2606 my $h = $par->[1]; 2690 my $h = $par->[1];
2607 2691
2608 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 2693 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2611 $layout->set_markup ($par->[4]); 2696 $layout->set_markup ($par->[4]);
2612 2697
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2614 2699
2615 glRasterPos $par->[3], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
… …
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 2816 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 2817 . "visible $widget->{visible}";
2733 } 2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2734 2822
2735 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2736 markup => $tooltip, 2824 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 2826 fontsize => 0.8,
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 2837
2750 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2751} 2839}
2752 2840
2753sub size_allocate { 2841sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2755 2843
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 2845}
2758 2846
2759sub visibility_change { 2847sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2761 2849
2762 return unless $visible; 2850 return unless $visible;
2763 2851
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2766 or return; 2854 or return;
2767 2855
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 2857
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 2859 if $x + $self->{w} > $self->{root}{w};
2772 2860
2773 $self->move_abs ($x, $y); 2861 $self->move_abs ($x, $y);
2774 }); 2862 });
2775} 2863}
2776 2864
… …
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2873 } 2961 }
2874} 2962}
2875 2963
2876sub DESTROY { 2964sub destroy {
2877 my ($self) = @_; 2965 my ($self) = @_;
2878 2966
2879 $self->{timer}->cancel 2967 $self->{timer}->cancel
2880 if $self->{timer}; 2968 if $self->{timer};
2881 2969
2882 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2883} 2971}
2884 2972
2885############################################################################# 2973#############################################################################
2886 2974
2887package CFClient::UI::Buttonbar; 2975package CFClient::UI::Buttonbar;
… …
2908 ); 2996 );
2909 2997
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2911 2999
2912 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2914 3002
2915 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2916 if (!ref $widget) { 3004 if (!ref $widget) {
2917 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2918 can_hover => 1, 3006 can_hover => 1,
2919 can_events => 1, 3007 can_events => 1,
2920 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2921 } 3010 }
2922 3011
2923 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2924 3013
2925 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2930 3019
2931# popup given the event (must be a mouse button down event currently) 3020# popup given the event (must be a mouse button down event currently)
2932sub popup { 3021sub popup {
2933 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2934 3023
2935 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2936 3025
2937 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3027 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2940 3029
2941 $self->show; 3030 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3032}
2944 3033
2945sub mouse_motion { 3034sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2947 3036
2948 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2951 3040
2952 0 3041 0
2953} 3042}
2954 3043
2955sub button_up { 3044sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2957 3046
2958 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3048 undef $GRAB;
2960 $self->hide; 3049 $self->hide;
2961 3050
2962 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3053 } else {
2965 return 0 3054 return 0
2966 } 3055 }
2967 3056
… …
3004 : $self->{children}[$page_or_widget]; 3093 : $self->{children}[$page_or_widget];
3005 3094
3006 $self->{current} = $widget; 3095 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3097
3009 $self->_emit (page_changed => $self->{current}); 3098 $self->emit (page_changed => $self->{current});
3010 3099
3011 $self->realloc; 3100 $self->realloc;
3012} 3101}
3013 3102
3014sub visible_children { 3103sub visible_children {
… …
3019 my ($self) = @_; 3108 my ($self) = @_;
3020 3109
3021 $self->{current}->size_request 3110 $self->{current}->size_request
3022} 3111}
3023 3112
3024sub size_allocate { 3113sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3114 my ($self, $w, $h) = @_;
3026 3115
3027 $self->{current}->configure (0, 0, $w, $h); 3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3028} 3119}
3029 3120
3030sub _draw { 3121sub _draw {
3031 my ($self) = @_; 3122 my ($self) = @_;
3032 3123
… …
3071 3162
3072sub set_current_page { 3163sub set_current_page {
3073 my ($self, $page) = @_; 3164 my ($self, $page) = @_;
3074 3165
3075 $self->{multiplexer}->set_current_page ($page); 3166 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3167 $self->emit (page_changed => $self->{multiplexer}{current});
3168}
3169
3170#############################################################################
3171
3172package CFClient::UI::Combobox;
3173
3174use utf8;
3175
3176our @ISA = CFClient::UI::Button::;
3177
3178sub new {
3179 my $class = shift;
3180
3181 my $self = $class->SUPER::new (
3182 options => [], # [value, title, longdesc], ...
3183 value => undef,
3184 @_,
3185 );
3186
3187 $self->_set_value ($self->{value});
3188
3189 $self
3190}
3191
3192sub invoke_button_down {
3193 my ($self, $ev) = @_;
3194
3195 my @menu_items;
3196
3197 for (@{ $self->{options} }) {
3198 my ($value, $title, $tooltip) = @$_;
3199
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 }
3202
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204}
3205
3206sub _set_value {
3207 my ($self, $value) = @_;
3208
3209 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3210 or return;
3211
3212 $self->{value} = $item->[0];
3213 $self->set_markup ("$item->[1] ⇓");
3214 $self->set_tooltip ($item->[2]);
3215}
3216
3217sub set_value {
3218 my ($self, $value) = @_;
3219
3220 return unless $self->{value} ne $value;
3221
3222 $self->_set_value ($value);
3223 $self->emit (changed => $value);
3077} 3224}
3078 3225
3079############################################################################# 3226#############################################################################
3080 3227
3081package CFClient::UI::Statusbox; 3228package CFClient::UI::Statusbox;
… …
3180 $item->{count}++; 3327 $item->{count}++;
3181 } else { 3328 } else {
3182 $item->{count} = 1; 3329 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
3184 } 3331 }
3185 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3334 delete $item->{label};
3188 } else { 3335 } else {
3189 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
3209 3356
3210 $self->reorder; 3357 $self->reorder;
3211 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
3212} 3359}
3213 3360
3214sub DESTROY { 3361sub destroy {
3215 my ($self) = @_; 3362 my ($self) = @_;
3216 3363
3217 $self->{timer}->cancel; 3364 $self->{timer}->cancel;
3218 3365
3219 $self->SUPER::DESTROY; 3366 $self->SUPER::destroy;
3220} 3367}
3221 3368
3222############################################################################# 3369#############################################################################
3223 3370
3224package CFClient::UI::Inventory; 3371package CFClient::UI::Inventory;
… …
3368 my ($self) = @_; 3515 my ($self) = @_;
3369 $self->ask_for_bind (1); 3516 $self->ask_for_bind (1);
3370} 3517}
3371 3518
3372sub ask_for_bind { 3519sub ask_for_bind {
3373 my ($self, $commit) = @_; 3520 my ($self, $commit, $end_cb) = @_;
3374 3521
3375 CFClient::Binder::open_binding_dialog (sub { 3522 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_; 3523 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets; 3525 $self->update_binding_widgets;
3379 $self->commit if $commit; 3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3380 }); 3528 });
3381} 3529}
3382 3530
3383# $mod and $sym are the modifiers and key symbol 3531# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands) 3532# $cmds is a array ref of strings (the commands)
… …
3402} 3550}
3403 3551
3404# this is a shortcut method that asks for a binding 3552# this is a shortcut method that asks for a binding
3405# and then just binds it. 3553# and then just binds it.
3406sub do_quick_binding { 3554sub do_quick_binding {
3407 my ($self, $cmds) = @_; 3555 my ($self, $cmds, $end_cb) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub { 3556 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 }); 3558 });
3411 $self->ask_for_bind (1); 3559 $self->ask_for_bind (1, $end_cb);
3412} 3560}
3413 3561
3414sub update_binding_widgets { 3562sub update_binding_widgets {
3415 my ($self) = @_; 3563 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding; 3564 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3472 commands => [], 3620 commands => [],
3473 @_, 3621 @_,
3474 ) 3622 )
3475} 3623}
3476 3624
3477# XXX: Do sorting? Argl... 3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
3657 $row++;
3658
3659 my $spell_cb = sub {
3660 my ($widget, $ev) = @_;
3661
3662 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu
3668 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ],
3672 )->popup ($ev);
3673 } else {
3674 return 0;
3675 }
3676
3677 1
3678 };
3679
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3478sub add_spell { 3710sub add_spell {
3479 my ($self, $spell) = @_; 3711 my ($self, $spell) = @_;
3712
3480 $self->{spells}->{$spell->{name}} = $spell; 3713 $self->{spell}->{$spell->{name}} = $spell;
3481 3714 $self->rebuild_spell_list;
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509} 3715}
3510 3716
3511sub remove_spell { 3717sub remove_spell {
3512 my ($self, $spell) = @_; 3718 my ($self, $spell) = @_;
3719
3513 delete $self->{spells}->{$spell->{name}}; 3720 delete $self->{spell}->{$spell->{name}};
3721 $self->rebuild_spell_list;
3722}
3723
3724sub clear_spells {
3725 my ($self) = @_;
3726
3727 $self->{spell} = {};
3514 $self->rebuild_spell_list; 3728 $self->rebuild_spell_list;
3515} 3729}
3516 3730
3517############################################################################# 3731#############################################################################
3518 3732
… …
3555 $coord = $max - $size if $coord > $max - $size; 3769 $coord = $max - $size if $coord > $max - $size;
3556 3770
3557 int $coord + 0.5 3771 int $coord + 0.5
3558} 3772}
3559 3773
3560sub size_allocate { 3774sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
3562 3776
3563 for my $child ($self->children) { 3777 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3778 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 3779
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 3783 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
3571 3785
3572 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
3573 } 3787 }
3788
3789 1
3574} 3790}
3575 3791
3576sub coord2local { 3792sub coord2local {
3577 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
3578 3794

Diff Legend

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