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.328 by root, Sat Jul 22 13:43:05 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 warn "button down $ev->{button}\n";#d# 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
89 105
90 if (!$BUTTON_STATE) { 106 unless ($GRAB) {
91 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
92 108
93 $GRAB = $widget; 109 $GRAB = $widget;
94 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
95 111
96 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
97 } 113 }
98 114
99 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
100 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
101 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
102 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
103} 125}
104 126
105sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
106 my ($ev) = @_; 128 my ($ev) = @_;
107 my ($x, $y) = ($ev->{x}, $ev->{y});
108 129
109 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
110 131
111 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
112 133
113 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
114 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
115 136
116 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
117 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
118 $grab->update if $grab; 139 $grab->update if $grab;
119 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
120 141
142 check_hover $widget;
121 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
122 } 144 }
123} 145}
124 146
125sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
126 my ($ev) = @_; 148 my ($ev) = @_;
127 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
128 150
129 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
130 152
131 if ($widget != $HOVER) { 153 check_hover $widget;
132 my $hover = $HOVER; $HOVER = $widget;
133 154
134 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
135 $HOVER->update if $HOVER && $HOVER->{can_hover};
136
137 $TOOLTIP_WATCHER->start;
138 }
139
140 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
141 if $HOVER; 156 if $HOVER;
142} 157}
143 158
144# convert position array to integers 159# convert position array to integers
145sub harmonize { 160sub harmonize {
… …
195 reconfigure_widgets; 210 reconfigure_widgets;
196} 211}
197 212
198############################################################################# 213#############################################################################
199 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
200package CFClient::UI::Base; 223package CFPlus::UI::Base;
201 224
202use strict; 225use strict;
203 226
204use CFClient::OpenGL; 227use CFPlus::OpenGL;
205 228
206sub new { 229sub new {
207 my $class = shift; 230 my $class = shift;
208 231
209 my $self = bless { 232 my $self = bless {
… …
214 h => undef, 237 h => undef,
215 can_events => 1, 238 can_events => 1,
216 @_ 239 @_
217 }, $class; 240 }, $class;
218 241
219 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
220 243
221 for (keys %$self) { 244 for (keys %$self) {
222 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
223 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
224 } 247 }
225 } 248 }
226 249
227 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
228 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
229 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
230 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
231 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
232 255
233 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
234 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
235 258
236 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
241 264
242sub destroy { 265sub destroy {
243 my ($self) = @_; 266 my ($self) = @_;
244 267
245 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
246 %$self = (); 270 %$self = ();
247} 271}
248 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
249sub show { 277sub show {
250 my ($self) = @_; 278 my ($self) = @_;
251 279
252 return if $self->{parent}; 280 return if $self->{parent};
253 281
254 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
255} 283}
256 284
257sub set_visible { 285sub set_visible {
258 my ($self) = @_; 286 my ($self) = @_;
259 287
… …
280 delete $self->{root}; 308 delete $self->{root};
281 309
282 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
283 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
284 312
285 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
286 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
287 315
288 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
289 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
290} 318}
… …
292sub set_visibility { 320sub set_visibility {
293 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
294 322
295 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
296 324
297 $visible ? $self->hide 325 $visible ? $self->show
298 : $self->show; 326 : $self->hide;
299} 327}
300 328
301sub toggle_visibility { 329sub toggle_visibility {
302 my ($self) = @_; 330 my ($self) = @_;
303 331
… …
347 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
348 376
349 if ($self->{aspect}) { 377 if ($self->{aspect}) {
350 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
351 379
352 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
353 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
354 382
355 # use alignment to adjust x, y 383 # use alignment to adjust x, y
356 384
357 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
358 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
399 427
400 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
401 429
402 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
403 431
404 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
405 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
406 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
407 } 435 }
408} 436}
409 437
410# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
411sub coord2local { 439sub coord2local {
412 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
413 441
442 Carp::confess unless $self->{parent};#d#
443
414 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
415} 445}
416 446
417# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
418sub coord2global { 448sub coord2global {
419 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
450
451 Carp::confess unless $self->{parent};#d#
420 452
421 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
422} 454}
423 455
424sub invoke_focus_in { 456sub invoke_focus_in {
… …
458 490
459sub invoke_mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
460sub invoke_button_up { 0 } 492sub invoke_button_up { 0 }
461sub invoke_key_down { 0 } 493sub invoke_key_down { 0 }
462sub invoke_key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
463 496
464sub invoke_button_down { 497sub invoke_button_down {
465 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
466 499
467 $self->grab_focus; 500 $self->grab_focus;
468 501
469 warn "button down $ev->{button} $x $y\n";#d#
470
471 0 502 0
472} 503}
473 504
474sub connect { 505sub connect {
475 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
476 507
477 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
478} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
479 528
480sub emit { 529sub emit {
481 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
482 531
483 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
484 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
485 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
486 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
487} 550}
488 551
489sub find_widget { 552sub find_widget {
490 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
491 554
… …
499} 562}
500 563
501sub set_parent { 564sub set_parent {
502 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
503 566
504 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
505 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
506} 569}
507 570
508sub realloc { 571sub realloc {
509 my ($self) = @_; 572 my ($self) = @_;
… …
575 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
578 glEnd; 641 glEnd;
579 glPopMatrix; 642 glPopMatrix;
580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
581 } 644 }
582 645
583 $self->_draw; 646 $self->_draw;
584 glPopMatrix; 647 glPopMatrix;
585} 648}
… …
588 my ($self) = @_; 651 my ($self) = @_;
589 652
590 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
591} 654}
592 655
656my $cntx;#d#
593sub DESTROY { 657sub DESTROY {
594 my ($self) = @_; 658 my ($self) = @_;
595 659
596 return if CFClient::in_destruct; 660 return if CFPlus::in_destruct;
597
598 delete $WIDGET{$self+0};
599 661
600 eval { $self->destroy }; 662 eval { $self->destroy };
601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
602} 666}
603 667
604############################################################################# 668#############################################################################
605 669
606package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
607 671
608our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
609 673
610use strict; 674use strict;
611use CFClient::OpenGL; 675use CFPlus::OpenGL;
612 676
613sub new { 677sub new {
614 my $class = shift; 678 my $class = shift;
615 679
616 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
647 } 711 }
648} 712}
649 713
650############################################################################# 714#############################################################################
651 715
652package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
653 717
654our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
655 719
656sub new { 720sub new {
657 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
658 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
659} 723}
… …
666 730
667sub draw { } 731sub draw { }
668 732
669############################################################################# 733#############################################################################
670 734
671package CFClient::UI::Container; 735package CFPlus::UI::Container;
672 736
673our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
674 738
675sub new { 739sub new {
676 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
677 741
678 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
687 if $children; 751 if $children;
688 752
689 $self 753 $self
690} 754}
691 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
692sub add { 764sub add {
693 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
694 766
695 $_->set_parent ($self) 767 $_->set_parent ($self)
696 for @widgets; 768 for @widgets;
… …
756 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
757} 829}
758 830
759############################################################################# 831#############################################################################
760 832
761package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
762 834
763our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
764 836
765sub new { 837sub new {
766 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
767 839
768 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
769 841
770 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
771} 843}
772 844
773sub add { 845sub add {
… …
780sub remove { 852sub remove {
781 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
782 854
783 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
784 856
785 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
786 unless @{$self->{children}}; 858 unless @{$self->{children}};
787} 859}
788 860
789sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
790 862
… …
802 874
803############################################################################# 875#############################################################################
804 876
805# back-buffered drawing area 877# back-buffered drawing area
806 878
807package CFClient::UI::Window; 879package CFPlus::UI::Window;
808 880
809our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
810 882
811use CFClient::OpenGL; 883use CFPlus::OpenGL;
812 884
813sub new { 885sub new {
814 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
815 887
816 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
838} 910}
839 911
840sub render_child { 912sub render_child {
841 my ($self) = @_; 913 my ($self) = @_;
842 914
843 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
844 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
845 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
846 918
847 { 919 {
848 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
849 921
850 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
851 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
852 } 926 }
853
854 $self->_render;
855 }; 927 };
856} 928}
857 929
858sub _draw { 930sub _draw {
859 my ($self) = @_; 931 my ($self) = @_;
860
861 my ($w, $h) = @$self{qw(w h)};
862 932
863 my $tex = $self->{texture} 933 my $tex = $self->{texture}
864 or return; 934 or return;
865 935
866 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
868 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
869 939
870 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
871 941
872 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
873} 943}
874 944
875############################################################################# 945#############################################################################
876 946
877package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
878 948
879our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
880 950
881sub new { 951sub new {
882 my $class = shift; 952 my $class = shift;
883 953
884 $class->SUPER::new ( 954 $class->SUPER::new (
… …
944 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
945 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
946 ) { 1016 ) {
947 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
948 } else { 1018 } else {
949 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
950 } 1020 }
951} 1021}
952 1022
953sub _render { 1023sub _render {
954 my ($self) = @_; 1024 my ($self) = @_;
955 1025
956 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
957 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
958 1028
959 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
960 1030
961 $self->SUPER::_render; 1031 $self->SUPER::_render;
962} 1032}
963 1033
964############################################################################# 1034#############################################################################
965 1035
966package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
967 1037
968our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
969 1039
970sub new { 1040sub new {
971 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
972 1042
973 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
974 1044
975 my $self; 1045 my $self;
976 1046
977 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
978 vertical => 1, 1057 vertical => 1,
979 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
980 on_changed => sub { 1059 on_changed => sub {
981 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
982 }, 1062 },
983 ; 1063 ;
984 1064
985 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
986 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
987 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
988 %arg, 1073 %arg,
989 ); 1074 );
990 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
991 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
992 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
993 1087
994 $self 1088 $self
995} 1089}
996 1090
… …
1000 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
1001 1095
1002 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
1003} 1097}
1004 1098
1005sub invoke_button_down { 1099sub invoke_mouse_wheel {
1006 my ($self, $ev) = @_; 1100 my ($self, $ev) = @_;
1007 1101
1008 warn "button down $ev->{button}\n";#d# 1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1009 1106 1
1010 0
1011} 1107}
1012 1108
1013sub update_slider { 1109sub update_slider {
1014 my ($self) = @_; 1110 my ($self) = @_;
1015 1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1017} 1121}
1018 1122
1019sub update { 1123sub update {
1020 my ($self) = @_; 1124 my ($self) = @_;
1021 1125
1022 $self->SUPER::update; 1126 $self->SUPER::update;
1023
1024 $self->update_slider; 1127 $self->update_slider;
1025} 1128}
1026 1129
1027sub invoke_size_allocate { 1130sub invoke_size_allocate {
1028 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1029 1132
1030 $self->update_slider; 1133 $self->update_slider;
1031
1032 $self->SUPER::invoke_size_allocate ($w, $h) 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1033} 1135}
1034 1136
1035############################################################################# 1137#############################################################################
1036 1138
1037package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1038 1140
1039our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1040 1142
1041use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1042 1144
1043sub new { 1145sub new {
1044 my $class = shift; 1146 my $class = shift;
1045 1147
1046 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1072 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1073} 1175}
1074 1176
1075############################################################################# 1177#############################################################################
1076 1178
1077package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1078 1180
1079our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1080 1182
1081use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1082 1284
1083my $bg = 1285my $bg =
1084 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085 mipmap => 1, wrap => 1; 1287 mipmap => 1, wrap => 1;
1086 1288
1087my @border = 1289my @border =
1088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1089 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1090 1292
1091sub new { 1293sub new {
1092 my ($class, %arg) = @_; 1294 my ($class, %arg) = @_;
1093 1295
… …
1099 min_w => 64, 1301 min_w => 64,
1100 min_h => 32, 1302 min_h => 32,
1101 %arg, 1303 %arg,
1102 ); 1304 );
1103 1305
1104 $self->{title_widget} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1105 align => 0, 1307 align => 0,
1106 valign => 1, 1308 valign => 1,
1107 text => $self->{title}, 1309 text => $self->{title},
1108 fontsize => $self->{border}, 1310 fontsize => $self->{border},
1109 if exists $self->{title}; 1311 if exists $self->{title};
1110 1312
1111 if ($self->{has_close_button}) { 1313 if ($self->{has_close_button}) {
1112 $self->{close_button} = 1314 $self->{close_button} =
1113 new CFClient::UI::ImageButton 1315 new CFPlus::UI::ImageButton
1114 path => 'x1_close.png', 1316 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") }; 1317 on_activate => sub { $self->emit ("delete") };
1116 1318
1117 $self->CFClient::UI::Container::add ($self->{close_button}); 1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1118 } 1320 }
1119 1321
1120 $self 1322 $self
1121} 1323}
1122 1324
1123sub add { 1325sub add {
1124 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1125 1327
1126 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1128 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129} 1331}
1130 1332
1131sub border { 1333sub border {
1132 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1133} 1335}
… …
1241 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242 1444
1243 ! ! $self->{motion} 1445 ! ! $self->{motion}
1244} 1446}
1245 1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1454}
1455
1246sub _draw { 1456sub _draw {
1247 my ($self) = @_; 1457 my ($self) = @_;
1248 1458
1249 my $child = $self->{children}[0]; 1459 my $child = $self->{children}[0];
1250 1460
… …
1287 if $self->{close_button}; 1497 if $self->{close_button};
1288} 1498}
1289 1499
1290############################################################################# 1500#############################################################################
1291 1501
1292package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1293 1503
1294our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1295 1505
1296use List::Util qw(max sum); 1506use List::Util qw(max sum);
1297 1507
1298use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1299 1509
1300sub new { 1510sub new {
1301 my $class = shift; 1511 my $class = shift;
1302 1512
1303 $class->SUPER::new ( 1513 $class->SUPER::new (
1304 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1305 @_, 1516 @_,
1306 ) 1517 )
1307} 1518}
1308 1519
1309sub children { 1520sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311} 1522}
1312 1523
1313sub add { 1524sub add {
1314 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1315 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1316 $child->set_parent ($self); 1529 $child->set_parent ($self);
1317 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1318 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1319 $self->realloc; 1535 $self->realloc;
1320} 1536}
1321 1537
1322sub remove { 1538sub remove {
1323 my ($self, $child) = @_; 1539 my ($self, $child) = @_;
… …
1379 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1380 1596
1381 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1382 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1383 1599
1384 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1385 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1386 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1387 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1388 1604
1389 # linearly scale sizes
1390 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392 1606
1393 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1394 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1395 1616
1396 my $y; 1617 my $y;
1397 1618
1398 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1399 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1442 } 1663 }
1443} 1664}
1444 1665
1445############################################################################# 1666#############################################################################
1446 1667
1447package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1448 1669
1449our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1450 1671
1451sub size_request { 1672sub size_request {
1452 my ($self) = @_; 1673 my ($self) = @_;
1453 1674
1454 $self->{vertical} 1675 $self->{vertical}
… …
1487 $req[$_] += $space * $children[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1488 for 0 .. $#children; 1709 for 0 .. $#children;
1489 } 1710 }
1490 } 1711 }
1491 1712
1492 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1493 1714
1494 my $pos = 0; 1715 my $pos = 0;
1495 for (0 .. $#children) { 1716 for (0 .. $#children) {
1496 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1502 1 1723 1
1503} 1724}
1504 1725
1505############################################################################# 1726#############################################################################
1506 1727
1507package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1508 1729
1509our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1510 1731
1511sub new { 1732sub new {
1512 my $class = shift; 1733 my $class = shift;
1513 1734
1514 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1517 ) 1738 )
1518} 1739}
1519 1740
1520############################################################################# 1741#############################################################################
1521 1742
1522package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1523 1744
1524our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1525 1746
1526sub new { 1747sub new {
1527 my $class = shift; 1748 my $class = shift;
1528 1749
1529 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1532 ) 1753 )
1533} 1754}
1534 1755
1535############################################################################# 1756#############################################################################
1536 1757
1537package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1538 1759
1539our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1540 1761
1541use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1542 1763
1543sub new { 1764sub new {
1544 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1545 1766
1546 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1549 #active_bg => none 1770 #active_bg => none
1550 #font => default_font 1771 #font => default_font
1551 #text => initial text 1772 #text => initial text
1552 #markup => initial narkup 1773 #markup => initial narkup
1553 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1554 ellipsise => 3, # end 1776 ellipsise => 3, # end
1555 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1556 fontsize => 1, 1778 fontsize => 1,
1557 align => -1, 1779 align => -1,
1558 valign => -1, 1780 valign => -1,
1559 padding_x => 2, 1781 padding_x => 2,
1560 padding_y => 2, 1782 padding_y => 2,
1561 can_events => 0, 1783 can_events => 0,
1562 %arg 1784 %arg
1563 ); 1785 );
1564 1786
1565 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1566 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1567 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1568 $self->{template} = $layout; 1790 $self->{template} = $layout;
1569 } 1791 }
1570 1792
1571 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1573 } else { 1795 } else {
1574 $self->set_text (delete $self->{text}); 1796 $self->set_text (delete $self->{text});
1575 } 1797 }
1576 1798
1577 $self 1799 $self
1578}
1579
1580sub escape($) {
1581 local $_ = $_[0];
1582
1583 s/&/&amp;/g;
1584 s/>/&gt;/g;
1585 s/</&lt;/g;
1586
1587 $_
1588} 1800}
1589 1801
1590sub update { 1802sub update {
1591 my ($self) = @_; 1803 my ($self) = @_;
1592 1804
… …
1719 }; 1931 };
1720 1932
1721 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1722 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1723 1935
1724 $self->{layout}->render ($self->{ox}, $self->{oy}); 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725} 1937}
1726 1938
1727############################################################################# 1939#############################################################################
1728 1940
1729package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1730 1942
1731our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1732 1944
1733use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1734 1946
1735sub new { 1947sub new {
1736 my $class = shift; 1948 my $class = shift;
1737 1949
1738 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1742 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1743 can_hover => 1, 1955 can_hover => 1,
1744 can_focus => 1, 1956 can_focus => 1,
1745 valign => 0, 1957 valign => 0,
1746 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1747 #text => ... 1960 #text => ...
1748 #hidden => "*", 1961 #hidden => "*",
1749 @_ 1962 @_
1750 ) 1963 )
1751} 1964}
… …
1796 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1797 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1798 2011
1799 my $text = $self->get_text; 2012 my $text = $self->get_text;
1800 2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2015
1801 if ($uni == 8) { 2016 if ($uni == 8) {
1802 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1804 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1805 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1806 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1807 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1808 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1809 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1810 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1811 } elsif ($sym == CFClient::SDLK_END) {
1812 $self->{cursor} = length $text;
1813 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1814 $self->emit ('escape'); 2040 $self->emit ('escape');
1815 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1816 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else { 2045 } else {
1818 return 0; 2046 return 0;
1819 } 2047 }
1820 2048
1821 $self->_set_text ($text); 2049 $self->_set_text ($text);
1822 2050
1823 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1824 2053
1825 1 2054 1
1826} 2055}
1827 2056
1828sub invoke_focus_in { 2057sub invoke_focus_in {
… …
1890 utf8::encode $text; 2119 utf8::encode $text;
1891 2120
1892 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893 } 2122 }
1894 2123
1895 glColor @{$self->{fg}};
1896 glBegin GL_LINES; 2124 glBegin GL_LINES;
1897 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1898 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899 glEnd; 2127 glEnd;
1900 } 2128 }
1901} 2129}
1902 2130
2131#############################################################################
2132
1903package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1904 2134
1905our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1906 2136
1907use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1908 2138
1909sub invoke_key_down { 2139sub invoke_key_down {
1910 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1911 2141
1912 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1913 2143
1914 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1915 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1916 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
1917 2147
1918 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1919 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1920 $self->emit (activate => $txt); 2150 $self->emit (activate => $txt);
1921 $self->update; 2151 $self->update;
1922 2152
1923 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1924 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1925 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1926 } 2156 }
1927 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1928 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1930 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1931 } 2161 }
1932 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1933 } 2163 }
1934 2164
1935 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1936 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1937 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938 2168
1939 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1940 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1949 1 2179 1
1950} 2180}
1951 2181
1952############################################################################# 2182#############################################################################
1953 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1954package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1955 2224
1956our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1957 2226
1958use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1959 2228
1960my @tex = 2229my @tex =
1961 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1963 2232
1964sub new { 2233sub new {
1965 my $class = shift; 2234 my $class = shift;
1966 2235
… …
2003 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
2004} 2273}
2005 2274
2006############################################################################# 2275#############################################################################
2007 2276
2277package CFPlus::UI::CheckBox;
2278
2279our @ISA = CFPlus::UI::DrawBG::;
2280
2281my @tex =
2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2284
2285use CFPlus::OpenGL;
2286
2287sub new {
2288 my $class = shift;
2289
2290 $class->SUPER::new (
2291 padding_x => 2,
2292 padding_y => 2,
2293 fg => [1, 1, 1],
2294 active_fg => [1, 1, 0],
2295 bg => [0, 0, 0, 0.2],
2296 active_bg => [1, 1, 1, 0.5],
2297 state => 0,
2298 can_hover => 1,
2299 @_
2300 )
2301}
2302
2303sub size_request {
2304 my ($self) = @_;
2305
2306 (6) x 2
2307}
2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
2317sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_;
2319
2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2322 $self->toggle;
2323 } else {
2324 return 0
2325 }
2326
2327 1
2328}
2329
2330sub _draw {
2331 my ($self) = @_;
2332
2333 $self->SUPER::_draw;
2334
2335 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2336
2337 my ($w, $h) = @$self{qw(w h)};
2338
2339 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2340
2341 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2342
2343 my $tex = $self->{state} ? $tex[1] : $tex[0];
2344
2345 glEnable GL_TEXTURE_2D;
2346 $tex->draw_quad_alpha (0, 0, $s, $s);
2347 glDisable GL_TEXTURE_2D;
2348}
2349
2350#############################################################################
2351
2352package CFPlus::UI::Image;
2353
2354our @ISA = CFPlus::UI::Base::;
2355
2356use CFPlus::OpenGL;
2357
2358our %texture_cache;
2359
2360sub new {
2361 my $class = shift;
2362
2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2367
2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2370
2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2373
2374 CFPlus::weaken $texture_cache{$self->{path}};
2375
2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2377
2378 $self
2379}
2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2396sub size_request {
2397 my ($self) = @_;
2398
2399 ($self->{tex}{w}, $self->{tex}{h})
2400}
2401
2402sub _draw {
2403 my ($self) = @_;
2404
2405 my $tex = $self->{tex};
2406
2407 my ($w, $h) = ($self->{w}, $self->{h});
2408
2409 if ($self->{rot90}) {
2410 glRotate 90, 0, 0, 1;
2411 glTranslate 0, -$self->{w}, 0;
2412
2413 ($w, $h) = ($h, $w);
2414 }
2415
2416 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418
2419 $tex->draw_quad (0, 0, $w, $h);
2420
2421 glDisable GL_TEXTURE_2D;
2422}
2423
2424#############################################################################
2425
2008package CFClient::UI::ImageButton; 2426package CFPlus::UI::ImageButton;
2009 2427
2010our @ISA = CFClient::UI::Image::; 2428our @ISA = CFPlus::UI::Image::;
2011 2429
2012use CFClient::OpenGL; 2430use CFPlus::OpenGL;
2013 2431
2014my %textures; 2432my %textures;
2015 2433
2016sub new { 2434sub new {
2017 my $class = shift; 2435 my $class = shift;
… …
2039 1 2457 1
2040} 2458}
2041 2459
2042############################################################################# 2460#############################################################################
2043 2461
2044package CFClient::UI::CheckBox;
2045
2046our @ISA = CFClient::UI::DrawBG::;
2047
2048my @tex =
2049 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2050 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2051
2052use CFClient::OpenGL;
2053
2054sub new {
2055 my $class = shift;
2056
2057 $class->SUPER::new (
2058 padding_x => 2,
2059 padding_y => 2,
2060 fg => [1, 1, 1],
2061 active_fg => [1, 1, 0],
2062 bg => [0, 0, 0, 0.2],
2063 active_bg => [1, 1, 1, 0.5],
2064 state => 0,
2065 can_hover => 1,
2066 @_
2067 )
2068}
2069
2070sub size_request {
2071 my ($self) = @_;
2072
2073 (6) x 2
2074}
2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
2084sub invoke_button_down {
2085 my ($self, $ev, $x, $y) = @_;
2086
2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2089 $self->toggle;
2090 } else {
2091 return 0
2092 }
2093
2094 1
2095}
2096
2097sub _draw {
2098 my ($self) = @_;
2099
2100 $self->SUPER::_draw;
2101
2102 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2103
2104 my ($w, $h) = @$self{qw(w h)};
2105
2106 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2107
2108 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2109
2110 my $tex = $self->{state} ? $tex[1] : $tex[0];
2111
2112 glEnable GL_TEXTURE_2D;
2113 $tex->draw_quad_alpha (0, 0, $s, $s);
2114 glDisable GL_TEXTURE_2D;
2115}
2116
2117#############################################################################
2118
2119package CFClient::UI::Image; 2462package CFPlus::UI::VGauge;
2120 2463
2121our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2122
2123use CFClient::OpenGL;
2124
2125our %texture_cache;
2126
2127sub new {
2128 my $class = shift;
2129
2130 my $self = $class->SUPER::new (
2131 can_events => 0,
2132 @_,
2133 );
2134
2135 $self->{path} || $self->{tex}
2136 or Carp::croak "'path' or 'tex' attributes required";
2137
2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2140
2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2142
2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2144
2145 $self
2146}
2147
2148sub size_request {
2149 my ($self) = @_;
2150
2151 ($self->{tex}{w}, $self->{tex}{h})
2152}
2153
2154sub _draw {
2155 my ($self) = @_;
2156
2157 my $tex = $self->{tex};
2158
2159 my ($w, $h) = ($self->{w}, $self->{h});
2160
2161 if ($self->{rot90}) {
2162 glRotate 90, 0, 0, 1;
2163 glTranslate 0, -$self->{w}, 0;
2164
2165 ($w, $h) = ($h, $w);
2166 }
2167
2168 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170
2171 $tex->draw_quad_alpha (0, 0, $w, $h);
2172
2173 glDisable GL_TEXTURE_2D;
2174}
2175
2176#############################################################################
2177
2178package CFClient::UI::VGauge;
2179
2180our @ISA = CFClient::UI::Base::;
2181 2465
2182use List::Util qw(min max); 2466use List::Util qw(min max);
2183 2467
2184use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2185 2469
2186my %tex = ( 2470my %tex = (
2187 food => [ 2471 food => [
2188 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190 ], 2474 ],
2191 grace => [ 2475 grace => [
2192 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2193 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194 ], 2478 ],
2195 hp => [ 2479 hp => [
2196 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198 ], 2482 ],
2199 mana => [ 2483 mana => [
2200 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2201 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202 ], 2486 ],
2203); 2487);
2204 2488
2205# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2308 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2309} 2593}
2310 2594
2311############################################################################# 2595#############################################################################
2312 2596
2313package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2314 2598
2315our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2316 2600
2317sub new { 2601sub new {
2318 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2319 2603
2320 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2322 can_hover => 1, 2606 can_hover => 1,
2323 can_events => 1, 2607 can_events => 1,
2324 %arg, 2608 %arg,
2325 ); 2609 );
2326 2610
2327 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2328 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2329 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330 2614
2331 $self 2615 $self
2332} 2616}
2333 2617
2334sub set_fontsize { 2618sub set_fontsize {
… …
2355 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2356} 2640}
2357 2641
2358############################################################################# 2642#############################################################################
2359 2643
2360package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2361 2645
2362use strict; 2646use strict;
2363 2647
2364use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2365 2649
2366our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2367 2651
2368my @tex = 2652my @tex =
2369 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2371 2655
2372sub new { 2656sub new {
2373 my $class = shift; 2657 my $class = shift;
2374 2658
… …
2463 } 2747 }
2464 2748
2465 1 2749 1
2466} 2750}
2467 2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2762}
2763
2468sub update { 2764sub update {
2469 my ($self) = @_; 2765 my ($self) = @_;
2470 2766
2471 delete $self->{knob_w}; 2767 delete $self->{knob_w};
2472 $self->SUPER::update; 2768 $self->SUPER::update;
… …
2519 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2520} 2816}
2521 2817
2522############################################################################# 2818#############################################################################
2523 2819
2524package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2525 2821
2526our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2527 2823
2528sub new { 2824sub new {
2529 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2530 2826
2531 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2532 2828
2533 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2534 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536 to_value => sub { shift }, 2832 to_value => sub { shift },
2537 from_value => sub { shift }, 2833 from_value => sub { shift },
2538 %arg, 2834 %arg,
2539 ); 2835 );
2540 2836
… …
2560sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2561sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2562 2858
2563############################################################################# 2859#############################################################################
2564 2860
2565package CFClient::UI::TextScroller; 2861package CFPlus::UI::TextScroller;
2566 2862
2567our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2568 2864
2569use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2570 2866
2571sub new { 2867sub new {
2572 my $class = shift; 2868 my $class = shift;
2573 2869
2574 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2575 fontsize => 1, 2871 fontsize => 1,
2576 can_events => 0, 2872 can_events => 1,
2577 indent => 0, 2873 indent => 0,
2578 #font => default_font 2874 #font => default_font
2579 @_, 2875 @_,
2580 2876
2581 layout => (new CFClient::Layout), 2877 layout => (new CFPlus::Layout),
2582 par => [], 2878 par => [],
2879 max_par => 0,
2583 height => 0, 2880 height => 0,
2584 children => [ 2881 children => [
2585 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2586 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2587 ], 2884 ],
2588 ); 2885 );
2589 2886
2590 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2591 2888
… …
2621 2918
2622 $self->reflow; 2919 $self->reflow;
2623 2920
2624 local $self->{children} = [$empty, $slider]; 2921 local $self->{children} = [$empty, $slider];
2625 $self->SUPER::invoke_size_allocate ($w, $h) 2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2626} 2933}
2627 2934
2628sub get_layout { 2935sub get_layout {
2629 my ($self, $para) = @_; 2936 my ($self, $para) = @_;
2630 2937
… …
2658 2965
2659 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2660 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2661} 2968}
2662 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2663sub clear { 2985sub clear {
2664 my ($self) = @_; 2986 my ($self) = @_;
2665 2987
2666 my (undef, undef, @other) = @{ $self->{children} }; 2988 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other; 2989 $self->remove ($_) for @other;
… …
2670 $self->{height} = 0; 2992 $self->{height} = 0;
2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672} 2994}
2673 2995
2674sub add_paragraph { 2996sub add_paragraph {
2675 my ($self, $color, $para, $indent) = @_; 2997 my $self = shift;
2676 2998
2677 my ($text, @w) = ref $para ? @$para : $para; 2999 for my $para (@_) {
2678
2679 $para = { 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
2680 w => 1e10, 3006 w => 1e10,
2681 wrapped => 1, 3007 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2686 }; 3008 };
2687 3009
2688 $self->add (@w) if @w; 3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689 push @{$self->{par}}, $para; 3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
2690 3017
2691 $self->{need_reflow}++; 3018 $self->{need_reflow}++;
2692 $self->update; 3019 $self->update;
2693} 3020}
2694 3021
2695sub scroll_to_bottom { 3022sub scroll_to_bottom {
2696 my ($self) = @_; 3023 my ($self) = @_;
2697 3024
2698 $self->{scroll_to_bottom} = 1; 3025 $self->{scroll_to} = $#{$self->{par}};
2699 $self->update; 3026 $self->update;
2700} 3027}
2701 3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
3051 $self->{height} = $height;
3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3053
3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
3060}
3061
2702sub update { 3062sub update {
2703 my ($self) = @_; 3063 my ($self) = @_;
2704 3064
2705 $self->SUPER::update; 3065 $self->SUPER::update;
2706 3066
2707 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2708 3068
2709 delete $self->{texture}; 3069 delete $self->{texture};
2710 3070
2711 $ROOT->on_post_alloc ($self => sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713 3075
2714 if (delete $self->{need_reflow}) {
2715 my $height = 0;
2716
2717 for my $para (@{$self->{par}}) {
2718 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2719 my $layout = $self->get_layout ($para);
2720 my ($w, $h) = $layout->size;
2721
2722 $para->{w} = $w + $para->{indent};
2723 $para->{h} = $h;
2724 $para->{wrapped} = $layout->has_wrapped;
2725 }
2726
2727 $height += $para->{h};
2728 }
2729
2730 $self->{height} = $height;
2731
2732 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2733
2734 delete $self->{texture};
2735 }
2736
2737 if (delete $self->{scroll_to_bottom}) {
2738 $self->{children}[1]->set_value (1e10);
2739 }
2740
2741 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2743 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2744 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2745 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2746 3089
2747 my $y0 = $top; 3090 my $y0 = $top;
2748 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2749 3092
2750 my $y = 0;
2751
2752 for my $para (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2753 my $h = $para->{h}; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2754 3096
2755 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2756
2757 my $layout = $self->get_layout ($para); 3098 my $layout = $self->get_layout ($para);
2758 3099
2759 $layout->render ($para->{indent}, $y - $y0); 3100 $layout->render ($para->{indent}, $y - $y0);
2760 3101
2761 if (my @w = @{ $para->{widget} }) { 3102 if (my @w = @{ $para->{widget} }) {
… …
2770 $_->draw; 3111 $_->draw;
2771 } 3112 }
2772 } 3113 }
2773 } 3114 }
2774 3115
2775 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2776 } 3118 }
3119
3120 $self->{top_paragraph} = $top_paragraph;
2777 }; 3121 };
2778 }); 3122 });
2779} 3123}
2780 3124
2781sub reconfigure { 3125sub reconfigure {
… …
2799 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2800} 3144}
2801 3145
2802############################################################################# 3146#############################################################################
2803 3147
2804package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2805 3149
2806use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2807 3151
2808our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2809 3153
2810sub moveto { 3154sub moveto {
2811 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2812 3156
2813 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2841 glPopMatrix; 3185 glPopMatrix;
2842} 3186}
2843 3187
2844############################################################################# 3188#############################################################################
2845 3189
2846package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2847 3191
2848our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2849 3193
2850sub new { 3194sub new {
2851 my $class = shift; 3195 my $class = shift;
2852 3196
2853 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2865 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2866} 3210}
2867 3211
2868############################################################################# 3212#############################################################################
2869 3213
2870package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2871 3215
2872our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2873 3217
2874use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2875 3219
2876sub new { 3220sub new {
2877 my $class = shift; 3221 my $class = shift;
2878 3222
2879 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2882 ) 3226 )
2883} 3227}
2884 3228
2885sub set_tooltip_from { 3229sub set_tooltip_from {
2886 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2887 3234
2888 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2889 3236
2890 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2891 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2895 } 3242 }
2896 3243
2897 $tooltip =~ s/^\n+//; 3244 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//; 3245 $tooltip =~ s/\n+$//;
2899 3246
2900 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2901 markup => $tooltip, 3248 markup => $tooltip,
2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903 fontsize => 0.8, 3250 fontsize => 0.8,
2904 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2905 ellipsise => 0, 3252 ellipsise => 0,
2906 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2907 ); 3254 );
2908} 3255}
2909 3256
… …
2928 3275
2929 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2930 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2931 or return; 3278 or return;
2932 3279
3280 if ($widget->{visible}) {
2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934 3282
2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936 if $x + $self->{w} > $self->{root}{w}; 3284 if $x + $self->{w} > $self->{root}{w};
2937 3285
2938 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2939 }); 3290 });
2940} 3291}
2941 3292
2942sub _draw { 3293sub _draw {
2943 my ($self) = @_; 3294 my ($self) = @_;
… …
2967 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2968} 3319}
2969 3320
2970############################################################################# 3321#############################################################################
2971 3322
2972package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2973 3324
2974our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2975 3326
2976use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2977 3328
2978sub new { 3329sub new {
2979 my $class = shift; 3330 my $class = shift;
2980 3331
2981 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2983 can_events => 0, 3334 can_events => 0,
2984 @_, 3335 @_,
2985 ); 3336 );
2986 3337
2987 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
2988 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
2989 3340
2990 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
2991 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992 hard => 1, 3343 hard => 1,
2993 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
2994 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
2995 ++$widget->{frame}; 3347 ++$widget->{frame};
2996 $widget->update; 3348 $widget->update;
2997 }, 3349 },
2998 ); 3350 );
2999 } 3351 }
… …
3016sub _draw { 3368sub _draw {
3017 my ($self) = @_; 3369 my ($self) = @_;
3018 3370
3019 return unless $::CONN; 3371 return unless $::CONN;
3020 3372
3373 $self->SUPER::_draw;
3374
3021 my $face; 3375 my $face;
3022 3376
3023 if ($self->{frame}) { 3377 if ($self->{frame}) {
3024 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
3025 3379
3026 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
3027 if $anim && @$anim; 3381 if $anim && @$anim;
3028 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
3029 3386
3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
3031 3388
3032 if ($tex) { 3389 if ($tex) {
3033 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3035 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3037 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
3038 } 3399 }
3039} 3400}
3040 3401
3041sub destroy { 3402sub destroy {
3042 my ($self) = @_; 3403 my ($self) = @_;
… …
3047 $self->SUPER::destroy; 3408 $self->SUPER::destroy;
3048} 3409}
3049 3410
3050############################################################################# 3411#############################################################################
3051 3412
3052package CFClient::UI::Buttonbar; 3413package CFPlus::UI::Buttonbar;
3053 3414
3054our @ISA = CFClient::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
3055 3416
3056# TODO: should actualyl wrap buttons and other goodies. 3417# TODO: should actually wrap buttons and other goodies.
3057 3418
3058############################################################################# 3419#############################################################################
3059 3420
3060package CFClient::UI::Menu; 3421package CFPlus::UI::Menu;
3061 3422
3062our @ISA = CFClient::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
3063 3424
3064use CFClient::OpenGL; 3425use CFPlus::OpenGL;
3065 3426
3066sub new { 3427sub new {
3067 my $class = shift; 3428 my $class = shift;
3068 3429
3069 my $self = $class->SUPER::new ( 3430 my $self = $class->SUPER::new (
3070 items => [], 3431 items => [],
3071 z => 100, 3432 z => 100,
3072 @_, 3433 @_,
3073 ); 3434 );
3074 3435
3075 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076 3437
3077 for my $item (@{ $self->{items} }) { 3438 for my $item (@{ $self->{items} }) {
3078 my ($widget, $cb, $tooltip) = @$item; 3439 my ($widget, $cb, $tooltip) = @$item;
3079 3440
3080 # handle various types of items, only text for now 3441 # handle various types of items, only text for now
3081 if (!ref $widget) { 3442 if (!ref $widget) {
3082 if ($widget =~ /\t/) { 3443 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2; 3444 my ($left, $right) = split /\t/, $widget, 2;
3084 3445
3085 $widget = new CFClient::UI::HBox 3446 $widget = new CFPlus::UI::HBox
3086 can_hover => 1, 3447 can_hover => 1,
3087 can_events => 1, 3448 can_events => 1,
3088 tooltip => $tooltip, 3449 tooltip => $tooltip,
3089 children => [ 3450 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1), 3451 (new CFPlus::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1), 3452 (new CFPlus::UI::Label markup => $right, align => +1),
3092 ], 3453 ],
3093 ; 3454 ;
3094 3455
3095 } else { 3456 } else {
3096 $widget = new CFClient::UI::Label 3457 $widget = new CFPlus::UI::Label
3097 can_hover => 1, 3458 can_hover => 1,
3098 can_events => 1, 3459 can_events => 1,
3099 markup => $widget, 3460 markup => $widget,
3100 tooltip => $tooltip; 3461 tooltip => $tooltip;
3101 } 3462 }
… …
3149 1 3510 1
3150} 3511}
3151 3512
3152############################################################################# 3513#############################################################################
3153 3514
3154package CFClient::UI::Multiplexer; 3515package CFPlus::UI::Multiplexer;
3155 3516
3156our @ISA = CFClient::UI::Container::; 3517our @ISA = CFPlus::UI::Container::;
3157 3518
3158sub new { 3519sub new {
3159 my $class = shift; 3520 my $class = shift;
3160 3521
3161 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
3222 $self->{current}->draw; 3583 $self->{current}->draw;
3223} 3584}
3224 3585
3225############################################################################# 3586#############################################################################
3226 3587
3227package CFClient::UI::Notebook; 3588package CFPlus::UI::Notebook;
3228 3589
3229our @ISA = CFClient::UI::VBox::; 3590our @ISA = CFPlus::UI::VBox::;
3230 3591
3231sub new { 3592sub new {
3232 my $class = shift; 3593 my $class = shift;
3233 3594
3234 my $self = $class->SUPER::new ( 3595 my $self = $class->SUPER::new (
3235 buttonbar => (new CFClient::UI::Buttonbar), 3596 buttonbar => (new CFPlus::UI::Buttonbar),
3236 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237 # filter => # will be put between multiplexer and $self 3598 # filter => # will be put between multiplexer and $self
3238 @_, 3599 @_,
3239 ); 3600 );
3240 3601
3241 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3245} 3606}
3246 3607
3247sub add { 3608sub add {
3248 my ($self, $title, $widget, $tooltip) = @_; 3609 my ($self, $title, $widget, $tooltip) = @_;
3249 3610
3250 Scalar::Util::weaken $self; 3611 CFPlus::weaken $self;
3251 3612
3252 $self->{buttonbar}->add (new CFClient::UI::Button 3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3253 markup => $title, 3614 markup => $title,
3254 tooltip => $tooltip, 3615 tooltip => $tooltip,
3255 on_activate => sub { $self->set_current_page ($widget) }, 3616 on_activate => sub { $self->set_current_page ($widget) },
3256 ); 3617 );
3257 3618
… …
3271 $self->emit (page_changed => $self->{multiplexer}{current}); 3632 $self->emit (page_changed => $self->{multiplexer}{current});
3272} 3633}
3273 3634
3274############################################################################# 3635#############################################################################
3275 3636
3276package CFClient::UI::Combobox; 3637package CFPlus::UI::Selector;
3277 3638
3278use utf8; 3639use utf8;
3279 3640
3280our @ISA = CFClient::UI::Button::; 3641our @ISA = CFPlus::UI::Button::;
3281 3642
3282sub new { 3643sub new {
3283 my $class = shift; 3644 my $class = shift;
3284 3645
3285 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3302 my ($value, $title, $tooltip) = @$_; 3663 my ($value, $title, $tooltip) = @$_;
3303 3664
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 } 3666 }
3306 3667
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308} 3669}
3309 3670
3310sub _set_value { 3671sub _set_value {
3311 my ($self, $value) = @_; 3672 my ($self, $value) = @_;
3312 3673
… …
3327 $self->emit (changed => $value); 3688 $self->emit (changed => $value);
3328} 3689}
3329 3690
3330############################################################################# 3691#############################################################################
3331 3692
3332package CFClient::UI::Statusbox; 3693package CFPlus::UI::Statusbox;
3333 3694
3334our @ISA = CFClient::UI::VBox::; 3695our @ISA = CFPlus::UI::VBox::;
3335 3696
3336sub new { 3697sub new {
3337 my $class = shift; 3698 my $class = shift;
3338 3699
3339 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3340 fontsize => 0.8, 3701 fontsize => 0.8,
3341 @_, 3702 @_,
3342 ); 3703 );
3343 3704
3344 Scalar::Util::weaken (my $this = $self); 3705 CFPlus::weaken (my $this = $self);
3345 3706
3346 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347 3708
3348 $self 3709 $self
3349} 3710}
… …
3351sub reorder { 3712sub reorder {
3352 my ($self) = @_; 3713 my ($self) = @_;
3353 my $NOW = Time::HiRes::time; 3714 my $NOW = Time::HiRes::time;
3354 3715
3355 # freeze display when hovering over any label 3716 # freeze display when hovering over any label
3356 return if $CFClient::UI::TOOLTIP->{owner} 3717 return if $CFPlus::UI::TOOLTIP->{owner}
3357 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358 values %{ $self->{item} }; 3719 values %{ $self->{item} };
3359 3720
3360 while (my ($k, $v) = each %{ $self->{item} }) { 3721 while (my ($k, $v) = each %{ $self->{item} }) {
3361 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3722 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362 } 3723 }
… …
3383 for ($short) { 3744 for ($short) {
3384 s/^\s+//; 3745 s/^\s+//;
3385 s/\s+/ /g; 3746 s/\s+/ /g;
3386 } 3747 }
3387 3748
3388 new CFClient::UI::Label 3749 new CFPlus::UI::Label
3389 markup => $short, 3750 markup => $short,
3390 tooltip => $item->{tooltip}, 3751 tooltip => $item->{tooltip},
3391 tooltip_font => $::FONT_PROP, 3752 tooltip_font => $::FONT_PROP,
3392 tooltip_width => 0.67, 3753 tooltip_width => 0.67,
3393 fontsize => $item->{fontsize} || $self->{fontsize}, 3754 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3472 $self->SUPER::destroy; 3833 $self->SUPER::destroy;
3473} 3834}
3474 3835
3475############################################################################# 3836#############################################################################
3476 3837
3477package CFClient::UI::Inventory;
3478
3479our @ISA = CFClient::UI::Table::;
3480
3481sub new {
3482 my $class = shift;
3483
3484 my $self = $class->SUPER::new (
3485 col_expand => [0, 1, 0],
3486 @_,
3487 );
3488
3489 $self
3490}
3491
3492sub set_items {
3493 my ($self, $items) = @_;
3494
3495 $self->clear;
3496 return unless $items;
3497
3498 my @items = sort {
3499 ($a->{type} <=> $b->{type})
3500 or ($a->{name} cmp $b->{name})
3501 } values %$items;
3502
3503 $self->{real_items} = \@items;
3504
3505 my $row = 0;
3506 for my $item (@items) {
3507 CFClient::Item::update_widgets $item;
3508
3509 $self->add (0, $row, $item->{face_widget});
3510 $self->add (1, $row, $item->{desc_widget});
3511 $self->add (2, $row, $item->{weight_widget});
3512
3513 $row++;
3514 }
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::SpellList;
3520
3521our @ISA = CFClient::UI::Table::;
3522
3523sub new {
3524 my $class = shift;
3525
3526 my $self = $class->SUPER::new (
3527 binding => [],
3528 commands => [],
3529 @_,
3530 )
3531}
3532
3533my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3534
3535my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3537my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3541my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3543my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3544 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3545
3546sub rebuild_spell_list {
3547 my ($self) = @_;
3548
3549 $CFClient::UI::ROOT->on_refresh ($self => sub {
3550 $self->clear;
3551
3552 return unless $::CONN;
3553
3554 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3555 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3556 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3557 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3558 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3559
3560 my $row = 0;
3561
3562 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3563 my $spell = $self->{spell}{$_};
3564
3565 $row++;
3566
3567 my $spell_cb = sub {
3568 my ($widget, $ev) = @_;
3569
3570 if ($ev->{button} == 1) {
3571 $::CONN->user_send ("cast $spell->{name}");
3572 } elsif ($ev->{button} == 2) {
3573 $::CONN->user_send ("invoke $spell->{name}");
3574 } elsif ($ev->{button} == 3) {
3575 (new CFClient::UI::Menu
3576 items => [
3577 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3578 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3579 ],
3580 )->popup ($ev);
3581 } else {
3582 return 0;
3583 }
3584
3585 1
3586 };
3587
3588 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3589
3590 #TODO: add path info to tooltip
3591 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3592
3593 $self->add (0, $row, new CFClient::UI::Face
3594 face => $spell->{face},
3595 can_hover => 1,
3596 can_events => 1,
3597 tooltip => $tooltip,
3598 on_button_down => $spell_cb,
3599 );
3600
3601 $self->add (1, $row, new CFClient::UI::Label
3602 expand => 1,
3603 text => $spell->{name},
3604 can_hover => 1,
3605 can_events => 1,
3606 tooltip => $tooltip,
3607 on_button_down => $spell_cb,
3608 );
3609
3610 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3611 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3612 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3613 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3614 }
3615 });
3616}
3617
3618sub add_spell {
3619 my ($self, $spell) = @_;
3620
3621 $self->{spell}->{$spell->{name}} = $spell;
3622 $self->rebuild_spell_list;
3623}
3624
3625sub remove_spell {
3626 my ($self, $spell) = @_;
3627
3628 delete $self->{spell}->{$spell->{name}};
3629 $self->rebuild_spell_list;
3630}
3631
3632sub clear_spells {
3633 my ($self) = @_;
3634
3635 $self->{spell} = {};
3636 $self->rebuild_spell_list;
3637}
3638
3639#############################################################################
3640
3641package CFClient::UI::Root; 3838package CFPlus::UI::Root;
3642 3839
3643our @ISA = CFClient::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3644 3841
3645use List::Util qw(min max); 3842use List::Util qw(min max);
3646 3843
3647use CFClient::OpenGL; 3844use CFPlus::OpenGL;
3648 3845
3649sub new { 3846sub new {
3650 my $class = shift; 3847 my $class = shift;
3651 3848
3652 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3653 visible => 1, 3850 visible => 1,
3654 @_, 3851 @_,
3655 ); 3852 );
3656 3853
3657 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3658 3855
3659 $self 3856 $self
3660} 3857}
3661 3858
3662sub size_request { 3859sub size_request {
… …
3831 $h = 0 if $h < 0; 4028 $h = 0 if $h < 0;
3832 4029
3833 $w = max $widget->{min_w}, $w; 4030 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h; 4031 $h = max $widget->{min_h}, $h;
3835 4032
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838 4038
3839 $w = int $w + 0.5; 4039 $w = int $w + 0.5;
3840 $h = int $h + 0.5; 4040 $h = int $h + 0.5;
… …
3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867 glMatrixMode GL_MODELVIEW; 4067 glMatrixMode GL_MODELVIEW;
3868 glLoadIdentity; 4068 glLoadIdentity;
3869 4069
3870 { 4070 {
3871 package CFClient::UI::Base; 4071 package CFPlus::UI::Base;
3872 4072
3873 ($draw_x, $draw_y, $draw_w, $draw_h) = 4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874 (0, 0, $self->{w}, $self->{h}); 4074 (0, 0, $self->{w}, $self->{h});
3875 }
3876 4075
3877 $self->_draw; 4076 $self->_draw;
4077 }
3878} 4078}
3879 4079
3880############################################################################# 4080#############################################################################
3881 4081
3882package CFClient::UI; 4082package CFPlus::UI;
3883 4083
3884$ROOT = new CFClient::UI::Root; 4084$ROOT = new CFPlus::UI::Root;
3885$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886 4086
38871 40871
3888 4088

Diff Legend

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