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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
271 272
272 return unless $self->{visible}; 273 return unless $self->{visible};
273 274
274 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
275 276
277 delete $self->{visible};
276 delete $self->{root}; 278 delete $self->{root};
277 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288} 288}
289 289
290sub set_visibility { 290sub set_visibility {
291 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
314} 314}
315 315
316sub move_abs { 316sub move_abs {
317 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
318 318
319 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
322 322
323 $self->update; 323 $self->update;
324} 324}
325 325
333} 333}
334 334
335sub size_request { 335sub size_request {
336 require Carp; 336 require Carp;
337 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
338} 342}
339 343
340sub configure { 344sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
342 346
366 370
367 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
368 } 372 }
369} 373}
370 374
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 375sub children {
376 # nop 376 # nop
377} 377}
378 378
379sub visible_children { 379sub visible_children {
399 399
400 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
401 401
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
404 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 } 405 }
406} 406}
407 407
408# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
409sub coord2local { 409sub coord2local {
417 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
418 418
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 420}
421 421
422sub focus_in { 422sub invoke_focus_in {
423 my ($self) = @_; 423 my ($self) = @_;
424 424
425 return if $FOCUS == $self; 425 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
427 427
428 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
429 429
430 $self->_emit (focus_in => $focus);
431
432 $focus->update if $focus; 430 $focus->update if $focus;
433 $FOCUS->update; 431 $FOCUS->update;
434}
435 432
433 0
434}
435
436sub focus_out { 436sub invoke_focus_out {
437 my ($self) = @_; 437 my ($self) = @_;
438 438
439 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
440 440
441 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
442 442
443 $self->_emit (focus_out => $focus);
444
445 $focus->update if $focus; #? 443 $focus->update if $focus; #?
446 444
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 446 unless $FOCUS;
449}
450 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
451sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
452sub button_up { 0 } 458sub invoke_button_up { 1 }
453sub key_down { 0 } 459sub invoke_key_down { 1 }
454sub key_up { 0 } 460sub invoke_key_up { 1 }
455 461
456sub button_down { 462sub invoke_button_down {
457 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
458 464
459 $self->focus_in; 465 $self->grab_focus;
460 466
461 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
462} 483}
463 484
464sub find_widget { 485sub find_widget {
465 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
466 487
476sub set_parent { 497sub set_parent {
477 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
478 499
479 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible}; 501 $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} 502}
505 503
506sub realloc { 504sub realloc {
507 my ($self) = @_; 505 my ($self) = @_;
508 506
592 590
593sub DESTROY { 591sub DESTROY {
594 my ($self) = @_; 592 my ($self) = @_;
595 593
596 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
597 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 598}
599 599
600############################################################################# 600#############################################################################
601 601
602package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
767} 767}
768 768
769sub add { 769sub add {
770 my ($self, $child) = @_; 770 my ($self, $child) = @_;
771 771
772 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
775} 774}
776 775
777sub remove { 776sub remove {
778 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
787 786
788sub size_request { 787sub size_request {
789 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
790} 789}
791 790
792sub size_allocate { 791sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
794 793
795 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
796} 797}
797 798
798############################################################################# 799#############################################################################
799 800
800# back-buffered drawing area 801# back-buffered drawing area
816 817
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 819 $self->SUPER::update;
819} 820}
820 821
821sub size_allocate { 822sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
823 824
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
826} 828}
827 829
828sub _render { 830sub _render {
829 my ($self) = @_; 831 my ($self) = @_;
830 832
891 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
892 894
893 ($w, $h) 895 ($w, $h)
894} 896}
895 897
896sub size_allocate { 898sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
898 900
899 my $child = $self->child; 901 my $child = $self->child;
900 902
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 905
904 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
905 $self->update; 907 $self->update;
908
909 1
906} 910}
907 911
908sub set_offset { 912sub set_offset {
909 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
910 914
1000 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1007}
1004 1008
1005sub size_allocate { 1009sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1010 my ($self, $w, $h) = @_;
1007
1008 $self->SUPER::size_allocate ($w, $h);
1009 1011
1010 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1016}
1013 1017
1014#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll 1019# update viewport offset on scroll
1016 1020
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 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); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1076
1073sub new { 1077sub new {
1074 my ($class, %arg) = @_; 1078 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1077 1079
1078 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1083 border => 0.6,
1083 min_w => 16, 1085 min_w => 16,
1084 min_h => 16, 1086 min_h => 16,
1085 %arg, 1087 %arg,
1086 ); 1088 );
1087 1089
1088 $self->{title} = new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1091 align => 0,
1090 valign => 1, 1092 valign => 1,
1091 text => $title, 1093 text => $self->{title},
1092 fontsize => $self->{border} 1094 fontsize => $self->{border},
1093 if defined $title; 1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1094 1105
1095 $self 1106 $self
1096} 1107}
1097 1108
1098sub add { 1109sub add {
1099 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1100 1111
1101 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1115}
1104 1116
1105sub border { 1117sub border {
1106 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1107} 1119}
1108 1120
1109sub size_request { 1121sub size_request {
1110 my ($self) = @_; 1122 my ($self) = @_;
1111 1123
1112 $self->{title}->size_request 1124 $self->{title_widget}->size_request
1113 if $self->{title}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1114 1129
1115 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1116 1131
1117 ( 1132 (
1118 $w + $self->border * 2, 1133 $w + $self->border * 2,
1119 $h + $self->border * 2, 1134 $h + $self->border * 2,
1120 ) 1135 )
1121} 1136}
1122 1137
1123sub size_allocate { 1138sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1125 1140
1126 if ($self->{title}) { 1141 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1145 }
1131 1146
1132 my $border = $self->border; 1147 my $border = $self->border;
1133 1148
1134 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1136 1151
1137 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1138}
1139 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1140sub button_down { 1160sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1142 1162
1143 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1164 my $border = $self->border;
1145 1165
1176 1196
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1198
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1200 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1202 };
1183 } else { 1203 } else {
1184 return 0; 1204 return 0;
1185 } 1205 }
1186 1206
1187 1 1207 1
1188} 1208}
1189 1209
1190sub button_up { 1210sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1192 1212
1193 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1194} 1214}
1195 1215
1196sub mouse_motion { 1216sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1198 1218
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1220
1201 !!$self->{motion} 1221 ! ! $self->{motion}
1202} 1222}
1203 1223
1204sub _draw { 1224sub _draw {
1205 my ($self) = @_; 1225 my ($self) = @_;
1206 1226
1232 1252
1233 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1234 1254
1235 $child->draw; 1255 $child->draw;
1236 1256
1237 if ($self->{title}) { 1257 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1240 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1241} 1266}
1242 1267
1243############################################################################# 1268#############################################################################
1244 1269
1245package CFClient::UI::Table; 1270package CFClient::UI::Table;
1268 1293
1269 $child->set_parent ($self); 1294 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1271 1296
1272 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1273} 1304}
1274 1305
1275# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1307sub clear {
1277 my ($self) = @_; 1308 my ($self) = @_;
1318 (sum @$ws), 1349 (sum @$ws),
1319 (sum @$hs), 1350 (sum @$hs),
1320 ) 1351 )
1321} 1352}
1322 1353
1323sub size_allocate { 1354sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1325 1356
1326 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1327 1358
1328 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
1360 } 1391 }
1361 1392
1362 $y += $row_h; 1393 $y += $row_h;
1363 } 1394 }
1364 1395
1396 1
1365} 1397}
1366 1398
1367sub find_widget { 1399sub find_widget {
1368 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1369 1401
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1440 )
1409} 1441}
1410 1442
1411sub size_allocate { 1443sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1413 1445
1414 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1416 1448
1417 my @req; 1449 my @req;
1418 1450
1419 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1421 } else { 1453 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1424 1456
1425 if ($req > $space) { 1457 if ($req > $space) {
1426 # ah well, not enough space 1458 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1428 } else { 1460 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1462
1431 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1432 1464
1433 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1466 for 0 .. $#children;
1435 } 1467 }
1436 } 1468 }
1437 1469
1438 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1439 1471
1440 my $pos = 0; 1472 my $pos = 0;
1441 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1476
1445 $pos += $alloc; 1477 $pos += $alloc;
1446 } 1478 }
1447 1479
1448 1 1480 1
1542 1574
1543sub realloc { 1575sub realloc {
1544 my ($self) = @_; 1576 my ($self) = @_;
1545 1577
1546 delete $self->{ox}; 1578 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc; 1579 $self->SUPER::realloc;
1549} 1580}
1550 1581
1551sub set_text { 1582sub set_text {
1552 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1555 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1556 1587
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1559 1590
1591 delete $self->{size_req};
1560 $self->realloc; 1592 $self->realloc;
1561 $self->update; 1593 $self->update;
1562} 1594}
1563 1595
1564sub set_markup { 1596sub set_markup {
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1603
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1574 1606
1607 delete $self->{size_req};
1575 $self->realloc; 1608 $self->realloc;
1576 $self->update; 1609 $self->update;
1577} 1610}
1578 1611
1579sub size_request { 1612sub size_request {
1580 my ($self) = @_; 1613 my ($self) = @_;
1581 1614
1582 if (exists $self->{req_h}) { 1615 $self->{size_req} ||= do {
1583 @$self{qw(req_w req_h)}
1584 } else {
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1629
1599 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1600 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1601 } 1632 }
1602 1633
1603 ($w, $h) 1634 [$w, $h]
1604 } 1635 };
1605}
1606 1636
1637 @{ $self->{size_req} }
1638}
1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1607sub size_allocate { 1644sub invoke_size_allocate {
1608 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1609 1646
1610 delete $self->{ox}; 1647 delete $self->{ox};
1611 1648
1612 delete $self->{texture} 1649 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1614} 1653}
1615 1654
1616sub set_fontsize { 1655sub set_fontsize {
1617 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1618 1657
1619 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1620 delete $self->{texture}; 1659 delete $self->{texture};
1621 1660
1622 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1623} 1670}
1624 1671
1625sub _draw { 1672sub _draw {
1626 my ($self) = @_; 1673 my ($self) = @_;
1627 1674
1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1648 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1649 }; 1696 };
1650 1697
1651 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1702
1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653
1654 glColor_premultiply @{$self->{fg}}
1655 if $tex->{format} == GL_ALPHA;
1656
1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1658 1711
1659 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1660} 1713}
1661 1714
1662############################################################################# 1715#############################################################################
1678 can_hover => 1, 1731 can_hover => 1,
1679 can_focus => 1, 1732 can_focus => 1,
1680 valign => 0, 1733 valign => 0,
1681 can_events => 1, 1734 can_events => 1,
1682 #text => ... 1735 #text => ...
1736 #hidden => "*",
1683 @_ 1737 @_
1684 ) 1738 )
1685} 1739}
1686 1740
1687sub _set_text { 1741sub _set_text {
1694 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1695 $self->{text} = $text; 1749 $self->{text} = $text;
1696 1750
1697 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1698 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1699 1754
1700 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1701 $self->update; 1758 $self->update;
1702} 1759}
1703 1760
1704sub set_text { 1761sub set_text {
1705 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1706 1763
1707 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1708 $self->_set_text ($text); 1765 $self->_set_text ($text);
1709
1710 $self->realloc;
1711} 1766}
1712 1767
1713sub get_text { 1768sub get_text {
1714 $_[0]{text} 1769 $_[0]{text}
1715} 1770}
1720 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1721 1776
1722 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1723} 1778}
1724 1779
1725sub key_down { 1780sub invoke_key_down {
1726 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1727 1782
1728 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1729 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1730 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
1742 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1743 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1744 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1745 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1746 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1747 $self->_emit ('escape'); 1802 $self->emit ('escape');
1748 } elsif ($uni) { 1803 } elsif ($uni) {
1749 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else { 1805 } else {
1751 return 0; 1806 return 0;
1752 } 1807 }
1756 $self->realloc; 1811 $self->realloc;
1757 1812
1758 1 1813 1
1759} 1814}
1760 1815
1761sub focus_in { 1816sub invoke_focus_in {
1762 my ($self) = @_; 1817 my ($self) = @_;
1763 1818
1764 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1765 1820
1766 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1767} 1822}
1768 1823
1769sub button_down { 1824sub invoke_button_down {
1770 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1771 1826
1772 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1773 1828
1774 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1775 1830
1776 # byte-index to char-index 1831 # byte-index to char-index
1777 my $text = $self->{text}; 1832 my $text = $self->{text};
1782 $self->update; 1837 $self->update;
1783 1838
1784 1 1839 1
1785} 1840}
1786 1841
1787sub mouse_motion { 1842sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790 1845
1791 0 1846 1
1792} 1847}
1793 1848
1794sub _draw { 1849sub _draw {
1795 my ($self) = @_; 1850 my ($self) = @_;
1796 1851
1837 1892
1838our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1839 1894
1840use CFClient::OpenGL; 1895use CFClient::OpenGL;
1841 1896
1842sub key_down { 1897sub invoke_key_down {
1843 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1844 1899
1845 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1846 1901
1847 if ($sym == 13) { 1902 if ($sym == 13) {
1848 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1849 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1850 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1851 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1852 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1853 $self->update; 1909 $self->update;
1854 1910
1855 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1856 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1857 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
1873 } else { 1929 } else {
1874 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1875 } 1931 }
1876 1932
1877 } else { 1933 } else {
1878 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1879 } 1935 }
1880 1936
1881 1 1937 1
1882} 1938}
1883 1939
1907 can_events => 1, 1963 can_events => 1,
1908 @_ 1964 @_
1909 ) 1965 )
1910} 1966}
1911 1967
1912sub activate { }
1913
1914sub button_up { 1968sub invoke_button_up {
1915 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1916 1970
1917 $self->emit ("activate") 1971 $self->emit ("activate")
1918 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1919 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1933 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1934 1988
1935 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1936 1990
1937 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1938} 2028}
1939 2029
1940############################################################################# 2030#############################################################################
1941 2031
1942package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1969 my ($self) = @_; 2059 my ($self) = @_;
1970 2060
1971 (6) x 2 2061 (6) x 2
1972} 2062}
1973 2063
1974sub button_down { 2064sub invoke_button_down {
1975 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1976 2066
1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1980 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
1981 } else { 2071 } else {
1982 return 0 2072 return 0
1983 } 2073 }
1984 2074
1985 1 2075 1
2010package CFClient::UI::Image; 2100package CFClient::UI::Image;
2011 2101
2012our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
2013 2103
2014use CFClient::OpenGL; 2104use CFClient::OpenGL;
2015use Carp qw/confess/;
2016 2105
2017our %loaded_images; 2106our %texture_cache;
2018 2107
2019sub new { 2108sub new {
2020 my $class = shift; 2109 my $class = shift;
2021 2110
2022 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2023 2115
2024 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2025 2118
2026 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2027 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2028 2121
2029 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2030 2123
2031 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033 $self->{aspect} = $tex->{w} / $tex->{h};
2034 2125
2035 $self 2126 $self
2036} 2127}
2037 2128
2038sub size_request { 2129sub size_request {
2039 my ($self) = @_; 2130 my ($self) = @_;
2040 2131
2041 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
2042} 2133}
2043 2134
2044sub _draw { 2135sub _draw {
2045 my ($self) = @_; 2136 my ($self) = @_;
2046 2137
2282 $self->update; 2373 $self->update;
2283 2374
2284 $self 2375 $self
2285} 2376}
2286 2377
2287sub changed { }
2288
2289sub set_range { 2378sub set_range {
2290 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2291 2380
2292 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2293 2382
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2296} 2387}
2297 2388
2298sub set_value { 2389sub set_value {
2299 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2300 2391
2311 if $unit; 2402 if $unit;
2312 2403
2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314 2405
2315 if ($value != $old_value) { 2406 if ($value != $old_value) {
2316 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2317 $self->update; 2408 $self->update;
2318 } 2409 }
2319} 2410}
2320 2411
2321sub size_request { 2412sub size_request {
2322 my ($self) = @_; 2413 my ($self) = @_;
2323 2414
2324 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2325} 2416}
2326 2417
2327sub button_down { 2418sub invoke_button_down {
2328 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2329 2420
2330 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2331 2422
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333 2424
2334 $self->mouse_motion ($ev, $x, $y) 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2335} 2426}
2336 2427
2337sub mouse_motion { 2428sub invoke_mouse_motion {
2338 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2339 2430
2340 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342 2433
2447sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2449 2540
2450############################################################################# 2541#############################################################################
2451 2542
2452package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2453 2544
2454our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2455 2546
2456use CFClient::OpenGL; 2547use CFClient::OpenGL;
2457 2548
2459 my $class = shift; 2550 my $class = shift;
2460 2551
2461 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2462 fontsize => 1, 2553 fontsize => 1,
2463 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2464 #font => default_font 2556 #font => default_font
2465 @_, 2557 @_,
2466 2558
2467 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2468 par => [], 2560 par => [],
2483 2575
2484 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2485 $self->reflow; 2577 $self->reflow;
2486} 2578}
2487 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2488sub size_allocate { 2586sub invoke_size_allocate {
2489 my ($self, $w, $h) = @_; 2587 my ($self, $w, $h) = @_;
2490 2588
2491 $self->SUPER::size_allocate ($w, $h); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492 2591
2493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496 2596
2497 $self->reflow; 2597 $self->reflow;
2498}
2499 2598
2500sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2501 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2502 2604
2503 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2504 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2508 2618 );
2619
2509 $layout->size 2620 $layout
2510} 2621}
2511 2622
2512sub reflow { 2623sub reflow {
2513 my ($self) = @_; 2624 my ($self) = @_;
2514 2625
2523 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2524} 2635}
2525 2636
2526sub clear { 2637sub clear {
2527 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2528 2642
2529 $self->{par} = []; 2643 $self->{par} = [];
2530 $self->{height} = 0; 2644 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532} 2646}
2533 2647
2534sub add_paragraph { 2648sub add_paragraph {
2535 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2536 2650
2537 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2538 my ($w, $h) = $self->text_size ($line); 2652
2539 $self->{height} += $h; 2653 $para = {
2540 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2541 } 2660 };
2542 2661
2543 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2544} 2674}
2545 2675
2546sub update { 2676sub update {
2547 my ($self) = @_; 2677 my ($self) = @_;
2548 2678
2550 2680
2551 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2552 2682
2553 delete $self->{texture}; 2683 delete $self->{texture};
2554 2684
2555 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557 2687
2558 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2559 my $height = 0; 2689 my $height = 0;
2560 2690
2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2567 $layout->set_width ($W - $_->[3]); 2693 my $layout = $self->get_layout ($para);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size; 2694 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3]; 2695
2571 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2572 } 2699 }
2573 2700
2574 $height += $_->[1]; 2701 $height += $para->{h};
2575 } 2702 }
2576 2703
2577 $self->{height} = $height; 2704 $self->{height} = $height;
2578 2705
2579 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2580 2707
2581 delete $self->{texture}; 2708 delete $self->{texture};
2709 }
2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2582 } 2713 }
2583 2714
2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2585 glClearColor 0, 0, 0, 0; 2716 glClearColor 0, 0, 0, 0;
2586 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2590 my $y0 = $top; 2721 my $y0 = $top;
2591 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2592 2723
2593 my $y = 0; 2724 my $y = 0;
2594 2725
2595 my $layout = $self->{layout};
2596
2597 $layout->set_font ($self->{font}) if $self->{font};
2598
2599 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602 2729
2603 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2604 my $h = $par->[1]; 2731 my $h = $para->{h};
2605 2732
2606 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2607 $layout->set_foreground (@{ $par->[2] }); 2734
2608 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2609 $layout->set_markup ($par->[4]);
2610 2736
2611 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2612 2738
2613 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2614 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2615 } 2754 }
2616 2755
2617 $y += $h; 2756 $y += $h;
2618 } 2757 }
2619 2758
2620 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2621 }; 2760 };
2622 }); 2761 });
2762}
2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2623} 2771}
2624 2772
2625sub _draw { 2773sub _draw {
2626 my ($self) = @_; 2774 my ($self) = @_;
2627 2775
2630 glColor 0, 0, 0, 1; 2778 glColor 0, 0, 0, 1;
2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2633 2781
2634 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2635
2636} 2783}
2637 2784
2638############################################################################# 2785#############################################################################
2639 2786
2640package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
2727 $tooltip .= "\n\n" . (ref $widget) . "\n" 2874 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2875 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n" 2876 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}"; 2877 . "visible $widget->{visible}";
2731 } 2878 }
2879
2880 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//;
2732 2882
2733 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2734 markup => $tooltip, 2884 markup => $tooltip,
2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736 fontsize => 0.8, 2886 fontsize => 0.8,
2746 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747 2897
2748 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2749} 2899}
2750 2900
2751sub size_allocate { 2901sub invoke_size_allocate {
2752 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2753 2903
2754 $self->SUPER::size_allocate ($w - 4, $h - 4); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755} 2905}
2756 2906
2757sub visibility_change { 2907sub invoke_visibility_change {
2758 my ($self, $visible) = @_; 2908 my ($self, $visible) = @_;
2759 2909
2760 return unless $visible; 2910 return unless $visible;
2761 2911
2762 $self->{root}->on_post_alloc ("move_$self" => sub { 2912 $self->{root}->on_post_alloc ("move_$self" => sub {
2764 or return; 2914 or return;
2765 2915
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767 2917
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH; 2919 if $x + $self->{w} > $self->{root}{w};
2770 2920
2771 $self->move_abs ($x, $y); 2921 $self->move_abs ($x, $y);
2772 }); 2922 });
2773} 2923}
2774 2924
2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2871 } 3021 }
2872} 3022}
2873 3023
2874sub DESTROY { 3024sub destroy {
2875 my ($self) = @_; 3025 my ($self) = @_;
2876 3026
2877 $self->{timer}->cancel 3027 $self->{timer}->cancel
2878 if $self->{timer}; 3028 if $self->{timer};
2879 3029
2880 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2881} 3031}
2882 3032
2883############################################################################# 3033#############################################################################
2884 3034
2885package CFClient::UI::Buttonbar; 3035package CFClient::UI::Buttonbar;
2906 ); 3056 );
2907 3057
2908 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2909 3059
2910 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2911 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2912 3062
2913 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2914 if (!ref $widget) { 3064 if (!ref $widget) {
2915 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2916 can_hover => 1, 3066 can_hover => 1,
2917 can_events => 1, 3067 can_events => 1,
2918 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2919 } 3070 }
2920 3071
2921 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2922 3073
2923 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
2928 3079
2929# popup given the event (must be a mouse button down event currently) 3080# popup given the event (must be a mouse button down event currently)
2930sub popup { 3081sub popup {
2931 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
2932 3083
2933 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
2934 3085
2935 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2936 $GRAB = $self; 3087 $GRAB = $self;
2937 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2938 3089
2939 $self->show; 3090 $self->show;
2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941} 3092}
2942 3093
2943sub mouse_motion { 3094sub invoke_mouse_motion {
2944 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2945 3096
2946 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2949 3100
2950 0 3101 0
2951} 3102}
2952 3103
2953sub button_up { 3104sub invoke_button_up {
2954 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2955 3106
2956 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2957 undef $GRAB; 3108 undef $GRAB;
2958 $self->hide; 3109 $self->hide;
2959 3110
2960 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
2961 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
2962 } else { 3113 } else {
2963 return 0 3114 return 0
2964 } 3115 }
2965 3116
3002 : $self->{children}[$page_or_widget]; 3153 : $self->{children}[$page_or_widget];
3003 3154
3004 $self->{current} = $widget; 3155 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006 3157
3007 $self->_emit (page_changed => $self->{current}); 3158 $self->emit (page_changed => $self->{current});
3008 3159
3009 $self->realloc; 3160 $self->realloc;
3010} 3161}
3011 3162
3012sub visible_children { 3163sub visible_children {
3017 my ($self) = @_; 3168 my ($self) = @_;
3018 3169
3019 $self->{current}->size_request 3170 $self->{current}->size_request
3020} 3171}
3021 3172
3022sub size_allocate { 3173sub invoke_size_allocate {
3023 my ($self, $w, $h) = @_; 3174 my ($self, $w, $h) = @_;
3024 3175
3025 $self->{current}->configure (0, 0, $w, $h); 3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3026} 3179}
3027 3180
3028sub _draw { 3181sub _draw {
3029 my ($self) = @_; 3182 my ($self) = @_;
3030 3183
3069 3222
3070sub set_current_page { 3223sub set_current_page {
3071 my ($self, $page) = @_; 3224 my ($self, $page) = @_;
3072 3225
3073 $self->{multiplexer}->set_current_page ($page); 3226 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current}); 3227 $self->emit (page_changed => $self->{multiplexer}{current});
3228}
3229
3230#############################################################################
3231
3232package CFClient::UI::Combobox;
3233
3234use utf8;
3235
3236our @ISA = CFClient::UI::Button::;
3237
3238sub new {
3239 my $class = shift;
3240
3241 my $self = $class->SUPER::new (
3242 options => [], # [value, title, longdesc], ...
3243 value => undef,
3244 @_,
3245 );
3246
3247 $self->_set_value ($self->{value});
3248
3249 $self
3250}
3251
3252sub invoke_button_down {
3253 my ($self, $ev) = @_;
3254
3255 my @menu_items;
3256
3257 for (@{ $self->{options} }) {
3258 my ($value, $title, $tooltip) = @$_;
3259
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 }
3262
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264}
3265
3266sub _set_value {
3267 my ($self, $value) = @_;
3268
3269 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3270 or return;
3271
3272 $self->{value} = $item->[0];
3273 $self->set_markup ("$item->[1] ⇓");
3274 $self->set_tooltip ($item->[2]);
3275}
3276
3277sub set_value {
3278 my ($self, $value) = @_;
3279
3280 return unless $self->{value} ne $value;
3281
3282 $self->_set_value ($value);
3283 $self->emit (changed => $value);
3075} 3284}
3076 3285
3077############################################################################# 3286#############################################################################
3078 3287
3079package CFClient::UI::Statusbox; 3288package CFClient::UI::Statusbox;
3178 $item->{count}++; 3387 $item->{count}++;
3179 } else { 3388 } else {
3180 $item->{count} = 1; 3389 $item->{count} = 1;
3181 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
3182 } 3391 }
3183 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
3184 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
3185 delete $item->{label}; 3394 delete $item->{label};
3186 } else { 3395 } else {
3187 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
3188 id => ++$self->{id}, 3397 id => ++$self->{id},
3207 3416
3208 $self->reorder; 3417 $self->reorder;
3209 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
3210} 3419}
3211 3420
3212sub DESTROY { 3421sub destroy {
3213 my ($self) = @_; 3422 my ($self) = @_;
3214 3423
3215 $self->{timer}->cancel; 3424 $self->{timer}->cancel;
3216 3425
3217 $self->SUPER::DESTROY; 3426 $self->SUPER::destroy;
3218} 3427}
3219 3428
3220############################################################################# 3429#############################################################################
3221 3430
3222package CFClient::UI::Inventory; 3431package CFClient::UI::Inventory;
3323 $self->update_binding_widgets; 3532 $self->update_binding_widgets;
3324 3533
3325 $self 3534 $self
3326} 3535}
3327 3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3328sub commit { 3549sub commit {
3329 my ($self) = @_; 3550 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding; 3551 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) { 3552 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3366 my ($self) = @_; 3587 my ($self) = @_;
3367 $self->ask_for_bind (1); 3588 $self->ask_for_bind (1);
3368} 3589}
3369 3590
3370sub ask_for_bind { 3591sub ask_for_bind {
3371 my ($self, $commit) = @_; 3592 my ($self, $commit, $end_cb) = @_;
3372 3593
3373 CFClient::Binder::open_binding_dialog (sub { 3594 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_; 3595 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets; 3597 $self->update_binding_widgets;
3377 $self->commit if $commit; 3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3378 }); 3600 });
3379} 3601}
3380 3602
3381# $mod and $sym are the modifiers and key symbol 3603# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands) 3604# $cmds is a array ref of strings (the commands)
3400} 3622}
3401 3623
3402# this is a shortcut method that asks for a binding 3624# this is a shortcut method that asks for a binding
3403# and then just binds it. 3625# and then just binds it.
3404sub do_quick_binding { 3626sub do_quick_binding {
3405 my ($self, $cmds) = @_; 3627 my ($self, $cmds, $end_cb) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub { 3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1); 3629 $self->ask_for_bind (1, $end_cb);
3410} 3630}
3411 3631
3412sub update_binding_widgets { 3632sub update_binding_widgets {
3413 my ($self) = @_; 3633 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding; 3634 my ($mod, $sym, $cmds) = $self->get_binding;
3470 commands => [], 3690 commands => [],
3471 @_, 3691 @_,
3472 ) 3692 )
3473} 3693}
3474 3694
3475# XXX: Do sorting? Argl... 3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3476sub add_spell { 3780sub add_spell {
3477 my ($self, $spell) = @_; 3781 my ($self, $spell) = @_;
3782
3478 $self->{spells}->{$spell->{name}} = $spell; 3783 $self->{spell}->{$spell->{name}} = $spell;
3479 3784 $self->rebuild_spell_list;
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507} 3785}
3508 3786
3509sub remove_spell { 3787sub remove_spell {
3510 my ($self, $spell) = @_; 3788 my ($self, $spell) = @_;
3789
3511 delete $self->{spells}->{$spell->{name}}; 3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3512 $self->rebuild_spell_list; 3798 $self->rebuild_spell_list;
3513} 3799}
3514 3800
3515############################################################################# 3801#############################################################################
3516 3802
3553 $coord = $max - $size if $coord > $max - $size; 3839 $coord = $max - $size if $coord > $max - $size;
3554 3840
3555 int $coord + 0.5 3841 int $coord + 0.5
3556} 3842}
3557 3843
3558sub size_allocate { 3844sub invoke_size_allocate {
3559 my ($self, $w, $h) = @_; 3845 my ($self, $w, $h) = @_;
3560 3846
3561 for my $child ($self->children) { 3847 for my $child ($self->children) {
3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563 3849
3567 $X = _to_pixel $X, $W, $self->{w}; 3853 $X = _to_pixel $X, $W, $self->{w};
3568 $Y = _to_pixel $Y, $H, $self->{h}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
3569 3855
3570 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3571 } 3857 }
3858
3859 1
3572} 3860}
3573 3861
3574sub coord2local { 3862sub coord2local {
3575 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3576 3864

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines