ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.317 by root, Sun Jul 2 18:52:05 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
1542 1582
1543sub realloc { 1583sub realloc {
1544 my ($self) = @_; 1584 my ($self) = @_;
1545 1585
1546 delete $self->{ox}; 1586 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc; 1587 $self->SUPER::realloc;
1549} 1588}
1550 1589
1551sub set_text { 1590sub set_text {
1552 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1555 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1556 1595
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1559 1598
1599 delete $self->{size_req};
1560 $self->realloc; 1600 $self->realloc;
1561 $self->update; 1601 $self->update;
1562} 1602}
1563 1603
1564sub set_markup { 1604sub set_markup {
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);
1574 1614
1615 delete $self->{size_req};
1575 $self->realloc; 1616 $self->realloc;
1576 $self->update; 1617 $self->update;
1577} 1618}
1578 1619
1579sub size_request { 1620sub size_request {
1580 my ($self) = @_; 1621 my ($self) = @_;
1581 1622
1582 if (exists $self->{req_h}) { 1623 $self->{size_req} ||= do {
1583 @$self{qw(req_w req_h)}
1584 } else {
1585 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1586 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1637
1599 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1600 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1601 } 1640 }
1602 1641
1603 ($w, $h) 1642 [$w, $h]
1604 } 1643 };
1605}
1606 1644
1645 @{ $self->{size_req} }
1646}
1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1607sub size_allocate { 1652sub invoke_size_allocate {
1608 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1609 1654
1610 delete $self->{ox}; 1655 delete $self->{ox};
1611 1656
1612 delete $self->{texture} 1657 delete $self->{texture}
1613 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
1614} 1661}
1615 1662
1616sub set_fontsize { 1663sub set_fontsize {
1617 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1618 1665
1619 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1620 delete $self->{texture}; 1668 delete $self->{texture};
1621 1669
1622 $self->realloc; 1670 $self->realloc;
1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1623} 1679}
1624 1680
1625sub _draw { 1681sub _draw {
1626 my ($self) = @_; 1682 my ($self) = @_;
1627 1683
1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1648 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1649 }; 1705 };
1650 1706
1651 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 {
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653
1654 glColor_premultiply @{$self->{fg}}
1655 if $tex->{format} == GL_ALPHA;
1656
1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1658 1720
1659 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1660} 1722}
1661 1723
1662############################################################################# 1724#############################################################################
1678 can_hover => 1, 1740 can_hover => 1,
1679 can_focus => 1, 1741 can_focus => 1,
1680 valign => 0, 1742 valign => 0,
1681 can_events => 1, 1743 can_events => 1,
1682 #text => ... 1744 #text => ...
1745 #hidden => "*",
1683 @_ 1746 @_
1684 ) 1747 )
1685} 1748}
1686 1749
1687sub _set_text { 1750sub _set_text {
1694 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1695 $self->{text} = $text; 1758 $self->{text} = $text;
1696 1759
1697 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1698 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1699 1763
1700 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1701 $self->update; 1767 $self->update;
1702} 1768}
1703 1769
1704sub set_text { 1770sub set_text {
1705 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1706 1772
1707 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1708 $self->_set_text ($text); 1774 $self->_set_text ($text);
1709
1710 $self->realloc;
1711} 1775}
1712 1776
1713sub get_text { 1777sub get_text {
1714 $_[0]{text} 1778 $_[0]{text}
1715} 1779}
1720 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1721 1785
1722 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1723} 1787}
1724 1788
1725sub key_down { 1789sub invoke_key_down {
1726 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1727 1791
1728 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1729 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1730 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
1742 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1743 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1744 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1745 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1746 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1747 $self->_emit ('escape'); 1811 $self->emit ('escape');
1748 } elsif ($uni) { 1812 } elsif ($uni) {
1749 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else { 1814 } else {
1751 return 0; 1815 return 0;
1752 } 1816 }
1756 $self->realloc; 1820 $self->realloc;
1757 1821
1758 1 1822 1
1759} 1823}
1760 1824
1761sub focus_in { 1825sub invoke_focus_in {
1762 my ($self) = @_; 1826 my ($self) = @_;
1763 1827
1764 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1765 1829
1766 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1767} 1831}
1768 1832
1769sub button_down { 1833sub invoke_button_down {
1770 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1771 1835
1772 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1773 1837
1774 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1775 1839
1776 # byte-index to char-index 1840 # byte-index to char-index
1777 my $text = $self->{text}; 1841 my $text = $self->{text};
1782 $self->update; 1846 $self->update;
1783 1847
1784 1 1848 1
1785} 1849}
1786 1850
1787sub mouse_motion { 1851sub invoke_mouse_motion {
1788 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1789# 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#
1790 1854
1791 0 1855 1
1792} 1856}
1793 1857
1794sub _draw { 1858sub _draw {
1795 my ($self) = @_; 1859 my ($self) = @_;
1796 1860
1837 1901
1838our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1839 1903
1840use CFClient::OpenGL; 1904use CFClient::OpenGL;
1841 1905
1842sub key_down { 1906sub invoke_key_down {
1843 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1844 1908
1845 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1846 1910
1847 if ($sym == 13) { 1911 if ($sym == 13) {
1848 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1849 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1850 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1851 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1852 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1853 $self->update; 1918 $self->update;
1854 1919
1855 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1856 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1857 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
1873 } else { 1938 } else {
1874 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1875 } 1940 }
1876 1941
1877 } else { 1942 } else {
1878 return $self->SUPER::key_down ($ev) 1943 return $self->SUPER::invoke_key_down ($ev)
1879 } 1944 }
1880 1945
1881 1 1946 1
1882} 1947}
1883 1948
1907 can_events => 1, 1972 can_events => 1,
1908 @_ 1973 @_
1909 ) 1974 )
1910} 1975}
1911 1976
1912sub activate { }
1913
1914sub button_up { 1977sub invoke_button_up {
1915 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1916 1979
1917 $self->emit ("activate") 1980 $self->emit ("activate")
1918 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1919 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1933 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1934 1997
1935 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1936 1999
1937 $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
1938} 2037}
1939 2038
1940############################################################################# 2039#############################################################################
1941 2040
1942package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1969 my ($self) = @_; 2068 my ($self) = @_;
1970 2069
1971 (6) x 2 2070 (6) x 2
1972} 2071}
1973 2072
1974sub button_down { 2073sub invoke_button_down {
1975 my ($self, $ev, $x, $y) = @_; 2074 my ($self, $ev, $x, $y) = @_;
1976 2075
1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1979 $self->{state} = !$self->{state}; 2078 $self->{state} = !$self->{state};
1980 $self->_emit (changed => $self->{state}); 2079 $self->emit (changed => $self->{state});
1981 } else { 2080 } else {
1982 return 0 2081 return 0
1983 } 2082 }
1984 2083
1985 1 2084 1
2010package CFClient::UI::Image; 2109package CFClient::UI::Image;
2011 2110
2012our @ISA = CFClient::UI::Base::; 2111our @ISA = CFClient::UI::Base::;
2013 2112
2014use CFClient::OpenGL; 2113use CFClient::OpenGL;
2015use Carp qw/confess/;
2016 2114
2017our %loaded_images; 2115our %texture_cache;
2018 2116
2019sub new { 2117sub new {
2020 my $class = shift; 2118 my $class = shift;
2021 2119
2022 my $self = $class->SUPER::new (can_events => 0, @_); 2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
2023 2124
2024 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2125 $self->{path}
2126 or Carp::croak "required attribute 'path' not set";
2025 2127
2026 $loaded_images{$self->{image}} ||= 2128 $self->{tex} = $texture_cache{$self->{path}} ||=
2027 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2028 2130
2029 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2131 Scalar::Util::weaken $texture_cache{$self->{path}};
2030 2132
2031 Scalar::Util::weaken $loaded_images{$self->{image}}; 2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2032
2033 $self->{aspect} = $tex->{w} / $tex->{h};
2034 2134
2035 $self 2135 $self
2036} 2136}
2037 2137
2038sub size_request { 2138sub size_request {
2039 my ($self) = @_; 2139 my ($self) = @_;
2040 2140
2041 ($self->{tex}->{w}, $self->{tex}->{h}) 2141 ($self->{tex}{w}, $self->{tex}{h})
2042} 2142}
2043 2143
2044sub _draw { 2144sub _draw {
2045 my ($self) = @_; 2145 my ($self) = @_;
2046 2146
2155 my $ycut1 = max 0, min 1, $ycut; 2255 my $ycut1 = max 0, min 1, $ycut;
2156 my $ycut2 = max 0, min 1, $ycut - 1; 2256 my $ycut2 = max 0, min 1, $ycut - 1;
2157 2257
2158 my $h1 = $self->{h} * (1 - $ycut1); 2258 my $h1 = $self->{h} * (1 - $ycut1);
2159 my $h2 = $self->{h} * (1 - $ycut2); 2259 my $h2 = $self->{h} * (1 - $ycut2);
2260 my $h3 = $self->{h};
2261
2262 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2160 2263
2161 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2265 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2266 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2164 glEnable GL_TEXTURE_2D; 2267 glEnable GL_TEXTURE_2D;
2183 2286
2184 if ($t3) { 2287 if ($t3) {
2185 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2288 glBindTexture GL_TEXTURE_2D, $t3->{name};
2186 glBegin GL_QUADS; 2289 glBegin GL_QUADS;
2187 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2290 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2188 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2291 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2189 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2292 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2190 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2293 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2191 glEnd; 2294 glEnd;
2192 } 2295 }
2193 2296
2194 glDisable GL_BLEND; 2297 glDisable GL_BLEND;
2282 $self->update; 2385 $self->update;
2283 2386
2284 $self 2387 $self
2285} 2388}
2286 2389
2287sub changed { }
2288
2289sub set_range { 2390sub set_range {
2290 my ($self, $range) = @_; 2391 my ($self, $range) = @_;
2291 2392
2292 ($range, $self->{range}) = ($self->{range}, $range); 2393 ($range, $self->{range}) = ($self->{range}, $range);
2293 2394
2294 $self->update
2295 if "@$range" ne "@{$self->{range}}"; 2395 if ("@$range" ne "@{$self->{range}}") {
2396 $self->update;
2397 $self->set_value ($self->{range}[0]);
2398 }
2296} 2399}
2297 2400
2298sub set_value { 2401sub set_value {
2299 my ($self, $value) = @_; 2402 my ($self, $value) = @_;
2300 2403
2311 if $unit; 2414 if $unit;
2312 2415
2313 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2416 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2314 2417
2315 if ($value != $old_value) { 2418 if ($value != $old_value) {
2316 $self->_emit (changed => $value); 2419 $self->emit (changed => $value);
2317 $self->update; 2420 $self->update;
2318 } 2421 }
2319} 2422}
2320 2423
2321sub size_request { 2424sub size_request {
2322 my ($self) = @_; 2425 my ($self) = @_;
2323 2426
2324 ($self->{req_w}, $self->{req_h}) 2427 ($self->{req_w}, $self->{req_h})
2325} 2428}
2326 2429
2327sub button_down { 2430sub invoke_button_down {
2328 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
2329 2432
2330 $self->SUPER::button_down ($ev, $x, $y); 2433 $self->SUPER::invoke_button_down ($ev, $x, $y);
2331 2434
2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2435 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2333 2436
2334 $self->mouse_motion ($ev, $x, $y) 2437 $self->invoke_mouse_motion ($ev, $x, $y)
2335} 2438}
2336 2439
2337sub mouse_motion { 2440sub invoke_mouse_motion {
2338 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2339 2442
2340 if ($GRAB == $self) { 2443 if ($GRAB == $self) {
2341 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2444 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2342 2445
2447sub set_range { shift->{slider}->set_range (@_) } 2550sub set_range { shift->{slider}->set_range (@_) }
2448sub set_value { shift->{slider}->set_value (@_) } 2551sub set_value { shift->{slider}->set_value (@_) }
2449 2552
2450############################################################################# 2553#############################################################################
2451 2554
2452package CFClient::UI::TextView; 2555package CFClient::UI::TextScroller;
2453 2556
2454our @ISA = CFClient::UI::HBox::; 2557our @ISA = CFClient::UI::HBox::;
2455 2558
2456use CFClient::OpenGL; 2559use CFClient::OpenGL;
2457 2560
2459 my $class = shift; 2562 my $class = shift;
2460 2563
2461 my $self = $class->SUPER::new ( 2564 my $self = $class->SUPER::new (
2462 fontsize => 1, 2565 fontsize => 1,
2463 can_events => 0, 2566 can_events => 0,
2567 indent => 0,
2464 #font => default_font 2568 #font => default_font
2465 @_, 2569 @_,
2466 2570
2467 layout => (new CFClient::Layout 1), 2571 layout => (new CFClient::Layout 1),
2468 par => [], 2572 par => [],
2483 2587
2484 $self->{fontsize} = $fontsize; 2588 $self->{fontsize} = $fontsize;
2485 $self->reflow; 2589 $self->reflow;
2486} 2590}
2487 2591
2592sub size_request {
2593 my ($self) = @_;
2594
2595 my ($empty, $slider) = @{ $self->{children} };
2596
2597 local $self->{children} = [$empty, $slider];
2598 $self->SUPER::size_request
2599}
2600
2488sub size_allocate { 2601sub invoke_size_allocate {
2489 my ($self, $w, $h) = @_; 2602 my ($self, $w, $h) = @_;
2490 2603
2491 $self->SUPER::size_allocate ($w, $h); 2604 my ($empty, $slider, @other) = @{ $self->{children} };
2605 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2492 2606
2493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2607 $self->{layout}->set_font ($self->{font}) if $self->{font};
2494 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2608 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2495 $self->{layout}->set_width ($self->{children}[0]{w}); 2609 $self->{layout}->set_width ($empty->{w});
2610 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2496 2611
2497 $self->reflow; 2612 $self->reflow;
2498}
2499 2613
2500sub text_size { 2614 local $self->{children} = [$empty, $slider];
2501 my ($self, $text, $indent) = @_; 2615 $self->SUPER::invoke_size_allocate ($w, $h)
2616}
2617
2618sub get_layout {
2619 my ($self, $para) = @_;
2502 2620
2503 my $layout = $self->{layout}; 2621 my $layout = $self->{layout};
2504 2622
2623 $layout->set_font ($self->{font}) if $self->{font};
2624 $layout->set_foreground (@{$para->{fg}});
2505 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2625 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2506 $layout->set_width ($self->{children}[0]{w} - $indent); 2626 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2627 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2507 $layout->set_markup ($text); 2628 $layout->set_markup ($para->{markup});
2629
2630 $layout->set_shapes (
2631 map
2632 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2633 @{$para->{widget}}
2508 2634 );
2635
2509 $layout->size 2636 $layout
2510} 2637}
2511 2638
2512sub reflow { 2639sub reflow {
2513 my ($self) = @_; 2640 my ($self) = @_;
2514 2641
2523 $self->{children}[1]->set_value ($offset); 2650 $self->{children}[1]->set_value ($offset);
2524} 2651}
2525 2652
2526sub clear { 2653sub clear {
2527 my ($self) = @_; 2654 my ($self) = @_;
2655
2656 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other;
2528 2658
2529 $self->{par} = []; 2659 $self->{par} = [];
2530 $self->{height} = 0; 2660 $self->{height} = 0;
2531 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2532} 2662}
2533 2663
2534sub add_paragraph { 2664sub add_paragraph {
2535 my ($self, $color, $text, $indent) = @_; 2665 my ($self, $color, $para, $indent) = @_;
2536 2666
2537 for my $line (split /\n/, $text) { 2667 my ($text, @w) = ref $para ? @$para : $para;
2538 my ($w, $h) = $self->text_size ($line); 2668
2539 $self->{height} += $h; 2669 $para = {
2540 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2670 w => 1e10,
2671 wrapped => 1,
2672 fg => $color,
2673 indent => $indent,
2674 markup => $text,
2675 widget => \@w,
2541 } 2676 };
2542 2677
2543 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2678 $self->add (@w) if @w;
2679 push @{$self->{par}}, $para;
2680
2681 $self->{need_reflow}++;
2682 $self->update;
2683}
2684
2685sub scroll_to_bottom {
2686 my ($self) = @_;
2687
2688 $self->{scroll_to_bottom} = 1;
2689 $self->update;
2544} 2690}
2545 2691
2546sub update { 2692sub update {
2547 my ($self) = @_; 2693 my ($self) = @_;
2548 2694
2550 2696
2551 return unless $self->{h} > 0; 2697 return unless $self->{h} > 0;
2552 2698
2553 delete $self->{texture}; 2699 delete $self->{texture};
2554 2700
2555 $ROOT->on_post_alloc ($self, sub { 2701 $ROOT->on_post_alloc ($self => sub {
2556 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2557 2703
2558 if (delete $self->{need_reflow}) { 2704 if (delete $self->{need_reflow}) {
2559 my $height = 0; 2705 my $height = 0;
2560 2706
2561 my $layout = $self->{layout};
2562
2563 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2564
2565 for (@{$self->{par}}) { 2707 for my $para (@{$self->{par}}) {
2566 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2567 $layout->set_width ($W - $_->[3]); 2709 my $layout = $self->get_layout ($para);
2568 $layout->set_markup ($_->[4]);
2569 my ($w, $h) = $layout->size; 2710 my ($w, $h) = $layout->size;
2570 $_->[0] = $w + $_->[3]; 2711
2571 $_->[1] = $h; 2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2572 } 2715 }
2573 2716
2574 $height += $_->[1]; 2717 $height += $para->{h};
2575 } 2718 }
2576 2719
2577 $self->{height} = $height; 2720 $self->{height} = $height;
2578 2721
2579 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2722 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2580 2723
2581 delete $self->{texture}; 2724 delete $self->{texture};
2725 }
2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2582 } 2729 }
2583 2730
2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2585 glClearColor 0, 0, 0, 0; 2732 glClearColor 0, 0, 0, 0;
2586 glClear GL_COLOR_BUFFER_BIT; 2733 glClear GL_COLOR_BUFFER_BIT;
2590 my $y0 = $top; 2737 my $y0 = $top;
2591 my $y1 = $top + $H; 2738 my $y1 = $top + $H;
2592 2739
2593 my $y = 0; 2740 my $y = 0;
2594 2741
2595 my $layout = $self->{layout};
2596
2597 $layout->set_font ($self->{font}) if $self->{font};
2598
2599 glEnable GL_BLEND; 2742 glEnable GL_BLEND;
2600 #TODO# not correct in windows where rgba is forced off 2743 #TODO# not correct in windows where rgba is forced off
2601 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2602 2745
2603 for my $par (@{$self->{par}}) { 2746 for my $para (@{$self->{par}}) {
2604 my $h = $par->[1]; 2747 my $h = $para->{h};
2605 2748
2606 if ($y0 < $y + $h && $y < $y1) { 2749 if ($y0 < $y + $h && $y < $y1) {
2607 $layout->set_foreground (@{ $par->[2] }); 2750
2608 $layout->set_width ($W - $par->[3]); 2751 my $layout = $self->get_layout ($para);
2609 $layout->set_markup ($par->[4]);
2610 2752
2611 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2612 2754
2613 glRasterPos $par->[3], $y - $y0; 2755 glRasterPos $para->{indent}, $y - $y0;
2614 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757
2758 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes;
2760
2761 glDisable GL_BLEND;
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 }
2615 } 2773 }
2616 2774
2617 $y += $h; 2775 $y += $h;
2618 } 2776 }
2619 2777
2620 glDisable GL_BLEND; 2778 glDisable GL_BLEND;
2621 }; 2779 };
2622 }); 2780 });
2781}
2782
2783sub reconfigure {
2784 my ($self) = @_;
2785
2786 $self->SUPER::reconfigure;
2787
2788 $_->{w} = 1e10 for @{ $self->{par} };
2789 $self->reflow;
2623} 2790}
2624 2791
2625sub _draw { 2792sub _draw {
2626 my ($self) = @_; 2793 my ($self) = @_;
2627 2794
2630 glColor 0, 0, 0, 1; 2797 glColor 0, 0, 0, 1;
2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2798 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2632 glDisable GL_TEXTURE_2D; 2799 glDisable GL_TEXTURE_2D;
2633 2800
2634 $self->{children}[1]->draw; 2801 $self->{children}[1]->draw;
2635
2636} 2802}
2637 2803
2638############################################################################# 2804#############################################################################
2639 2805
2640package CFClient::UI::Animator; 2806package CFClient::UI::Animator;
2727 $tooltip .= "\n\n" . (ref $widget) . "\n" 2893 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2894 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n" 2895 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}"; 2896 . "visible $widget->{visible}";
2731 } 2897 }
2898
2899 $tooltip =~ s/^\n+//;
2900 $tooltip =~ s/\n+$//;
2732 2901
2733 $self->add (new CFClient::UI::Label 2902 $self->add (new CFClient::UI::Label
2734 markup => $tooltip, 2903 markup => $tooltip,
2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2904 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2736 fontsize => 0.8, 2905 fontsize => 0.8,
2746 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2915 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2747 2916
2748 ($w + 4, $h + 4) 2917 ($w + 4, $h + 4)
2749} 2918}
2750 2919
2751sub size_allocate { 2920sub invoke_size_allocate {
2752 my ($self, $w, $h) = @_; 2921 my ($self, $w, $h) = @_;
2753 2922
2754 $self->SUPER::size_allocate ($w - 4, $h - 4); 2923 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2755} 2924}
2756 2925
2757sub visibility_change { 2926sub invoke_visibility_change {
2758 my ($self, $visible) = @_; 2927 my ($self, $visible) = @_;
2759 2928
2760 return unless $visible; 2929 return unless $visible;
2761 2930
2762 $self->{root}->on_post_alloc ("move_$self" => sub { 2931 $self->{root}->on_post_alloc ("move_$self" => sub {
2764 or return; 2933 or return;
2765 2934
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2935 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767 2936
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2937 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH; 2938 if $x + $self->{w} > $self->{root}{w};
2770 2939
2771 $self->move_abs ($x, $y); 2940 $self->move_abs ($x, $y);
2772 }); 2941 });
2773} 2942}
2774 2943
2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3038 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2870 glDisable GL_TEXTURE_2D; 3039 glDisable GL_TEXTURE_2D;
2871 } 3040 }
2872} 3041}
2873 3042
2874sub DESTROY { 3043sub destroy {
2875 my ($self) = @_; 3044 my ($self) = @_;
2876 3045
2877 $self->{timer}->cancel 3046 $self->{timer}->cancel
2878 if $self->{timer}; 3047 if $self->{timer};
2879 3048
2880 $self->SUPER::DESTROY; 3049 $self->SUPER::destroy;
2881} 3050}
2882 3051
2883############################################################################# 3052#############################################################################
2884 3053
2885package CFClient::UI::Buttonbar; 3054package CFClient::UI::Buttonbar;
2906 ); 3075 );
2907 3076
2908 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3077 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2909 3078
2910 for my $item (@{ $self->{items} }) { 3079 for my $item (@{ $self->{items} }) {
2911 my ($widget, $cb) = @$item; 3080 my ($widget, $cb, $tooltip) = @$item;
2912 3081
2913 # handle various types of items, only text for now 3082 # handle various types of items, only text for now
2914 if (!ref $widget) { 3083 if (!ref $widget) {
2915 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2916 can_hover => 1, 3085 can_hover => 1,
2917 can_events => 1, 3086 can_events => 1,
2918 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip
2919 } 3089 }
2920 3090
2921 $self->{item}{$widget} = $item; 3091 $self->{item}{$widget} = $item;
2922 3092
2923 $self->{vbox}->add ($widget); 3093 $self->{vbox}->add ($widget);
2928 3098
2929# popup given the event (must be a mouse button down event currently) 3099# popup given the event (must be a mouse button down event currently)
2930sub popup { 3100sub popup {
2931 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2932 3102
2933 $self->_emit ("popdown"); 3103 $self->emit ("popdown");
2934 3104
2935 # maybe save $GRAB? must be careful about events... 3105 # maybe save $GRAB? must be careful about events...
2936 $GRAB = $self; 3106 $GRAB = $self;
2937 $self->{button} = $ev->{button}; 3107 $self->{button} = $ev->{button};
2938 3108
2939 $self->show; 3109 $self->show;
2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3110 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2941} 3111}
2942 3112
2943sub mouse_motion { 3113sub invoke_mouse_motion {
2944 my ($self, $ev, $x, $y) = @_; 3114 my ($self, $ev, $x, $y) = @_;
2945 3115
2946 # TODO: should use vbox->find_widget or so 3116 # TODO: should use vbox->find_widget or so
2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3117 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2948 $self->{hover} = $self->{item}{$HOVER}; 3118 $self->{hover} = $self->{item}{$HOVER};
2949 3119
2950 0 3120 0
2951} 3121}
2952 3122
2953sub button_up { 3123sub invoke_button_up {
2954 my ($self, $ev, $x, $y) = @_; 3124 my ($self, $ev, $x, $y) = @_;
2955 3125
2956 if ($ev->{button} == $self->{button}) { 3126 if ($ev->{button} == $self->{button}) {
2957 undef $GRAB; 3127 undef $GRAB;
2958 $self->hide; 3128 $self->hide;
2959 3129
2960 $self->_emit ("popdown"); 3130 $self->emit ("popdown");
2961 $self->{hover}[1]->() if $self->{hover}; 3131 $self->{hover}[1]->() if $self->{hover};
2962 } else { 3132 } else {
2963 return 0 3133 return 0
2964 } 3134 }
2965 3135
3002 : $self->{children}[$page_or_widget]; 3172 : $self->{children}[$page_or_widget];
3003 3173
3004 $self->{current} = $widget; 3174 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3175 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006 3176
3007 $self->_emit (page_changed => $self->{current}); 3177 $self->emit (page_changed => $self->{current});
3008 3178
3009 $self->realloc; 3179 $self->realloc;
3010} 3180}
3011 3181
3012sub visible_children { 3182sub visible_children {
3017 my ($self) = @_; 3187 my ($self) = @_;
3018 3188
3019 $self->{current}->size_request 3189 $self->{current}->size_request
3020} 3190}
3021 3191
3022sub size_allocate { 3192sub invoke_size_allocate {
3023 my ($self, $w, $h) = @_; 3193 my ($self, $w, $h) = @_;
3024 3194
3025 $self->{current}->configure (0, 0, $w, $h); 3195 $self->{current}->configure (0, 0, $w, $h);
3196
3197 1
3026} 3198}
3027 3199
3028sub _draw { 3200sub _draw {
3029 my ($self) = @_; 3201 my ($self) = @_;
3030 3202
3069 3241
3070sub set_current_page { 3242sub set_current_page {
3071 my ($self, $page) = @_; 3243 my ($self, $page) = @_;
3072 3244
3073 $self->{multiplexer}->set_current_page ($page); 3245 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current}); 3246 $self->emit (page_changed => $self->{multiplexer}{current});
3247}
3248
3249#############################################################################
3250
3251package CFClient::UI::Combobox;
3252
3253use utf8;
3254
3255our @ISA = CFClient::UI::Button::;
3256
3257sub new {
3258 my $class = shift;
3259
3260 my $self = $class->SUPER::new (
3261 options => [], # [value, title, longdesc], ...
3262 value => undef,
3263 @_,
3264 );
3265
3266 $self->_set_value ($self->{value});
3267
3268 $self
3269}
3270
3271sub invoke_button_down {
3272 my ($self, $ev) = @_;
3273
3274 my @menu_items;
3275
3276 for (@{ $self->{options} }) {
3277 my ($value, $title, $tooltip) = @$_;
3278
3279 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3280 }
3281
3282 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3283}
3284
3285sub _set_value {
3286 my ($self, $value) = @_;
3287
3288 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3289 or return;
3290
3291 $self->{value} = $item->[0];
3292 $self->set_markup ("$item->[1] ⇓");
3293 $self->set_tooltip ($item->[2]);
3294}
3295
3296sub set_value {
3297 my ($self, $value) = @_;
3298
3299 return unless $self->{value} ne $value;
3300
3301 $self->_set_value ($value);
3302 $self->emit (changed => $value);
3075} 3303}
3076 3304
3077############################################################################# 3305#############################################################################
3078 3306
3079package CFClient::UI::Statusbox; 3307package CFClient::UI::Statusbox;
3178 $item->{count}++; 3406 $item->{count}++;
3179 } else { 3407 } else {
3180 $item->{count} = 1; 3408 $item->{count} = 1;
3181 $item->{text} = $item->{tooltip} = $text; 3409 $item->{text} = $item->{tooltip} = $text;
3182 } 3410 }
3183 $item->{id} = ++$self->{id}; 3411 $item->{id} += 0.2;#d#
3184 $item->{timeout} = $timeout; 3412 $item->{timeout} = $timeout;
3185 delete $item->{label}; 3413 delete $item->{label};
3186 } else { 3414 } else {
3187 $self->{item}{$group} = { 3415 $self->{item}{$group} = {
3188 id => ++$self->{id}, 3416 id => ++$self->{id},
3194 count => 1, 3422 count => 1,
3195 %arg, 3423 %arg,
3196 }; 3424 };
3197 } 3425 }
3198 3426
3427 $ROOT->on_refresh (reorder => sub {
3199 $self->reorder; 3428 $self->reorder;
3429 });
3200} 3430}
3201 3431
3202sub reconfigure { 3432sub reconfigure {
3203 my ($self) = @_; 3433 my ($self) = @_;
3204 3434
3207 3437
3208 $self->reorder; 3438 $self->reorder;
3209 $self->SUPER::reconfigure; 3439 $self->SUPER::reconfigure;
3210} 3440}
3211 3441
3212sub DESTROY { 3442sub destroy {
3213 my ($self) = @_; 3443 my ($self) = @_;
3214 3444
3215 $self->{timer}->cancel; 3445 $self->{timer}->cancel;
3216 3446
3217 $self->SUPER::DESTROY; 3447 $self->SUPER::destroy;
3218} 3448}
3219 3449
3220############################################################################# 3450#############################################################################
3221 3451
3222package CFClient::UI::Inventory; 3452package CFClient::UI::Inventory;
3241 return unless $items; 3471 return unless $items;
3242 3472
3243 my @items = sort { 3473 my @items = sort {
3244 ($a->{type} <=> $b->{type}) 3474 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name}) 3475 or ($a->{name} cmp $b->{name})
3246 } @$items; 3476 } values %$items;
3247 3477
3248 $self->{real_items} = \@items; 3478 $self->{real_items} = \@items;
3249 3479
3250 my $row = 0; 3480 my $row = 0;
3251 for my $item (@items) { 3481 for my $item (@items) {
3254 $self->{child}->add (0, $row, $item->{face_widget}); 3484 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget}); 3485 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget}); 3486 $self->{child}->add (2, $row, $item->{weight_widget});
3257 3487
3258 $row++; 3488 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 } 3489 }
3457} 3490}
3458 3491
3459############################################################################# 3492#############################################################################
3460 3493
3470 commands => [], 3503 commands => [],
3471 @_, 3504 @_,
3472 ) 3505 )
3473} 3506}
3474 3507
3475# XXX: Do sorting? Argl... 3508my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3509
3510my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3511 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3512my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3513 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3514my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3515 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3516my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3517 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3518my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3519 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3520
3521sub rebuild_spell_list {
3522 my ($self) = @_;
3523
3524 $CFClient::UI::ROOT->on_refresh ($self => sub {
3525 $self->clear;
3526
3527 return unless $::CONN;
3528
3529 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3530 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3531 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3532 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3533 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3534
3535 my $row = 0;
3536
3537 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3538 my $spell = $self->{spell}{$_};
3539
3540 $row++;
3541
3542 my $spell_cb = sub {
3543 my ($widget, $ev) = @_;
3544
3545 if ($ev->{button} == 1) {
3546 $::CONN->user_send ("cast $spell->{name}");
3547 } elsif ($ev->{button} == 2) {
3548 $::CONN->user_send ("invoke $spell->{name}");
3549 } elsif ($ev->{button} == 3) {
3550 (new CFClient::UI::Menu
3551 items => [
3552 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3553 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3554 ],
3555 )->popup ($ev);
3556 } else {
3557 return 0;
3558 }
3559
3560 1
3561 };
3562
3563 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3564
3565 #TODO: add path info to tooltip
3566 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3567
3568 $self->add (0, $row, new CFClient::UI::Face
3569 face => $spell->{face},
3570 can_hover => 1,
3571 can_events => 1,
3572 tooltip => $tooltip,
3573 on_button_down => $spell_cb,
3574 );
3575
3576 $self->add (1, $row, new CFClient::UI::Label
3577 expand => 1,
3578 text => $spell->{name},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $tooltip,
3582 on_button_down => $spell_cb,
3583 );
3584
3585 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3586 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3587 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3588 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3589 }
3590 });
3591}
3592
3476sub add_spell { 3593sub add_spell {
3477 my ($self, $spell) = @_; 3594 my ($self, $spell) = @_;
3595
3478 $self->{spells}->{$spell->{name}} = $spell; 3596 $self->{spell}->{$spell->{name}} = $spell;
3479 3597 $self->rebuild_spell_list;
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507} 3598}
3508 3599
3509sub remove_spell { 3600sub remove_spell {
3510 my ($self, $spell) = @_; 3601 my ($self, $spell) = @_;
3602
3511 delete $self->{spells}->{$spell->{name}}; 3603 delete $self->{spell}->{$spell->{name}};
3604 $self->rebuild_spell_list;
3605}
3606
3607sub clear_spells {
3608 my ($self) = @_;
3609
3610 $self->{spell} = {};
3512 $self->rebuild_spell_list; 3611 $self->rebuild_spell_list;
3513} 3612}
3514 3613
3515############################################################################# 3614#############################################################################
3516 3615
3553 $coord = $max - $size if $coord > $max - $size; 3652 $coord = $max - $size if $coord > $max - $size;
3554 3653
3555 int $coord + 0.5 3654 int $coord + 0.5
3556} 3655}
3557 3656
3558sub size_allocate { 3657sub invoke_size_allocate {
3559 my ($self, $w, $h) = @_; 3658 my ($self, $w, $h) = @_;
3560 3659
3561 for my $child ($self->children) { 3660 for my $child ($self->children) {
3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3661 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3563 3662
3567 $X = _to_pixel $X, $W, $self->{w}; 3666 $X = _to_pixel $X, $W, $self->{w};
3568 $Y = _to_pixel $Y, $H, $self->{h}; 3667 $Y = _to_pixel $Y, $H, $self->{h};
3569 3668
3570 $child->configure ($X, $Y, $W, $H); 3669 $child->configure ($X, $Y, $W, $H);
3571 } 3670 }
3671
3672 1
3572} 3673}
3573 3674
3574sub coord2local { 3675sub coord2local {
3575 my ($self, $x, $y) = @_; 3676 my ($self, $x, $y) = @_;
3576 3677

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines