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.371 by root, Sun Jul 15 22:07:48 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 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
987 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
988 %arg, 1072 %arg,
989 ); 1073 );
990 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
991 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
992 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
993 1080
994 $self 1081 $self
995} 1082}
996 1083
… …
1000 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
1001 1088
1002 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
1003} 1090}
1004 1091
1005sub invoke_button_down { 1092sub invoke_mouse_wheel {
1006 my ($self, $ev) = @_; 1093 my ($self, $ev) = @_;
1007 1094
1008 warn "button down $ev->{button}\n";#d# 1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1009 1099 1
1010 0
1011} 1100}
1012 1101
1013sub update_slider { 1102sub update_slider {
1014 my ($self) = @_; 1103 my ($self) = @_;
1015 1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 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]); 1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1017} 1114}
1018 1115
1019sub update { 1116sub update {
1020 my ($self) = @_; 1117 my ($self) = @_;
1021 1118
1022 $self->SUPER::update; 1119 $self->SUPER::update;
1023
1024 $self->update_slider; 1120 $self->update_slider;
1025} 1121}
1026 1122
1027sub invoke_size_allocate { 1123sub invoke_size_allocate {
1028 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1029 1125
1030 $self->update_slider; 1126 $self->update_slider;
1031
1032 $self->SUPER::invoke_size_allocate ($w, $h) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1033} 1128}
1034 1129
1035############################################################################# 1130#############################################################################
1036 1131
1037package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1038 1133
1039our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1040 1135
1041use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1042 1137
1043sub new { 1138sub new {
1044 my $class = shift; 1139 my $class = shift;
1045 1140
1046 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1072 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1073} 1168}
1074 1169
1075############################################################################# 1170#############################################################################
1076 1171
1077package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1078 1173
1079our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1080 1175
1081use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1082 1277
1083my $bg = 1278my $bg =
1084 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1085 mipmap => 1, wrap => 1; 1280 mipmap => 1, wrap => 1;
1086 1281
1087my @border = 1282my @border =
1088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1283 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); 1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1090 1285
1091sub new { 1286sub new {
1092 my ($class, %arg) = @_; 1287 my ($class, %arg) = @_;
1093 1288
… …
1099 min_w => 64, 1294 min_w => 64,
1100 min_h => 32, 1295 min_h => 32,
1101 %arg, 1296 %arg,
1102 ); 1297 );
1103 1298
1104 $self->{title_widget} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1105 align => 0, 1300 align => 0,
1106 valign => 1, 1301 valign => 1,
1107 text => $self->{title}, 1302 text => $self->{title},
1108 fontsize => $self->{border}, 1303 fontsize => $self->{border},
1109 if exists $self->{title}; 1304 if exists $self->{title};
1110 1305
1111 if ($self->{has_close_button}) { 1306 if ($self->{has_close_button}) {
1112 $self->{close_button} = 1307 $self->{close_button} =
1113 new CFClient::UI::ImageButton 1308 new CFPlus::UI::ImageButton
1114 path => 'x1_close.png', 1309 path => 'x1_close.png',
1115 on_activate => sub { $self->emit ("delete") }; 1310 on_activate => sub { $self->emit ("delete") };
1116 1311
1117 $self->CFClient::UI::Container::add ($self->{close_button}); 1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1118 } 1313 }
1119 1314
1120 $self 1315 $self
1121} 1316}
1122 1317
1123sub add { 1318sub add {
1124 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1125 1320
1126 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1127 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1322 $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}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1129} 1324}
1130 1325
1131sub border { 1326sub border {
1132 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1133} 1328}
… …
1241 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1242 1437
1243 ! ! $self->{motion} 1438 ! ! $self->{motion}
1244} 1439}
1245 1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1447}
1448
1246sub _draw { 1449sub _draw {
1247 my ($self) = @_; 1450 my ($self) = @_;
1248 1451
1249 my $child = $self->{children}[0]; 1452 my $child = $self->{children}[0];
1250 1453
… …
1287 if $self->{close_button}; 1490 if $self->{close_button};
1288} 1491}
1289 1492
1290############################################################################# 1493#############################################################################
1291 1494
1292package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1293 1496
1294our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1295 1498
1296use List::Util qw(max sum); 1499use List::Util qw(max sum);
1297 1500
1298use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1299 1502
1300sub new { 1503sub new {
1301 my $class = shift; 1504 my $class = shift;
1302 1505
1303 $class->SUPER::new ( 1506 $class->SUPER::new (
1304 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1305 @_, 1509 @_,
1306 ) 1510 )
1307} 1511}
1308 1512
1309sub children { 1513sub children {
1310 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1311} 1515}
1312 1516
1313sub add { 1517sub add {
1314 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1315 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1316 $child->set_parent ($self); 1522 $child->set_parent ($self);
1317 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1318 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1319 $self->realloc; 1528 $self->realloc;
1320} 1529}
1321 1530
1322sub remove { 1531sub remove {
1323 my ($self, $child) = @_; 1532 my ($self, $child) = @_;
… …
1379 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1380 1589
1381 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1382 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1383 1592
1384 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1385 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1386 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1387 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1388 1597
1389 # linearly scale sizes
1390 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1391 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1392 1599
1393 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1394 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1395 1609
1396 my $y; 1610 my $y;
1397 1611
1398 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1399 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1442 } 1656 }
1443} 1657}
1444 1658
1445############################################################################# 1659#############################################################################
1446 1660
1447package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1448 1662
1449our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1450 1664
1451sub size_request { 1665sub size_request {
1452 my ($self) = @_; 1666 my ($self) = @_;
1453 1667
1454 $self->{vertical} 1668 $self->{vertical}
… …
1487 $req[$_] += $space * $children[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1488 for 0 .. $#children; 1702 for 0 .. $#children;
1489 } 1703 }
1490 } 1704 }
1491 1705
1492 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1493 1707
1494 my $pos = 0; 1708 my $pos = 0;
1495 for (0 .. $#children) { 1709 for (0 .. $#children) {
1496 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1497 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1502 1 1716 1
1503} 1717}
1504 1718
1505############################################################################# 1719#############################################################################
1506 1720
1507package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1508 1722
1509our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1510 1724
1511sub new { 1725sub new {
1512 my $class = shift; 1726 my $class = shift;
1513 1727
1514 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1517 ) 1731 )
1518} 1732}
1519 1733
1520############################################################################# 1734#############################################################################
1521 1735
1522package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1523 1737
1524our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1525 1739
1526sub new { 1740sub new {
1527 my $class = shift; 1741 my $class = shift;
1528 1742
1529 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1532 ) 1746 )
1533} 1747}
1534 1748
1535############################################################################# 1749#############################################################################
1536 1750
1537package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1538 1752
1539our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1540 1754
1541use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1542 1756
1543sub new { 1757sub new {
1544 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1545 1759
1546 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1549 #active_bg => none 1763 #active_bg => none
1550 #font => default_font 1764 #font => default_font
1551 #text => initial text 1765 #text => initial text
1552 #markup => initial narkup 1766 #markup => initial narkup
1553 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1554 ellipsise => 3, # end 1769 ellipsise => 3, # end
1555 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1556 fontsize => 1, 1771 fontsize => 1,
1557 align => -1, 1772 align => -1,
1558 valign => -1, 1773 valign => -1,
1559 padding_x => 2, 1774 padding_x => 2,
1560 padding_y => 2, 1775 padding_y => 2,
1561 can_events => 0, 1776 can_events => 0,
1562 %arg 1777 %arg
1563 ); 1778 );
1564 1779
1565 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1566 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1567 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1568 $self->{template} = $layout; 1783 $self->{template} = $layout;
1569 } 1784 }
1570 1785
1571 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1573 } else { 1788 } else {
1574 $self->set_text (delete $self->{text}); 1789 $self->set_text (delete $self->{text});
1575 } 1790 }
1576 1791
1577 $self 1792 $self
1578}
1579
1580sub escape($) {
1581 local $_ = $_[0];
1582
1583 s/&/&amp;/g;
1584 s/>/&gt;/g;
1585 s/</&lt;/g;
1586
1587 $_
1588} 1793}
1589 1794
1590sub update { 1795sub update {
1591 my ($self) = @_; 1796 my ($self) = @_;
1592 1797
… …
1719 }; 1924 };
1720 1925
1721 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1722 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1723 1928
1724 $self->{layout}->render ($self->{ox}, $self->{oy}); 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1725} 1930}
1726 1931
1727############################################################################# 1932#############################################################################
1728 1933
1729package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1730 1935
1731our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1732 1937
1733use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1734 1939
1735sub new { 1940sub new {
1736 my $class = shift; 1941 my $class = shift;
1737 1942
1738 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1742 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1743 can_hover => 1, 1948 can_hover => 1,
1744 can_focus => 1, 1949 can_focus => 1,
1745 valign => 0, 1950 valign => 0,
1746 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1747 #text => ... 1953 #text => ...
1748 #hidden => "*", 1954 #hidden => "*",
1749 @_ 1955 @_
1750 ) 1956 )
1751} 1957}
… …
1796 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1797 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1798 2004
1799 my $text = $self->get_text; 2005 my $text = $self->get_text;
1800 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1801 if ($uni == 8) { 2009 if ($uni == 8) {
1802 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1803 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1804 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1805 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1806 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1807 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1808 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1809 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1810 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1811 } elsif ($sym == CFClient::SDLK_END) {
1812 $self->{cursor} = length $text;
1813 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1814 $self->emit ('escape'); 2033 $self->emit ('escape');
1815 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1816 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1817 } else { 2038 } else {
1818 return 0; 2039 return 0;
1819 } 2040 }
1820 2041
1821 $self->_set_text ($text); 2042 $self->_set_text ($text);
1822 2043
1823 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1824 2046
1825 1 2047 1
1826} 2048}
1827 2049
1828sub invoke_focus_in { 2050sub invoke_focus_in {
… …
1890 utf8::encode $text; 2112 utf8::encode $text;
1891 2113
1892 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1893 } 2115 }
1894 2116
1895 glColor @{$self->{fg}};
1896 glBegin GL_LINES; 2117 glBegin GL_LINES;
1897 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 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}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1899 glEnd; 2120 glEnd;
1900 } 2121 }
1901} 2122}
1902 2123
2124#############################################################################
2125
1903package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1904 2127
1905our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1906 2129
1907use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1908 2131
1909sub invoke_key_down { 2132sub invoke_key_down {
1910 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1911 2134
1912 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1913 2136
1914 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1915 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1916 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
1917 2140
1918 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1919 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1920 $self->emit (activate => $txt); 2143 $self->emit (activate => $txt);
1921 $self->update; 2144 $self->update;
1922 2145
1923 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1924 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1925 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1926 } 2149 }
1927 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1928 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1930 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1931 } 2154 }
1932 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1933 } 2156 }
1934 2157
1935 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1936 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1937 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1938 2161
1939 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1940 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1949 1 2172 1
1950} 2173}
1951 2174
1952############################################################################# 2175#############################################################################
1953 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1954package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1955 2217
1956our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1957 2219
1958use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1959 2221
1960my @tex = 2222my @tex =
1961 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1962 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1963 2225
1964sub new { 2226sub new {
1965 my $class = shift; 2227 my $class = shift;
1966 2228
… …
2003 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
2004} 2266}
2005 2267
2006############################################################################# 2268#############################################################################
2007 2269
2270package CFPlus::UI::CheckBox;
2271
2272our @ISA = CFPlus::UI::DrawBG::;
2273
2274my @tex =
2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2277
2278use CFPlus::OpenGL;
2279
2280sub new {
2281 my $class = shift;
2282
2283 $class->SUPER::new (
2284 padding_x => 2,
2285 padding_y => 2,
2286 fg => [1, 1, 1],
2287 active_fg => [1, 1, 0],
2288 bg => [0, 0, 0, 0.2],
2289 active_bg => [1, 1, 1, 0.5],
2290 state => 0,
2291 can_hover => 1,
2292 @_
2293 )
2294}
2295
2296sub size_request {
2297 my ($self) = @_;
2298
2299 (6) x 2
2300}
2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
2310sub invoke_button_down {
2311 my ($self, $ev, $x, $y) = @_;
2312
2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2315 $self->toggle;
2316 } else {
2317 return 0
2318 }
2319
2320 1
2321}
2322
2323sub _draw {
2324 my ($self) = @_;
2325
2326 $self->SUPER::_draw;
2327
2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2329
2330 my ($w, $h) = @$self{qw(w h)};
2331
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333
2334 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2335
2336 my $tex = $self->{state} ? $tex[1] : $tex[0];
2337
2338 glEnable GL_TEXTURE_2D;
2339 $tex->draw_quad_alpha (0, 0, $s, $s);
2340 glDisable GL_TEXTURE_2D;
2341}
2342
2343#############################################################################
2344
2345package CFPlus::UI::Image;
2346
2347our @ISA = CFPlus::UI::Base::;
2348
2349use CFPlus::OpenGL;
2350
2351our %texture_cache;
2352
2353sub new {
2354 my $class = shift;
2355
2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2360
2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2363
2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2366
2367 CFPlus::weaken $texture_cache{$self->{path}};
2368
2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2370
2371 $self
2372}
2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2389sub size_request {
2390 my ($self) = @_;
2391
2392 ($self->{tex}{w}, $self->{tex}{h})
2393}
2394
2395sub _draw {
2396 my ($self) = @_;
2397
2398 my $tex = $self->{tex};
2399
2400 my ($w, $h) = ($self->{w}, $self->{h});
2401
2402 if ($self->{rot90}) {
2403 glRotate 90, 0, 0, 1;
2404 glTranslate 0, -$self->{w}, 0;
2405
2406 ($w, $h) = ($h, $w);
2407 }
2408
2409 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411
2412 $tex->draw_quad (0, 0, $w, $h);
2413
2414 glDisable GL_TEXTURE_2D;
2415}
2416
2417#############################################################################
2418
2008package CFClient::UI::ImageButton; 2419package CFPlus::UI::ImageButton;
2009 2420
2010our @ISA = CFClient::UI::Image::; 2421our @ISA = CFPlus::UI::Image::;
2011 2422
2012use CFClient::OpenGL; 2423use CFPlus::OpenGL;
2013 2424
2014my %textures; 2425my %textures;
2015 2426
2016sub new { 2427sub new {
2017 my $class = shift; 2428 my $class = shift;
… …
2039 1 2450 1
2040} 2451}
2041 2452
2042############################################################################# 2453#############################################################################
2043 2454
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; 2455package CFPlus::UI::VGauge;
2120 2456
2121our @ISA = CFClient::UI::Base::; 2457our @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 2458
2182use List::Util qw(min max); 2459use List::Util qw(min max);
2183 2460
2184use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2185 2462
2186my %tex = ( 2463my %tex = (
2187 food => [ 2464 food => [
2188 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2189 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2190 ], 2467 ],
2191 grace => [ 2468 grace => [
2192 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 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/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2194 ], 2471 ],
2195 hp => [ 2472 hp => [
2196 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2197 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2198 ], 2475 ],
2199 mana => [ 2476 mana => [
2200 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 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/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2202 ], 2479 ],
2203); 2480);
2204 2481
2205# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2308 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2309} 2586}
2310 2587
2311############################################################################# 2588#############################################################################
2312 2589
2313package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2314 2591
2315our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2316 2593
2317sub new { 2594sub new {
2318 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2319 2596
2320 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2322 can_hover => 1, 2599 can_hover => 1,
2323 can_events => 1, 2600 can_events => 1,
2324 %arg, 2601 %arg,
2325 ); 2602 );
2326 2603
2327 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $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); 2605 $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"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2330 2607
2331 $self 2608 $self
2332} 2609}
2333 2610
2334sub set_fontsize { 2611sub set_fontsize {
… …
2355 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2356} 2633}
2357 2634
2358############################################################################# 2635#############################################################################
2359 2636
2360package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2361 2638
2362use strict; 2639use strict;
2363 2640
2364use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2365 2642
2366our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2367 2644
2368my @tex = 2645my @tex =
2369 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2370 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2371 2648
2372sub new { 2649sub new {
2373 my $class = shift; 2650 my $class = shift;
2374 2651
… …
2463 } 2740 }
2464 2741
2465 1 2742 1
2466} 2743}
2467 2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2755}
2756
2468sub update { 2757sub update {
2469 my ($self) = @_; 2758 my ($self) = @_;
2470 2759
2471 delete $self->{knob_w}; 2760 delete $self->{knob_w};
2472 $self->SUPER::update; 2761 $self->SUPER::update;
… …
2519 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2520} 2809}
2521 2810
2522############################################################################# 2811#############################################################################
2523 2812
2524package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2525 2814
2526our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2527 2816
2528sub new { 2817sub new {
2529 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2530 2819
2531 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2532 2821
2533 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2534 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2535 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2536 to_value => sub { shift }, 2825 to_value => sub { shift },
2537 from_value => sub { shift }, 2826 from_value => sub { shift },
2538 %arg, 2827 %arg,
2539 ); 2828 );
2540 2829
… …
2560sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2561sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2562 2851
2563############################################################################# 2852#############################################################################
2564 2853
2565package CFClient::UI::TextScroller; 2854package CFPlus::UI::TextScroller;
2566 2855
2567our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2568 2857
2569use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2570 2859
2571sub new { 2860sub new {
2572 my $class = shift; 2861 my $class = shift;
2573 2862
2574 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2575 fontsize => 1, 2864 fontsize => 1,
2576 can_events => 0, 2865 can_events => 1,
2577 indent => 0, 2866 indent => 0,
2578 #font => default_font 2867 #font => default_font
2579 @_, 2868 @_,
2580 2869
2581 layout => (new CFClient::Layout), 2870 layout => (new CFPlus::Layout),
2582 par => [], 2871 par => [],
2872 max_par => 0,
2583 height => 0, 2873 height => 0,
2584 children => [ 2874 children => [
2585 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2586 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2587 ], 2877 ],
2588 ); 2878 );
2589 2879
2590 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2591 2881
… …
2621 2911
2622 $self->reflow; 2912 $self->reflow;
2623 2913
2624 local $self->{children} = [$empty, $slider]; 2914 local $self->{children} = [$empty, $slider];
2625 $self->SUPER::invoke_size_allocate ($w, $h) 2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2626} 2926}
2627 2927
2628sub get_layout { 2928sub get_layout {
2629 my ($self, $para) = @_; 2929 my ($self, $para) = @_;
2630 2930
… …
2658 2958
2659 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2660 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2661} 2961}
2662 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2663sub clear { 2978sub clear {
2664 my ($self) = @_; 2979 my ($self) = @_;
2665 2980
2666 my (undef, undef, @other) = @{ $self->{children} }; 2981 my (undef, undef, @other) = @{ $self->{children} };
2667 $self->remove ($_) for @other; 2982 $self->remove ($_) for @other;
… …
2670 $self->{height} = 0; 2985 $self->{height} = 0;
2671 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2672} 2987}
2673 2988
2674sub add_paragraph { 2989sub add_paragraph {
2675 my ($self, $color, $para, $indent) = @_; 2990 my $self = shift;
2676 2991
2677 my ($text, @w) = ref $para ? @$para : $para; 2992 for my $para (@_) {
2678
2679 $para = { 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2680 w => 1e10, 2999 w => 1e10,
2681 wrapped => 1, 3000 wrapped => 1,
2682 fg => $color,
2683 indent => $indent,
2684 markup => $text,
2685 widget => \@w,
2686 }; 3001 };
2687 3002
2688 $self->add (@w) if @w; 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2689 push @{$self->{par}}, $para; 3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
2690 3010
2691 $self->{need_reflow}++; 3011 $self->{need_reflow}++;
2692 $self->update; 3012 $self->update;
2693} 3013}
2694 3014
2695sub scroll_to_bottom { 3015sub scroll_to_bottom {
2696 my ($self) = @_; 3016 my ($self) = @_;
2697 3017
2698 $self->{scroll_to_bottom} = 1; 3018 $self->{scroll_to} = $#{$self->{par}};
2699 $self->update; 3019 $self->update;
2700} 3020}
2701 3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
3044 $self->{height} = $height;
3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3046
3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
3053}
3054
2702sub update { 3055sub update {
2703 my ($self) = @_; 3056 my ($self) = @_;
2704 3057
2705 $self->SUPER::update; 3058 $self->SUPER::update;
2706 3059
2707 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2708 3061
2709 delete $self->{texture}; 3062 delete $self->{texture};
2710 3063
2711 $ROOT->on_post_alloc ($self => sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2712 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2713 3068
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 { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2742 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2743 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2744 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2745 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2746 3082
2747 my $y0 = $top; 3083 my $y0 = $top;
2748 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2749 3085
2750 my $y = 0;
2751
2752 for my $para (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2753 my $h = $para->{h}; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2754 3089
2755 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2756
2757 my $layout = $self->get_layout ($para); 3091 my $layout = $self->get_layout ($para);
2758 3092
2759 $layout->render ($para->{indent}, $y - $y0); 3093 $layout->render ($para->{indent}, $y - $y0);
2760 3094
2761 if (my @w = @{ $para->{widget} }) { 3095 if (my @w = @{ $para->{widget} }) {
… …
2770 $_->draw; 3104 $_->draw;
2771 } 3105 }
2772 } 3106 }
2773 } 3107 }
2774 3108
2775 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2776 } 3111 }
3112
3113 $self->{top_paragraph} = $top_paragraph;
2777 }; 3114 };
2778 }); 3115 });
2779} 3116}
2780 3117
2781sub reconfigure { 3118sub reconfigure {
… …
2799 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2800} 3137}
2801 3138
2802############################################################################# 3139#############################################################################
2803 3140
2804package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2805 3142
2806use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2807 3144
2808our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2809 3146
2810sub moveto { 3147sub moveto {
2811 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2812 3149
2813 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2841 glPopMatrix; 3178 glPopMatrix;
2842} 3179}
2843 3180
2844############################################################################# 3181#############################################################################
2845 3182
2846package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2847 3184
2848our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2849 3186
2850sub new { 3187sub new {
2851 my $class = shift; 3188 my $class = shift;
2852 3189
2853 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2865 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2866} 3203}
2867 3204
2868############################################################################# 3205#############################################################################
2869 3206
2870package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2871 3208
2872our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2873 3210
2874use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2875 3212
2876sub new { 3213sub new {
2877 my $class = shift; 3214 my $class = shift;
2878 3215
2879 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2882 ) 3219 )
2883} 3220}
2884 3221
2885sub set_tooltip_from { 3222sub set_tooltip_from {
2886 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2887 3227
2888 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2889 3229
2890 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2891 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2895 } 3235 }
2896 3236
2897 $tooltip =~ s/^\n+//; 3237 $tooltip =~ s/^\n+//;
2898 $tooltip =~ s/\n+$//; 3238 $tooltip =~ s/\n+$//;
2899 3239
2900 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2901 markup => $tooltip, 3241 markup => $tooltip,
2902 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2903 fontsize => 0.8, 3243 fontsize => 0.8,
2904 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2905 ellipsise => 0, 3245 ellipsise => 0,
2906 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2907 ); 3247 );
2908} 3248}
2909 3249
… …
2928 3268
2929 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2930 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2931 or return; 3271 or return;
2932 3272
3273 if ($widget->{visible}) {
2933 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2934 3275
2935 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2936 if $x + $self->{w} > $self->{root}{w}; 3277 if $x + $self->{w} > $self->{root}{w};
2937 3278
2938 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2939 }); 3283 });
2940} 3284}
2941 3285
2942sub _draw { 3286sub _draw {
2943 my ($self) = @_; 3287 my ($self) = @_;
… …
2967 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2968} 3312}
2969 3313
2970############################################################################# 3314#############################################################################
2971 3315
2972package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2973 3317
2974our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2975 3319
2976use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2977 3321
2978sub new { 3322sub new {
2979 my $class = shift; 3323 my $class = shift;
2980 3324
2981 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2983 can_events => 0, 3327 can_events => 0,
2984 @_, 3328 @_,
2985 ); 3329 );
2986 3330
2987 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2988 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2989 3333
2990 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2991 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2992 hard => 1, 3336 hard => 1,
2993 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
2994 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
2995 ++$widget->{frame}; 3340 ++$widget->{frame};
2996 $widget->update; 3341 $widget->update;
2997 }, 3342 },
2998 ); 3343 );
2999 } 3344 }
… …
3016sub _draw { 3361sub _draw {
3017 my ($self) = @_; 3362 my ($self) = @_;
3018 3363
3019 return unless $::CONN; 3364 return unless $::CONN;
3020 3365
3366 $self->SUPER::_draw;
3367
3021 my $face; 3368 my $face;
3022 3369
3023 if ($self->{frame}) { 3370 if ($self->{frame}) {
3024 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
3025 3372
3026 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
3027 if $anim && @$anim; 3374 if $anim && @$anim;
3028 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3029 3379
3030 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
3031 3381
3032 if ($tex) { 3382 if ($tex) {
3033 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
3034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3035 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
3036 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3037 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3038 } 3392 }
3039} 3393}
3040 3394
3041sub destroy { 3395sub destroy {
3042 my ($self) = @_; 3396 my ($self) = @_;
… …
3047 $self->SUPER::destroy; 3401 $self->SUPER::destroy;
3048} 3402}
3049 3403
3050############################################################################# 3404#############################################################################
3051 3405
3052package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
3053 3407
3054our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
3055 3409
3056# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
3057 3411
3058############################################################################# 3412#############################################################################
3059 3413
3060package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
3061 3415
3062our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
3063 3417
3064use CFClient::OpenGL; 3418use CFPlus::OpenGL;
3065 3419
3066sub new { 3420sub new {
3067 my $class = shift; 3421 my $class = shift;
3068 3422
3069 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
3070 items => [], 3424 items => [],
3071 z => 100, 3425 z => 100,
3072 @_, 3426 @_,
3073 ); 3427 );
3074 3428
3075 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3076 3430
3077 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
3078 my ($widget, $cb, $tooltip) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
3079 3433
3080 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
3081 if (!ref $widget) { 3435 if (!ref $widget) {
3082 if ($widget =~ /\t/) { 3436 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2; 3437 my ($left, $right) = split /\t/, $widget, 2;
3084 3438
3085 $widget = new CFClient::UI::HBox 3439 $widget = new CFPlus::UI::HBox
3086 can_hover => 1, 3440 can_hover => 1,
3087 can_events => 1, 3441 can_events => 1,
3088 tooltip => $tooltip, 3442 tooltip => $tooltip,
3089 children => [ 3443 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1), 3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1), 3445 (new CFPlus::UI::Label markup => $right, align => +1),
3092 ], 3446 ],
3093 ; 3447 ;
3094 3448
3095 } else { 3449 } else {
3096 $widget = new CFClient::UI::Label 3450 $widget = new CFPlus::UI::Label
3097 can_hover => 1, 3451 can_hover => 1,
3098 can_events => 1, 3452 can_events => 1,
3099 markup => $widget, 3453 markup => $widget,
3100 tooltip => $tooltip; 3454 tooltip => $tooltip;
3101 } 3455 }
… …
3149 1 3503 1
3150} 3504}
3151 3505
3152############################################################################# 3506#############################################################################
3153 3507
3154package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
3155 3509
3156our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
3157 3511
3158sub new { 3512sub new {
3159 my $class = shift; 3513 my $class = shift;
3160 3514
3161 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
… …
3222 $self->{current}->draw; 3576 $self->{current}->draw;
3223} 3577}
3224 3578
3225############################################################################# 3579#############################################################################
3226 3580
3227package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3228 3582
3229our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3230 3584
3231sub new { 3585sub new {
3232 my $class = shift; 3586 my $class = shift;
3233 3587
3234 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3235 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3236 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3237 # filter => # will be put between multiplexer and $self 3591 # filter => # will be put between multiplexer and $self
3238 @_, 3592 @_,
3239 ); 3593 );
3240 3594
3241 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3245} 3599}
3246 3600
3247sub add { 3601sub add {
3248 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3249 3603
3250 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3251 3605
3252 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3253 markup => $title, 3607 markup => $title,
3254 tooltip => $tooltip, 3608 tooltip => $tooltip,
3255 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3256 ); 3610 );
3257 3611
… …
3271 $self->emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3272} 3626}
3273 3627
3274############################################################################# 3628#############################################################################
3275 3629
3276package CFClient::UI::Combobox; 3630package CFPlus::UI::Selector;
3277 3631
3278use utf8; 3632use utf8;
3279 3633
3280our @ISA = CFClient::UI::Button::; 3634our @ISA = CFPlus::UI::Button::;
3281 3635
3282sub new { 3636sub new {
3283 my $class = shift; 3637 my $class = shift;
3284 3638
3285 my $self = $class->SUPER::new ( 3639 my $self = $class->SUPER::new (
… …
3302 my ($value, $title, $tooltip) = @$_; 3656 my ($value, $title, $tooltip) = @$_;
3303 3657
3304 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3305 } 3659 }
3306 3660
3307 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3308} 3662}
3309 3663
3310sub _set_value { 3664sub _set_value {
3311 my ($self, $value) = @_; 3665 my ($self, $value) = @_;
3312 3666
… …
3327 $self->emit (changed => $value); 3681 $self->emit (changed => $value);
3328} 3682}
3329 3683
3330############################################################################# 3684#############################################################################
3331 3685
3332package CFClient::UI::Statusbox; 3686package CFPlus::UI::Statusbox;
3333 3687
3334our @ISA = CFClient::UI::VBox::; 3688our @ISA = CFPlus::UI::VBox::;
3335 3689
3336sub new { 3690sub new {
3337 my $class = shift; 3691 my $class = shift;
3338 3692
3339 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3340 fontsize => 0.8, 3694 fontsize => 0.8,
3341 @_, 3695 @_,
3342 ); 3696 );
3343 3697
3344 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3345 3699
3346 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3347 3701
3348 $self 3702 $self
3349} 3703}
… …
3351sub reorder { 3705sub reorder {
3352 my ($self) = @_; 3706 my ($self) = @_;
3353 my $NOW = Time::HiRes::time; 3707 my $NOW = Time::HiRes::time;
3354 3708
3355 # freeze display when hovering over any label 3709 # freeze display when hovering over any label
3356 return if $CFClient::UI::TOOLTIP->{owner} 3710 return if $CFPlus::UI::TOOLTIP->{owner}
3357 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3358 values %{ $self->{item} }; 3712 values %{ $self->{item} };
3359 3713
3360 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3361 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3362 } 3716 }
… …
3383 for ($short) { 3737 for ($short) {
3384 s/^\s+//; 3738 s/^\s+//;
3385 s/\s+/ /g; 3739 s/\s+/ /g;
3386 } 3740 }
3387 3741
3388 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3389 markup => $short, 3743 markup => $short,
3390 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3391 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3392 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3393 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3472 $self->SUPER::destroy; 3826 $self->SUPER::destroy;
3473} 3827}
3474 3828
3475############################################################################# 3829#############################################################################
3476 3830
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; 3831package CFPlus::UI::Root;
3642 3832
3643our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3644 3834
3645use List::Util qw(min max); 3835use List::Util qw(min max);
3646 3836
3647use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3648 3838
3649sub new { 3839sub new {
3650 my $class = shift; 3840 my $class = shift;
3651 3841
3652 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3653 visible => 1, 3843 visible => 1,
3654 @_, 3844 @_,
3655 ); 3845 );
3656 3846
3657 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3658 3848
3659 $self 3849 $self
3660} 3850}
3661 3851
3662sub size_request { 3852sub size_request {
… …
3831 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
3832 4022
3833 $w = max $widget->{min_w}, $w; 4023 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h; 4024 $h = max $widget->{min_h}, $h;
3835 4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838 4031
3839 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3840 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
… …
3866 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3867 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
3868 glLoadIdentity; 4061 glLoadIdentity;
3869 4062
3870 { 4063 {
3871 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
3872 4065
3873 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3874 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
3875 }
3876 4068
3877 $self->_draw; 4069 $self->_draw;
4070 }
3878} 4071}
3879 4072
3880############################################################################# 4073#############################################################################
3881 4074
3882package CFClient::UI; 4075package CFPlus::UI;
3883 4076
3884$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
3885$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3886 4079
38871 40801
3888 4081

Diff Legend

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