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

Diff Legend

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