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.316 by root, Sun Jul 2 13:57:58 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
541 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
542 540
543 # update screen rectangle 541 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548 544
549 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
552 548
592 588
593sub DESTROY { 589sub DESTROY {
594 my ($self) = @_; 590 my ($self) = @_;
595 591
596 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
597 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
598} 596}
599 597
600############################################################################# 598#############################################################################
601 599
602package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
767} 765}
768 766
769sub add { 767sub add {
770 my ($self, $child) = @_; 768 my ($self, $child) = @_;
771 769
772 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
773
774 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
775} 772}
776 773
777sub remove { 774sub remove {
778 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
787 784
788sub size_request { 785sub size_request {
789 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
790} 787}
791 788
792sub size_allocate { 789sub invoke_size_allocate {
793 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
794 791
795 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
796} 795}
797 796
798############################################################################# 797#############################################################################
799 798
800# back-buffered drawing area 799# back-buffered drawing area
816 815
817 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
818 $self->SUPER::update; 817 $self->SUPER::update;
819} 818}
820 819
821sub size_allocate { 820sub invoke_size_allocate {
822 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
823 822
824 $self->SUPER::size_allocate ($w, $h);
825 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
826} 826}
827 827
828sub _render { 828sub _render {
829 my ($self) = @_; 829 my ($self) = @_;
830 830
891 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
892 892
893 ($w, $h) 893 ($w, $h)
894} 894}
895 895
896sub size_allocate { 896sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
898 898
899 my $child = $self->child; 899 my $child = $self->child;
900 900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 903
904 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
905 $self->update; 905 $self->update;
906
907 1
906} 908}
907 909
908sub set_offset { 910sub set_offset {
909 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
910 912
984 $self->add ($child) if $child; 986 $self->add ($child) if $child;
985 987
986 $self 988 $self
987} 989}
988 990
991#TODO# update range on size_allocate depending on child
992
989sub add { 993sub add {
990 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
991 995
992 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
993} 997}
994 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
995sub update { 1005sub update {
996 my ($self) = @_; 1006 my ($self) = @_;
997 1007
998 $self->SUPER::update; 1008 $self->SUPER::update;
999 1009
1000 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1011}
1004 1012
1005sub size_allocate { 1013sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1007 1015
1016 $self->update_slider;
1017
1008 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012} 1019}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1020
1017############################################################################# 1021#############################################################################
1018 1022
1019package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1020 1024
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
1553 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1555 1587
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1590
1558 delete $self->{req_h}; 1591 delete $self->{size_req};
1559
1560 $self->realloc; 1592 $self->realloc;
1561 $self->update; 1593 $self->update;
1562} 1594}
1563 1595
1564sub set_markup { 1596sub set_markup {
1569 1601
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);
1606
1574 delete $self->{req_h}; 1607 delete $self->{size_req};
1575
1576 $self->realloc; 1608 $self->realloc;
1577 $self->update; 1609 $self->update;
1578} 1610}
1579 1611
1580sub size_request { 1612sub size_request {
1581 my ($self) = @_; 1613 my ($self) = @_;
1582 1614
1583 if (exists $self->{req_h}) { 1615 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1599 1629
1600 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1602 } 1632 }
1603 1633
1604 ($w, $h) 1634 [$w, $h]
1605 } 1635 };
1606}
1607 1636
1637 @{ $self->{size_req} }
1638}
1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1608sub size_allocate { 1644sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1610 1646
1611 delete $self->{ox}; 1647 delete $self->{ox};
1612 1648
1613 delete $self->{texture} 1649 delete $self->{texture}
1614 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
1615} 1653}
1616 1654
1617sub set_fontsize { 1655sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1619 1657
1620 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1621 delete $self->{texture}; 1660 delete $self->{texture};
1622 1661
1623 $self->realloc; 1662 $self->realloc;
1663}
1664
1665sub reconfigure {
1666 my ($self) = @_;
1667
1668 delete $self->{size_req};
1669
1670 $self->SUPER::reconfigure;
1624} 1671}
1625 1672
1626sub _draw { 1673sub _draw {
1627 my ($self) = @_; 1674 my ($self) = @_;
1628 1675
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1696 : ($self->{h} - $tex->{h}) * 0.5);
1650 }; 1697 };
1651 1698
1652 glEnable GL_TEXTURE_2D; 1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1703
1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1709 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}); 1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1659 1712
1660 glDisable GL_TEXTURE_2D; 1713 glDisable GL_TEXTURE_2D;
1661} 1714}
1662 1715
1663############################################################################# 1716#############################################################################
1679 can_hover => 1, 1732 can_hover => 1,
1680 can_focus => 1, 1733 can_focus => 1,
1681 valign => 0, 1734 valign => 0,
1682 can_events => 1, 1735 can_events => 1,
1683 #text => ... 1736 #text => ...
1737 #hidden => "*",
1684 @_ 1738 @_
1685 ) 1739 )
1686} 1740}
1687 1741
1688sub _set_text { 1742sub _set_text {
1695 $self->{last_activity} = $::NOW; 1749 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1750 $self->{text} = $text;
1697 1751
1698 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1754 delete $self->{size_req};
1701 1755
1702 $self->_emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1703 1757
1704 $self->realloc; 1758 $self->realloc;
1705 $self->update; 1759 $self->update;
1706} 1760}
1707 1761
1722 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1723 1777
1724 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1725} 1779}
1726 1780
1727sub key_down { 1781sub invoke_key_down {
1728 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1729 1783
1730 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
1744 } elsif ($sym == CFClient::SDLK_HOME) { 1798 } elsif ($sym == CFClient::SDLK_HOME) {
1745 $self->{cursor} = 0; 1799 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) { 1800 } elsif ($sym == CFClient::SDLK_END) {
1747 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 1803 $self->emit ('escape');
1750 } elsif ($uni) { 1804 } elsif ($uni) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 1806 } else {
1753 return 0; 1807 return 0;
1754 } 1808 }
1758 $self->realloc; 1812 $self->realloc;
1759 1813
1760 1 1814 1
1761} 1815}
1762 1816
1763sub focus_in { 1817sub invoke_focus_in {
1764 my ($self) = @_; 1818 my ($self) = @_;
1765 1819
1766 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1767 1821
1768 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1769} 1823}
1770 1824
1771sub button_down { 1825sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1773 1827
1774 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 1829
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 1831
1778 # byte-index to char-index 1832 # byte-index to char-index
1779 my $text = $self->{text}; 1833 my $text = $self->{text};
1784 $self->update; 1838 $self->update;
1785 1839
1786 1 1840 1
1787} 1841}
1788 1842
1789sub mouse_motion { 1843sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1845# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792 1846
1793 0 1847 1
1794} 1848}
1795 1849
1796sub _draw { 1850sub _draw {
1797 my ($self) = @_; 1851 my ($self) = @_;
1798 1852
1839 1893
1840our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1841 1895
1842use CFClient::OpenGL; 1896use CFClient::OpenGL;
1843 1897
1844sub key_down { 1898sub invoke_key_down {
1845 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1846 1900
1847 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1848 1902
1849 if ($sym == 13) { 1903 if ($sym == 13) {
1850 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1852 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 1909 $self->emit (activate => $txt);
1855 $self->update; 1910 $self->update;
1856 1911
1857 } elsif ($sym == CFClient::SDLK_UP) { 1912 } elsif ($sym == CFClient::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 1913 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 1914 $self->{history_saveback} = $self->get_text;
1875 } else { 1930 } else {
1876 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1877 } 1932 }
1878 1933
1879 } else { 1934 } else {
1880 return $self->SUPER::key_down ($ev) 1935 return $self->SUPER::invoke_key_down ($ev)
1881 } 1936 }
1882 1937
1883 1 1938 1
1884} 1939}
1885 1940
1909 can_events => 1, 1964 can_events => 1,
1910 @_ 1965 @_
1911 ) 1966 )
1912} 1967}
1913 1968
1914sub activate { }
1915
1916sub button_up { 1969sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1918 1971
1919 $self->emit ("activate") 1972 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 1974 && $y >= 0 && $y < $self->{h};
1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936 1989
1937 glDisable GL_TEXTURE_2D; 1990 glDisable GL_TEXTURE_2D;
1938 1991
1939 $self->SUPER::_draw; 1992 $self->SUPER::_draw;
1993}
1994
1995#############################################################################
1996
1997package CFClient::UI::ImageButton;
1998
1999our @ISA = CFClient::UI::Image::;
2000
2001use CFClient::OpenGL;
2002
2003my %textures;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 padding_x => 4,
2010 padding_y => 4,
2011 fg => [1, 1, 1],
2012 active_fg => [0, 0, 1],
2013 can_hover => 1,
2014 align => 0,
2015 valign => 0,
2016 can_events => 1,
2017 @_
2018 );
2019}
2020
2021sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_;
2023
2024 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h};
2027
2028 1
1940} 2029}
1941 2030
1942############################################################################# 2031#############################################################################
1943 2032
1944package CFClient::UI::CheckBox; 2033package CFClient::UI::CheckBox;
1971 my ($self) = @_; 2060 my ($self) = @_;
1972 2061
1973 (6) x 2 2062 (6) x 2
1974} 2063}
1975 2064
1976sub button_down { 2065sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1978 2067
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
1982 $self->_emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
1983 } else { 2072 } else {
1984 return 0 2073 return 0
1985 } 2074 }
1986 2075
1987 1 2076 1
2012package CFClient::UI::Image; 2101package CFClient::UI::Image;
2013 2102
2014our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
2015 2104
2016use CFClient::OpenGL; 2105use CFClient::OpenGL;
2017use Carp qw/confess/;
2018 2106
2019our %loaded_images; 2107our %texture_cache;
2020 2108
2021sub new { 2109sub new {
2022 my $class = shift; 2110 my $class = shift;
2023 2111
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2025 2116
2026 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2027 2119
2028 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2029 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2030 2122
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2032 2124
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2126
2037 $self 2127 $self
2038} 2128}
2039 2129
2040sub size_request { 2130sub size_request {
2041 my ($self) = @_; 2131 my ($self) = @_;
2042 2132
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
2044} 2134}
2045 2135
2046sub _draw { 2136sub _draw {
2047 my ($self) = @_; 2137 my ($self) = @_;
2048 2138
2284 $self->update; 2374 $self->update;
2285 2375
2286 $self 2376 $self
2287} 2377}
2288 2378
2289sub changed { }
2290
2291sub set_range { 2379sub set_range {
2292 my ($self, $range) = @_; 2380 my ($self, $range) = @_;
2293 2381
2294 ($range, $self->{range}) = ($self->{range}, $range); 2382 ($range, $self->{range}) = ($self->{range}, $range);
2295 2383
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2384 if ("@$range" ne "@{$self->{range}}") {
2385 $self->update;
2386 $self->set_value ($self->{range}[0]);
2387 }
2298} 2388}
2299 2389
2300sub set_value { 2390sub set_value {
2301 my ($self, $value) = @_; 2391 my ($self, $value) = @_;
2302 2392
2313 if $unit; 2403 if $unit;
2314 2404
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2406
2317 if ($value != $old_value) { 2407 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2408 $self->emit (changed => $value);
2319 $self->update; 2409 $self->update;
2320 } 2410 }
2321} 2411}
2322 2412
2323sub size_request { 2413sub size_request {
2324 my ($self) = @_; 2414 my ($self) = @_;
2325 2415
2326 ($self->{req_w}, $self->{req_h}) 2416 ($self->{req_w}, $self->{req_h})
2327} 2417}
2328 2418
2329sub button_down { 2419sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2331 2421
2332 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2423
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2425
2336 $self->mouse_motion ($ev, $x, $y) 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2427}
2338 2428
2339sub mouse_motion { 2429sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2341 2431
2342 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2434
2449sub set_range { shift->{slider}->set_range (@_) } 2539sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2540sub set_value { shift->{slider}->set_value (@_) }
2451 2541
2452############################################################################# 2542#############################################################################
2453 2543
2454package CFClient::UI::TextView; 2544package CFClient::UI::TextScroller;
2455 2545
2456our @ISA = CFClient::UI::HBox::; 2546our @ISA = CFClient::UI::HBox::;
2457 2547
2458use CFClient::OpenGL; 2548use CFClient::OpenGL;
2459 2549
2461 my $class = shift; 2551 my $class = shift;
2462 2552
2463 my $self = $class->SUPER::new ( 2553 my $self = $class->SUPER::new (
2464 fontsize => 1, 2554 fontsize => 1,
2465 can_events => 0, 2555 can_events => 0,
2556 indent => 0,
2466 #font => default_font 2557 #font => default_font
2467 @_, 2558 @_,
2468 2559
2469 layout => (new CFClient::Layout 1), 2560 layout => (new CFClient::Layout 1),
2470 par => [], 2561 par => [],
2485 2576
2486 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2487 $self->reflow; 2578 $self->reflow;
2488} 2579}
2489 2580
2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2490sub size_allocate { 2590sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2492 2592
2493 $self->SUPER::size_allocate ($w, $h); 2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 2595
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 2600
2499 $self->reflow; 2601 $self->reflow;
2500}
2501 2602
2502sub text_size { 2603 local $self->{children} = [$empty, $slider];
2503 my ($self, $text, $indent) = @_; 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2608 my ($self, $para) = @_;
2504 2609
2505 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2506 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2510 2623 );
2624
2511 $layout->size 2625 $layout
2512} 2626}
2513 2627
2514sub reflow { 2628sub reflow {
2515 my ($self) = @_; 2629 my ($self) = @_;
2516 2630
2525 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2526} 2640}
2527 2641
2528sub clear { 2642sub clear {
2529 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2530 2647
2531 $self->{par} = []; 2648 $self->{par} = [];
2532 $self->{height} = 0; 2649 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 2651}
2535 2652
2536sub add_paragraph { 2653sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2538 2655
2539 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2540 my ($w, $h) = $self->text_size ($line); 2657
2541 $self->{height} += $h; 2658 $para = {
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2543 } 2665 };
2544 2666
2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2669
2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2673
2674sub scroll_to_bottom {
2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2546} 2679}
2547 2680
2548sub update { 2681sub update {
2549 my ($self) = @_; 2682 my ($self) = @_;
2550 2683
2552 2685
2553 return unless $self->{h} > 0; 2686 return unless $self->{h} > 0;
2554 2687
2555 delete $self->{texture}; 2688 delete $self->{texture};
2556 2689
2557 $ROOT->on_post_alloc ($self, sub { 2690 $ROOT->on_post_alloc ($self => sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 2692
2560 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2561 my $height = 0; 2694 my $height = 0;
2562 2695
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2569 $layout->set_width ($W - $_->[3]); 2698 my $layout = $self->get_layout ($para);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size; 2699 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3]; 2700
2573 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2574 } 2704 }
2575 2705
2576 $height += $_->[1]; 2706 $height += $para->{h};
2577 } 2707 }
2578 2708
2579 $self->{height} = $height; 2709 $self->{height} = $height;
2580 2710
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2582 2712
2583 delete $self->{texture}; 2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2584 } 2718 }
2585 2719
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 2721 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
2592 my $y0 = $top; 2726 my $y0 = $top;
2593 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2594 2728
2595 my $y = 0; 2729 my $y = 0;
2596 2730
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2601 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604 2734
2605 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 2736 my $h = $para->{h};
2607 2737
2608 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 2739
2610 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2611 $layout->set_markup ($par->[4]);
2612 2741
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2614 2743
2615 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2617 } 2762 }
2618 2763
2619 $y += $h; 2764 $y += $h;
2620 } 2765 }
2621 2766
2622 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2623 }; 2768 };
2624 }); 2769 });
2770}
2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2625} 2779}
2626 2780
2627sub _draw { 2781sub _draw {
2628 my ($self) = @_; 2782 my ($self) = @_;
2629 2783
2632 glColor 0, 0, 0, 1; 2786 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2635 2789
2636 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2637
2638} 2791}
2639 2792
2640############################################################################# 2793#############################################################################
2641 2794
2642package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 2882 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 2884 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 2885 . "visible $widget->{visible}";
2733 } 2886 }
2887
2888 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//;
2734 2890
2735 $self->add (new CFClient::UI::Label 2891 $self->add (new CFClient::UI::Label
2736 markup => $tooltip, 2892 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 2894 fontsize => 0.8,
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 2905
2750 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2751} 2907}
2752 2908
2753sub size_allocate { 2909sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2755 2911
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 2913}
2758 2914
2759sub visibility_change { 2915sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 2916 my ($self, $visible) = @_;
2761 2917
2762 return unless $visible; 2918 return unless $visible;
2763 2919
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 2920 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 or return; 2922 or return;
2767 2923
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 2925
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 2927 if $x + $self->{w} > $self->{root}{w};
2772 2928
2773 $self->move_abs ($x, $y); 2929 $self->move_abs ($x, $y);
2774 }); 2930 });
2775} 2931}
2776 2932
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3028 glDisable GL_TEXTURE_2D;
2873 } 3029 }
2874} 3030}
2875 3031
2876sub DESTROY { 3032sub destroy {
2877 my ($self) = @_; 3033 my ($self) = @_;
2878 3034
2879 $self->{timer}->cancel 3035 $self->{timer}->cancel
2880 if $self->{timer}; 3036 if $self->{timer};
2881 3037
2882 $self->SUPER::DESTROY; 3038 $self->SUPER::destroy;
2883} 3039}
2884 3040
2885############################################################################# 3041#############################################################################
2886 3042
2887package CFClient::UI::Buttonbar; 3043package CFClient::UI::Buttonbar;
2908 ); 3064 );
2909 3065
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3066 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2911 3067
2912 for my $item (@{ $self->{items} }) { 3068 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3069 my ($widget, $cb, $tooltip) = @$item;
2914 3070
2915 # handle various types of items, only text for now 3071 # handle various types of items, only text for now
2916 if (!ref $widget) { 3072 if (!ref $widget) {
2917 $widget = new CFClient::UI::Label 3073 $widget = new CFClient::UI::Label
2918 can_hover => 1, 3074 can_hover => 1,
2919 can_events => 1, 3075 can_events => 1,
2920 text => $widget; 3076 markup => $widget,
3077 tooltip => $tooltip
2921 } 3078 }
2922 3079
2923 $self->{item}{$widget} = $item; 3080 $self->{item}{$widget} = $item;
2924 3081
2925 $self->{vbox}->add ($widget); 3082 $self->{vbox}->add ($widget);
2930 3087
2931# popup given the event (must be a mouse button down event currently) 3088# popup given the event (must be a mouse button down event currently)
2932sub popup { 3089sub popup {
2933 my ($self, $ev) = @_; 3090 my ($self, $ev) = @_;
2934 3091
2935 $self->_emit ("popdown"); 3092 $self->emit ("popdown");
2936 3093
2937 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3095 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
2940 3097
2941 $self->show; 3098 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3100}
2944 3101
2945sub mouse_motion { 3102sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
2947 3104
2948 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
2951 3108
2952 0 3109 0
2953} 3110}
2954 3111
2955sub button_up { 3112sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2957 3114
2958 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3116 undef $GRAB;
2960 $self->hide; 3117 $self->hide;
2961 3118
2962 $self->_emit ("popdown"); 3119 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3121 } else {
2965 return 0 3122 return 0
2966 } 3123 }
2967 3124
3004 : $self->{children}[$page_or_widget]; 3161 : $self->{children}[$page_or_widget];
3005 3162
3006 $self->{current} = $widget; 3163 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3165
3009 $self->_emit (page_changed => $self->{current}); 3166 $self->emit (page_changed => $self->{current});
3010 3167
3011 $self->realloc; 3168 $self->realloc;
3012} 3169}
3013 3170
3014sub visible_children { 3171sub visible_children {
3019 my ($self) = @_; 3176 my ($self) = @_;
3020 3177
3021 $self->{current}->size_request 3178 $self->{current}->size_request
3022} 3179}
3023 3180
3024sub size_allocate { 3181sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3182 my ($self, $w, $h) = @_;
3026 3183
3027 $self->{current}->configure (0, 0, $w, $h); 3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3028} 3187}
3029 3188
3030sub _draw { 3189sub _draw {
3031 my ($self) = @_; 3190 my ($self) = @_;
3032 3191
3071 3230
3072sub set_current_page { 3231sub set_current_page {
3073 my ($self, $page) = @_; 3232 my ($self, $page) = @_;
3074 3233
3075 $self->{multiplexer}->set_current_page ($page); 3234 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3235 $self->emit (page_changed => $self->{multiplexer}{current});
3236}
3237
3238#############################################################################
3239
3240package CFClient::UI::Combobox;
3241
3242use utf8;
3243
3244our @ISA = CFClient::UI::Button::;
3245
3246sub new {
3247 my $class = shift;
3248
3249 my $self = $class->SUPER::new (
3250 options => [], # [value, title, longdesc], ...
3251 value => undef,
3252 @_,
3253 );
3254
3255 $self->_set_value ($self->{value});
3256
3257 $self
3258}
3259
3260sub invoke_button_down {
3261 my ($self, $ev) = @_;
3262
3263 my @menu_items;
3264
3265 for (@{ $self->{options} }) {
3266 my ($value, $title, $tooltip) = @$_;
3267
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 }
3270
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272}
3273
3274sub _set_value {
3275 my ($self, $value) = @_;
3276
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3278 or return;
3279
3280 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]);
3283}
3284
3285sub set_value {
3286 my ($self, $value) = @_;
3287
3288 return unless $self->{value} ne $value;
3289
3290 $self->_set_value ($value);
3291 $self->emit (changed => $value);
3077} 3292}
3078 3293
3079############################################################################# 3294#############################################################################
3080 3295
3081package CFClient::UI::Statusbox; 3296package CFClient::UI::Statusbox;
3180 $item->{count}++; 3395 $item->{count}++;
3181 } else { 3396 } else {
3182 $item->{count} = 1; 3397 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3398 $item->{text} = $item->{tooltip} = $text;
3184 } 3399 }
3185 $item->{id} = ++$self->{id}; 3400 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3401 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3402 delete $item->{label};
3188 } else { 3403 } else {
3189 $self->{item}{$group} = { 3404 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3405 id => ++$self->{id},
3196 count => 1, 3411 count => 1,
3197 %arg, 3412 %arg,
3198 }; 3413 };
3199 } 3414 }
3200 3415
3416 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 3417 $self->reorder;
3418 });
3202} 3419}
3203 3420
3204sub reconfigure { 3421sub reconfigure {
3205 my ($self) = @_; 3422 my ($self) = @_;
3206 3423
3209 3426
3210 $self->reorder; 3427 $self->reorder;
3211 $self->SUPER::reconfigure; 3428 $self->SUPER::reconfigure;
3212} 3429}
3213 3430
3214sub DESTROY { 3431sub destroy {
3215 my ($self) = @_; 3432 my ($self) = @_;
3216 3433
3217 $self->{timer}->cancel; 3434 $self->{timer}->cancel;
3218 3435
3219 $self->SUPER::DESTROY; 3436 $self->SUPER::destroy;
3220} 3437}
3221 3438
3222############################################################################# 3439#############################################################################
3223 3440
3224package CFClient::UI::Inventory; 3441package CFClient::UI::Inventory;
3243 return unless $items; 3460 return unless $items;
3244 3461
3245 my @items = sort { 3462 my @items = sort {
3246 ($a->{type} <=> $b->{type}) 3463 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name}) 3464 or ($a->{name} cmp $b->{name})
3248 } @$items; 3465 } values %$items;
3249 3466
3250 $self->{real_items} = \@items; 3467 $self->{real_items} = \@items;
3251 3468
3252 my $row = 0; 3469 my $row = 0;
3253 for my $item (@items) { 3470 for my $item (@items) {
3256 $self->{child}->add (0, $row, $item->{face_widget}); 3473 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget}); 3474 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget}); 3475 $self->{child}->add (2, $row, $item->{weight_widget});
3259 3476
3260 $row++; 3477 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 } 3478 }
3459} 3479}
3460 3480
3461############################################################################# 3481#############################################################################
3462 3482
3472 commands => [], 3492 commands => [],
3473 @_, 3493 @_,
3474 ) 3494 )
3475} 3495}
3476 3496
3477# XXX: Do sorting? Argl... 3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3478sub add_spell { 3582sub add_spell {
3479 my ($self, $spell) = @_; 3583 my ($self, $spell) = @_;
3584
3480 $self->{spells}->{$spell->{name}} = $spell; 3585 $self->{spell}->{$spell->{name}} = $spell;
3481 3586 $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} 3587}
3510 3588
3511sub remove_spell { 3589sub remove_spell {
3512 my ($self, $spell) = @_; 3590 my ($self, $spell) = @_;
3591
3513 delete $self->{spells}->{$spell->{name}}; 3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3514 $self->rebuild_spell_list; 3600 $self->rebuild_spell_list;
3515} 3601}
3516 3602
3517############################################################################# 3603#############################################################################
3518 3604
3555 $coord = $max - $size if $coord > $max - $size; 3641 $coord = $max - $size if $coord > $max - $size;
3556 3642
3557 int $coord + 0.5 3643 int $coord + 0.5
3558} 3644}
3559 3645
3560sub size_allocate { 3646sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
3562 3648
3563 for my $child ($self->children) { 3649 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3650 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 3651
3569 $X = _to_pixel $X, $W, $self->{w}; 3655 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
3571 3657
3572 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
3573 } 3659 }
3660
3661 1
3574} 3662}
3575 3663
3576sub coord2local { 3664sub coord2local {
3577 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
3578 3666

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines