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.319 by root, Sun Jul 2 21:07:26 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 $FOCUS = $self;
429 429
430 $self->_emit (focus_in => $focus); 430 $self->update;
431 431
432 $focus->update if $focus; 432 0
433 $FOCUS->update;
434} 433}
435 434
436sub focus_out { 435sub invoke_focus_out {
437 my ($self) = @_; 436 my ($self) = @_;
438 437
439 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
440 439
441 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
442 441
443 $self->_emit (focus_out => $focus); 442 $self->update;
444 443
445 $focus->update if $focus; #?
446
447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
448 unless $FOCUS; 445 unless $FOCUS;
449}
450 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
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->emit ("delete") };
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;
1151
1152 $self->child->configure ($border, $border, $w, $h);
1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1136 1164
1137 $self->child->configure ($border, $border, $w, $h); 1165 1
1138} 1166}
1139 1167
1140sub button_down { 1168sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1142 1170
1143 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1172 my $border = $self->border;
1145 1173
1176 1204
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1206
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1210 };
1183 } else { 1211 } else {
1184 return 0; 1212 return 0;
1185 } 1213 }
1186 1214
1187 1 1215 1
1188} 1216}
1189 1217
1190sub button_up { 1218sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1192 1220
1193 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1194} 1222}
1195 1223
1196sub mouse_motion { 1224sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1198 1226
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1228
1201 !!$self->{motion} 1229 ! ! $self->{motion}
1202} 1230}
1203 1231
1204sub _draw { 1232sub _draw {
1205 my ($self) = @_; 1233 my ($self) = @_;
1206 1234
1232 1260
1233 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1234 1262
1235 $child->draw; 1263 $child->draw;
1236 1264
1237 if ($self->{title}) { 1265 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1240 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1241} 1274}
1242 1275
1243############################################################################# 1276#############################################################################
1244 1277
1245package CFClient::UI::Table; 1278package CFClient::UI::Table;
1268 1301
1269 $child->set_parent ($self); 1302 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1271 1304
1272 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1273} 1312}
1274 1313
1275# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1315sub clear {
1277 my ($self) = @_; 1316 my ($self) = @_;
1318 (sum @$ws), 1357 (sum @$ws),
1319 (sum @$hs), 1358 (sum @$hs),
1320 ) 1359 )
1321} 1360}
1322 1361
1323sub size_allocate { 1362sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1325 1364
1326 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1327 1366
1328 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
1360 } 1399 }
1361 1400
1362 $y += $row_h; 1401 $y += $row_h;
1363 } 1402 }
1364 1403
1404 1
1365} 1405}
1366 1406
1367sub find_widget { 1407sub find_widget {
1368 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1369 1409
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1448 )
1409} 1449}
1410 1450
1411sub size_allocate { 1451sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1413 1453
1414 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1416 1456
1417 my @req; 1457 my @req;
1418 1458
1419 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1421 } else { 1461 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1424 1464
1425 if ($req > $space) { 1465 if ($req > $space) {
1426 # ah well, not enough space 1466 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1428 } else { 1468 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1470
1431 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1432 1472
1433 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1474 for 0 .. $#children;
1435 } 1475 }
1436 } 1476 }
1437 1477
1438 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1439 1479
1440 my $pos = 0; 1480 my $pos = 0;
1441 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1484
1445 $pos += $alloc; 1485 $pos += $alloc;
1446 } 1486 }
1447 1487
1448 1 1488 1
1553 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1554 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1555 1595
1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1557 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1598
1558 delete $self->{req_h}; 1599 delete $self->{size_req};
1559
1560 $self->realloc; 1600 $self->realloc;
1561 $self->update; 1601 $self->update;
1562} 1602}
1563 1603
1564sub set_markup { 1604sub set_markup {
1569 1609
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1611
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1614
1574 delete $self->{req_h}; 1615 delete $self->{size_req};
1575
1576 $self->realloc; 1616 $self->realloc;
1577 $self->update; 1617 $self->update;
1578} 1618}
1579 1619
1580sub size_request { 1620sub size_request {
1581 my ($self) = @_; 1621 my ($self) = @_;
1582 1622
1583 if (exists $self->{req_h}) { 1623 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1599 1637
1600 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1602 } 1640 }
1603 1641
1604 ($w, $h) 1642 [$w, $h]
1605 } 1643 };
1606}
1607 1644
1645 @{ $self->{size_req} }
1646}
1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1608sub size_allocate { 1652sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1610 1654
1611 delete $self->{ox}; 1655 delete $self->{ox};
1612 1656
1613 delete $self->{texture} 1657 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1615} 1661}
1616 1662
1617sub set_fontsize { 1663sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1619 1665
1620 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1621 delete $self->{texture}; 1668 delete $self->{texture};
1622 1669
1623 $self->realloc; 1670 $self->realloc;
1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1624} 1679}
1625 1680
1626sub _draw { 1681sub _draw {
1627 my ($self) = @_; 1682 my ($self) = @_;
1628 1683
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1650 }; 1705 };
1651 1706
1652 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1711
1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1717 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}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1659 1720
1660 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1661} 1722}
1662 1723
1663############################################################################# 1724#############################################################################
1679 can_hover => 1, 1740 can_hover => 1,
1680 can_focus => 1, 1741 can_focus => 1,
1681 valign => 0, 1742 valign => 0,
1682 can_events => 1, 1743 can_events => 1,
1683 #text => ... 1744 #text => ...
1745 #hidden => "*",
1684 @_ 1746 @_
1685 ) 1747 )
1686} 1748}
1687 1749
1688sub _set_text { 1750sub _set_text {
1695 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1758 $self->{text} = $text;
1697 1759
1698 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1762 delete $self->{size_req};
1701 1763
1702 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1703 1765
1704 $self->realloc; 1766 $self->realloc;
1705 $self->update; 1767 $self->update;
1706} 1768}
1707 1769
1722 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1723 1785
1724 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1725} 1787}
1726 1788
1727sub key_down { 1789sub invoke_key_down {
1728 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1729 1791
1730 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
1744 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1745 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1747 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 1811 $self->emit ('escape');
1750 } elsif ($uni) { 1812 } elsif ($uni) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 1814 } else {
1753 return 0; 1815 return 0;
1754 } 1816 }
1758 $self->realloc; 1820 $self->realloc;
1759 1821
1760 1 1822 1
1761} 1823}
1762 1824
1763sub focus_in { 1825sub invoke_focus_in {
1764 my ($self) = @_; 1826 my ($self) = @_;
1765 1827
1766 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1767 1829
1768 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1769} 1831}
1770 1832
1771sub button_down { 1833sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1773 1835
1774 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 1837
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 1839
1778 # byte-index to char-index 1840 # byte-index to char-index
1779 my $text = $self->{text}; 1841 my $text = $self->{text};
1784 $self->update; 1846 $self->update;
1785 1847
1786 1 1848 1
1787} 1849}
1788 1850
1789sub mouse_motion { 1851sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792 1854
1793 0 1855 1
1794} 1856}
1795 1857
1796sub _draw { 1858sub _draw {
1797 my ($self) = @_; 1859 my ($self) = @_;
1798 1860
1839 1901
1840our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1841 1903
1842use CFClient::OpenGL; 1904use CFClient::OpenGL;
1843 1905
1844sub key_down { 1906sub invoke_key_down {
1845 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1846 1908
1847 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1848 1910
1849 if ($sym == 13) { 1911 if ($sym == 13) {
1850 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1852 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1855 $self->update; 1918 $self->update;
1856 1919
1857 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
1875 } else { 1938 } else {
1876 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1877 } 1940 }
1878 1941
1879 } else { 1942 } else {
1880 return $self->SUPER::key_down ($ev) 1943 return $self->SUPER::invoke_key_down ($ev)
1881 } 1944 }
1882 1945
1883 1 1946 1
1884} 1947}
1885 1948
1909 can_events => 1, 1972 can_events => 1,
1910 @_ 1973 @_
1911 ) 1974 )
1912} 1975}
1913 1976
1914sub activate { }
1915
1916sub button_up { 1977sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1918 1979
1919 $self->emit ("activate") 1980 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936 1997
1937 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1938 1999
1939 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
2001}
2002
2003#############################################################################
2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
1940} 2037}
1941 2038
1942############################################################################# 2039#############################################################################
1943 2040
1944package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1971 my ($self) = @_; 2068 my ($self) = @_;
1972 2069
1973 (6) x 2 2070 (6) x 2
1974} 2071}
1975 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1976sub button_down { 2081sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1978 2083
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2086 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2087 } else {
1984 return 0 2088 return 0
1985 } 2089 }
1986 2090
1987 1 2091 1
2012package CFClient::UI::Image; 2116package CFClient::UI::Image;
2013 2117
2014our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
2015 2119
2016use CFClient::OpenGL; 2120use CFClient::OpenGL;
2017use Carp qw/confess/;
2018 2121
2019our %loaded_images; 2122our %texture_cache;
2020 2123
2021sub new { 2124sub new {
2022 my $class = shift; 2125 my $class = shift;
2023 2126
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
2025 2131
2026 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
2027 2134
2028 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
2029 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2030 2137
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
2032 2139
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2141
2037 $self 2142 $self
2038} 2143}
2039 2144
2040sub size_request { 2145sub size_request {
2041 my ($self) = @_; 2146 my ($self) = @_;
2042 2147
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
2044} 2149}
2045 2150
2046sub _draw { 2151sub _draw {
2047 my ($self) = @_; 2152 my ($self) = @_;
2048 2153
2157 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2264
2160 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2161 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2162 2270
2163 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2185 2293
2186 if ($t3) { 2294 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2301 glEnd;
2194 } 2302 }
2195 2303
2196 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
2284 $self->update; 2392 $self->update;
2285 2393
2286 $self 2394 $self
2287} 2395}
2288 2396
2289sub changed { }
2290
2291sub set_range { 2397sub set_range {
2292 my ($self, $range) = @_; 2398 my ($self, $range) = @_;
2293 2399
2294 ($range, $self->{range}) = ($self->{range}, $range); 2400 ($range, $self->{range}) = ($self->{range}, $range);
2295 2401
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2402 if ("@$range" ne "@{$self->{range}}") {
2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2298} 2406}
2299 2407
2300sub set_value { 2408sub set_value {
2301 my ($self, $value) = @_; 2409 my ($self, $value) = @_;
2302 2410
2313 if $unit; 2421 if $unit;
2314 2422
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2424
2317 if ($value != $old_value) { 2425 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2426 $self->emit (changed => $value);
2319 $self->update; 2427 $self->update;
2320 } 2428 }
2321} 2429}
2322 2430
2323sub size_request { 2431sub size_request {
2324 my ($self) = @_; 2432 my ($self) = @_;
2325 2433
2326 ($self->{req_w}, $self->{req_h}) 2434 ($self->{req_w}, $self->{req_h})
2327} 2435}
2328 2436
2329sub button_down { 2437sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2331 2439
2332 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2441
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2443
2336 $self->mouse_motion ($ev, $x, $y) 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2445}
2338 2446
2339sub mouse_motion { 2447sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2341 2449
2342 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2452
2449sub set_range { shift->{slider}->set_range (@_) } 2557sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2558sub set_value { shift->{slider}->set_value (@_) }
2451 2559
2452############################################################################# 2560#############################################################################
2453 2561
2454package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2455 2563
2456our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2457 2565
2458use CFClient::OpenGL; 2566use CFClient::OpenGL;
2459 2567
2461 my $class = shift; 2569 my $class = shift;
2462 2570
2463 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2464 fontsize => 1, 2572 fontsize => 1,
2465 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2466 #font => default_font 2575 #font => default_font
2467 @_, 2576 @_,
2468 2577
2469 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2470 par => [], 2579 par => [],
2485 2594
2486 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2487 $self->reflow; 2596 $self->reflow;
2488} 2597}
2489 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2490sub size_allocate { 2608sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 2609 my ($self, $w, $h) = @_;
2492 2610
2493 $self->SUPER::size_allocate ($w, $h); 2611 my ($empty, $slider, @other) = @{ $self->{children} };
2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 2613
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 2618
2499 $self->reflow; 2619 $self->reflow;
2500}
2501 2620
2502sub text_size { 2621 local $self->{children} = [$empty, $slider];
2503 my ($self, $text, $indent) = @_; 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2626 my ($self, $para) = @_;
2504 2627
2505 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2506 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2510 2641 );
2642
2511 $layout->size 2643 $layout
2512} 2644}
2513 2645
2514sub reflow { 2646sub reflow {
2515 my ($self) = @_; 2647 my ($self) = @_;
2516 2648
2525 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2526} 2658}
2527 2659
2528sub clear { 2660sub clear {
2529 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2530 2665
2531 $self->{par} = []; 2666 $self->{par} = [];
2532 $self->{height} = 0; 2667 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 2669}
2535 2670
2536sub add_paragraph { 2671sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2538 2673
2539 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2540 my ($w, $h) = $self->text_size ($line); 2675
2541 $self->{height} += $h; 2676 $para = {
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2543 } 2683 };
2544 2684
2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2546} 2697}
2547 2698
2548sub update { 2699sub update {
2549 my ($self) = @_; 2700 my ($self) = @_;
2550 2701
2552 2703
2553 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2554 2705
2555 delete $self->{texture}; 2706 delete $self->{texture};
2556 2707
2557 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 2710
2560 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2561 my $height = 0; 2712 my $height = 0;
2562 2713
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2569 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3]; 2718
2573 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2574 } 2722 }
2575 2723
2576 $height += $_->[1]; 2724 $height += $para->{h};
2577 } 2725 }
2578 2726
2579 $self->{height} = $height; 2727 $self->{height} = $height;
2580 2728
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2582 2730
2583 delete $self->{texture}; 2731 delete $self->{texture};
2732 }
2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2584 } 2736 }
2585 2737
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 2739 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2592 my $y0 = $top; 2744 my $y0 = $top;
2593 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2594 2746
2595 my $y = 0; 2747 my $y = 0;
2596 2748
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2601 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604 2752
2605 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 2754 my $h = $para->{h};
2607 2755
2608 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] }); 2757
2610 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2611 $layout->set_markup ($par->[4]);
2612 2759
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2614 2761
2615 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2617 } 2780 }
2618 2781
2619 $y += $h; 2782 $y += $h;
2620 } 2783 }
2621 2784
2622 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2623 }; 2786 };
2624 }); 2787 });
2788}
2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2625} 2797}
2626 2798
2627sub _draw { 2799sub _draw {
2628 my ($self) = @_; 2800 my ($self) = @_;
2629 2801
2632 glColor 0, 0, 0, 1; 2804 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2635 2807
2636 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2637
2638} 2809}
2639 2810
2640############################################################################# 2811#############################################################################
2641 2812
2642package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 2902 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 2903 . "visible $widget->{visible}";
2733 } 2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2734 2908
2735 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2736 markup => $tooltip, 2910 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 2912 fontsize => 0.8,
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 2923
2750 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2751} 2925}
2752 2926
2753sub size_allocate { 2927sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 2928 my ($self, $w, $h) = @_;
2755 2929
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 2931}
2758 2932
2759sub visibility_change { 2933sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 2934 my ($self, $visible) = @_;
2761 2935
2762 return unless $visible; 2936 return unless $visible;
2763 2937
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 2938 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 or return; 2940 or return;
2767 2941
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 2943
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 2945 if $x + $self->{w} > $self->{root}{w};
2772 2946
2773 $self->move_abs ($x, $y); 2947 $self->move_abs ($x, $y);
2774 }); 2948 });
2775} 2949}
2776 2950
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2873 } 3047 }
2874} 3048}
2875 3049
2876sub DESTROY { 3050sub destroy {
2877 my ($self) = @_; 3051 my ($self) = @_;
2878 3052
2879 $self->{timer}->cancel 3053 $self->{timer}->cancel
2880 if $self->{timer}; 3054 if $self->{timer};
2881 3055
2882 $self->SUPER::DESTROY; 3056 $self->SUPER::destroy;
2883} 3057}
2884 3058
2885############################################################################# 3059#############################################################################
2886 3060
2887package CFClient::UI::Buttonbar; 3061package CFClient::UI::Buttonbar;
2908 ); 3082 );
2909 3083
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3084 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2911 3085
2912 for my $item (@{ $self->{items} }) { 3086 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3087 my ($widget, $cb, $tooltip) = @$item;
2914 3088
2915 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2916 if (!ref $widget) { 3090 if (!ref $widget) {
2917 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2918 can_hover => 1, 3092 can_hover => 1,
2919 can_events => 1, 3093 can_events => 1,
2920 text => $widget; 3094 markup => $widget,
3095 tooltip => $tooltip
2921 } 3096 }
2922 3097
2923 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2924 3099
2925 $self->{vbox}->add ($widget); 3100 $self->{vbox}->add ($widget);
2930 3105
2931# popup given the event (must be a mouse button down event currently) 3106# popup given the event (must be a mouse button down event currently)
2932sub popup { 3107sub popup {
2933 my ($self, $ev) = @_; 3108 my ($self, $ev) = @_;
2934 3109
2935 $self->_emit ("popdown"); 3110 $self->emit ("popdown");
2936 3111
2937 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3113 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2940 3115
2941 $self->show; 3116 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3118}
2944 3119
2945sub mouse_motion { 3120sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2947 3122
2948 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2951 3126
2952 0 3127 0
2953} 3128}
2954 3129
2955sub button_up { 3130sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2957 3132
2958 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3134 undef $GRAB;
2960 $self->hide; 3135 $self->hide;
2961 3136
2962 $self->_emit ("popdown"); 3137 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3139 } else {
2965 return 0 3140 return 0
2966 } 3141 }
2967 3142
2994 3169
2995 $self->{current} = $self->{children}[0] 3170 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3171 if @{ $self->{children} };
2997} 3172}
2998 3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
2999sub set_current_page { 3180sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3181 my ($self, $page_or_widget) = @_;
3001 3182
3002 my $widget = ref $page_or_widget 3183 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3184 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3185 : $self->{children}[$page_or_widget];
3005 3186
3006 $self->{current} = $widget; 3187 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3189
3009 $self->_emit (page_changed => $self->{current}); 3190 $self->emit (page_changed => $self->{current});
3010 3191
3011 $self->realloc; 3192 $self->realloc;
3012} 3193}
3013 3194
3014sub visible_children { 3195sub visible_children {
3019 my ($self) = @_; 3200 my ($self) = @_;
3020 3201
3021 $self->{current}->size_request 3202 $self->{current}->size_request
3022} 3203}
3023 3204
3024sub size_allocate { 3205sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3206 my ($self, $w, $h) = @_;
3026 3207
3027 $self->{current}->configure (0, 0, $w, $h); 3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3028} 3211}
3029 3212
3030sub _draw { 3213sub _draw {
3031 my ($self) = @_; 3214 my ($self) = @_;
3032 3215
3067 ); 3250 );
3068 3251
3069 $self->{multiplexer}->add ($widget); 3252 $self->{multiplexer}->add ($widget);
3070} 3253}
3071 3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3072sub set_current_page { 3261sub set_current_page {
3073 my ($self, $page) = @_; 3262 my ($self, $page) = @_;
3074 3263
3075 $self->{multiplexer}->set_current_page ($page); 3264 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3265 $self->emit (page_changed => $self->{multiplexer}{current});
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::Combobox;
3271
3272use utf8;
3273
3274our @ISA = CFClient::UI::Button::;
3275
3276sub new {
3277 my $class = shift;
3278
3279 my $self = $class->SUPER::new (
3280 options => [], # [value, title, longdesc], ...
3281 value => undef,
3282 @_,
3283 );
3284
3285 $self->_set_value ($self->{value});
3286
3287 $self
3288}
3289
3290sub invoke_button_down {
3291 my ($self, $ev) = @_;
3292
3293 my @menu_items;
3294
3295 for (@{ $self->{options} }) {
3296 my ($value, $title, $tooltip) = @$_;
3297
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 }
3300
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302}
3303
3304sub _set_value {
3305 my ($self, $value) = @_;
3306
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3308 or return;
3309
3310 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]);
3313}
3314
3315sub set_value {
3316 my ($self, $value) = @_;
3317
3318 return unless $self->{value} ne $value;
3319
3320 $self->_set_value ($value);
3321 $self->emit (changed => $value);
3077} 3322}
3078 3323
3079############################################################################# 3324#############################################################################
3080 3325
3081package CFClient::UI::Statusbox; 3326package CFClient::UI::Statusbox;
3180 $item->{count}++; 3425 $item->{count}++;
3181 } else { 3426 } else {
3182 $item->{count} = 1; 3427 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
3184 } 3429 }
3185 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3432 delete $item->{label};
3188 } else { 3433 } else {
3189 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3435 id => ++$self->{id},
3196 count => 1, 3441 count => 1,
3197 %arg, 3442 %arg,
3198 }; 3443 };
3199 } 3444 }
3200 3445
3446 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 3447 $self->reorder;
3448 });
3202} 3449}
3203 3450
3204sub reconfigure { 3451sub reconfigure {
3205 my ($self) = @_; 3452 my ($self) = @_;
3206 3453
3209 3456
3210 $self->reorder; 3457 $self->reorder;
3211 $self->SUPER::reconfigure; 3458 $self->SUPER::reconfigure;
3212} 3459}
3213 3460
3214sub DESTROY { 3461sub destroy {
3215 my ($self) = @_; 3462 my ($self) = @_;
3216 3463
3217 $self->{timer}->cancel; 3464 $self->{timer}->cancel;
3218 3465
3219 $self->SUPER::DESTROY; 3466 $self->SUPER::destroy;
3220} 3467}
3221 3468
3222############################################################################# 3469#############################################################################
3223 3470
3224package CFClient::UI::Inventory; 3471package CFClient::UI::Inventory;
3225 3472
3226our @ISA = CFClient::UI::ScrolledWindow::; 3473our @ISA = CFClient::UI::Table::;
3227 3474
3228sub new { 3475sub new {
3229 my $class = shift; 3476 my $class = shift;
3230 3477
3231 my $self = $class->SUPER::new ( 3478 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3479 col_expand => [0, 1, 0],
3233 @_, 3480 @_,
3234 ); 3481 );
3235 3482
3236 $self 3483 $self
3237} 3484}
3238 3485
3239sub set_items { 3486sub set_items {
3240 my ($self, $items) = @_; 3487 my ($self, $items) = @_;
3241 3488
3242 $self->{child}->clear; 3489 $self->clear;
3243 return unless $items; 3490 return unless $items;
3244 3491
3245 my @items = sort { 3492 my @items = sort {
3246 ($a->{type} <=> $b->{type}) 3493 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name}) 3494 or ($a->{name} cmp $b->{name})
3248 } @$items; 3495 } values %$items;
3249 3496
3250 $self->{real_items} = \@items; 3497 $self->{real_items} = \@items;
3251 3498
3252 my $row = 0; 3499 my $row = 0;
3253 for my $item (@items) { 3500 for my $item (@items) {
3254 CFClient::Item::update_widgets $item; 3501 CFClient::Item::update_widgets $item;
3255 3502
3256 $self->{child}->add (0, $row, $item->{face_widget}); 3503 $self->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget}); 3504 $self->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget}); 3505 $self->add (2, $row, $item->{weight_widget});
3259 3506
3260 $row++; 3507 $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 } 3508 }
3459} 3509}
3460 3510
3461############################################################################# 3511#############################################################################
3462 3512
3472 commands => [], 3522 commands => [],
3473 @_, 3523 @_,
3474 ) 3524 )
3475} 3525}
3476 3526
3477# XXX: Do sorting? Argl... 3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3478sub add_spell { 3612sub add_spell {
3479 my ($self, $spell) = @_; 3613 my ($self, $spell) = @_;
3614
3480 $self->{spells}->{$spell->{name}} = $spell; 3615 $self->{spell}->{$spell->{name}} = $spell;
3481 3616 $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} 3617}
3510 3618
3511sub remove_spell { 3619sub remove_spell {
3512 my ($self, $spell) = @_; 3620 my ($self, $spell) = @_;
3621
3513 delete $self->{spells}->{$spell->{name}}; 3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3514 $self->rebuild_spell_list; 3630 $self->rebuild_spell_list;
3515} 3631}
3516 3632
3517############################################################################# 3633#############################################################################
3518 3634
3555 $coord = $max - $size if $coord > $max - $size; 3671 $coord = $max - $size if $coord > $max - $size;
3556 3672
3557 int $coord + 0.5 3673 int $coord + 0.5
3558} 3674}
3559 3675
3560sub size_allocate { 3676sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 3677 my ($self, $w, $h) = @_;
3562 3678
3563 for my $child ($self->children) { 3679 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 3681
3569 $X = _to_pixel $X, $W, $self->{w}; 3685 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 3686 $Y = _to_pixel $Y, $H, $self->{h};
3571 3687
3572 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
3573 } 3689 }
3690
3691 1
3574} 3692}
3575 3693
3576sub coord2local { 3694sub coord2local {
3577 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
3578 3696

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines