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.318 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 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 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 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 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $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};
227 $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};
228 $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};
229 $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};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
247sub show { 273sub show {
248 my ($self) = @_; 274 my ($self) = @_;
249 275
250 return if $self->{parent}; 276 return if $self->{parent};
251 277
252 $CFClient::UI::ROOT->add ($self); 278 $CFPlus::UI::ROOT->add ($self);
253} 279}
254 280
255sub set_visible { 281sub set_visible {
256 my ($self) = @_; 282 my ($self) = @_;
257 283
… …
278 delete $self->{root}; 304 delete $self->{root};
279 305
280 undef $GRAB if $GRAB == $self; 306 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 307 undef $HOVER if $HOVER == $self;
282 308
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 309 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 310 if $TOOLTIP->{owner} == $self;
285 311
286 $self->emit ("focus_out"); 312 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 313 $self->emit (visibility_change => 0);
288} 314}
… …
345 my ($self, $x, $y, $w, $h) = @_; 371 my ($self, $x, $y, $w, $h) = @_;
346 372
347 if ($self->{aspect}) { 373 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 374 my ($ow, $oh) = ($w, $h);
349 375
350 $w = List::Util::min $w, int $h * $self->{aspect}; 376 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 377 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 378
353 # use alignment to adjust x, y 379 # use alignment to adjust x, y
354 380
355 $x += int 0.5 * ($ow - $w); 381 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 382 $y += int 0.5 * ($oh - $h);
… …
397 423
398 return if $self->{tooltip} eq $tooltip; 424 return if $self->{tooltip} eq $tooltip;
399 425
400 $self->{tooltip} = $tooltip; 426 $self->{tooltip} = $tooltip;
401 427
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 428 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 429 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 430 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 431 }
406} 432}
407 433
408# translate global coordinates to local coordinate system 434# translate global coordinates to local coordinate system
409sub coord2local { 435sub coord2local {
410 my ($self, $x, $y) = @_; 436 my ($self, $x, $y) = @_;
411 437
438 Carp::confess unless $self->{parent};#d#
439
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 440 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 441}
414 442
415# translate local coordinates to global coordinate system 443# translate local coordinates to global coordinate system
416sub coord2global { 444sub coord2global {
417 my ($self, $x, $y) = @_; 445 my ($self, $x, $y) = @_;
418 446
447 Carp::confess unless $self->{parent};#d#
448
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 449 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 450}
421 451
422sub invoke_focus_in { 452sub invoke_focus_in {
423 my ($self) = @_; 453 my ($self) = @_;
… …
452 482
453 $FOCUS->emit ("focus_out") if $FOCUS; 483 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 484 $self->emit ("focus_in");
455} 485}
456 486
457sub invoke_mouse_motion { 1 } 487sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 488sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 489sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 490sub invoke_key_up { 0 }
491sub invoke_mouse_wheel { 0 }
461 492
462sub invoke_button_down { 493sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 494 my ($self, $ev, $x, $y) = @_;
464 495
465 $self->grab_focus; 496 $self->grab_focus;
466 497
467 1 498 0
468} 499}
469 500
470sub connect { 501sub connect {
471 my ($self, $signal, $cb) = @_; 502 my ($self, $signal, $cb) = @_;
472 503
473 push @{ $self->{signal_cb}{$signal} }, $cb; 504 push @{ $self->{signal_cb}{$signal} }, $cb;
505
506 defined wantarray and CFPlus::guard {
507 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
508 @{ $self->{signal_cb}{$signal} };
509 }
474} 510}
511
512sub disconnect_all {
513 my ($self, $signal) = @_;
514
515 delete $self->{signal_cb}{$signal};
516}
517
518my %has_coords = (
519 button_down => 1,
520 button_up => 1,
521 mouse_motion => 1,
522 mouse_wheel => 1,
523);
475 524
476sub emit { 525sub emit {
477 my ($self, $signal, @args) = @_; 526 my ($self, $signal, @args) = @_;
478 527
479 #d##TODO# stop propagating at first true, do not use sum 528 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 529 # and needlessly verbose code, either.
530 my @append
531 = $has_coords{$signal}
532 ? $args[0]->xy ($self)
533 : ();
534
535 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
536
537 for my $cb (
538 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 539 ($self->can ("invoke_$signal") || sub { 1 }), # closure
540 ) {
541 return $cb->($self, @args, @append) || next;
542 }
543
544 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 545 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 546}
484 547
485sub find_widget { 548sub find_widget {
486 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
487 550
… …
495} 558}
496 559
497sub set_parent { 560sub set_parent {
498 my ($self, $parent) = @_; 561 my ($self, $parent) = @_;
499 562
500 Scalar::Util::weaken ($self->{parent} = $parent); 563 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 564 $self->set_visible if $parent->{visible};
502} 565}
503 566
504sub realloc { 567sub realloc {
505 my ($self) = @_; 568 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 634 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 635 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 636 glVertex 0 , $self->{h} - 1;
574 glEnd; 637 glEnd;
575 glPopMatrix; 638 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 640 }
578 641
579 $self->_draw; 642 $self->_draw;
580 glPopMatrix; 643 glPopMatrix;
581} 644}
… …
584 my ($self) = @_; 647 my ($self) = @_;
585 648
586 warn "no draw defined for $self\n"; 649 warn "no draw defined for $self\n";
587} 650}
588 651
652my $cntx;#d#
589sub DESTROY { 653sub DESTROY {
590 my ($self) = @_; 654 my ($self) = @_;
591 655
592 delete $WIDGET{$self+0}; 656 return if CFPlus::in_destruct;
593 657
594 eval { $self->destroy }; 658 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660
661 delete $WIDGET{$self+0};
596} 662}
597 663
598############################################################################# 664#############################################################################
599 665
600package CFClient::UI::DrawBG; 666package CFPlus::UI::DrawBG;
601 667
602our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
603 669
604use strict; 670use strict;
605use CFClient::OpenGL; 671use CFPlus::OpenGL;
606 672
607sub new { 673sub new {
608 my $class = shift; 674 my $class = shift;
609 675
610 # range [value, low, high, page] 676 # range [value, low, high, page]
… …
641 } 707 }
642} 708}
643 709
644############################################################################# 710#############################################################################
645 711
646package CFClient::UI::Empty; 712package CFPlus::UI::Empty;
647 713
648our @ISA = CFClient::UI::Base::; 714our @ISA = CFPlus::UI::Base::;
649 715
650sub new { 716sub new {
651 my ($class, %arg) = @_; 717 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 718 $class->SUPER::new (can_events => 0, %arg);
653} 719}
… …
660 726
661sub draw { } 727sub draw { }
662 728
663############################################################################# 729#############################################################################
664 730
665package CFClient::UI::Container; 731package CFPlus::UI::Container;
666 732
667our @ISA = CFClient::UI::Base::; 733our @ISA = CFPlus::UI::Base::;
668 734
669sub new { 735sub new {
670 my ($class, %arg) = @_; 736 my ($class, %arg) = @_;
671 737
672 my $children = delete $arg{children}; 738 my $children = delete $arg{children};
… …
681 if $children; 747 if $children;
682 748
683 $self 749 $self
684} 750}
685 751
752sub realloc {
753 my ($self) = @_;
754
755 $self->{force_realloc} = 1;
756 $self->{force_size_alloc} = 1;
757 $self->SUPER::realloc;
758}
759
686sub add { 760sub add {
687 my ($self, @widgets) = @_; 761 my ($self, @widgets) = @_;
688 762
689 $_->set_parent ($self) 763 $_->set_parent ($self)
690 for @widgets; 764 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 824 $_->draw for @{$self->{children}};
751} 825}
752 826
753############################################################################# 827#############################################################################
754 828
755package CFClient::UI::Bin; 829package CFPlus::UI::Bin;
756 830
757our @ISA = CFClient::UI::Container::; 831our @ISA = CFPlus::UI::Container::;
758 832
759sub new { 833sub new {
760 my ($class, %arg) = @_; 834 my ($class, %arg) = @_;
761 835
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 837
764 $class->SUPER::new (children => [$child], %arg) 838 $class->SUPER::new (children => [$child], %arg)
765} 839}
766 840
767sub add { 841sub add {
… …
774sub remove { 848sub remove {
775 my ($self, $widget) = @_; 849 my ($self, $widget) = @_;
776 850
777 $self->SUPER::remove ($widget); 851 $self->SUPER::remove ($widget);
778 852
779 $self->{children} = [new CFClient::UI::Empty] 853 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 854 unless @{$self->{children}};
781} 855}
782 856
783sub child { $_[0]->{children}[0] } 857sub child { $_[0]->{children}[0] }
784 858
… …
796 870
797############################################################################# 871#############################################################################
798 872
799# back-buffered drawing area 873# back-buffered drawing area
800 874
801package CFClient::UI::Window; 875package CFPlus::UI::Window;
802 876
803our @ISA = CFClient::UI::Bin::; 877our @ISA = CFPlus::UI::Bin::;
804 878
805use CFClient::OpenGL; 879use CFPlus::OpenGL;
806 880
807sub new { 881sub new {
808 my ($class, %arg) = @_; 882 my ($class, %arg) = @_;
809 883
810 my $self = $class->SUPER::new (%arg); 884 my $self = $class->SUPER::new (%arg);
… …
832} 906}
833 907
834sub render_child { 908sub render_child {
835 my ($self) = @_; 909 my ($self) = @_;
836 910
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 912 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
840 914
841 { 915 {
842 package CFClient::UI::Base; 916 package CFPlus::UI::Base;
843 917
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
846 } 922 }
847
848 $self->_render;
849 }; 923 };
850} 924}
851 925
852sub _draw { 926sub _draw {
853 my ($self) = @_; 927 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 928
857 my $tex = $self->{texture} 929 my $tex = $self->{texture}
858 or return; 930 or return;
859 931
860 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
863 935
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
865 937
866 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
867} 939}
868 940
869############################################################################# 941#############################################################################
870 942
871package CFClient::UI::ViewPort; 943package CFPlus::UI::ViewPort;
872 944
873our @ISA = CFClient::UI::Window::; 945our @ISA = CFPlus::UI::Window::;
874 946
875sub new { 947sub new {
876 my $class = shift; 948 my $class = shift;
877 949
878 $class->SUPER::new ( 950 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1012 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1014 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1015 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1016 }
945} 1017}
946 1018
947sub _render { 1019sub _render {
948 my ($self) = @_; 1020 my ($self) = @_;
949 1021
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1022 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1023 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1024
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1025 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1026
955 $self->SUPER::_render; 1027 $self->SUPER::_render;
956} 1028}
957 1029
958############################################################################# 1030#############################################################################
959 1031
960package CFClient::UI::ScrolledWindow; 1032package CFPlus::UI::ScrolledWindow;
961 1033
962our @ISA = CFClient::UI::HBox::; 1034our @ISA = CFPlus::UI::HBox::;
963 1035
964sub new { 1036sub new {
965 my ($class, %arg) = @_; 1037 my ($class, %arg) = @_;
966 1038
967 my $child = delete $arg{child}; 1039 my $child = delete $arg{child};
968 1040
969 my $self; 1041 my $self;
970 1042
971 my $slider = new CFClient::UI::Slider 1043 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1044 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1045 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1046 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1047 $self->{vp}->set_offset (0, $_[1]);
976 }, 1048 },
977 ; 1049 ;
978 1050
979 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1052 vp => (new CFPlus::UI::ViewPort expand => 1),
1053 can_events => 1,
981 slider => $slider, 1054 slider => $slider,
982 %arg, 1055 %arg,
983 ); 1056 );
984 1057
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1058 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1059 $self->add ($child) if $child;
… …
994 my ($self, $widget) = @_; 1067 my ($self, $widget) = @_;
995 1068
996 $self->{vp}->add ($self->{child} = $widget); 1069 $self->{vp}->add ($self->{child} = $widget);
997} 1070}
998 1071
1072sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_;
1074
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->emit (mouse_wheel => $ev);
1078
1079 1
1080}
1081
999sub update_slider { 1082sub update_slider {
1000 my ($self) = @_; 1083 my ($self) = @_;
1001 1084
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003} 1086}
… …
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1101 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1102}
1020 1103
1021############################################################################# 1104#############################################################################
1022 1105
1023package CFClient::UI::Frame; 1106package CFPlus::UI::Frame;
1024 1107
1025our @ISA = CFClient::UI::Bin::; 1108our @ISA = CFPlus::UI::Bin::;
1026 1109
1027use CFClient::OpenGL; 1110use CFPlus::OpenGL;
1028 1111
1029sub new { 1112sub new {
1030 my $class = shift; 1113 my $class = shift;
1031 1114
1032 $class->SUPER::new ( 1115 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1141 $self->SUPER::_draw;
1059} 1142}
1060 1143
1061############################################################################# 1144#############################################################################
1062 1145
1063package CFClient::UI::FancyFrame; 1146package CFPlus::UI::FancyFrame;
1064 1147
1065our @ISA = CFClient::UI::Bin::; 1148our @ISA = CFPlus::UI::Bin::;
1066 1149
1067use CFClient::OpenGL; 1150use CFPlus::OpenGL;
1151
1152sub new {
1153 my ($class, %arg) = @_;
1154
1155 if ((exists $arg{label}) && !ref $arg{label}) {
1156 $arg{label} = new CFPlus::UI::Label
1157 align => 1,
1158 valign => 0,
1159 text => $arg{label},
1160 fontsize => ($arg{border} || 0.8) * 0.75;
1161 }
1162
1163 my $self = $class->SUPER::new (
1164 # label => "",
1165 fg => [0.6, 0.3, 0.1],
1166 border => 0.8,
1167 style => 'single',
1168 %arg,
1169 );
1170
1171 $self
1172}
1173
1174sub add {
1175 my ($self, @widgets) = @_;
1176
1177 $self->SUPER::add (@widgets);
1178 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1179}
1180
1181sub border {
1182 int $_[0]{border} * $::FONTSIZE
1183}
1184
1185sub size_request {
1186 my ($self) = @_;
1187
1188 ($self->{label_w}, undef) = $self->{label}->size_request
1189 if $self->{label};
1190
1191 my ($w, $h) = $self->SUPER::size_request;
1192
1193 (
1194 $w + $self->border * 2,
1195 $h + $self->border * 2,
1196 )
1197}
1198
1199sub invoke_size_allocate {
1200 my ($self, $w, $h) = @_;
1201
1202 my $border = $self->border;
1203
1204 $w -= List::Util::max 0, $border * 2;
1205 $h -= List::Util::max 0, $border * 2;
1206
1207 if (my $label = $self->{label}) {
1208 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1209 $label->{h} = List::Util::min $h, $border;
1210 $label->invoke_size_allocate ($label->{w}, $label->{h});
1211 }
1212
1213 $self->child->configure ($border, $border, $w, $h);
1214
1215 1
1216}
1217
1218sub _draw {
1219 my ($self) = @_;
1220
1221 my $child = $self->{children}[0];
1222
1223 my $border = $self->border;
1224 my ($w, $h) = ($self->{w}, $self->{h});
1225
1226 $child->draw;
1227
1228 glColor @{$self->{fg}};
1229 glBegin GL_LINE_STRIP;
1230 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1231 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1233 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1234 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1235 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1236 glEnd;
1237
1238 if ($self->{label}) {
1239 glTranslate $border * 2, 0;
1240 $self->{label}->_draw;
1241 }
1242}
1243
1244#############################################################################
1245
1246package CFPlus::UI::Toplevel;
1247
1248our @ISA = CFPlus::UI::Bin::;
1249
1250use CFPlus::OpenGL;
1068 1251
1069my $bg = 1252my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1253 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1254 mipmap => 1, wrap => 1;
1072 1255
1073my @border = 1256my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1258 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1259
1077sub new { 1260sub new {
1078 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1079 1262
1080 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1264 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1265 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1266 border => 0.6,
1084 can_events => 1, 1267 can_events => 1,
1085 min_w => 16, 1268 min_w => 64,
1086 min_h => 16, 1269 min_h => 32,
1087 %arg, 1270 %arg,
1088 ); 1271 );
1089 1272
1090 $self->{title_widget} = new CFClient::UI::Label 1273 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1274 align => 0,
1092 valign => 1, 1275 valign => 1,
1093 text => $self->{title}, 1276 text => $self->{title},
1094 fontsize => $self->{border}, 1277 fontsize => $self->{border},
1095 if exists $self->{title}; 1278 if exists $self->{title};
1096 1279
1097 if ($self->{has_close_button}) { 1280 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1281 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1282 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1283 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1284 on_activate => sub { $self->emit ("delete") };
1102 1285
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1286 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1287 }
1105 1288
1106 $self 1289 $self
1107} 1290}
1108 1291
1109sub add { 1292sub add {
1110 my ($self, @widgets) = @_; 1293 my ($self, @widgets) = @_;
1111 1294
1112 $self->SUPER::add (@widgets); 1295 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1296 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1297 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1298}
1116 1299
1117sub border { 1300sub border {
1118 int $_[0]{border} * $::FONTSIZE 1301 int $_[0]{border} * $::FONTSIZE
1119} 1302}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1410 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1411
1229 ! ! $self->{motion} 1412 ! ! $self->{motion}
1230} 1413}
1231 1414
1415sub invoke_visibility_change {
1416 my ($self, $visible) = @_;
1417
1418 delete $self->{motion} unless $visible;
1419
1420 0
1421}
1422
1232sub _draw { 1423sub _draw {
1233 my ($self) = @_; 1424 my ($self) = @_;
1234 1425
1235 my $child = $self->{children}[0]; 1426 my $child = $self->{children}[0];
1236 1427
… …
1273 if $self->{close_button}; 1464 if $self->{close_button};
1274} 1465}
1275 1466
1276############################################################################# 1467#############################################################################
1277 1468
1278package CFClient::UI::Table; 1469package CFPlus::UI::Table;
1279 1470
1280our @ISA = CFClient::UI::Base::; 1471our @ISA = CFPlus::UI::Base::;
1281 1472
1282use List::Util qw(max sum); 1473use List::Util qw(max sum);
1283 1474
1284use CFClient::OpenGL; 1475use CFPlus::OpenGL;
1285 1476
1286sub new { 1477sub new {
1287 my $class = shift; 1478 my $class = shift;
1288 1479
1289 $class->SUPER::new ( 1480 $class->SUPER::new (
… …
1295sub children { 1486sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1488}
1298 1489
1299sub add { 1490sub add {
1300 my ($self, $x, $y, $child) = @_; 1491 my ($self) = shift;
1301 1492
1493 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1495 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1496 $self->{children}[$y][$x] = $child;
1497 }
1304 1498
1499 $self->{force_realloc} = 1;
1500 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1501 $self->realloc;
1306} 1502}
1307 1503
1308sub remove { 1504sub remove {
1309 my ($self, $child) = @_; 1505 my ($self, $child) = @_;
… …
1374 1570
1375 # linearly scale sizes 1571 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1574
1379 CFClient::UI::harmonize $ws; 1575 CFPlus::UI::harmonize $ws;
1380 CFClient::UI::harmonize $hs; 1576 CFPlus::UI::harmonize $hs;
1381 1577
1382 my $y; 1578 my $y;
1383 1579
1384 for my $r (0 .. $#{$self->{children}}) { 1580 for my $r (0 .. $#{$self->{children}}) {
1385 my $row = $self->{children}[$r] 1581 my $row = $self->{children}[$r]
… …
1428 } 1624 }
1429} 1625}
1430 1626
1431############################################################################# 1627#############################################################################
1432 1628
1433package CFClient::UI::Box; 1629package CFPlus::UI::Box;
1434 1630
1435our @ISA = CFClient::UI::Container::; 1631our @ISA = CFPlus::UI::Container::;
1436 1632
1437sub size_request { 1633sub size_request {
1438 my ($self) = @_; 1634 my ($self) = @_;
1439 1635
1440 $self->{vertical} 1636 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1669 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1670 for 0 .. $#children;
1475 } 1671 }
1476 } 1672 }
1477 1673
1478 CFClient::UI::harmonize \@req; 1674 CFPlus::UI::harmonize \@req;
1479 1675
1480 my $pos = 0; 1676 my $pos = 0;
1481 for (0 .. $#children) { 1677 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1678 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1679 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1684 1
1489} 1685}
1490 1686
1491############################################################################# 1687#############################################################################
1492 1688
1493package CFClient::UI::HBox; 1689package CFPlus::UI::HBox;
1494 1690
1495our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1496 1692
1497sub new { 1693sub new {
1498 my $class = shift; 1694 my $class = shift;
1499 1695
1500 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1503 ) 1699 )
1504} 1700}
1505 1701
1506############################################################################# 1702#############################################################################
1507 1703
1508package CFClient::UI::VBox; 1704package CFPlus::UI::VBox;
1509 1705
1510our @ISA = CFClient::UI::Box::; 1706our @ISA = CFPlus::UI::Box::;
1511 1707
1512sub new { 1708sub new {
1513 my $class = shift; 1709 my $class = shift;
1514 1710
1515 $class->SUPER::new ( 1711 $class->SUPER::new (
… …
1518 ) 1714 )
1519} 1715}
1520 1716
1521############################################################################# 1717#############################################################################
1522 1718
1523package CFClient::UI::Label; 1719package CFPlus::UI::Label;
1524 1720
1525our @ISA = CFClient::UI::DrawBG::; 1721our @ISA = CFPlus::UI::DrawBG::;
1526 1722
1527use CFClient::OpenGL; 1723use CFPlus::OpenGL;
1528 1724
1529sub new { 1725sub new {
1530 my ($class, %arg) = @_; 1726 my ($class, %arg) = @_;
1531 1727
1532 my $self = $class->SUPER::new ( 1728 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1731 #active_bg => none
1536 #font => default_font 1732 #font => default_font
1537 #text => initial text 1733 #text => initial text
1538 #markup => initial narkup 1734 #markup => initial narkup
1539 #max_w => maximum pixel width 1735 #max_w => maximum pixel width
1736 #style => 0, # render flags
1540 ellipsise => 3, # end 1737 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1738 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1739 fontsize => 1,
1543 align => -1, 1740 align => -1,
1544 valign => -1, 1741 valign => -1,
1545 padding_x => 2, 1742 padding_x => 2,
1546 padding_y => 2, 1743 padding_y => 2,
1547 can_events => 0, 1744 can_events => 0,
1548 %arg 1745 %arg
1549 ); 1746 );
1550 1747
1551 if (exists $self->{template}) { 1748 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1749 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1750 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1751 $self->{template} = $layout;
1555 } 1752 }
1556 1753
1557 if (exists $self->{markup}) { 1754 if (exists $self->{markup}) {
… …
1561 } 1758 }
1562 1759
1563 $self 1760 $self
1564} 1761}
1565 1762
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574}
1575
1576sub update { 1763sub update {
1577 my ($self) = @_; 1764 my ($self) = @_;
1578 1765
1579 delete $self->{texture}; 1766 delete $self->{texture};
1580 $self->SUPER::update; 1767 $self->SUPER::update;
… …
1591 my ($self, $text) = @_; 1778 my ($self, $text) = @_;
1592 1779
1593 return if $self->{text} eq "T$text"; 1780 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1781 $self->{text} = "T$text";
1595 1782
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1783 $self->{layout}->set_text ($text);
1598 1784
1599 delete $self->{size_req}; 1785 delete $self->{size_req};
1600 $self->realloc; 1786 $self->realloc;
1601 $self->update; 1787 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1793 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1794 $self->{text} = "M$markup";
1609 1795
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1796 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1797
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1798 $self->{layout}->set_markup ($markup);
1614 1799
1615 delete $self->{size_req}; 1800 delete $self->{size_req};
1616 $self->realloc; 1801 $self->realloc;
1617 $self->update; 1802 $self->update;
… …
1629 1814
1630 my ($w, $h) = $self->{layout}->size; 1815 my ($w, $h) = $self->{layout}->size;
1631 1816
1632 if (exists $self->{template}) { 1817 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 1818 $self->{template}->set_font ($self->{font}) if $self->{font};
1819 $self->{template}->set_width ($self->{max_w} || -1);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1820 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 1821
1636 my ($w2, $h2) = $self->{template}->size; 1822 my ($w2, $h2) = $self->{template}->size;
1637 1823
1638 $w = List::Util::max $w, $w2; 1824 $w = List::Util::max $w, $w2;
… …
1672 1858
1673sub reconfigure { 1859sub reconfigure {
1674 my ($self) = @_; 1860 my ($self) = @_;
1675 1861
1676 delete $self->{size_req}; 1862 delete $self->{size_req};
1863 delete $self->{texture};
1677 1864
1678 $self->SUPER::reconfigure; 1865 $self->SUPER::reconfigure;
1679} 1866}
1680 1867
1681sub _draw { 1868sub _draw {
1682 my ($self) = @_; 1869 my ($self) = @_;
1683 1870
1684 $self->SUPER::_draw; # draw background, if applicable 1871 $self->SUPER::_draw; # draw background, if applicable
1685 1872
1686 my $tex = $self->{texture} ||= do { 1873 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 1874 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1875 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 1876 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1877 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1878 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1879 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 1880
1694 new_from_layout CFClient::Texture $self->{layout} 1881 [$self->{layout}->size]
1695 }; 1882 };
1696 1883
1697 unless (exists $self->{ox}) { 1884 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1885 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1886 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 1887 : ($self->{w} - $size->[0]) * 0.5);
1701 1888
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 1891 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 1892 };
1706 1893
1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1894 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1895 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 1896
1712 if ($tex->{format} == GL_ALPHA) { 1897 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1720
1721 glDisable GL_TEXTURE_2D;
1722} 1898}
1723 1899
1724############################################################################# 1900#############################################################################
1725 1901
1726package CFClient::UI::EntryBase; 1902package CFPlus::UI::EntryBase;
1727 1903
1728our @ISA = CFClient::UI::Label::; 1904our @ISA = CFPlus::UI::Label::;
1729 1905
1730use CFClient::OpenGL; 1906use CFPlus::OpenGL;
1731 1907
1732sub new { 1908sub new {
1733 my $class = shift; 1909 my $class = shift;
1734 1910
1735 $class->SUPER::new ( 1911 $class->SUPER::new (
… …
1739 active_fg => [0, 0, 0], 1915 active_fg => [0, 0, 0],
1740 can_hover => 1, 1916 can_hover => 1,
1741 can_focus => 1, 1917 can_focus => 1,
1742 valign => 0, 1918 valign => 0,
1743 can_events => 1, 1919 can_events => 1,
1920 ellipsise => 0,
1744 #text => ... 1921 #text => ...
1745 #hidden => "*", 1922 #hidden => "*",
1746 @_ 1923 @_
1747 ) 1924 )
1748} 1925}
… …
1797 1974
1798 if ($uni == 8) { 1975 if ($uni == 8) {
1799 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800 } elsif ($uni == 127) { 1977 } elsif ($uni == 127) {
1801 substr $text, $self->{cursor}, 1, ""; 1978 substr $text, $self->{cursor}, 1, "";
1802 } elsif ($sym == CFClient::SDLK_LEFT) { 1979 } elsif ($sym == CFPlus::SDLK_LEFT) {
1803 --$self->{cursor} if $self->{cursor}; 1980 --$self->{cursor} if $self->{cursor};
1804 } elsif ($sym == CFClient::SDLK_RIGHT) { 1981 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1805 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1982 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1806 } elsif ($sym == CFClient::SDLK_HOME) { 1983 } elsif ($sym == CFPlus::SDLK_HOME) {
1984 # what a hack
1985 $self->{cursor} =
1986 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1987 ? length $1
1988 : 0;
1989 } elsif ($sym == CFPlus::SDLK_END) {
1990 # uh, again
1991 $self->{cursor} =
1992 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1993 ? $self->{cursor} + length $1
1994 : length $self->{text};
1995 } elsif ($uni == 21) { # ctrl-u
1996 $text = "";
1807 $self->{cursor} = 0; 1997 $self->{cursor} = 0;
1808 } elsif ($sym == CFClient::SDLK_END) {
1809 $self->{cursor} = length $text;
1810 } elsif ($uni == 27) { 1998 } elsif ($uni == 27) {
1811 $self->emit ('escape'); 1999 $self->emit ('escape');
1812 } elsif ($uni) { 2000 } elsif ($uni == 0x0d) {
2001 substr $text, $self->{cursor}++, 0, "\012";
2002 } elsif ($uni >= 0x20) {
1813 substr $text, $self->{cursor}++, 0, chr $uni; 2003 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else { 2004 } else {
1815 return 0; 2005 return 0;
1816 } 2006 }
1817 2007
1818 $self->_set_text ($text); 2008 $self->_set_text ($text);
1819 2009
1820 $self->realloc; 2010 $self->realloc;
2011 $self->update;
1821 2012
1822 1 2013 1
1823} 2014}
1824 2015
1825sub invoke_focus_in { 2016sub invoke_focus_in {
… …
1837 2028
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 2029 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 2030
1840 # byte-index to char-index 2031 # byte-index to char-index
1841 my $text = $self->{text}; 2032 my $text = $self->{text};
1842 utf8::encode $text; 2033 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 2034 $self->{cursor} = length $text;
1844 2035
1845 $self->_set_text ($self->{text}); 2036 $self->_set_text ($self->{text});
1846 $self->update; 2037 $self->update;
1847 2038
1848 1 2039 1
… …
1887 utf8::encode $text; 2078 utf8::encode $text;
1888 2079
1889 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2080 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890 } 2081 }
1891 2082
1892 glColor @{$self->{fg}};
1893 glBegin GL_LINES; 2083 glBegin GL_LINES;
1894 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2084 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2085 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896 glEnd; 2086 glEnd;
1897 } 2087 }
1898} 2088}
1899 2089
2090#############################################################################
2091
1900package CFClient::UI::Entry; 2092package CFPlus::UI::Entry;
1901 2093
1902our @ISA = CFClient::UI::EntryBase::; 2094our @ISA = CFPlus::UI::EntryBase::;
1903 2095
1904use CFClient::OpenGL; 2096use CFPlus::OpenGL;
1905 2097
1906sub invoke_key_down { 2098sub invoke_key_down {
1907 my ($self, $ev) = @_; 2099 my ($self, $ev) = @_;
1908 2100
1909 my $sym = $ev->{sym}; 2101 my $sym = $ev->{sym};
1910 2102
1911 if ($sym == 13) { 2103 if ($ev->{uni} == 0x0d || $sym == 13) {
1912 unshift @{$self->{history}}, 2104 unshift @{$self->{history}},
1913 my $txt = $self->get_text; 2105 my $txt = $self->get_text;
1914 2106
1915 $self->{history_pointer} = -1; 2107 $self->{history_pointer} = -1;
1916 $self->{history_saveback} = ''; 2108 $self->{history_saveback} = '';
1917 $self->emit (activate => $txt); 2109 $self->emit (activate => $txt);
1918 $self->update; 2110 $self->update;
1919 2111
1920 } elsif ($sym == CFClient::SDLK_UP) { 2112 } elsif ($sym == CFPlus::SDLK_UP) {
1921 if ($self->{history_pointer} < 0) { 2113 if ($self->{history_pointer} < 0) {
1922 $self->{history_saveback} = $self->get_text; 2114 $self->{history_saveback} = $self->get_text;
1923 } 2115 }
1924 if (@{$self->{history} || []} > 0) { 2116 if (@{$self->{history} || []} > 0) {
1925 $self->{history_pointer}++; 2117 $self->{history_pointer}++;
… …
1927 $self->{history_pointer} = @{$self->{history} || []} - 1; 2119 $self->{history_pointer} = @{$self->{history} || []} - 1;
1928 } 2120 }
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2121 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1930 } 2122 }
1931 2123
1932 } elsif ($sym == CFClient::SDLK_DOWN) { 2124 } elsif ($sym == CFPlus::SDLK_DOWN) {
1933 $self->{history_pointer}--; 2125 $self->{history_pointer}--;
1934 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2126 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935 2127
1936 if ($self->{history_pointer} >= 0) { 2128 if ($self->{history_pointer} >= 0) {
1937 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2129 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1946 1 2138 1
1947} 2139}
1948 2140
1949############################################################################# 2141#############################################################################
1950 2142
2143package CFPlus::UI::TextEdit;
2144
2145our @ISA = CFPlus::UI::EntryBase::;
2146
2147use CFPlus::OpenGL;
2148
2149sub move_cursor_ver {
2150 my ($self, $dy) = @_;
2151
2152 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2153
2154 $y += $dy;
2155
2156 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2157 $self->{cursor} = $index;
2158 delete $self->{cur_h};
2159 $self->update;
2160 return;
2161 }
2162}
2163
2164sub invoke_key_down {
2165 my ($self, $ev) = @_;
2166
2167 my $sym = $ev->{sym};
2168
2169 if ($sym == CFPlus::SDLK_UP) {
2170 $self->move_cursor_ver (-1);
2171 } elsif ($sym == CFPlus::SDLK_DOWN) {
2172 $self->move_cursor_ver (+1);
2173 } else {
2174 return $self->SUPER::invoke_key_down ($ev)
2175 }
2176
2177 1
2178}
2179
2180#############################################################################
2181
1951package CFClient::UI::Button; 2182package CFPlus::UI::Button;
1952 2183
1953our @ISA = CFClient::UI::Label::; 2184our @ISA = CFPlus::UI::Label::;
1954 2185
1955use CFClient::OpenGL; 2186use CFPlus::OpenGL;
1956 2187
1957my @tex = 2188my @tex =
1958 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2189 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959 qw(b1_button_active.png); 2190 qw(b1_button_active.png);
1960 2191
1961sub new { 2192sub new {
1962 my $class = shift; 2193 my $class = shift;
1963 2194
… …
2000 $self->SUPER::_draw; 2231 $self->SUPER::_draw;
2001} 2232}
2002 2233
2003############################################################################# 2234#############################################################################
2004 2235
2236package CFPlus::UI::CheckBox;
2237
2238our @ISA = CFPlus::UI::DrawBG::;
2239
2240my @tex =
2241 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2242 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2243
2244use CFPlus::OpenGL;
2245
2246sub new {
2247 my $class = shift;
2248
2249 $class->SUPER::new (
2250 padding_x => 2,
2251 padding_y => 2,
2252 fg => [1, 1, 1],
2253 active_fg => [1, 1, 0],
2254 bg => [0, 0, 0, 0.2],
2255 active_bg => [1, 1, 1, 0.5],
2256 state => 0,
2257 can_hover => 1,
2258 @_
2259 )
2260}
2261
2262sub size_request {
2263 my ($self) = @_;
2264
2265 (6) x 2
2266}
2267
2268sub toggle {
2269 my ($self) = @_;
2270
2271 $self->{state} = !$self->{state};
2272 $self->emit (changed => $self->{state});
2273 $self->update;
2274}
2275
2276sub invoke_button_down {
2277 my ($self, $ev, $x, $y) = @_;
2278
2279 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2280 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2281 $self->toggle;
2282 } else {
2283 return 0
2284 }
2285
2286 1
2287}
2288
2289sub _draw {
2290 my ($self) = @_;
2291
2292 $self->SUPER::_draw;
2293
2294 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2295
2296 my ($w, $h) = @$self{qw(w h)};
2297
2298 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2299
2300 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2301
2302 my $tex = $self->{state} ? $tex[1] : $tex[0];
2303
2304 glEnable GL_TEXTURE_2D;
2305 $tex->draw_quad_alpha (0, 0, $s, $s);
2306 glDisable GL_TEXTURE_2D;
2307}
2308
2309#############################################################################
2310
2311package CFPlus::UI::Image;
2312
2313our @ISA = CFPlus::UI::Base::;
2314
2315use CFPlus::OpenGL;
2316
2317our %texture_cache;
2318
2319sub new {
2320 my $class = shift;
2321
2322 my $self = $class->SUPER::new (
2323 can_events => 0,
2324 @_,
2325 );
2326
2327 $self->{path} || $self->{tex}
2328 or Carp::croak "'path' or 'tex' attributes required";
2329
2330 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2331 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2332
2333 CFPlus::weaken $texture_cache{$self->{path}};
2334
2335 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2336
2337 $self
2338}
2339
2340sub STORABLE_freeze {
2341 my ($self, $cloning) = @_;
2342
2343 $self->{path}
2344 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2345
2346 $self->{path}
2347}
2348
2349sub STORABLE_attach {
2350 my ($self, $cloning, $path) = @_;
2351
2352 $self->new (path => $path)
2353}
2354
2355sub size_request {
2356 my ($self) = @_;
2357
2358 ($self->{tex}{w}, $self->{tex}{h})
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363
2364 my $tex = $self->{tex};
2365
2366 my ($w, $h) = ($self->{w}, $self->{h});
2367
2368 if ($self->{rot90}) {
2369 glRotate 90, 0, 0, 1;
2370 glTranslate 0, -$self->{w}, 0;
2371
2372 ($w, $h) = ($h, $w);
2373 }
2374
2375 glEnable GL_TEXTURE_2D;
2376 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2377
2378 $tex->draw_quad (0, 0, $w, $h);
2379
2380 glDisable GL_TEXTURE_2D;
2381}
2382
2383#############################################################################
2384
2005package CFClient::UI::ImageButton; 2385package CFPlus::UI::ImageButton;
2006 2386
2007our @ISA = CFClient::UI::Image::; 2387our @ISA = CFPlus::UI::Image::;
2008 2388
2009use CFClient::OpenGL; 2389use CFPlus::OpenGL;
2010 2390
2011my %textures; 2391my %textures;
2012 2392
2013sub new { 2393sub new {
2014 my $class = shift; 2394 my $class = shift;
… …
2036 1 2416 1
2037} 2417}
2038 2418
2039############################################################################# 2419#############################################################################
2040 2420
2041package CFClient::UI::CheckBox;
2042
2043our @ISA = CFClient::UI::DrawBG::;
2044
2045my @tex =
2046 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2047 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2048
2049use CFClient::OpenGL;
2050
2051sub new {
2052 my $class = shift;
2053
2054 $class->SUPER::new (
2055 padding_x => 2,
2056 padding_y => 2,
2057 fg => [1, 1, 1],
2058 active_fg => [1, 1, 0],
2059 bg => [0, 0, 0, 0.2],
2060 active_bg => [1, 1, 1, 0.5],
2061 state => 0,
2062 can_hover => 1,
2063 @_
2064 )
2065}
2066
2067sub size_request {
2068 my ($self) = @_;
2069
2070 (6) x 2
2071}
2072
2073sub invoke_button_down {
2074 my ($self, $ev, $x, $y) = @_;
2075
2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2078 $self->{state} = !$self->{state};
2079 $self->emit (changed => $self->{state});
2080 } else {
2081 return 0
2082 }
2083
2084 1
2085}
2086
2087sub _draw {
2088 my ($self) = @_;
2089
2090 $self->SUPER::_draw;
2091
2092 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2093
2094 my ($w, $h) = @$self{qw(w h)};
2095
2096 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2097
2098 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2099
2100 my $tex = $self->{state} ? $tex[1] : $tex[0];
2101
2102 glEnable GL_TEXTURE_2D;
2103 $tex->draw_quad_alpha (0, 0, $s, $s);
2104 glDisable GL_TEXTURE_2D;
2105}
2106
2107#############################################################################
2108
2109package CFClient::UI::Image; 2421package CFPlus::UI::VGauge;
2110 2422
2111our @ISA = CFClient::UI::Base::; 2423our @ISA = CFPlus::UI::Base::;
2112
2113use CFClient::OpenGL;
2114
2115our %texture_cache;
2116
2117sub new {
2118 my $class = shift;
2119
2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
2124
2125 $self->{path}
2126 or Carp::croak "required attribute 'path' not set";
2127
2128 $self->{tex} = $texture_cache{$self->{path}} ||=
2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2130
2131 Scalar::Util::weaken $texture_cache{$self->{path}};
2132
2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2134
2135 $self
2136}
2137
2138sub size_request {
2139 my ($self) = @_;
2140
2141 ($self->{tex}{w}, $self->{tex}{h})
2142}
2143
2144sub _draw {
2145 my ($self) = @_;
2146
2147 my $tex = $self->{tex};
2148
2149 my ($w, $h) = ($self->{w}, $self->{h});
2150
2151 if ($self->{rot90}) {
2152 glRotate 90, 0, 0, 1;
2153 glTranslate 0, -$self->{w}, 0;
2154
2155 ($w, $h) = ($h, $w);
2156 }
2157
2158 glEnable GL_TEXTURE_2D;
2159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2160
2161 $tex->draw_quad_alpha (0, 0, $w, $h);
2162
2163 glDisable GL_TEXTURE_2D;
2164}
2165
2166#############################################################################
2167
2168package CFClient::UI::VGauge;
2169
2170our @ISA = CFClient::UI::Base::;
2171 2424
2172use List::Util qw(min max); 2425use List::Util qw(min max);
2173 2426
2174use CFClient::OpenGL; 2427use CFPlus::OpenGL;
2175 2428
2176my %tex = ( 2429my %tex = (
2177 food => [ 2430 food => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2432 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2180 ], 2433 ],
2181 grace => [ 2434 grace => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2435 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2436 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2184 ], 2437 ],
2185 hp => [ 2438 hp => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2439 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2440 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2188 ], 2441 ],
2189 mana => [ 2442 mana => [
2190 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2444 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2192 ], 2445 ],
2193); 2446);
2194 2447
2195# eg. VGauge->new (gauge => 'food'), default gauge: food 2448# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2298 glDisable GL_TEXTURE_2D; 2551 glDisable GL_TEXTURE_2D;
2299} 2552}
2300 2553
2301############################################################################# 2554#############################################################################
2302 2555
2303package CFClient::UI::Gauge; 2556package CFPlus::UI::Gauge;
2304 2557
2305our @ISA = CFClient::UI::VBox::; 2558our @ISA = CFPlus::UI::VBox::;
2306 2559
2307sub new { 2560sub new {
2308 my ($class, %arg) = @_; 2561 my ($class, %arg) = @_;
2309 2562
2310 my $self = $class->SUPER::new ( 2563 my $self = $class->SUPER::new (
… …
2312 can_hover => 1, 2565 can_hover => 1,
2313 can_events => 1, 2566 can_events => 1,
2314 %arg, 2567 %arg,
2315 ); 2568 );
2316 2569
2317 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2570 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2318 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2571 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2319 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2572 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2320 2573
2321 $self 2574 $self
2322} 2575}
2323 2576
2324sub set_fontsize { 2577sub set_fontsize {
… …
2345 $self->{value}->set_text ($val); 2598 $self->{value}->set_text ($val);
2346} 2599}
2347 2600
2348############################################################################# 2601#############################################################################
2349 2602
2350package CFClient::UI::Slider; 2603package CFPlus::UI::Slider;
2351 2604
2352use strict; 2605use strict;
2353 2606
2354use CFClient::OpenGL; 2607use CFPlus::OpenGL;
2355 2608
2356our @ISA = CFClient::UI::DrawBG::; 2609our @ISA = CFPlus::UI::DrawBG::;
2357 2610
2358my @tex = 2611my @tex =
2359 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2360 qw(s1_slider.png s1_slider_bg.png); 2613 qw(s1_slider.png s1_slider_bg.png);
2361 2614
2362sub new { 2615sub new {
2363 my $class = shift; 2616 my $class = shift;
2364 2617
… …
2453 } 2706 }
2454 2707
2455 1 2708 1
2456} 2709}
2457 2710
2711sub invoke_mouse_wheel {
2712 my ($self, $ev) = @_;
2713
2714 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2715
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717
2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2719
2720 ! ! $delta
2721}
2722
2458sub update { 2723sub update {
2459 my ($self) = @_; 2724 my ($self) = @_;
2460 2725
2461 delete $self->{knob_w}; 2726 delete $self->{knob_w};
2462 $self->SUPER::update; 2727 $self->SUPER::update;
… …
2509 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2510} 2775}
2511 2776
2512############################################################################# 2777#############################################################################
2513 2778
2514package CFClient::UI::ValSlider; 2779package CFPlus::UI::ValSlider;
2515 2780
2516our @ISA = CFClient::UI::HBox::; 2781our @ISA = CFPlus::UI::HBox::;
2517 2782
2518sub new { 2783sub new {
2519 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2520 2785
2521 my $range = delete $arg{range}; 2786 my $range = delete $arg{range};
2522 2787
2523 my $self = $class->SUPER::new ( 2788 my $self = $class->SUPER::new (
2524 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2789 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2525 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2790 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2526 to_value => sub { shift }, 2791 to_value => sub { shift },
2527 from_value => sub { shift }, 2792 from_value => sub { shift },
2528 %arg, 2793 %arg,
2529 ); 2794 );
2530 2795
… …
2550sub set_range { shift->{slider}->set_range (@_) } 2815sub set_range { shift->{slider}->set_range (@_) }
2551sub set_value { shift->{slider}->set_value (@_) } 2816sub set_value { shift->{slider}->set_value (@_) }
2552 2817
2553############################################################################# 2818#############################################################################
2554 2819
2555package CFClient::UI::TextScroller; 2820package CFPlus::UI::TextScroller;
2556 2821
2557our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2558 2823
2559use CFClient::OpenGL; 2824use CFPlus::OpenGL;
2560 2825
2561sub new { 2826sub new {
2562 my $class = shift; 2827 my $class = shift;
2563 2828
2564 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2565 fontsize => 1, 2830 fontsize => 1,
2566 can_events => 0, 2831 can_events => 1,
2567 indent => 0, 2832 indent => 0,
2568 #font => default_font 2833 #font => default_font
2569 @_, 2834 @_,
2570 2835
2571 layout => (new CFClient::Layout 1), 2836 layout => (new CFPlus::Layout),
2572 par => [], 2837 par => [],
2838 max_par => 0,
2573 height => 0, 2839 height => 0,
2574 children => [ 2840 children => [
2575 (new CFClient::UI::Empty expand => 1), 2841 (new CFPlus::UI::Empty expand => 1),
2576 (new CFClient::UI::Slider vertical => 1), 2842 (new CFPlus::UI::Slider vertical => 1),
2577 ], 2843 ],
2578 ); 2844 );
2579 2845
2580 $self->{children}[1]->connect (changed => sub { $self->update }); 2846 $self->{children}[1]->connect (changed => sub { $self->update });
2581 2847
… …
2611 2877
2612 $self->reflow; 2878 $self->reflow;
2613 2879
2614 local $self->{children} = [$empty, $slider]; 2880 local $self->{children} = [$empty, $slider];
2615 $self->SUPER::invoke_size_allocate ($w, $h) 2881 $self->SUPER::invoke_size_allocate ($w, $h)
2882}
2883
2884sub invoke_mouse_wheel {
2885 my ($self, $ev) = @_;
2886
2887 return 0 unless $ev->{dy}; # only vertical movements
2888
2889 $self->{children}[1]->emit (mouse_wheel => $ev);
2890
2891 1
2616} 2892}
2617 2893
2618sub get_layout { 2894sub get_layout {
2619 my ($self, $para) = @_; 2895 my ($self, $para) = @_;
2620 2896
… …
2648 2924
2649 # todo: base offset on lines or so, not on pixels 2925 # todo: base offset on lines or so, not on pixels
2650 $self->{children}[1]->set_value ($offset); 2926 $self->{children}[1]->set_value ($offset);
2651} 2927}
2652 2928
2929sub current_paragraph {
2930 my ($self) = @_;
2931
2932 $self->{top_paragraph} - 1
2933}
2934
2935sub scroll_to {
2936 my ($self, $para) = @_;
2937
2938 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2939
2940 $self->{scroll_to} = $para;
2941 $self->update;
2942}
2943
2653sub clear { 2944sub clear {
2654 my ($self) = @_; 2945 my ($self) = @_;
2655 2946
2656 my (undef, undef, @other) = @{ $self->{children} }; 2947 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other; 2948 $self->remove ($_) for @other;
… …
2660 $self->{height} = 0; 2951 $self->{height} = 0;
2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2952 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2662} 2953}
2663 2954
2664sub add_paragraph { 2955sub add_paragraph {
2665 my ($self, $color, $para, $indent) = @_; 2956 my $self = shift;
2666 2957
2667 my ($text, @w) = ref $para ? @$para : $para; 2958 for my $para (@_) {
2668
2669 $para = { 2959 $para = {
2960 fg => [1, 1, 1, 1],
2961 indent => 0,
2962 markup => "",
2963 widget => [],
2964 ref $para ? %$para : (markup => $para),
2670 w => 1e10, 2965 w => 1e10,
2671 wrapped => 1, 2966 wrapped => 1,
2672 fg => $color,
2673 indent => $indent,
2674 markup => $text,
2675 widget => \@w,
2676 }; 2967 };
2677 2968
2678 $self->add (@w) if @w; 2969 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2679 push @{$self->{par}}, $para; 2970 push @{$self->{par}}, $para;
2971 }
2972
2973 if (my $max = $self->{max_par}) {
2974 shift @{$self->{par}} while @{$self->{par}} > $max;
2975 }
2680 2976
2681 $self->{need_reflow}++; 2977 $self->{need_reflow}++;
2682 $self->update; 2978 $self->update;
2683} 2979}
2684 2980
2685sub scroll_to_bottom { 2981sub scroll_to_bottom {
2686 my ($self) = @_; 2982 my ($self) = @_;
2687 2983
2688 $self->{scroll_to_bottom} = 1; 2984 $self->{scroll_to} = $#{$self->{par}};
2689 $self->update; 2985 $self->update;
2690} 2986}
2691 2987
2988sub force_uptodate {
2989 my ($self) = @_;
2990
2991 if (delete $self->{need_reflow}) {
2992 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2993
2994 my $height = 0;
2995
2996 for my $para (@{$self->{par}}) {
2997 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2998 my $layout = $self->get_layout ($para);
2999 my ($w, $h) = $layout->size;
3000
3001 $para->{w} = $w + $para->{indent};
3002 $para->{h} = $h;
3003 $para->{wrapped} = $layout->has_wrapped;
3004 }
3005
3006 $para->{y} = $height;
3007 $height += $para->{h};
3008 }
3009
3010 $self->{height} = $height;
3011 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3012
3013 delete $self->{texture};
3014 }
3015
3016 if (my $paridx = delete $self->{scroll_to}) {
3017 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3018 }
3019}
3020
2692sub update { 3021sub update {
2693 my ($self) = @_; 3022 my ($self) = @_;
2694 3023
2695 $self->SUPER::update; 3024 $self->SUPER::update;
2696 3025
2697 return unless $self->{h} > 0; 3026 return unless $self->{h} > 0;
2698 3027
2699 delete $self->{texture}; 3028 delete $self->{texture};
2700 3029
2701 $ROOT->on_post_alloc ($self => sub { 3030 $ROOT->on_post_alloc ($self => sub {
3031 $self->force_uptodate;
3032
2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2703 3034
2704 if (delete $self->{need_reflow}) {
2705 my $height = 0;
2706
2707 for my $para (@{$self->{par}}) {
2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2709 my $layout = $self->get_layout ($para);
2710 my ($w, $h) = $layout->size;
2711
2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2715 }
2716
2717 $height += $para->{h};
2718 }
2719
2720 $self->{height} = $height;
2721
2722 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2723
2724 delete $self->{texture};
2725 }
2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2729 }
2730
2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3035 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2732 glClearColor 0, 0, 0, 0; 3036 glClearColor 0, 0, 0, 0;
2733 glClear GL_COLOR_BUFFER_BIT; 3037 glClear GL_COLOR_BUFFER_BIT;
2734 3038
3039 package CFPlus::UI::Base;
3040 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3041 (0, 0, $self->{w}, $self->{h});
3042
3043 my $top = int $self->{children}[1]{range}[0];
3044
3045 my $paridx = 0;
3046 my $top_paragraph;
2735 my $top = int $self->{children}[1]{range}[0]; 3047 my $top = int $self->{children}[1]{range}[0];
2736 3048
2737 my $y0 = $top; 3049 my $y0 = $top;
2738 my $y1 = $top + $H; 3050 my $y1 = $top + $H;
2739 3051
2740 my $y = 0;
2741
2742 glEnable GL_BLEND;
2743 #TODO# not correct in windows where rgba is forced off
2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2745
2746 for my $para (@{$self->{par}}) { 3052 for my $para (@{$self->{par}}) {
2747 my $h = $para->{h}; 3053 my $h = $para->{h};
3054 my $y = $para->{y};
2748 3055
2749 if ($y0 < $y + $h && $y < $y1) { 3056 if ($y0 < $y + $h && $y < $y1) {
2750
2751 my $layout = $self->get_layout ($para); 3057 my $layout = $self->get_layout ($para);
2752 3058
2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2754
2755 glRasterPos $para->{indent}, $y - $y0; 3059 $layout->render ($para->{indent}, $y - $y0);
2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757 3060
2758 if (my @w = @{ $para->{widget} }) { 3061 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes; 3062 my @s = $layout->get_shapes;
2760 3063
2761 glDisable GL_BLEND;
2762 for (@w) { 3064 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, (); 3065 my ($dx, $dy) = splice @s, 0, 2, ();
2764 3066
2765 $_->{x} = $dx + $para->{indent}; 3067 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0; 3068 $_->{y} = $dy + $y - $y0;
2767 3069
2768 $_->draw; 3070 $_->draw;
2769 } 3071 }
2770 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 } 3072 }
2773 } 3073 }
2774 3074
2775 $y += $h; 3075 $paridx++;
3076 $top_paragraph ||= $paridx if $y >= $top;
2776 } 3077 }
2777 3078
2778 glDisable GL_BLEND; 3079 $self->{top_paragraph} = $top_paragraph;
2779 }; 3080 };
2780 }); 3081 });
2781} 3082}
2782 3083
2783sub reconfigure { 3084sub reconfigure {
… …
2801 $self->{children}[1]->draw; 3102 $self->{children}[1]->draw;
2802} 3103}
2803 3104
2804############################################################################# 3105#############################################################################
2805 3106
2806package CFClient::UI::Animator; 3107package CFPlus::UI::Animator;
2807 3108
2808use CFClient::OpenGL; 3109use CFPlus::OpenGL;
2809 3110
2810our @ISA = CFClient::UI::Bin::; 3111our @ISA = CFPlus::UI::Bin::;
2811 3112
2812sub moveto { 3113sub moveto {
2813 my ($self, $x, $y) = @_; 3114 my ($self, $x, $y) = @_;
2814 3115
2815 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3116 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2843 glPopMatrix; 3144 glPopMatrix;
2844} 3145}
2845 3146
2846############################################################################# 3147#############################################################################
2847 3148
2848package CFClient::UI::Flopper; 3149package CFPlus::UI::Flopper;
2849 3150
2850our @ISA = CFClient::UI::Button::; 3151our @ISA = CFPlus::UI::Button::;
2851 3152
2852sub new { 3153sub new {
2853 my $class = shift; 3154 my $class = shift;
2854 3155
2855 my $self = $class->SUPER::new ( 3156 my $self = $class->SUPER::new (
… …
2867 $self->{other}->toggle_visibility; 3168 $self->{other}->toggle_visibility;
2868} 3169}
2869 3170
2870############################################################################# 3171#############################################################################
2871 3172
2872package CFClient::UI::Tooltip; 3173package CFPlus::UI::Tooltip;
2873 3174
2874our @ISA = CFClient::UI::Bin::; 3175our @ISA = CFPlus::UI::Bin::;
2875 3176
2876use CFClient::OpenGL; 3177use CFPlus::OpenGL;
2877 3178
2878sub new { 3179sub new {
2879 my $class = shift; 3180 my $class = shift;
2880 3181
2881 $class->SUPER::new ( 3182 $class->SUPER::new (
… …
2884 ) 3185 )
2885} 3186}
2886 3187
2887sub set_tooltip_from { 3188sub set_tooltip_from {
2888 my ($self, $widget) = @_; 3189 my ($self, $widget) = @_;
3190
3191 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3192 if $widget->{tooltip} =~ /^#(.*)$/;
2889 3193
2890 my $tooltip = $widget->{tooltip}; 3194 my $tooltip = $widget->{tooltip};
2891 3195
2892 if ($ENV{CFPLUS_DEBUG} & 2) { 3196 if ($ENV{CFPLUS_DEBUG} & 2) {
2893 $tooltip .= "\n\n" . (ref $widget) . "\n" 3197 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2897 } 3201 }
2898 3202
2899 $tooltip =~ s/^\n+//; 3203 $tooltip =~ s/^\n+//;
2900 $tooltip =~ s/\n+$//; 3204 $tooltip =~ s/\n+$//;
2901 3205
2902 $self->add (new CFClient::UI::Label 3206 $self->add (new CFPlus::UI::Label
2903 markup => $tooltip, 3207 markup => $tooltip,
2904 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3208 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2905 fontsize => 0.8, 3209 fontsize => 0.8,
2906 fg => [0, 0, 0, 1], 3210 style => 1, # FLAG_INVERSE
2907 ellipsise => 0, 3211 ellipsise => 0,
2908 font => ($widget->{tooltip_font} || $::FONT_PROP), 3212 font => ($widget->{tooltip_font} || $::FONT_PROP),
2909 ); 3213 );
2910} 3214}
2911 3215
… …
2930 3234
2931 $self->{root}->on_post_alloc ("move_$self" => sub { 3235 $self->{root}->on_post_alloc ("move_$self" => sub {
2932 my $widget = $self->{owner} 3236 my $widget = $self->{owner}
2933 or return; 3237 or return;
2934 3238
3239 if ($widget->{visible}) {
2935 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3240 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2936 3241
2937 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3242 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2938 if $x + $self->{w} > $self->{root}{w}; 3243 if $x + $self->{w} > $self->{root}{w};
2939 3244
2940 $self->move_abs ($x, $y); 3245 $self->move_abs ($x, $y);
3246 } else {
3247 $self->hide;
3248 }
2941 }); 3249 });
2942} 3250}
2943 3251
2944sub _draw { 3252sub _draw {
2945 my ($self) = @_; 3253 my ($self) = @_;
… …
2969 $self->SUPER::_draw; 3277 $self->SUPER::_draw;
2970} 3278}
2971 3279
2972############################################################################# 3280#############################################################################
2973 3281
2974package CFClient::UI::Face; 3282package CFPlus::UI::Face;
2975 3283
2976our @ISA = CFClient::UI::Base::; 3284our @ISA = CFPlus::UI::DrawBG::;
2977 3285
2978use CFClient::OpenGL; 3286use CFPlus::OpenGL;
2979 3287
2980sub new { 3288sub new {
2981 my $class = shift; 3289 my $class = shift;
2982 3290
2983 my $self = $class->SUPER::new ( 3291 my $self = $class->SUPER::new (
… …
2985 can_events => 0, 3293 can_events => 0,
2986 @_, 3294 @_,
2987 ); 3295 );
2988 3296
2989 if ($self->{anim} && $self->{animspeed}) { 3297 if ($self->{anim} && $self->{animspeed}) {
2990 Scalar::Util::weaken (my $widget = $self); 3298 CFPlus::weaken (my $widget = $self);
2991 3299
2992 $self->{timer} = Event->timer ( 3300 $self->{timer} = Event->timer (
2993 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2994 hard => 1, 3302 hard => 1,
2995 interval => $self->{animspeed}, 3303 interval => $self->{animspeed},
… …
3018sub _draw { 3326sub _draw {
3019 my ($self) = @_; 3327 my ($self) = @_;
3020 3328
3021 return unless $::CONN; 3329 return unless $::CONN;
3022 3330
3331 $self->SUPER::_draw;
3332
3023 my $face; 3333 my $face;
3024 3334
3025 if ($self->{frame}) { 3335 if ($self->{frame}) {
3026 my $anim = $::CONN->{anim}[$self->{anim}]; 3336 my $anim = $::CONN->{anim}[$self->{anim}];
3027 3337
… …
3049 $self->SUPER::destroy; 3359 $self->SUPER::destroy;
3050} 3360}
3051 3361
3052############################################################################# 3362#############################################################################
3053 3363
3054package CFClient::UI::Buttonbar; 3364package CFPlus::UI::Buttonbar;
3055 3365
3056our @ISA = CFClient::UI::HBox::; 3366our @ISA = CFPlus::UI::HBox::;
3057 3367
3058# TODO: should actualyl wrap buttons and other goodies. 3368# TODO: should actually wrap buttons and other goodies.
3059 3369
3060############################################################################# 3370#############################################################################
3061 3371
3062package CFClient::UI::Menu; 3372package CFPlus::UI::Menu;
3063 3373
3064our @ISA = CFClient::UI::FancyFrame::; 3374our @ISA = CFPlus::UI::Toplevel::;
3065 3375
3066use CFClient::OpenGL; 3376use CFPlus::OpenGL;
3067 3377
3068sub new { 3378sub new {
3069 my $class = shift; 3379 my $class = shift;
3070 3380
3071 my $self = $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3072 items => [], 3382 items => [],
3073 z => 100, 3383 z => 100,
3074 @_, 3384 @_,
3075 ); 3385 );
3076 3386
3077 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3387 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3078 3388
3079 for my $item (@{ $self->{items} }) { 3389 for my $item (@{ $self->{items} }) {
3080 my ($widget, $cb, $tooltip) = @$item; 3390 my ($widget, $cb, $tooltip) = @$item;
3081 3391
3082 # handle various types of items, only text for now 3392 # handle various types of items, only text for now
3083 if (!ref $widget) { 3393 if (!ref $widget) {
3394 if ($widget =~ /\t/) {
3395 my ($left, $right) = split /\t/, $widget, 2;
3396
3084 $widget = new CFClient::UI::Label 3397 $widget = new CFPlus::UI::HBox
3085 can_hover => 1, 3398 can_hover => 1,
3086 can_events => 1, 3399 can_events => 1,
3400 tooltip => $tooltip,
3401 children => [
3402 (new CFPlus::UI::Label markup => $left, expand => 1),
3403 (new CFPlus::UI::Label markup => $right, align => +1),
3404 ],
3405 ;
3406
3407 } else {
3408 $widget = new CFPlus::UI::Label
3409 can_hover => 1,
3410 can_events => 1,
3087 markup => $widget, 3411 markup => $widget,
3088 tooltip => $tooltip 3412 tooltip => $tooltip;
3413 }
3089 } 3414 }
3090 3415
3091 $self->{item}{$widget} = $item; 3416 $self->{item}{$widget} = $item;
3092 3417
3093 $self->{vbox}->add ($widget); 3418 $self->{vbox}->add ($widget);
… …
3136 1 3461 1
3137} 3462}
3138 3463
3139############################################################################# 3464#############################################################################
3140 3465
3141package CFClient::UI::Multiplexer; 3466package CFPlus::UI::Multiplexer;
3142 3467
3143our @ISA = CFClient::UI::Container::; 3468our @ISA = CFPlus::UI::Container::;
3144 3469
3145sub new { 3470sub new {
3146 my $class = shift; 3471 my $class = shift;
3147 3472
3148 my $self = $class->SUPER::new ( 3473 my $self = $class->SUPER::new (
… …
3162 3487
3163 $self->{current} = $self->{children}[0] 3488 $self->{current} = $self->{children}[0]
3164 if @{ $self->{children} }; 3489 if @{ $self->{children} };
3165} 3490}
3166 3491
3492sub get_current_page {
3493 my ($self) = @_;
3494
3495 $self->{current}
3496}
3497
3167sub set_current_page { 3498sub set_current_page {
3168 my ($self, $page_or_widget) = @_; 3499 my ($self, $page_or_widget) = @_;
3169 3500
3170 my $widget = ref $page_or_widget 3501 my $widget = ref $page_or_widget
3171 ? $page_or_widget 3502 ? $page_or_widget
… …
3203 $self->{current}->draw; 3534 $self->{current}->draw;
3204} 3535}
3205 3536
3206############################################################################# 3537#############################################################################
3207 3538
3208package CFClient::UI::Notebook; 3539package CFPlus::UI::Notebook;
3209 3540
3210our @ISA = CFClient::UI::VBox::; 3541our @ISA = CFPlus::UI::VBox::;
3211 3542
3212sub new { 3543sub new {
3213 my $class = shift; 3544 my $class = shift;
3214 3545
3215 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
3216 buttonbar => (new CFClient::UI::Buttonbar), 3547 buttonbar => (new CFPlus::UI::Buttonbar),
3217 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3548 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3218 # filter => # will be put between multiplexer and $self 3549 # filter => # will be put between multiplexer and $self
3219 @_, 3550 @_,
3220 ); 3551 );
3221 3552
3222 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3553 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3226} 3557}
3227 3558
3228sub add { 3559sub add {
3229 my ($self, $title, $widget, $tooltip) = @_; 3560 my ($self, $title, $widget, $tooltip) = @_;
3230 3561
3231 Scalar::Util::weaken $self; 3562 CFPlus::weaken $self;
3232 3563
3233 $self->{buttonbar}->add (new CFClient::UI::Button 3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3234 markup => $title, 3565 markup => $title,
3235 tooltip => $tooltip, 3566 tooltip => $tooltip,
3236 on_activate => sub { $self->set_current_page ($widget) }, 3567 on_activate => sub { $self->set_current_page ($widget) },
3237 ); 3568 );
3238 3569
3239 $self->{multiplexer}->add ($widget); 3570 $self->{multiplexer}->add ($widget);
3240} 3571}
3241 3572
3573sub get_current_page {
3574 my ($self) = @_;
3575
3576 $self->{multiplexer}->get_current_page
3577}
3578
3242sub set_current_page { 3579sub set_current_page {
3243 my ($self, $page) = @_; 3580 my ($self, $page) = @_;
3244 3581
3245 $self->{multiplexer}->set_current_page ($page); 3582 $self->{multiplexer}->set_current_page ($page);
3246 $self->emit (page_changed => $self->{multiplexer}{current}); 3583 $self->emit (page_changed => $self->{multiplexer}{current});
3247} 3584}
3248 3585
3249############################################################################# 3586#############################################################################
3250 3587
3251package CFClient::UI::Combobox; 3588package CFPlus::UI::Selector;
3252 3589
3253use utf8; 3590use utf8;
3254 3591
3255our @ISA = CFClient::UI::Button::; 3592our @ISA = CFPlus::UI::Button::;
3256 3593
3257sub new { 3594sub new {
3258 my $class = shift; 3595 my $class = shift;
3259 3596
3260 my $self = $class->SUPER::new ( 3597 my $self = $class->SUPER::new (
… …
3277 my ($value, $title, $tooltip) = @$_; 3614 my ($value, $title, $tooltip) = @$_;
3278 3615
3279 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3616 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3280 } 3617 }
3281 3618
3282 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3619 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3283} 3620}
3284 3621
3285sub _set_value { 3622sub _set_value {
3286 my ($self, $value) = @_; 3623 my ($self, $value) = @_;
3287 3624
… …
3302 $self->emit (changed => $value); 3639 $self->emit (changed => $value);
3303} 3640}
3304 3641
3305############################################################################# 3642#############################################################################
3306 3643
3307package CFClient::UI::Statusbox; 3644package CFPlus::UI::Statusbox;
3308 3645
3309our @ISA = CFClient::UI::VBox::; 3646our @ISA = CFPlus::UI::VBox::;
3310 3647
3311sub new { 3648sub new {
3312 my $class = shift; 3649 my $class = shift;
3313 3650
3314 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3315 fontsize => 0.8, 3652 fontsize => 0.8,
3316 @_, 3653 @_,
3317 ); 3654 );
3318 3655
3319 Scalar::Util::weaken (my $this = $self); 3656 CFPlus::weaken (my $this = $self);
3320 3657
3321 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3658 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3322 3659
3323 $self 3660 $self
3324} 3661}
… …
3326sub reorder { 3663sub reorder {
3327 my ($self) = @_; 3664 my ($self) = @_;
3328 my $NOW = Time::HiRes::time; 3665 my $NOW = Time::HiRes::time;
3329 3666
3330 # freeze display when hovering over any label 3667 # freeze display when hovering over any label
3331 return if $CFClient::UI::TOOLTIP->{owner} 3668 return if $CFPlus::UI::TOOLTIP->{owner}
3332 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3669 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3333 values %{ $self->{item} }; 3670 values %{ $self->{item} };
3334 3671
3335 while (my ($k, $v) = each %{ $self->{item} }) { 3672 while (my ($k, $v) = each %{ $self->{item} }) {
3336 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3673 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3337 } 3674 }
… …
3358 for ($short) { 3695 for ($short) {
3359 s/^\s+//; 3696 s/^\s+//;
3360 s/\s+/ /g; 3697 s/\s+/ /g;
3361 } 3698 }
3362 3699
3363 new CFClient::UI::Label 3700 new CFPlus::UI::Label
3364 markup => $short, 3701 markup => $short,
3365 tooltip => $item->{tooltip}, 3702 tooltip => $item->{tooltip},
3366 tooltip_font => $::FONT_PROP, 3703 tooltip_font => $::FONT_PROP,
3367 tooltip_width => 0.67, 3704 tooltip_width => 0.67,
3368 fontsize => $item->{fontsize} || $self->{fontsize}, 3705 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3447 $self->SUPER::destroy; 3784 $self->SUPER::destroy;
3448} 3785}
3449 3786
3450############################################################################# 3787#############################################################################
3451 3788
3452package CFClient::UI::Inventory;
3453
3454our @ISA = CFClient::UI::Table::;
3455
3456sub new {
3457 my $class = shift;
3458
3459 my $self = $class->SUPER::new (
3460 col_expand => [0, 1, 0],
3461 @_,
3462 );
3463
3464 $self
3465}
3466
3467sub set_items {
3468 my ($self, $items) = @_;
3469
3470 $self->clear;
3471 return unless $items;
3472
3473 my @items = sort {
3474 ($a->{type} <=> $b->{type})
3475 or ($a->{name} cmp $b->{name})
3476 } values %$items;
3477
3478 $self->{real_items} = \@items;
3479
3480 my $row = 0;
3481 for my $item (@items) {
3482 CFClient::Item::update_widgets $item;
3483
3484 $self->add (0, $row, $item->{face_widget});
3485 $self->add (1, $row, $item->{desc_widget});
3486 $self->add (2, $row, $item->{weight_widget});
3487
3488 $row++;
3489 }
3490}
3491
3492#############################################################################
3493
3494package CFClient::UI::SpellList;
3495
3496our @ISA = CFClient::UI::Table::;
3497
3498sub new {
3499 my $class = shift;
3500
3501 my $self = $class->SUPER::new (
3502 binding => [],
3503 commands => [],
3504 @_,
3505 )
3506}
3507
3508my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3509
3510my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3511 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3512my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3513 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3514my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3515 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3516my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3517 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3518my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3519 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3520
3521sub rebuild_spell_list {
3522 my ($self) = @_;
3523
3524 $CFClient::UI::ROOT->on_refresh ($self => sub {
3525 $self->clear;
3526
3527 return unless $::CONN;
3528
3529 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3530 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3531 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3532 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3533 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3534
3535 my $row = 0;
3536
3537 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3538 my $spell = $self->{spell}{$_};
3539
3540 $row++;
3541
3542 my $spell_cb = sub {
3543 my ($widget, $ev) = @_;
3544
3545 if ($ev->{button} == 1) {
3546 $::CONN->user_send ("cast $spell->{name}");
3547 } elsif ($ev->{button} == 2) {
3548 $::CONN->user_send ("invoke $spell->{name}");
3549 } elsif ($ev->{button} == 3) {
3550 (new CFClient::UI::Menu
3551 items => [
3552 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3553 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3554 ],
3555 )->popup ($ev);
3556 } else {
3557 return 0;
3558 }
3559
3560 1
3561 };
3562
3563 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3564
3565 #TODO: add path info to tooltip
3566 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3567
3568 $self->add (0, $row, new CFClient::UI::Face
3569 face => $spell->{face},
3570 can_hover => 1,
3571 can_events => 1,
3572 tooltip => $tooltip,
3573 on_button_down => $spell_cb,
3574 );
3575
3576 $self->add (1, $row, new CFClient::UI::Label
3577 expand => 1,
3578 text => $spell->{name},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $tooltip,
3582 on_button_down => $spell_cb,
3583 );
3584
3585 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3586 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3587 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3588 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3589 }
3590 });
3591}
3592
3593sub add_spell {
3594 my ($self, $spell) = @_;
3595
3596 $self->{spell}->{$spell->{name}} = $spell;
3597 $self->rebuild_spell_list;
3598}
3599
3600sub remove_spell {
3601 my ($self, $spell) = @_;
3602
3603 delete $self->{spell}->{$spell->{name}};
3604 $self->rebuild_spell_list;
3605}
3606
3607sub clear_spells {
3608 my ($self) = @_;
3609
3610 $self->{spell} = {};
3611 $self->rebuild_spell_list;
3612}
3613
3614#############################################################################
3615
3616package CFClient::UI::Root; 3789package CFPlus::UI::Root;
3617 3790
3618our @ISA = CFClient::UI::Container::; 3791our @ISA = CFPlus::UI::Container::;
3619 3792
3620use List::Util qw(min max); 3793use List::Util qw(min max);
3621 3794
3622use CFClient::OpenGL; 3795use CFPlus::OpenGL;
3623 3796
3624sub new { 3797sub new {
3625 my $class = shift; 3798 my $class = shift;
3626 3799
3627 my $self = $class->SUPER::new ( 3800 my $self = $class->SUPER::new (
3628 visible => 1, 3801 visible => 1,
3629 @_, 3802 @_,
3630 ); 3803 );
3631 3804
3632 Scalar::Util::weaken ($self->{root} = $self); 3805 CFPlus::weaken ($self->{root} = $self);
3633 3806
3634 $self 3807 $self
3635} 3808}
3636 3809
3637sub size_request { 3810sub size_request {
… …
3803 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3804 3977
3805 $w = 0 if $w < 0; 3978 $w = 0 if $w < 0;
3806 $h = 0 if $h < 0; 3979 $h = 0 if $h < 0;
3807 3980
3981 $w = max $widget->{min_w}, $w;
3982 $h = max $widget->{min_h}, $h;
3983
3984# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986
3987 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989
3808 $w = int $w + 0.5; 3990 $w = int $w + 0.5;
3809 $h = int $h + 0.5; 3991 $h = int $h + 0.5;
3810 3992
3811 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3993 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3812 $widget->{old_w} = $widget->{w}; 3994 $widget->{old_w} = $widget->{w};
… …
3835 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4017 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3836 glMatrixMode GL_MODELVIEW; 4018 glMatrixMode GL_MODELVIEW;
3837 glLoadIdentity; 4019 glLoadIdentity;
3838 4020
3839 { 4021 {
3840 package CFClient::UI::Base; 4022 package CFPlus::UI::Base;
3841 4023
3842 ($draw_x, $draw_y, $draw_w, $draw_h) = 4024 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3843 (0, 0, $self->{w}, $self->{h}); 4025 (0, 0, $self->{w}, $self->{h});
3844 }
3845 4026
3846 $self->_draw; 4027 $self->_draw;
4028 }
3847} 4029}
3848 4030
3849############################################################################# 4031#############################################################################
3850 4032
3851package CFClient::UI; 4033package CFPlus::UI;
3852 4034
3853$ROOT = new CFClient::UI::Root; 4035$ROOT = new CFPlus::UI::Root;
3854$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4036$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3855 4037
38561 40381
3857 4039

Diff Legend

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