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.323 by root, Wed Jul 5 03:01:01 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
… …
1551 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1552 1592
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;
1557 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1597
1558 delete $self->{req_h}; 1598 delete $self->{size_req};
1559
1560 $self->realloc; 1599 $self->realloc;
1561 $self->update; 1600 $self->update;
1562} 1601}
1563 1602
1564sub set_markup { 1603sub set_markup {
… …
1567 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1568 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1569 1608
1570 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1571 1610
1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1573 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1612
1574 delete $self->{req_h}; 1613 delete $self->{size_req};
1575
1576 $self->realloc; 1614 $self->realloc;
1577 $self->update; 1615 $self->update;
1578} 1616}
1579 1617
1580sub size_request { 1618sub size_request {
1581 my ($self) = @_; 1619 my ($self) = @_;
1582 1620
1583 if (exists $self->{req_h}) { 1621 $self->{size_req} ||= do {
1584 @$self{qw(req_w req_h)}
1585 } else {
1586 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1587 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1588 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1591 1627
1592 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1593 1629
1594 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1595 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1597 1634
1598 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1599 1636
1600 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
1601 $h = List::Util::max $h, $h2; 1638 $h = List::Util::max $h, $h2;
1602 } 1639 }
1603 1640
1604 ($w, $h) 1641 [$w, $h]
1605 } 1642 };
1606}
1607 1643
1644 @{ $self->{size_req} }
1645}
1646
1647sub baseline_shift {
1648 $_[0]{layout}->descent
1649}
1650
1608sub size_allocate { 1651sub invoke_size_allocate {
1609 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1610 1653
1611 delete $self->{ox}; 1654 delete $self->{ox};
1612 1655
1613 delete $self->{texture} 1656 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1657 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1658
1659 1
1615} 1660}
1616 1661
1617sub set_fontsize { 1662sub set_fontsize {
1618 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1619 1664
1620 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1621 delete $self->{texture}; 1667 delete $self->{texture};
1622 1668
1623 $self->realloc; 1669 $self->realloc;
1624} 1670}
1625 1671
1672sub reconfigure {
1673 my ($self) = @_;
1674
1675 delete $self->{size_req};
1676 delete $self->{texture};
1677
1678 $self->SUPER::reconfigure;
1679}
1680
1626sub _draw { 1681sub _draw {
1627 my ($self) = @_; 1682 my ($self) = @_;
1628 1683
1629 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1630 1685
1631 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1632 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1633 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1634 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1635 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1638 1693
1639 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1640 }; 1695 };
1641 1696
1642 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1645 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1646 1701
1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1649 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1650 }; 1705 };
1651 1706
1652 glEnable GL_TEXTURE_2D; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1654 1709
1655 glColor_premultiply @{$self->{fg}} 1710 $self->{layout}->render ($self->{ox}, $self->{oy});
1656 if $tex->{format} == GL_ALPHA;
1657
1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1659
1660 glDisable GL_TEXTURE_2D;
1661} 1711}
1662 1712
1663############################################################################# 1713#############################################################################
1664 1714
1665package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
1679 can_hover => 1, 1729 can_hover => 1,
1680 can_focus => 1, 1730 can_focus => 1,
1681 valign => 0, 1731 valign => 0,
1682 can_events => 1, 1732 can_events => 1,
1683 #text => ... 1733 #text => ...
1734 #hidden => "*",
1684 @_ 1735 @_
1685 ) 1736 )
1686} 1737}
1687 1738
1688sub _set_text { 1739sub _set_text {
… …
1695 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1696 $self->{text} = $text; 1747 $self->{text} = $text;
1697 1748
1698 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1699 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h}; 1751 delete $self->{size_req};
1701 1752
1702 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1703 1754
1704 $self->realloc; 1755 $self->realloc;
1705 $self->update; 1756 $self->update;
1706} 1757}
1707 1758
… …
1722 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1723 1774
1724 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1725} 1776}
1726 1777
1727sub key_down { 1778sub invoke_key_down {
1728 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1729 1780
1730 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1731 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1732 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1744 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1745 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1746 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1747 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1748 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1749 $self->_emit ('escape'); 1800 $self->emit ('escape');
1750 } elsif ($uni) { 1801 } elsif ($uni) {
1751 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else { 1803 } else {
1753 return 0; 1804 return 0;
1754 } 1805 }
… …
1758 $self->realloc; 1809 $self->realloc;
1759 1810
1760 1 1811 1
1761} 1812}
1762 1813
1763sub focus_in { 1814sub invoke_focus_in {
1764 my ($self) = @_; 1815 my ($self) = @_;
1765 1816
1766 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1767 1818
1768 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1769} 1820}
1770 1821
1771sub button_down { 1822sub invoke_button_down {
1772 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1773 1824
1774 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1775 1826
1776 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1777 1828
1778 # byte-index to char-index 1829 # byte-index to char-index
1779 my $text = $self->{text}; 1830 my $text = $self->{text};
… …
1784 $self->update; 1835 $self->update;
1785 1836
1786 1 1837 1
1787} 1838}
1788 1839
1789sub mouse_motion { 1840sub invoke_mouse_motion {
1790 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792 1843
1793 0 1844 1
1794} 1845}
1795 1846
1796sub _draw { 1847sub _draw {
1797 my ($self) = @_; 1848 my ($self) = @_;
1798 1849
… …
1839 1890
1840our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1841 1892
1842use CFClient::OpenGL; 1893use CFClient::OpenGL;
1843 1894
1844sub key_down { 1895sub invoke_key_down {
1845 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1846 1897
1847 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1848 1899
1849 if ($sym == 13) { 1900 if ($sym == 13) {
1850 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1851 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1852 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1853 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1854 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1855 $self->update; 1907 $self->update;
1856 1908
1857 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1858 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1859 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1875 } else { 1927 } else {
1876 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1877 } 1929 }
1878 1930
1879 } else { 1931 } else {
1880 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1881 } 1933 }
1882 1934
1883 1 1935 1
1884} 1936}
1885 1937
… …
1909 can_events => 1, 1961 can_events => 1,
1910 @_ 1962 @_
1911 ) 1963 )
1912} 1964}
1913 1965
1914sub activate { }
1915
1916sub button_up { 1966sub invoke_button_up {
1917 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1918 1968
1919 $self->emit ("activate") 1969 $self->emit ("activate")
1920 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1921 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
… …
1935 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1936 1986
1937 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1938 1988
1939 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1940} 2026}
1941 2027
1942############################################################################# 2028#############################################################################
1943 2029
1944package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1971 my ($self) = @_; 2057 my ($self) = @_;
1972 2058
1973 (6) x 2 2059 (6) x 2
1974} 2060}
1975 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
1976sub button_down { 2070sub invoke_button_down {
1977 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
1978 2072
1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1981 $self->{state} = !$self->{state}; 2075 $self->toggle;
1982 $self->_emit (changed => $self->{state});
1983 } else { 2076 } else {
1984 return 0 2077 return 0
1985 } 2078 }
1986 2079
1987 1 2080 1
… …
2012package CFClient::UI::Image; 2105package CFClient::UI::Image;
2013 2106
2014our @ISA = CFClient::UI::Base::; 2107our @ISA = CFClient::UI::Base::;
2015 2108
2016use CFClient::OpenGL; 2109use CFClient::OpenGL;
2017use Carp qw/confess/;
2018 2110
2019our %loaded_images; 2111our %texture_cache;
2020 2112
2021sub new { 2113sub new {
2022 my $class = shift; 2114 my $class = shift;
2023 2115
2024 my $self = $class->SUPER::new (can_events => 0, @_); 2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
2025 2120
2026 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2121 $self->{path}
2122 or Carp::croak "required attribute 'path' not set";
2027 2123
2028 $loaded_images{$self->{image}} ||= 2124 $self->{tex} = $texture_cache{$self->{path}} ||=
2029 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2030 2126
2031 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2127 Scalar::Util::weaken $texture_cache{$self->{path}};
2032 2128
2033 Scalar::Util::weaken $loaded_images{$self->{image}}; 2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2034
2035 $self->{aspect} = $tex->{w} / $tex->{h};
2036 2130
2037 $self 2131 $self
2038} 2132}
2039 2133
2040sub size_request { 2134sub size_request {
2041 my ($self) = @_; 2135 my ($self) = @_;
2042 2136
2043 ($self->{tex}->{w}, $self->{tex}->{h}) 2137 ($self->{tex}{w}, $self->{tex}{h})
2044} 2138}
2045 2139
2046sub _draw { 2140sub _draw {
2047 my ($self) = @_; 2141 my ($self) = @_;
2048 2142
… …
2157 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2158 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2159 2253
2160 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2161 my $h2 = $self->{h} * (1 - $ycut2); 2255 my $h2 = $self->{h} * (1 - $ycut2);
2256 my $h3 = $self->{h};
2257
2258 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2162 2259
2163 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2166 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
… …
2185 2282
2186 if ($t3) { 2283 if ($t3) {
2187 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2188 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2189 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2190 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2191 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2192 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2193 glEnd; 2290 glEnd;
2194 } 2291 }
2195 2292
2196 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
… …
2284 $self->update; 2381 $self->update;
2285 2382
2286 $self 2383 $self
2287} 2384}
2288 2385
2289sub changed { }
2290
2291sub set_range { 2386sub set_range {
2292 my ($self, $range) = @_; 2387 my ($self, $range) = @_;
2293 2388
2294 ($range, $self->{range}) = ($self->{range}, $range); 2389 ($range, $self->{range}) = ($self->{range}, $range);
2295 2390
2296 $self->update
2297 if "@$range" ne "@{$self->{range}}"; 2391 if ("@$range" ne "@{$self->{range}}") {
2392 $self->update;
2393 $self->set_value ($self->{range}[0]);
2394 }
2298} 2395}
2299 2396
2300sub set_value { 2397sub set_value {
2301 my ($self, $value) = @_; 2398 my ($self, $value) = @_;
2302 2399
… …
2313 if $unit; 2410 if $unit;
2314 2411
2315 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2412 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2316 2413
2317 if ($value != $old_value) { 2414 if ($value != $old_value) {
2318 $self->_emit (changed => $value); 2415 $self->emit (changed => $value);
2319 $self->update; 2416 $self->update;
2320 } 2417 }
2321} 2418}
2322 2419
2323sub size_request { 2420sub size_request {
2324 my ($self) = @_; 2421 my ($self) = @_;
2325 2422
2326 ($self->{req_w}, $self->{req_h}) 2423 ($self->{req_w}, $self->{req_h})
2327} 2424}
2328 2425
2329sub button_down { 2426sub invoke_button_down {
2330 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2331 2428
2332 $self->SUPER::button_down ($ev, $x, $y); 2429 $self->SUPER::invoke_button_down ($ev, $x, $y);
2333 2430
2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2431 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2335 2432
2336 $self->mouse_motion ($ev, $x, $y) 2433 $self->invoke_mouse_motion ($ev, $x, $y)
2337} 2434}
2338 2435
2339sub mouse_motion { 2436sub invoke_mouse_motion {
2340 my ($self, $ev, $x, $y) = @_; 2437 my ($self, $ev, $x, $y) = @_;
2341 2438
2342 if ($GRAB == $self) { 2439 if ($GRAB == $self) {
2343 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2440 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2344 2441
… …
2449sub set_range { shift->{slider}->set_range (@_) } 2546sub set_range { shift->{slider}->set_range (@_) }
2450sub set_value { shift->{slider}->set_value (@_) } 2547sub set_value { shift->{slider}->set_value (@_) }
2451 2548
2452############################################################################# 2549#############################################################################
2453 2550
2454package CFClient::UI::TextView; 2551package CFClient::UI::TextScroller;
2455 2552
2456our @ISA = CFClient::UI::HBox::; 2553our @ISA = CFClient::UI::HBox::;
2457 2554
2458use CFClient::OpenGL; 2555use CFClient::OpenGL;
2459 2556
… …
2461 my $class = shift; 2558 my $class = shift;
2462 2559
2463 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2464 fontsize => 1, 2561 fontsize => 1,
2465 can_events => 0, 2562 can_events => 0,
2563 indent => 0,
2466 #font => default_font 2564 #font => default_font
2467 @_, 2565 @_,
2468 2566
2469 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2470 par => [], 2568 par => [],
2471 height => 0, 2569 height => 0,
2472 children => [ 2570 children => [
2473 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2474 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2485 2583
2486 $self->{fontsize} = $fontsize; 2584 $self->{fontsize} = $fontsize;
2487 $self->reflow; 2585 $self->reflow;
2488} 2586}
2489 2587
2588sub size_request {
2589 my ($self) = @_;
2590
2591 my ($empty, $slider) = @{ $self->{children} };
2592
2593 local $self->{children} = [$empty, $slider];
2594 $self->SUPER::size_request
2595}
2596
2490sub size_allocate { 2597sub invoke_size_allocate {
2491 my ($self, $w, $h) = @_; 2598 my ($self, $w, $h) = @_;
2492 2599
2493 $self->SUPER::size_allocate ($w, $h); 2600 my ($empty, $slider, @other) = @{ $self->{children} };
2601 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2494 2602
2495 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2603 $self->{layout}->set_font ($self->{font}) if $self->{font};
2496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2604 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $self->{layout}->set_width ($self->{children}[0]{w}); 2605 $self->{layout}->set_width ($empty->{w});
2606 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 2607
2499 $self->reflow; 2608 $self->reflow;
2500}
2501 2609
2502sub text_size { 2610 local $self->{children} = [$empty, $slider];
2503 my ($self, $text, $indent) = @_; 2611 $self->SUPER::invoke_size_allocate ($w, $h)
2612}
2613
2614sub get_layout {
2615 my ($self, $para) = @_;
2504 2616
2505 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2506 2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620 $layout->set_foreground (@{$para->{fg}});
2507 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2621 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2508 $layout->set_width ($self->{children}[0]{w} - $indent); 2622 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($text); 2624 $layout->set_markup ($para->{markup});
2625
2626 $layout->set_shapes (
2627 map
2628 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2629 @{$para->{widget}}
2510 2630 );
2631
2511 $layout->size 2632 $layout
2512} 2633}
2513 2634
2514sub reflow { 2635sub reflow {
2515 my ($self) = @_; 2636 my ($self) = @_;
2516 2637
… …
2525 $self->{children}[1]->set_value ($offset); 2646 $self->{children}[1]->set_value ($offset);
2526} 2647}
2527 2648
2528sub clear { 2649sub clear {
2529 my ($self) = @_; 2650 my ($self) = @_;
2651
2652 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other;
2530 2654
2531 $self->{par} = []; 2655 $self->{par} = [];
2532 $self->{height} = 0; 2656 $self->{height} = 0;
2533 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2534} 2658}
2535 2659
2536sub add_paragraph { 2660sub add_paragraph {
2537 my ($self, $color, $text, $indent) = @_; 2661 my ($self, $color, $para, $indent) = @_;
2538 2662
2539 for my $line (split /\n/, $text) { 2663 my ($text, @w) = ref $para ? @$para : $para;
2540 my ($w, $h) = $self->text_size ($line); 2664
2541 $self->{height} += $h; 2665 $para = {
2542 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2666 w => 1e10,
2667 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2543 } 2672 };
2544 2673
2545 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2674 $self->add (@w) if @w;
2675 push @{$self->{par}}, $para;
2676
2677 $self->{need_reflow}++;
2678 $self->update;
2679}
2680
2681sub scroll_to_bottom {
2682 my ($self) = @_;
2683
2684 $self->{scroll_to_bottom} = 1;
2685 $self->update;
2546} 2686}
2547 2687
2548sub update { 2688sub update {
2549 my ($self) = @_; 2689 my ($self) = @_;
2550 2690
… …
2552 2692
2553 return unless $self->{h} > 0; 2693 return unless $self->{h} > 0;
2554 2694
2555 delete $self->{texture}; 2695 delete $self->{texture};
2556 2696
2557 $ROOT->on_post_alloc ($self, sub { 2697 $ROOT->on_post_alloc ($self => sub {
2558 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2559 2699
2560 if (delete $self->{need_reflow}) { 2700 if (delete $self->{need_reflow}) {
2561 my $height = 0; 2701 my $height = 0;
2562 2702
2563 my $layout = $self->{layout};
2564
2565 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2566
2567 for (@{$self->{par}}) { 2703 for my $para (@{$self->{par}}) {
2568 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2569 $layout->set_width ($W - $_->[3]); 2705 my $layout = $self->get_layout ($para);
2570 $layout->set_markup ($_->[4]);
2571 my ($w, $h) = $layout->size; 2706 my ($w, $h) = $layout->size;
2572 $_->[0] = $w + $_->[3]; 2707
2573 $_->[1] = $h; 2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2574 } 2711 }
2575 2712
2576 $height += $_->[1]; 2713 $height += $para->{h};
2577 } 2714 }
2578 2715
2579 $self->{height} = $height; 2716 $self->{height} = $height;
2580 2717
2581 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2718 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2582 2719
2583 delete $self->{texture}; 2720 delete $self->{texture};
2721 }
2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2584 } 2725 }
2585 2726
2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2587 glClearColor 0, 0, 0, 0; 2728 glClearColor 0, 0, 0, 0;
2588 glClear GL_COLOR_BUFFER_BIT; 2729 glClear GL_COLOR_BUFFER_BIT;
… …
2592 my $y0 = $top; 2733 my $y0 = $top;
2593 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2594 2735
2595 my $y = 0; 2736 my $y = 0;
2596 2737
2597 my $layout = $self->{layout};
2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2600
2601 glEnable GL_BLEND;
2602 #TODO# not correct in windows where rgba is forced off
2603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2604
2605 for my $par (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2606 my $h = $par->[1]; 2739 my $h = $para->{h};
2607 2740
2608 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2609 $layout->set_foreground (@{ $par->[2] });
2610 $layout->set_width ($W - $par->[3]);
2611 $layout->set_markup ($par->[4]);
2612 2742
2613 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2743 my $layout = $self->get_layout ($para);
2614 2744
2615 glRasterPos $par->[3], $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2616 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 }
2617 } 2759 }
2618 2760
2619 $y += $h; 2761 $y += $h;
2620 } 2762 }
2621
2622 glDisable GL_BLEND;
2623 }; 2763 };
2624 }); 2764 });
2765}
2766
2767sub reconfigure {
2768 my ($self) = @_;
2769
2770 $self->SUPER::reconfigure;
2771
2772 $_->{w} = 1e10 for @{ $self->{par} };
2773 $self->reflow;
2625} 2774}
2626 2775
2627sub _draw { 2776sub _draw {
2628 my ($self) = @_; 2777 my ($self) = @_;
2629 2778
… …
2632 glColor 0, 0, 0, 1; 2781 glColor 0, 0, 0, 1;
2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2782 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2634 glDisable GL_TEXTURE_2D; 2783 glDisable GL_TEXTURE_2D;
2635 2784
2636 $self->{children}[1]->draw; 2785 $self->{children}[1]->draw;
2637
2638} 2786}
2639 2787
2640############################################################################# 2788#############################################################################
2641 2789
2642package CFClient::UI::Animator; 2790package CFClient::UI::Animator;
… …
2729 $tooltip .= "\n\n" . (ref $widget) . "\n" 2877 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2878 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n" 2879 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}"; 2880 . "visible $widget->{visible}";
2733 } 2881 }
2882
2883 $tooltip =~ s/^\n+//;
2884 $tooltip =~ s/\n+$//;
2734 2885
2735 $self->add (new CFClient::UI::Label 2886 $self->add (new CFClient::UI::Label
2736 markup => $tooltip, 2887 markup => $tooltip,
2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2888 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2738 fontsize => 0.8, 2889 fontsize => 0.8,
… …
2748 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2899 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2749 2900
2750 ($w + 4, $h + 4) 2901 ($w + 4, $h + 4)
2751} 2902}
2752 2903
2753sub size_allocate { 2904sub invoke_size_allocate {
2754 my ($self, $w, $h) = @_; 2905 my ($self, $w, $h) = @_;
2755 2906
2756 $self->SUPER::size_allocate ($w - 4, $h - 4); 2907 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2757} 2908}
2758 2909
2759sub visibility_change { 2910sub invoke_visibility_change {
2760 my ($self, $visible) = @_; 2911 my ($self, $visible) = @_;
2761 2912
2762 return unless $visible; 2913 return unless $visible;
2763 2914
2764 $self->{root}->on_post_alloc ("move_$self" => sub { 2915 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2766 or return; 2917 or return;
2767 2918
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769 2920
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH; 2922 if $x + $self->{w} > $self->{root}{w};
2772 2923
2773 $self->move_abs ($x, $y); 2924 $self->move_abs ($x, $y);
2774 }); 2925 });
2775} 2926}
2776 2927
… …
2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3022 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2872 glDisable GL_TEXTURE_2D; 3023 glDisable GL_TEXTURE_2D;
2873 } 3024 }
2874} 3025}
2875 3026
2876sub DESTROY { 3027sub destroy {
2877 my ($self) = @_; 3028 my ($self) = @_;
2878 3029
2879 $self->{timer}->cancel 3030 $self->{timer}->cancel
2880 if $self->{timer}; 3031 if $self->{timer};
2881 3032
2882 $self->SUPER::DESTROY; 3033 $self->SUPER::destroy;
2883} 3034}
2884 3035
2885############################################################################# 3036#############################################################################
2886 3037
2887package CFClient::UI::Buttonbar; 3038package CFClient::UI::Buttonbar;
… …
2908 ); 3059 );
2909 3060
2910 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3061 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2911 3062
2912 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
2913 my ($widget, $cb) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
2914 3065
2915 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
2916 if (!ref $widget) { 3067 if (!ref $widget) {
3068 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2;
3070
3071 $widget = new CFClient::UI::HBox
3072 can_hover => 1,
3073 can_events => 1,
3074 tooltip => $tooltip,
3075 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1),
3078 ],
3079 ;
3080
3081 } else {
2917 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
2918 can_hover => 1, 3083 can_hover => 1,
2919 can_events => 1, 3084 can_events => 1,
2920 text => $widget; 3085 markup => $widget,
3086 tooltip => $tooltip;
3087 }
2921 } 3088 }
2922 3089
2923 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
2924 3091
2925 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
2930 3097
2931# popup given the event (must be a mouse button down event currently) 3098# popup given the event (must be a mouse button down event currently)
2932sub popup { 3099sub popup {
2933 my ($self, $ev) = @_; 3100 my ($self, $ev) = @_;
2934 3101
2935 $self->_emit ("popdown"); 3102 $self->emit ("popdown");
2936 3103
2937 # maybe save $GRAB? must be careful about events... 3104 # maybe save $GRAB? must be careful about events...
2938 $GRAB = $self; 3105 $GRAB = $self;
2939 $self->{button} = $ev->{button}; 3106 $self->{button} = $ev->{button};
2940 3107
2941 $self->show; 3108 $self->show;
2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3109 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2943} 3110}
2944 3111
2945sub mouse_motion { 3112sub invoke_mouse_motion {
2946 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2947 3114
2948 # TODO: should use vbox->find_widget or so 3115 # TODO: should use vbox->find_widget or so
2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3116 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2950 $self->{hover} = $self->{item}{$HOVER}; 3117 $self->{hover} = $self->{item}{$HOVER};
2951 3118
2952 0 3119 0
2953} 3120}
2954 3121
2955sub button_up { 3122sub invoke_button_up {
2956 my ($self, $ev, $x, $y) = @_; 3123 my ($self, $ev, $x, $y) = @_;
2957 3124
2958 if ($ev->{button} == $self->{button}) { 3125 if ($ev->{button} == $self->{button}) {
2959 undef $GRAB; 3126 undef $GRAB;
2960 $self->hide; 3127 $self->hide;
2961 3128
2962 $self->_emit ("popdown"); 3129 $self->emit ("popdown");
2963 $self->{hover}[1]->() if $self->{hover}; 3130 $self->{hover}[1]->() if $self->{hover};
2964 } else { 3131 } else {
2965 return 0 3132 return 0
2966 } 3133 }
2967 3134
… …
2994 3161
2995 $self->{current} = $self->{children}[0] 3162 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} }; 3163 if @{ $self->{children} };
2997} 3164}
2998 3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3170}
3171
2999sub set_current_page { 3172sub set_current_page {
3000 my ($self, $page_or_widget) = @_; 3173 my ($self, $page_or_widget) = @_;
3001 3174
3002 my $widget = ref $page_or_widget 3175 my $widget = ref $page_or_widget
3003 ? $page_or_widget 3176 ? $page_or_widget
3004 : $self->{children}[$page_or_widget]; 3177 : $self->{children}[$page_or_widget];
3005 3178
3006 $self->{current} = $widget; 3179 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3180 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008 3181
3009 $self->_emit (page_changed => $self->{current}); 3182 $self->emit (page_changed => $self->{current});
3010 3183
3011 $self->realloc; 3184 $self->realloc;
3012} 3185}
3013 3186
3014sub visible_children { 3187sub visible_children {
… …
3019 my ($self) = @_; 3192 my ($self) = @_;
3020 3193
3021 $self->{current}->size_request 3194 $self->{current}->size_request
3022} 3195}
3023 3196
3024sub size_allocate { 3197sub invoke_size_allocate {
3025 my ($self, $w, $h) = @_; 3198 my ($self, $w, $h) = @_;
3026 3199
3027 $self->{current}->configure (0, 0, $w, $h); 3200 $self->{current}->configure (0, 0, $w, $h);
3201
3202 1
3028} 3203}
3029 3204
3030sub _draw { 3205sub _draw {
3031 my ($self) = @_; 3206 my ($self) = @_;
3032 3207
… …
3067 ); 3242 );
3068 3243
3069 $self->{multiplexer}->add ($widget); 3244 $self->{multiplexer}->add ($widget);
3070} 3245}
3071 3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3251}
3252
3072sub set_current_page { 3253sub set_current_page {
3073 my ($self, $page) = @_; 3254 my ($self, $page) = @_;
3074 3255
3075 $self->{multiplexer}->set_current_page ($page); 3256 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current}); 3257 $self->emit (page_changed => $self->{multiplexer}{current});
3258}
3259
3260#############################################################################
3261
3262package CFClient::UI::Combobox;
3263
3264use utf8;
3265
3266our @ISA = CFClient::UI::Button::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (
3272 options => [], # [value, title, longdesc], ...
3273 value => undef,
3274 @_,
3275 );
3276
3277 $self->_set_value ($self->{value});
3278
3279 $self
3280}
3281
3282sub invoke_button_down {
3283 my ($self, $ev) = @_;
3284
3285 my @menu_items;
3286
3287 for (@{ $self->{options} }) {
3288 my ($value, $title, $tooltip) = @$_;
3289
3290 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291 }
3292
3293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294}
3295
3296sub _set_value {
3297 my ($self, $value) = @_;
3298
3299 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3300 or return;
3301
3302 $self->{value} = $item->[0];
3303 $self->set_markup ("$item->[1] ⇓");
3304 $self->set_tooltip ($item->[2]);
3305}
3306
3307sub set_value {
3308 my ($self, $value) = @_;
3309
3310 return unless $self->{value} ne $value;
3311
3312 $self->_set_value ($value);
3313 $self->emit (changed => $value);
3077} 3314}
3078 3315
3079############################################################################# 3316#############################################################################
3080 3317
3081package CFClient::UI::Statusbox; 3318package CFClient::UI::Statusbox;
… …
3180 $item->{count}++; 3417 $item->{count}++;
3181 } else { 3418 } else {
3182 $item->{count} = 1; 3419 $item->{count} = 1;
3183 $item->{text} = $item->{tooltip} = $text; 3420 $item->{text} = $item->{tooltip} = $text;
3184 } 3421 }
3185 $item->{id} = ++$self->{id}; 3422 $item->{id} += 0.2;#d#
3186 $item->{timeout} = $timeout; 3423 $item->{timeout} = $timeout;
3187 delete $item->{label}; 3424 delete $item->{label};
3188 } else { 3425 } else {
3189 $self->{item}{$group} = { 3426 $self->{item}{$group} = {
3190 id => ++$self->{id}, 3427 id => ++$self->{id},
… …
3196 count => 1, 3433 count => 1,
3197 %arg, 3434 %arg,
3198 }; 3435 };
3199 } 3436 }
3200 3437
3438 $ROOT->on_refresh (reorder => sub {
3201 $self->reorder; 3439 $self->reorder;
3440 });
3202} 3441}
3203 3442
3204sub reconfigure { 3443sub reconfigure {
3205 my ($self) = @_; 3444 my ($self) = @_;
3206 3445
… …
3209 3448
3210 $self->reorder; 3449 $self->reorder;
3211 $self->SUPER::reconfigure; 3450 $self->SUPER::reconfigure;
3212} 3451}
3213 3452
3214sub DESTROY { 3453sub destroy {
3215 my ($self) = @_; 3454 my ($self) = @_;
3216 3455
3217 $self->{timer}->cancel; 3456 $self->{timer}->cancel;
3218 3457
3219 $self->SUPER::DESTROY; 3458 $self->SUPER::destroy;
3220} 3459}
3221 3460
3222############################################################################# 3461#############################################################################
3223 3462
3224package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3225 3464
3226our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3227 3466
3228sub new { 3467sub new {
3229 my $class = shift; 3468 my $class = shift;
3230 3469
3231 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3233 @_, 3472 @_,
3234 ); 3473 );
3235 3474
3236 $self 3475 $self
3237} 3476}
3238 3477
3239sub set_items { 3478sub set_items {
3240 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3241 3480
3242 $self->{child}->clear; 3481 $self->clear;
3243 return unless $items; 3482 return unless $items;
3244 3483
3245 my @items = sort { 3484 my @items = sort {
3246 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
3248 } @$items; 3487 } values %$items;
3249 3488
3250 $self->{real_items} = \@items; 3489 $self->{real_items} = \@items;
3251 3490
3252 my $row = 0; 3491 my $row = 0;
3253 for my $item (@items) { 3492 for my $item (@items) {
3254 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3255 3494
3256 $self->{child}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3259 3498
3260 $row++; 3499 $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 } 3500 }
3459} 3501}
3460 3502
3461############################################################################# 3503#############################################################################
3462 3504
… …
3472 commands => [], 3514 commands => [],
3473 @_, 3515 @_,
3474 ) 3516 )
3475} 3517}
3476 3518
3477# XXX: Do sorting? Argl... 3519my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3520
3521my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3522 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3523my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3525my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3529my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3531
3532sub rebuild_spell_list {
3533 my ($self) = @_;
3534
3535 $CFClient::UI::ROOT->on_refresh ($self => sub {
3536 $self->clear;
3537
3538 return unless $::CONN;
3539
3540 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3541 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3542 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3543 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3544 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545
3546 my $row = 0;
3547
3548 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549 my $spell = $self->{spell}{$_};
3550
3551 $row++;
3552
3553 my $spell_cb = sub {
3554 my ($widget, $ev) = @_;
3555
3556 if ($ev->{button} == 1) {
3557 $::CONN->user_send ("cast $spell->{name}");
3558 } elsif ($ev->{button} == 2) {
3559 $::CONN->user_send ("invoke $spell->{name}");
3560 } elsif ($ev->{button} == 3) {
3561 (new CFClient::UI::Menu
3562 items => [
3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565 ],
3566 )->popup ($ev);
3567 } else {
3568 return 0;
3569 }
3570
3571 1
3572 };
3573
3574 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3575
3576 #TODO: add path info to tooltip
3577 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3578
3579 $self->add (0, $row, new CFClient::UI::Face
3580 face => $spell->{face},
3581 can_hover => 1,
3582 can_events => 1,
3583 tooltip => $tooltip,
3584 on_button_down => $spell_cb,
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $tooltip,
3593 on_button_down => $spell_cb,
3594 );
3595
3596 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600 }
3601 });
3602}
3603
3478sub add_spell { 3604sub add_spell {
3479 my ($self, $spell) = @_; 3605 my ($self, $spell) = @_;
3606
3480 $self->{spells}->{$spell->{name}} = $spell; 3607 $self->{spell}->{$spell->{name}} = $spell;
3481 3608 $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} 3609}
3510 3610
3511sub remove_spell { 3611sub remove_spell {
3512 my ($self, $spell) = @_; 3612 my ($self, $spell) = @_;
3613
3513 delete $self->{spells}->{$spell->{name}}; 3614 delete $self->{spell}->{$spell->{name}};
3615 $self->rebuild_spell_list;
3616}
3617
3618sub clear_spells {
3619 my ($self) = @_;
3620
3621 $self->{spell} = {};
3514 $self->rebuild_spell_list; 3622 $self->rebuild_spell_list;
3515} 3623}
3516 3624
3517############################################################################# 3625#############################################################################
3518 3626
… …
3555 $coord = $max - $size if $coord > $max - $size; 3663 $coord = $max - $size if $coord > $max - $size;
3556 3664
3557 int $coord + 0.5 3665 int $coord + 0.5
3558} 3666}
3559 3667
3560sub size_allocate { 3668sub invoke_size_allocate {
3561 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
3562 3670
3563 for my $child ($self->children) { 3671 for my $child ($self->children) {
3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3565 3673
… …
3569 $X = _to_pixel $X, $W, $self->{w}; 3677 $X = _to_pixel $X, $W, $self->{w};
3570 $Y = _to_pixel $Y, $H, $self->{h}; 3678 $Y = _to_pixel $Y, $H, $self->{h};
3571 3679
3572 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
3573 } 3681 }
3682
3683 1
3574} 3684}
3575 3685
3576sub coord2local { 3686sub coord2local {
3577 my ($self, $x, $y) = @_; 3687 my ($self, $x, $y) = @_;
3578 3688

Diff Legend

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