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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.369 by root, Sun Jul 15 20:25:26 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}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
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::Table::;
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 $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1057 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1059 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1062 },
977 ; 1063 ;
978 1064
979 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
981 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
982 %arg, 1072 %arg,
983 ); 1073 );
984 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
986 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
987 1080
988 $self 1081 $self
989} 1082}
990 1083
… …
994 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
995 1088
996 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
997} 1090}
998 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
999sub update_slider { 1102sub update_slider {
1000 my ($self) = @_; 1103 my ($self) = @_;
1001 1104
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1003} 1112}
1004 1113
1005sub update { 1114sub update {
1006 my ($self) = @_; 1115 my ($self) = @_;
1007 1116
… …
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1128}
1020 1129
1021############################################################################# 1130#############################################################################
1022 1131
1023package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1024 1133
1025our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1026 1135
1027use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1028 1137
1029sub new { 1138sub new {
1030 my $class = shift; 1139 my $class = shift;
1031 1140
1032 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1059} 1168}
1060 1169
1061############################################################################# 1170#############################################################################
1062 1171
1063package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1064 1173
1065our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1066 1175
1067use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1068 1277
1069my $bg = 1278my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1280 mipmap => 1, wrap => 1;
1072 1281
1073my @border = 1282my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1283 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); 1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1285
1077sub new { 1286sub new {
1078 my ($class, %arg) = @_; 1287 my ($class, %arg) = @_;
1079 1288
1080 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1292 border => 0.6,
1084 can_events => 1, 1293 can_events => 1,
1085 min_w => 16, 1294 min_w => 64,
1086 min_h => 16, 1295 min_h => 32,
1087 %arg, 1296 %arg,
1088 ); 1297 );
1089 1298
1090 $self->{title_widget} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1300 align => 0,
1092 valign => 1, 1301 valign => 1,
1093 text => $self->{title}, 1302 text => $self->{title},
1094 fontsize => $self->{border}, 1303 fontsize => $self->{border},
1095 if exists $self->{title}; 1304 if exists $self->{title};
1096 1305
1097 if ($self->{has_close_button}) { 1306 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1307 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1308 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1309 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1310 on_activate => sub { $self->emit ("delete") };
1102 1311
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1313 }
1105 1314
1106 $self 1315 $self
1107} 1316}
1108 1317
1109sub add { 1318sub add {
1110 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1111 1320
1112 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1324}
1116 1325
1117sub border { 1326sub border {
1118 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1119} 1328}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1437
1229 ! ! $self->{motion} 1438 ! ! $self->{motion}
1230} 1439}
1231 1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1447}
1448
1232sub _draw { 1449sub _draw {
1233 my ($self) = @_; 1450 my ($self) = @_;
1234 1451
1235 my $child = $self->{children}[0]; 1452 my $child = $self->{children}[0];
1236 1453
… …
1273 if $self->{close_button}; 1490 if $self->{close_button};
1274} 1491}
1275 1492
1276############################################################################# 1493#############################################################################
1277 1494
1278package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1279 1496
1280our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1281 1498
1282use List::Util qw(max sum); 1499use List::Util qw(max sum);
1283 1500
1284use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1285 1502
1286sub new { 1503sub new {
1287 my $class = shift; 1504 my $class = shift;
1288 1505
1289 $class->SUPER::new ( 1506 $class->SUPER::new (
1290 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1291 @_, 1509 @_,
1292 ) 1510 )
1293} 1511}
1294 1512
1295sub children { 1513sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1515}
1298 1516
1299sub add { 1517sub add {
1300 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1301 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1522 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1304 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1528 $self->realloc;
1306} 1529}
1307 1530
1308sub remove { 1531sub remove {
1309 my ($self, $child) = @_; 1532 my ($self, $child) = @_;
… …
1365 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1366 1589
1367 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1368 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1369 1592
1370 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1371 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1372 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1373 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1374 1597
1375 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1599
1379 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1380 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1381 1609
1382 my $y; 1610 my $y;
1383 1611
1384 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1385 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1428 } 1656 }
1429} 1657}
1430 1658
1431############################################################################# 1659#############################################################################
1432 1660
1433package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1434 1662
1435our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1436 1664
1437sub size_request { 1665sub size_request {
1438 my ($self) = @_; 1666 my ($self) = @_;
1439 1667
1440 $self->{vertical} 1668 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1702 for 0 .. $#children;
1475 } 1703 }
1476 } 1704 }
1477 1705
1478 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1479 1707
1480 my $pos = 0; 1708 my $pos = 0;
1481 for (0 .. $#children) { 1709 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1716 1
1489} 1717}
1490 1718
1491############################################################################# 1719#############################################################################
1492 1720
1493package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1494 1722
1495our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1496 1724
1497sub new { 1725sub new {
1498 my $class = shift; 1726 my $class = shift;
1499 1727
1500 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1503 ) 1731 )
1504} 1732}
1505 1733
1506############################################################################# 1734#############################################################################
1507 1735
1508package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1509 1737
1510our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1511 1739
1512sub new { 1740sub new {
1513 my $class = shift; 1741 my $class = shift;
1514 1742
1515 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1518 ) 1746 )
1519} 1747}
1520 1748
1521############################################################################# 1749#############################################################################
1522 1750
1523package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1524 1752
1525our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1526 1754
1527use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1528 1756
1529sub new { 1757sub new {
1530 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1531 1759
1532 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1763 #active_bg => none
1536 #font => default_font 1764 #font => default_font
1537 #text => initial text 1765 #text => initial text
1538 #markup => initial narkup 1766 #markup => initial narkup
1539 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1540 ellipsise => 3, # end 1769 ellipsise => 3, # end
1541 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1771 fontsize => 1,
1543 align => -1, 1772 align => -1,
1544 valign => -1, 1773 valign => -1,
1545 padding_x => 2, 1774 padding_x => 2,
1546 padding_y => 2, 1775 padding_y => 2,
1547 can_events => 0, 1776 can_events => 0,
1548 %arg 1777 %arg
1549 ); 1778 );
1550 1779
1551 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1783 $self->{template} = $layout;
1555 } 1784 }
1556 1785
1557 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1561 } 1790 }
1562 1791
1563 $self 1792 $self
1564} 1793}
1565 1794
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574}
1575
1576sub update { 1795sub update {
1577 my ($self) = @_; 1796 my ($self) = @_;
1578 1797
1579 delete $self->{texture}; 1798 delete $self->{texture};
1580 $self->SUPER::update; 1799 $self->SUPER::update;
… …
1591 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1592 1811
1593 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1595 1814
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1598 1816
1599 delete $self->{size_req}; 1817 delete $self->{size_req};
1600 $self->realloc; 1818 $self->realloc;
1601 $self->update; 1819 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1609 1827
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1829
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1614 1831
1615 delete $self->{size_req}; 1832 delete $self->{size_req};
1616 $self->realloc; 1833 $self->realloc;
1617 $self->update; 1834 $self->update;
… …
1629 1846
1630 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1631 1848
1632 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 1853
1636 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1637 1855
1638 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
… …
1672 1890
1673sub reconfigure { 1891sub reconfigure {
1674 my ($self) = @_; 1892 my ($self) = @_;
1675 1893
1676 delete $self->{size_req}; 1894 delete $self->{size_req};
1895 delete $self->{texture};
1677 1896
1678 $self->SUPER::reconfigure; 1897 $self->SUPER::reconfigure;
1679} 1898}
1680 1899
1681sub _draw { 1900sub _draw {
1682 my ($self) = @_; 1901 my ($self) = @_;
1683 1902
1684 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1685 1904
1686 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 1912
1694 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1695 }; 1914 };
1696 1915
1697 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1701 1920
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 1924 };
1706 1925
1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 1928
1712 if ($tex->{format} == GL_ALPHA) { 1929 $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} 1930}
1723 1931
1724############################################################################# 1932#############################################################################
1725 1933
1726package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1727 1935
1728our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1729 1937
1730use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1731 1939
1732sub new { 1940sub new {
1733 my $class = shift; 1941 my $class = shift;
1734 1942
1735 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1739 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1740 can_hover => 1, 1948 can_hover => 1,
1741 can_focus => 1, 1949 can_focus => 1,
1742 valign => 0, 1950 valign => 0,
1743 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1744 #text => ... 1953 #text => ...
1745 #hidden => "*", 1954 #hidden => "*",
1746 @_ 1955 @_
1747 ) 1956 )
1748} 1957}
… …
1793 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1794 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1795 2004
1796 my $text = $self->get_text; 2005 my $text = $self->get_text;
1797 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1798 if ($uni == 8) { 2009 if ($uni == 8) {
1799 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1800 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1801 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1802 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1803 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1804 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1805 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1806 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1807 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1808 } elsif ($sym == CFClient::SDLK_END) {
1809 $self->{cursor} = length $text;
1810 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1811 $self->emit ('escape'); 2033 $self->emit ('escape');
1812 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1813 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else { 2038 } else {
1815 return 0; 2039 return 0;
1816 } 2040 }
1817 2041
1818 $self->_set_text ($text); 2042 $self->_set_text ($text);
1819 2043
1820 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1821 2046
1822 1 2047 1
1823} 2048}
1824 2049
1825sub invoke_focus_in { 2050sub invoke_focus_in {
… …
1837 2062
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 2064
1840 # byte-index to char-index 2065 # byte-index to char-index
1841 my $text = $self->{text}; 2066 my $text = $self->{text};
1842 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1844 2069
1845 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1846 $self->update; 2071 $self->update;
1847 2072
1848 1 2073 1
… …
1887 utf8::encode $text; 2112 utf8::encode $text;
1888 2113
1889 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1890 } 2115 }
1891 2116
1892 glColor @{$self->{fg}};
1893 glBegin GL_LINES; 2117 glBegin GL_LINES;
1894 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1895 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1896 glEnd; 2120 glEnd;
1897 } 2121 }
1898} 2122}
1899 2123
2124#############################################################################
2125
1900package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1901 2127
1902our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1903 2129
1904use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1905 2131
1906sub invoke_key_down { 2132sub invoke_key_down {
1907 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1908 2134
1909 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1910 2136
1911 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1912 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1913 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
1914 2140
1915 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1916 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1917 $self->emit (activate => $txt); 2143 $self->emit (activate => $txt);
1918 $self->update; 2144 $self->update;
1919 2145
1920 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1921 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1922 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1923 } 2149 }
1924 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1925 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1927 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1928 } 2154 }
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1930 } 2156 }
1931 2157
1932 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1933 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1934 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1935 2161
1936 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1937 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1946 1 2172 1
1947} 2173}
1948 2174
1949############################################################################# 2175#############################################################################
1950 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1951package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1952 2217
1953our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1954 2219
1955use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1956 2221
1957my @tex = 2222my @tex =
1958 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1959 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1960 2225
1961sub new { 2226sub new {
1962 my $class = shift; 2227 my $class = shift;
1963 2228
… …
2000 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
2001} 2266}
2002 2267
2003############################################################################# 2268#############################################################################
2004 2269
2270package CFPlus::UI::CheckBox;
2271
2272our @ISA = CFPlus::UI::DrawBG::;
2273
2274my @tex =
2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2277
2278use CFPlus::OpenGL;
2279
2280sub new {
2281 my $class = shift;
2282
2283 $class->SUPER::new (
2284 padding_x => 2,
2285 padding_y => 2,
2286 fg => [1, 1, 1],
2287 active_fg => [1, 1, 0],
2288 bg => [0, 0, 0, 0.2],
2289 active_bg => [1, 1, 1, 0.5],
2290 state => 0,
2291 can_hover => 1,
2292 @_
2293 )
2294}
2295
2296sub size_request {
2297 my ($self) = @_;
2298
2299 (6) x 2
2300}
2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
2310sub invoke_button_down {
2311 my ($self, $ev, $x, $y) = @_;
2312
2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2315 $self->toggle;
2316 } else {
2317 return 0
2318 }
2319
2320 1
2321}
2322
2323sub _draw {
2324 my ($self) = @_;
2325
2326 $self->SUPER::_draw;
2327
2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2329
2330 my ($w, $h) = @$self{qw(w h)};
2331
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333
2334 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2335
2336 my $tex = $self->{state} ? $tex[1] : $tex[0];
2337
2338 glEnable GL_TEXTURE_2D;
2339 $tex->draw_quad_alpha (0, 0, $s, $s);
2340 glDisable GL_TEXTURE_2D;
2341}
2342
2343#############################################################################
2344
2345package CFPlus::UI::Image;
2346
2347our @ISA = CFPlus::UI::Base::;
2348
2349use CFPlus::OpenGL;
2350
2351our %texture_cache;
2352
2353sub new {
2354 my $class = shift;
2355
2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2360
2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2363
2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2366
2367 CFPlus::weaken $texture_cache{$self->{path}};
2368
2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2370
2371 $self
2372}
2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2389sub size_request {
2390 my ($self) = @_;
2391
2392 ($self->{tex}{w}, $self->{tex}{h})
2393}
2394
2395sub _draw {
2396 my ($self) = @_;
2397
2398 my $tex = $self->{tex};
2399
2400 my ($w, $h) = ($self->{w}, $self->{h});
2401
2402 if ($self->{rot90}) {
2403 glRotate 90, 0, 0, 1;
2404 glTranslate 0, -$self->{w}, 0;
2405
2406 ($w, $h) = ($h, $w);
2407 }
2408
2409 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411
2412 $tex->draw_quad (0, 0, $w, $h);
2413
2414 glDisable GL_TEXTURE_2D;
2415}
2416
2417#############################################################################
2418
2005package CFClient::UI::ImageButton; 2419package CFPlus::UI::ImageButton;
2006 2420
2007our @ISA = CFClient::UI::Image::; 2421our @ISA = CFPlus::UI::Image::;
2008 2422
2009use CFClient::OpenGL; 2423use CFPlus::OpenGL;
2010 2424
2011my %textures; 2425my %textures;
2012 2426
2013sub new { 2427sub new {
2014 my $class = shift; 2428 my $class = shift;
… …
2036 1 2450 1
2037} 2451}
2038 2452
2039############################################################################# 2453#############################################################################
2040 2454
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 toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
2081sub invoke_button_down {
2082 my ($self, $ev, $x, $y) = @_;
2083
2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2086 $self->toggle;
2087 } else {
2088 return 0
2089 }
2090
2091 1
2092}
2093
2094sub _draw {
2095 my ($self) = @_;
2096
2097 $self->SUPER::_draw;
2098
2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2100
2101 my ($w, $h) = @$self{qw(w h)};
2102
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2104
2105 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2106
2107 my $tex = $self->{state} ? $tex[1] : $tex[0];
2108
2109 glEnable GL_TEXTURE_2D;
2110 $tex->draw_quad_alpha (0, 0, $s, $s);
2111 glDisable GL_TEXTURE_2D;
2112}
2113
2114#############################################################################
2115
2116package CFClient::UI::Image; 2455package CFPlus::UI::VGauge;
2117 2456
2118our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
2119
2120use CFClient::OpenGL;
2121
2122our %texture_cache;
2123
2124sub new {
2125 my $class = shift;
2126
2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
2131
2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
2134
2135 $self->{tex} = $texture_cache{$self->{path}} ||=
2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137
2138 Scalar::Util::weaken $texture_cache{$self->{path}};
2139
2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2141
2142 $self
2143}
2144
2145sub size_request {
2146 my ($self) = @_;
2147
2148 ($self->{tex}{w}, $self->{tex}{h})
2149}
2150
2151sub _draw {
2152 my ($self) = @_;
2153
2154 my $tex = $self->{tex};
2155
2156 my ($w, $h) = ($self->{w}, $self->{h});
2157
2158 if ($self->{rot90}) {
2159 glRotate 90, 0, 0, 1;
2160 glTranslate 0, -$self->{w}, 0;
2161
2162 ($w, $h) = ($h, $w);
2163 }
2164
2165 glEnable GL_TEXTURE_2D;
2166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2167
2168 $tex->draw_quad_alpha (0, 0, $w, $h);
2169
2170 glDisable GL_TEXTURE_2D;
2171}
2172
2173#############################################################################
2174
2175package CFClient::UI::VGauge;
2176
2177our @ISA = CFClient::UI::Base::;
2178 2458
2179use List::Util qw(min max); 2459use List::Util qw(min max);
2180 2460
2181use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2182 2462
2183my %tex = ( 2463my %tex = (
2184 food => [ 2464 food => [
2185 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2187 ], 2467 ],
2188 grace => [ 2468 grace => [
2189 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2191 ], 2471 ],
2192 hp => [ 2472 hp => [
2193 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2194 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2195 ], 2475 ],
2196 mana => [ 2476 mana => [
2197 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2198 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2199 ], 2479 ],
2200); 2480);
2201 2481
2202# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2305 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2306} 2586}
2307 2587
2308############################################################################# 2588#############################################################################
2309 2589
2310package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2311 2591
2312our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2313 2593
2314sub new { 2594sub new {
2315 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2316 2596
2317 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2319 can_hover => 1, 2599 can_hover => 1,
2320 can_events => 1, 2600 can_events => 1,
2321 %arg, 2601 %arg,
2322 ); 2602 );
2323 2603
2324 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2325 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2605 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2326 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2327 2607
2328 $self 2608 $self
2329} 2609}
2330 2610
2331sub set_fontsize { 2611sub set_fontsize {
… …
2352 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2353} 2633}
2354 2634
2355############################################################################# 2635#############################################################################
2356 2636
2357package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2358 2638
2359use strict; 2639use strict;
2360 2640
2361use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2362 2642
2363our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2364 2644
2365my @tex = 2645my @tex =
2366 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2367 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2368 2648
2369sub new { 2649sub new {
2370 my $class = shift; 2650 my $class = shift;
2371 2651
… …
2460 } 2740 }
2461 2741
2462 1 2742 1
2463} 2743}
2464 2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2755}
2756
2465sub update { 2757sub update {
2466 my ($self) = @_; 2758 my ($self) = @_;
2467 2759
2468 delete $self->{knob_w}; 2760 delete $self->{knob_w};
2469 $self->SUPER::update; 2761 $self->SUPER::update;
… …
2516 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2517} 2809}
2518 2810
2519############################################################################# 2811#############################################################################
2520 2812
2521package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2522 2814
2523our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2524 2816
2525sub new { 2817sub new {
2526 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2527 2819
2528 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2529 2821
2530 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2531 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2532 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2533 to_value => sub { shift }, 2825 to_value => sub { shift },
2534 from_value => sub { shift }, 2826 from_value => sub { shift },
2535 %arg, 2827 %arg,
2536 ); 2828 );
2537 2829
… …
2557sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2558sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2559 2851
2560############################################################################# 2852#############################################################################
2561 2853
2562package CFClient::UI::TextScroller; 2854package CFPlus::UI::TextScroller;
2563 2855
2564our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2565 2857
2566use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2567 2859
2568sub new { 2860sub new {
2569 my $class = shift; 2861 my $class = shift;
2570 2862
2571 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2572 fontsize => 1, 2864 fontsize => 1,
2573 can_events => 0, 2865 can_events => 1,
2574 indent => 0, 2866 indent => 0,
2575 #font => default_font 2867 #font => default_font
2576 @_, 2868 @_,
2577 2869
2578 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2579 par => [], 2871 par => [],
2872 max_par => 0,
2580 height => 0, 2873 height => 0,
2581 children => [ 2874 children => [
2582 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2583 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2584 ], 2877 ],
2585 ); 2878 );
2586 2879
2587 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2588 2881
… …
2618 2911
2619 $self->reflow; 2912 $self->reflow;
2620 2913
2621 local $self->{children} = [$empty, $slider]; 2914 local $self->{children} = [$empty, $slider];
2622 $self->SUPER::invoke_size_allocate ($w, $h) 2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2623} 2926}
2624 2927
2625sub get_layout { 2928sub get_layout {
2626 my ($self, $para) = @_; 2929 my ($self, $para) = @_;
2627 2930
… …
2655 2958
2656 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2657 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2658} 2961}
2659 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2660sub clear { 2978sub clear {
2661 my ($self) = @_; 2979 my ($self) = @_;
2662 2980
2663 my (undef, undef, @other) = @{ $self->{children} }; 2981 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other; 2982 $self->remove ($_) for @other;
… …
2667 $self->{height} = 0; 2985 $self->{height} = 0;
2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2669} 2987}
2670 2988
2671sub add_paragraph { 2989sub add_paragraph {
2672 my ($self, $color, $para, $indent) = @_; 2990 my $self = shift;
2673 2991
2674 my ($text, @w) = ref $para ? @$para : $para; 2992 for my $para (@_) {
2675
2676 $para = { 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2677 w => 1e10, 2999 w => 1e10,
2678 wrapped => 1, 3000 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2683 }; 3001 };
2684 3002
2685 $self->add (@w) if @w; 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2686 push @{$self->{par}}, $para; 3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
2687 3010
2688 $self->{need_reflow}++; 3011 $self->{need_reflow}++;
2689 $self->update; 3012 $self->update;
2690} 3013}
2691 3014
2692sub scroll_to_bottom { 3015sub scroll_to_bottom {
2693 my ($self) = @_; 3016 my ($self) = @_;
2694 3017
2695 $self->{scroll_to_bottom} = 1; 3018 $self->{scroll_to} = $#{$self->{par}};
2696 $self->update; 3019 $self->update;
2697} 3020}
2698 3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
3044 $self->{height} = $height;
3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3046
3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
3053}
3054
2699sub update { 3055sub update {
2700 my ($self) = @_; 3056 my ($self) = @_;
2701 3057
2702 $self->SUPER::update; 3058 $self->SUPER::update;
2703 3059
2704 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2705 3061
2706 delete $self->{texture}; 3062 delete $self->{texture};
2707 3063
2708 $ROOT->on_post_alloc ($self => sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2710 3068
2711 if (delete $self->{need_reflow}) {
2712 my $height = 0;
2713
2714 for my $para (@{$self->{par}}) {
2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2716 my $layout = $self->get_layout ($para);
2717 my ($w, $h) = $layout->size;
2718
2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2722 }
2723
2724 $height += $para->{h};
2725 }
2726
2727 $self->{height} = $height;
2728
2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2730
2731 delete $self->{texture};
2732 }
2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2739 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2740 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2741 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2742 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2743 3082
2744 my $y0 = $top; 3083 my $y0 = $top;
2745 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2746 3085
2747 my $y = 0;
2748
2749 glEnable GL_BLEND;
2750 #TODO# not correct in windows where rgba is forced off
2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753 for my $para (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2754 my $h = $para->{h}; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2755 3089
2756 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2757
2758 my $layout = $self->get_layout ($para); 3091 my $layout = $self->get_layout ($para);
2759 3092
2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762 glRasterPos $para->{indent}, $y - $y0; 3093 $layout->render ($para->{indent}, $y - $y0);
2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764 3094
2765 if (my @w = @{ $para->{widget} }) { 3095 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes; 3096 my @s = $layout->get_shapes;
2767 3097
2768 glDisable GL_BLEND;
2769 for (@w) { 3098 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, (); 3099 my ($dx, $dy) = splice @s, 0, 2, ();
2771 3100
2772 $_->{x} = $dx + $para->{indent}; 3101 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0; 3102 $_->{y} = $dy + $y - $y0;
2774 3103
2775 $_->draw; 3104 $_->draw;
2776 } 3105 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 } 3106 }
2780 } 3107 }
2781 3108
2782 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2783 } 3111 }
2784 3112
2785 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2786 }; 3114 };
2787 }); 3115 });
2788} 3116}
2789 3117
2790sub reconfigure { 3118sub reconfigure {
… …
2808 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2809} 3137}
2810 3138
2811############################################################################# 3139#############################################################################
2812 3140
2813package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2814 3142
2815use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2816 3144
2817our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2818 3146
2819sub moveto { 3147sub moveto {
2820 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2821 3149
2822 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2850 glPopMatrix; 3178 glPopMatrix;
2851} 3179}
2852 3180
2853############################################################################# 3181#############################################################################
2854 3182
2855package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2856 3184
2857our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2858 3186
2859sub new { 3187sub new {
2860 my $class = shift; 3188 my $class = shift;
2861 3189
2862 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2874 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2875} 3203}
2876 3204
2877############################################################################# 3205#############################################################################
2878 3206
2879package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2880 3208
2881our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2882 3210
2883use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2884 3212
2885sub new { 3213sub new {
2886 my $class = shift; 3214 my $class = shift;
2887 3215
2888 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2891 ) 3219 )
2892} 3220}
2893 3221
2894sub set_tooltip_from { 3222sub set_tooltip_from {
2895 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2896 3227
2897 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2898 3229
2899 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2904 } 3235 }
2905 3236
2906 $tooltip =~ s/^\n+//; 3237 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//; 3238 $tooltip =~ s/\n+$//;
2908 3239
2909 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2910 markup => $tooltip, 3241 markup => $tooltip,
2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2912 fontsize => 0.8, 3243 fontsize => 0.8,
2913 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2914 ellipsise => 0, 3245 ellipsise => 0,
2915 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2916 ); 3247 );
2917} 3248}
2918 3249
… …
2937 3268
2938 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2939 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2940 or return; 3271 or return;
2941 3272
3273 if ($widget->{visible}) {
2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2943 3275
2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2945 if $x + $self->{w} > $self->{root}{w}; 3277 if $x + $self->{w} > $self->{root}{w};
2946 3278
2947 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2948 }); 3283 });
2949} 3284}
2950 3285
2951sub _draw { 3286sub _draw {
2952 my ($self) = @_; 3287 my ($self) = @_;
… …
2976 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2977} 3312}
2978 3313
2979############################################################################# 3314#############################################################################
2980 3315
2981package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2982 3317
2983our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2984 3319
2985use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2986 3321
2987sub new { 3322sub new {
2988 my $class = shift; 3323 my $class = shift;
2989 3324
2990 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2992 can_events => 0, 3327 can_events => 0,
2993 @_, 3328 @_,
2994 ); 3329 );
2995 3330
2996 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2997 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2998 3333
2999 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
3000 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3001 hard => 1, 3336 hard => 1,
3002 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
… …
3025sub _draw { 3360sub _draw {
3026 my ($self) = @_; 3361 my ($self) = @_;
3027 3362
3028 return unless $::CONN; 3363 return unless $::CONN;
3029 3364
3365 $self->SUPER::_draw;
3366
3030 my $face; 3367 my $face;
3031 3368
3032 if ($self->{frame}) { 3369 if ($self->{frame}) {
3033 my $anim = $::CONN->{anim}[$self->{anim}]; 3370 my $anim = $::CONN->{anim}[$self->{anim}];
3034 3371
… …
3056 $self->SUPER::destroy; 3393 $self->SUPER::destroy;
3057} 3394}
3058 3395
3059############################################################################# 3396#############################################################################
3060 3397
3061package CFClient::UI::Buttonbar; 3398package CFPlus::UI::Buttonbar;
3062 3399
3063our @ISA = CFClient::UI::HBox::; 3400our @ISA = CFPlus::UI::HBox::;
3064 3401
3065# TODO: should actualyl wrap buttons and other goodies. 3402# TODO: should actually wrap buttons and other goodies.
3066 3403
3067############################################################################# 3404#############################################################################
3068 3405
3069package CFClient::UI::Menu; 3406package CFPlus::UI::Menu;
3070 3407
3071our @ISA = CFClient::UI::FancyFrame::; 3408our @ISA = CFPlus::UI::Toplevel::;
3072 3409
3073use CFClient::OpenGL; 3410use CFPlus::OpenGL;
3074 3411
3075sub new { 3412sub new {
3076 my $class = shift; 3413 my $class = shift;
3077 3414
3078 my $self = $class->SUPER::new ( 3415 my $self = $class->SUPER::new (
3079 items => [], 3416 items => [],
3080 z => 100, 3417 z => 100,
3081 @_, 3418 @_,
3082 ); 3419 );
3083 3420
3084 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3421 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3085 3422
3086 for my $item (@{ $self->{items} }) { 3423 for my $item (@{ $self->{items} }) {
3087 my ($widget, $cb, $tooltip) = @$item; 3424 my ($widget, $cb, $tooltip) = @$item;
3088 3425
3089 # handle various types of items, only text for now 3426 # handle various types of items, only text for now
3090 if (!ref $widget) { 3427 if (!ref $widget) {
3428 if ($widget =~ /\t/) {
3429 my ($left, $right) = split /\t/, $widget, 2;
3430
3091 $widget = new CFClient::UI::Label 3431 $widget = new CFPlus::UI::HBox
3092 can_hover => 1, 3432 can_hover => 1,
3093 can_events => 1, 3433 can_events => 1,
3434 tooltip => $tooltip,
3435 children => [
3436 (new CFPlus::UI::Label markup => $left, expand => 1),
3437 (new CFPlus::UI::Label markup => $right, align => +1),
3438 ],
3439 ;
3440
3441 } else {
3442 $widget = new CFPlus::UI::Label
3443 can_hover => 1,
3444 can_events => 1,
3094 markup => $widget, 3445 markup => $widget,
3095 tooltip => $tooltip 3446 tooltip => $tooltip;
3447 }
3096 } 3448 }
3097 3449
3098 $self->{item}{$widget} = $item; 3450 $self->{item}{$widget} = $item;
3099 3451
3100 $self->{vbox}->add ($widget); 3452 $self->{vbox}->add ($widget);
… …
3143 1 3495 1
3144} 3496}
3145 3497
3146############################################################################# 3498#############################################################################
3147 3499
3148package CFClient::UI::Multiplexer; 3500package CFPlus::UI::Multiplexer;
3149 3501
3150our @ISA = CFClient::UI::Container::; 3502our @ISA = CFPlus::UI::Container::;
3151 3503
3152sub new { 3504sub new {
3153 my $class = shift; 3505 my $class = shift;
3154 3506
3155 my $self = $class->SUPER::new ( 3507 my $self = $class->SUPER::new (
… …
3216 $self->{current}->draw; 3568 $self->{current}->draw;
3217} 3569}
3218 3570
3219############################################################################# 3571#############################################################################
3220 3572
3221package CFClient::UI::Notebook; 3573package CFPlus::UI::Notebook;
3222 3574
3223our @ISA = CFClient::UI::VBox::; 3575our @ISA = CFPlus::UI::VBox::;
3224 3576
3225sub new { 3577sub new {
3226 my $class = shift; 3578 my $class = shift;
3227 3579
3228 my $self = $class->SUPER::new ( 3580 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar), 3581 buttonbar => (new CFPlus::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3582 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self 3583 # filter => # will be put between multiplexer and $self
3232 @_, 3584 @_,
3233 ); 3585 );
3234 3586
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3587 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3239} 3591}
3240 3592
3241sub add { 3593sub add {
3242 my ($self, $title, $widget, $tooltip) = @_; 3594 my ($self, $title, $widget, $tooltip) = @_;
3243 3595
3244 Scalar::Util::weaken $self; 3596 CFPlus::weaken $self;
3245 3597
3246 $self->{buttonbar}->add (new CFClient::UI::Button 3598 $self->{buttonbar}->add (new CFPlus::UI::Button
3247 markup => $title, 3599 markup => $title,
3248 tooltip => $tooltip, 3600 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) }, 3601 on_activate => sub { $self->set_current_page ($widget) },
3250 ); 3602 );
3251 3603
… …
3265 $self->emit (page_changed => $self->{multiplexer}{current}); 3617 $self->emit (page_changed => $self->{multiplexer}{current});
3266} 3618}
3267 3619
3268############################################################################# 3620#############################################################################
3269 3621
3270package CFClient::UI::Combobox; 3622package CFPlus::UI::Selector;
3271 3623
3272use utf8; 3624use utf8;
3273 3625
3274our @ISA = CFClient::UI::Button::; 3626our @ISA = CFPlus::UI::Button::;
3275 3627
3276sub new { 3628sub new {
3277 my $class = shift; 3629 my $class = shift;
3278 3630
3279 my $self = $class->SUPER::new ( 3631 my $self = $class->SUPER::new (
… …
3296 my ($value, $title, $tooltip) = @$_; 3648 my ($value, $title, $tooltip) = @$_;
3297 3649
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3650 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 } 3651 }
3300 3652
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3653 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302} 3654}
3303 3655
3304sub _set_value { 3656sub _set_value {
3305 my ($self, $value) = @_; 3657 my ($self, $value) = @_;
3306 3658
… …
3321 $self->emit (changed => $value); 3673 $self->emit (changed => $value);
3322} 3674}
3323 3675
3324############################################################################# 3676#############################################################################
3325 3677
3326package CFClient::UI::Statusbox; 3678package CFPlus::UI::Statusbox;
3327 3679
3328our @ISA = CFClient::UI::VBox::; 3680our @ISA = CFPlus::UI::VBox::;
3329 3681
3330sub new { 3682sub new {
3331 my $class = shift; 3683 my $class = shift;
3332 3684
3333 my $self = $class->SUPER::new ( 3685 my $self = $class->SUPER::new (
3334 fontsize => 0.8, 3686 fontsize => 0.8,
3335 @_, 3687 @_,
3336 ); 3688 );
3337 3689
3338 Scalar::Util::weaken (my $this = $self); 3690 CFPlus::weaken (my $this = $self);
3339 3691
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3692 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341 3693
3342 $self 3694 $self
3343} 3695}
… …
3345sub reorder { 3697sub reorder {
3346 my ($self) = @_; 3698 my ($self) = @_;
3347 my $NOW = Time::HiRes::time; 3699 my $NOW = Time::HiRes::time;
3348 3700
3349 # freeze display when hovering over any label 3701 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner} 3702 return if $CFPlus::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3703 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} }; 3704 values %{ $self->{item} };
3353 3705
3354 while (my ($k, $v) = each %{ $self->{item} }) { 3706 while (my ($k, $v) = each %{ $self->{item} }) {
3355 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3707 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3356 } 3708 }
… …
3377 for ($short) { 3729 for ($short) {
3378 s/^\s+//; 3730 s/^\s+//;
3379 s/\s+/ /g; 3731 s/\s+/ /g;
3380 } 3732 }
3381 3733
3382 new CFClient::UI::Label 3734 new CFPlus::UI::Label
3383 markup => $short, 3735 markup => $short,
3384 tooltip => $item->{tooltip}, 3736 tooltip => $item->{tooltip},
3385 tooltip_font => $::FONT_PROP, 3737 tooltip_font => $::FONT_PROP,
3386 tooltip_width => 0.67, 3738 tooltip_width => 0.67,
3387 fontsize => $item->{fontsize} || $self->{fontsize}, 3739 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3466 $self->SUPER::destroy; 3818 $self->SUPER::destroy;
3467} 3819}
3468 3820
3469############################################################################# 3821#############################################################################
3470 3822
3471package CFClient::UI::Inventory;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
3613 my ($self, $spell) = @_;
3614
3615 $self->{spell}->{$spell->{name}} = $spell;
3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
3635package CFClient::UI::Root; 3823package CFPlus::UI::Root;
3636 3824
3637our @ISA = CFClient::UI::Container::; 3825our @ISA = CFPlus::UI::Container::;
3638 3826
3639use List::Util qw(min max); 3827use List::Util qw(min max);
3640 3828
3641use CFClient::OpenGL; 3829use CFPlus::OpenGL;
3642 3830
3643sub new { 3831sub new {
3644 my $class = shift; 3832 my $class = shift;
3645 3833
3646 my $self = $class->SUPER::new ( 3834 my $self = $class->SUPER::new (
3647 visible => 1, 3835 visible => 1,
3648 @_, 3836 @_,
3649 ); 3837 );
3650 3838
3651 Scalar::Util::weaken ($self->{root} = $self); 3839 CFPlus::weaken ($self->{root} = $self);
3652 3840
3653 $self 3841 $self
3654} 3842}
3655 3843
3656sub size_request { 3844sub size_request {
… …
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4010 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823 4011
3824 $w = 0 if $w < 0; 4012 $w = 0 if $w < 0;
3825 $h = 0 if $h < 0; 4013 $h = 0 if $h < 0;
3826 4014
4015 $w = max $widget->{min_w}, $w;
4016 $h = max $widget->{min_h}, $h;
4017
4018# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4019# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4020
4021 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4022 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4023
3827 $w = int $w + 0.5; 4024 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 4025 $h = int $h + 0.5;
3829 4026
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4027 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w}; 4028 $widget->{old_w} = $widget->{w};
… …
3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4051 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3855 glMatrixMode GL_MODELVIEW; 4052 glMatrixMode GL_MODELVIEW;
3856 glLoadIdentity; 4053 glLoadIdentity;
3857 4054
3858 { 4055 {
3859 package CFClient::UI::Base; 4056 package CFPlus::UI::Base;
3860 4057
3861 ($draw_x, $draw_y, $draw_w, $draw_h) = 4058 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h}); 4059 (0, 0, $self->{w}, $self->{h});
3863 }
3864 4060
3865 $self->_draw; 4061 $self->_draw;
4062 }
3866} 4063}
3867 4064
3868############################################################################# 4065#############################################################################
3869 4066
3870package CFClient::UI; 4067package CFPlus::UI;
3871 4068
3872$ROOT = new CFClient::UI::Root; 4069$ROOT = new CFPlus::UI::Root;
3873$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4070$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3874 4071
38751 40721
3876 4073

Diff Legend

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