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.321 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.373 by root, Sun Jul 15 22:39:30 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 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
981 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
982 %arg, 1073 %arg,
983 ); 1074 );
984 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
986 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
987 1087
988 $self 1088 $self
989} 1089}
990 1090
… …
994 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
995 1095
996 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
997} 1097}
998 1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
999sub update_slider { 1109sub update_slider {
1000 my ($self) = @_; 1110 my ($self) = @_;
1001 1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1003} 1121}
1004 1122
1005sub update { 1123sub update {
1006 my ($self) = @_; 1124 my ($self) = @_;
1007 1125
1008 $self->SUPER::update; 1126 $self->SUPER::update;
1009
1010 $self->update_slider; 1127 $self->update_slider;
1011} 1128}
1012 1129
1013sub invoke_size_allocate { 1130sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1015 1132
1016 $self->update_slider; 1133 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1135}
1020 1136
1021############################################################################# 1137#############################################################################
1022 1138
1023package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1024 1140
1025our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1026 1142
1027use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1028 1144
1029sub new { 1145sub new {
1030 my $class = shift; 1146 my $class = shift;
1031 1147
1032 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1059} 1175}
1060 1176
1061############################################################################# 1177#############################################################################
1062 1178
1063package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1064 1180
1065our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1066 1182
1067use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1068 1284
1069my $bg = 1285my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1287 mipmap => 1, wrap => 1;
1072 1288
1073my @border = 1289my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1290 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); 1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1292
1077sub new { 1293sub new {
1078 my ($class, %arg) = @_; 1294 my ($class, %arg) = @_;
1079 1295
1080 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1299 border => 0.6,
1084 can_events => 1, 1300 can_events => 1,
1085 min_w => 16, 1301 min_w => 64,
1086 min_h => 16, 1302 min_h => 32,
1087 %arg, 1303 %arg,
1088 ); 1304 );
1089 1305
1090 $self->{title_widget} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1307 align => 0,
1092 valign => 1, 1308 valign => 1,
1093 text => $self->{title}, 1309 text => $self->{title},
1094 fontsize => $self->{border}, 1310 fontsize => $self->{border},
1095 if exists $self->{title}; 1311 if exists $self->{title};
1096 1312
1097 if ($self->{has_close_button}) { 1313 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1314 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1315 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1316 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") }; 1317 on_activate => sub { $self->emit ("delete") };
1102 1318
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1320 }
1105 1321
1106 $self 1322 $self
1107} 1323}
1108 1324
1109sub add { 1325sub add {
1110 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1111 1327
1112 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1331}
1116 1332
1117sub border { 1333sub border {
1118 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1119} 1335}
… …
1227 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228 1444
1229 ! ! $self->{motion} 1445 ! ! $self->{motion}
1230} 1446}
1231 1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1454}
1455
1232sub _draw { 1456sub _draw {
1233 my ($self) = @_; 1457 my ($self) = @_;
1234 1458
1235 my $child = $self->{children}[0]; 1459 my $child = $self->{children}[0];
1236 1460
… …
1273 if $self->{close_button}; 1497 if $self->{close_button};
1274} 1498}
1275 1499
1276############################################################################# 1500#############################################################################
1277 1501
1278package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1279 1503
1280our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1281 1505
1282use List::Util qw(max sum); 1506use List::Util qw(max sum);
1283 1507
1284use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1285 1509
1286sub new { 1510sub new {
1287 my $class = shift; 1511 my $class = shift;
1288 1512
1289 $class->SUPER::new ( 1513 $class->SUPER::new (
1290 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1291 @_, 1516 @_,
1292 ) 1517 )
1293} 1518}
1294 1519
1295sub children { 1520sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1522}
1298 1523
1299sub add { 1524sub add {
1300 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1301 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1529 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1304 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1535 $self->realloc;
1306} 1536}
1307 1537
1308sub remove { 1538sub remove {
1309 my ($self, $child) = @_; 1539 my ($self, $child) = @_;
… …
1365 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1366 1596
1367 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1368 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1369 1599
1370 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1371 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1372 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1373 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1374 1604
1375 # linearly scale sizes
1376 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1377 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1378 1606
1379 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1380 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1381 1616
1382 my $y; 1617 my $y;
1383 1618
1384 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1385 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1428 } 1663 }
1429} 1664}
1430 1665
1431############################################################################# 1666#############################################################################
1432 1667
1433package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1434 1669
1435our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1436 1671
1437sub size_request { 1672sub size_request {
1438 my ($self) = @_; 1673 my ($self) = @_;
1439 1674
1440 $self->{vertical} 1675 $self->{vertical}
… …
1473 $req[$_] += $space * $children[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children; 1709 for 0 .. $#children;
1475 } 1710 }
1476 } 1711 }
1477 1712
1478 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1479 1714
1480 my $pos = 0; 1715 my $pos = 0;
1481 for (0 .. $#children) { 1716 for (0 .. $#children) {
1482 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1488 1 1723 1
1489} 1724}
1490 1725
1491############################################################################# 1726#############################################################################
1492 1727
1493package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1494 1729
1495our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1496 1731
1497sub new { 1732sub new {
1498 my $class = shift; 1733 my $class = shift;
1499 1734
1500 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1503 ) 1738 )
1504} 1739}
1505 1740
1506############################################################################# 1741#############################################################################
1507 1742
1508package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1509 1744
1510our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1511 1746
1512sub new { 1747sub new {
1513 my $class = shift; 1748 my $class = shift;
1514 1749
1515 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1518 ) 1753 )
1519} 1754}
1520 1755
1521############################################################################# 1756#############################################################################
1522 1757
1523package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1524 1759
1525our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1526 1761
1527use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1528 1763
1529sub new { 1764sub new {
1530 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1531 1766
1532 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1535 #active_bg => none 1770 #active_bg => none
1536 #font => default_font 1771 #font => default_font
1537 #text => initial text 1772 #text => initial text
1538 #markup => initial narkup 1773 #markup => initial narkup
1539 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1540 ellipsise => 3, # end 1776 ellipsise => 3, # end
1541 layout => (new CFClient::Layout 2), 1777 layout => (new CFPlus::Layout),
1542 fontsize => 1, 1778 fontsize => 1,
1543 align => -1, 1779 align => -1,
1544 valign => -1, 1780 valign => -1,
1545 padding_x => 2, 1781 padding_x => 2,
1546 padding_y => 2, 1782 padding_y => 2,
1547 can_events => 0, 1783 can_events => 0,
1548 %arg 1784 %arg
1549 ); 1785 );
1550 1786
1551 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout 2; 1788 my $layout = new CFPlus::Layout;
1553 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1790 $self->{template} = $layout;
1555 } 1791 }
1556 1792
1557 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1559 } else { 1795 } else {
1560 $self->set_text (delete $self->{text}); 1796 $self->set_text (delete $self->{text});
1561 } 1797 }
1562 1798
1563 $self 1799 $self
1564}
1565
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574} 1800}
1575 1801
1576sub update { 1802sub update {
1577 my ($self) = @_; 1803 my ($self) = @_;
1578 1804
… …
1627 1853
1628 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1629 1855
1630 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1631 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1633 1860
1634 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1635 1862
1636 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
… …
1688 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1689 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1692 1919
1693 $self->{size_req} 1920 [$self->{layout}->size]
1694 }; 1921 };
1695 1922
1696 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
… …
1704 }; 1931 };
1705 1932
1706 my $w = List::Util::min $self->{w} + 4, $size->[0]; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1707 my $h = List::Util::min $self->{h} + 2, $size->[1]; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1708 1935
1709 $self->{layout}->render ($self->{ox}, $self->{oy}); 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1710} 1937}
1711 1938
1712############################################################################# 1939#############################################################################
1713 1940
1714package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1715 1942
1716our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1717 1944
1718use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1719 1946
1720sub new { 1947sub new {
1721 my $class = shift; 1948 my $class = shift;
1722 1949
1723 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1727 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1728 can_hover => 1, 1955 can_hover => 1,
1729 can_focus => 1, 1956 can_focus => 1,
1730 valign => 0, 1957 valign => 0,
1731 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1732 #text => ... 1960 #text => ...
1733 #hidden => "*", 1961 #hidden => "*",
1734 @_ 1962 @_
1735 ) 1963 )
1736} 1964}
… …
1781 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1782 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1783 2011
1784 my $text = $self->get_text; 2012 my $text = $self->get_text;
1785 2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2015
1786 if ($uni == 8) { 2016 if ($uni == 8) {
1787 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1788 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1789 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1790 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1791 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1792 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1793 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1794 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1795 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1796 } elsif ($sym == CFClient::SDLK_END) {
1797 $self->{cursor} = length $text;
1798 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1799 $self->emit ('escape'); 2040 $self->emit ('escape');
1800 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1801 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1802 } else { 2045 } else {
1803 return 0; 2046 return 0;
1804 } 2047 }
1805 2048
1806 $self->_set_text ($text); 2049 $self->_set_text ($text);
1807 2050
1808 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1809 2053
1810 1 2054 1
1811} 2055}
1812 2056
1813sub invoke_focus_in { 2057sub invoke_focus_in {
… …
1825 2069
1826 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1827 2071
1828 # byte-index to char-index 2072 # byte-index to char-index
1829 my $text = $self->{text}; 2073 my $text = $self->{text};
1830 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1831 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1832 2076
1833 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1834 $self->update; 2078 $self->update;
1835 2079
1836 1 2080 1
… …
1875 utf8::encode $text; 2119 utf8::encode $text;
1876 2120
1877 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1878 } 2122 }
1879 2123
1880 glColor @{$self->{fg}};
1881 glBegin GL_LINES; 2124 glBegin GL_LINES;
1882 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1884 glEnd; 2127 glEnd;
1885 } 2128 }
1886} 2129}
1887 2130
2131#############################################################################
2132
1888package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1889 2134
1890our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1891 2136
1892use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1893 2138
1894sub invoke_key_down { 2139sub invoke_key_down {
1895 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1896 2141
1897 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1898 2143
1899 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1900 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1901 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
1902 2147
1903 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1904 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1905 $self->emit (activate => $txt); 2150 $self->emit (activate => $txt);
1906 $self->update; 2151 $self->update;
1907 2152
1908 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1909 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1910 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1911 } 2156 }
1912 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1913 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1915 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1916 } 2161 }
1917 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1918 } 2163 }
1919 2164
1920 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1921 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1922 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1923 2168
1924 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1925 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1934 1 2179 1
1935} 2180}
1936 2181
1937############################################################################# 2182#############################################################################
1938 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1939package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1940 2224
1941our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1942 2226
1943use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1944 2228
1945my @tex = 2229my @tex =
1946 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1947 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1948 2232
1949sub new { 2233sub new {
1950 my $class = shift; 2234 my $class = shift;
1951 2235
… …
1988 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1989} 2273}
1990 2274
1991############################################################################# 2275#############################################################################
1992 2276
2277package CFPlus::UI::CheckBox;
2278
2279our @ISA = CFPlus::UI::DrawBG::;
2280
2281my @tex =
2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2284
2285use CFPlus::OpenGL;
2286
2287sub new {
2288 my $class = shift;
2289
2290 $class->SUPER::new (
2291 padding_x => 2,
2292 padding_y => 2,
2293 fg => [1, 1, 1],
2294 active_fg => [1, 1, 0],
2295 bg => [0, 0, 0, 0.2],
2296 active_bg => [1, 1, 1, 0.5],
2297 state => 0,
2298 can_hover => 1,
2299 @_
2300 )
2301}
2302
2303sub size_request {
2304 my ($self) = @_;
2305
2306 (6) x 2
2307}
2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
2317sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_;
2319
2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2322 $self->toggle;
2323 } else {
2324 return 0
2325 }
2326
2327 1
2328}
2329
2330sub _draw {
2331 my ($self) = @_;
2332
2333 $self->SUPER::_draw;
2334
2335 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2336
2337 my ($w, $h) = @$self{qw(w h)};
2338
2339 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2340
2341 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2342
2343 my $tex = $self->{state} ? $tex[1] : $tex[0];
2344
2345 glEnable GL_TEXTURE_2D;
2346 $tex->draw_quad_alpha (0, 0, $s, $s);
2347 glDisable GL_TEXTURE_2D;
2348}
2349
2350#############################################################################
2351
2352package CFPlus::UI::Image;
2353
2354our @ISA = CFPlus::UI::Base::;
2355
2356use CFPlus::OpenGL;
2357
2358our %texture_cache;
2359
2360sub new {
2361 my $class = shift;
2362
2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2367
2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2370
2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2373
2374 CFPlus::weaken $texture_cache{$self->{path}};
2375
2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2377
2378 $self
2379}
2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2396sub size_request {
2397 my ($self) = @_;
2398
2399 ($self->{tex}{w}, $self->{tex}{h})
2400}
2401
2402sub _draw {
2403 my ($self) = @_;
2404
2405 my $tex = $self->{tex};
2406
2407 my ($w, $h) = ($self->{w}, $self->{h});
2408
2409 if ($self->{rot90}) {
2410 glRotate 90, 0, 0, 1;
2411 glTranslate 0, -$self->{w}, 0;
2412
2413 ($w, $h) = ($h, $w);
2414 }
2415
2416 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418
2419 $tex->draw_quad (0, 0, $w, $h);
2420
2421 glDisable GL_TEXTURE_2D;
2422}
2423
2424#############################################################################
2425
1993package CFClient::UI::ImageButton; 2426package CFPlus::UI::ImageButton;
1994 2427
1995our @ISA = CFClient::UI::Image::; 2428our @ISA = CFPlus::UI::Image::;
1996 2429
1997use CFClient::OpenGL; 2430use CFPlus::OpenGL;
1998 2431
1999my %textures; 2432my %textures;
2000 2433
2001sub new { 2434sub new {
2002 my $class = shift; 2435 my $class = shift;
… …
2024 1 2457 1
2025} 2458}
2026 2459
2027############################################################################# 2460#############################################################################
2028 2461
2029package CFClient::UI::CheckBox;
2030
2031our @ISA = CFClient::UI::DrawBG::;
2032
2033my @tex =
2034 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2035 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2036
2037use CFClient::OpenGL;
2038
2039sub new {
2040 my $class = shift;
2041
2042 $class->SUPER::new (
2043 padding_x => 2,
2044 padding_y => 2,
2045 fg => [1, 1, 1],
2046 active_fg => [1, 1, 0],
2047 bg => [0, 0, 0, 0.2],
2048 active_bg => [1, 1, 1, 0.5],
2049 state => 0,
2050 can_hover => 1,
2051 @_
2052 )
2053}
2054
2055sub size_request {
2056 my ($self) = @_;
2057
2058 (6) x 2
2059}
2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
2069sub invoke_button_down {
2070 my ($self, $ev, $x, $y) = @_;
2071
2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2074 $self->toggle;
2075 } else {
2076 return 0
2077 }
2078
2079 1
2080}
2081
2082sub _draw {
2083 my ($self) = @_;
2084
2085 $self->SUPER::_draw;
2086
2087 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2088
2089 my ($w, $h) = @$self{qw(w h)};
2090
2091 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2092
2093 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2094
2095 my $tex = $self->{state} ? $tex[1] : $tex[0];
2096
2097 glEnable GL_TEXTURE_2D;
2098 $tex->draw_quad_alpha (0, 0, $s, $s);
2099 glDisable GL_TEXTURE_2D;
2100}
2101
2102#############################################################################
2103
2104package CFClient::UI::Image; 2462package CFPlus::UI::VGauge;
2105 2463
2106our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2107
2108use CFClient::OpenGL;
2109
2110our %texture_cache;
2111
2112sub new {
2113 my $class = shift;
2114
2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
2119
2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
2122
2123 $self->{tex} = $texture_cache{$self->{path}} ||=
2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2125
2126 Scalar::Util::weaken $texture_cache{$self->{path}};
2127
2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2129
2130 $self
2131}
2132
2133sub size_request {
2134 my ($self) = @_;
2135
2136 ($self->{tex}{w}, $self->{tex}{h})
2137}
2138
2139sub _draw {
2140 my ($self) = @_;
2141
2142 my $tex = $self->{tex};
2143
2144 my ($w, $h) = ($self->{w}, $self->{h});
2145
2146 if ($self->{rot90}) {
2147 glRotate 90, 0, 0, 1;
2148 glTranslate 0, -$self->{w}, 0;
2149
2150 ($w, $h) = ($h, $w);
2151 }
2152
2153 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155
2156 $tex->draw_quad_alpha (0, 0, $w, $h);
2157
2158 glDisable GL_TEXTURE_2D;
2159}
2160
2161#############################################################################
2162
2163package CFClient::UI::VGauge;
2164
2165our @ISA = CFClient::UI::Base::;
2166 2465
2167use List::Util qw(min max); 2466use List::Util qw(min max);
2168 2467
2169use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2170 2469
2171my %tex = ( 2470my %tex = (
2172 food => [ 2471 food => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2175 ], 2474 ],
2176 grace => [ 2475 grace => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2179 ], 2478 ],
2180 hp => [ 2479 hp => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2183 ], 2482 ],
2184 mana => [ 2483 mana => [
2185 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2186 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2187 ], 2486 ],
2188); 2487);
2189 2488
2190# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2293 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2294} 2593}
2295 2594
2296############################################################################# 2595#############################################################################
2297 2596
2298package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2299 2598
2300our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2301 2600
2302sub new { 2601sub new {
2303 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2304 2603
2305 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2307 can_hover => 1, 2606 can_hover => 1,
2308 can_events => 1, 2607 can_events => 1,
2309 %arg, 2608 %arg,
2310 ); 2609 );
2311 2610
2312 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2313 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2612 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2314 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2315 2614
2316 $self 2615 $self
2317} 2616}
2318 2617
2319sub set_fontsize { 2618sub set_fontsize {
… …
2340 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2341} 2640}
2342 2641
2343############################################################################# 2642#############################################################################
2344 2643
2345package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2346 2645
2347use strict; 2646use strict;
2348 2647
2349use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2350 2649
2351our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2352 2651
2353my @tex = 2652my @tex =
2354 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2355 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2356 2655
2357sub new { 2656sub new {
2358 my $class = shift; 2657 my $class = shift;
2359 2658
… …
2448 } 2747 }
2449 2748
2450 1 2749 1
2451} 2750}
2452 2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2762}
2763
2453sub update { 2764sub update {
2454 my ($self) = @_; 2765 my ($self) = @_;
2455 2766
2456 delete $self->{knob_w}; 2767 delete $self->{knob_w};
2457 $self->SUPER::update; 2768 $self->SUPER::update;
… …
2504 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2505} 2816}
2506 2817
2507############################################################################# 2818#############################################################################
2508 2819
2509package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2510 2821
2511our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2512 2823
2513sub new { 2824sub new {
2514 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2515 2826
2516 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2517 2828
2518 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2519 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2520 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2521 to_value => sub { shift }, 2832 to_value => sub { shift },
2522 from_value => sub { shift }, 2833 from_value => sub { shift },
2523 %arg, 2834 %arg,
2524 ); 2835 );
2525 2836
… …
2545sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2546sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2547 2858
2548############################################################################# 2859#############################################################################
2549 2860
2550package CFClient::UI::TextScroller; 2861package CFPlus::UI::TextScroller;
2551 2862
2552our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2553 2864
2554use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2555 2866
2556sub new { 2867sub new {
2557 my $class = shift; 2868 my $class = shift;
2558 2869
2559 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2560 fontsize => 1, 2871 fontsize => 1,
2561 can_events => 0, 2872 can_events => 1,
2562 indent => 0, 2873 indent => 0,
2563 #font => default_font 2874 #font => default_font
2564 @_, 2875 @_,
2565 2876
2566 layout => (new CFClient::Layout 2), 2877 layout => (new CFPlus::Layout),
2567 par => [], 2878 par => [],
2879 max_par => 0,
2568 height => 0, 2880 height => 0,
2569 children => [ 2881 children => [
2570 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2571 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2572 ], 2884 ],
2573 ); 2885 );
2574 2886
2575 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2576 2888
… …
2606 2918
2607 $self->reflow; 2919 $self->reflow;
2608 2920
2609 local $self->{children} = [$empty, $slider]; 2921 local $self->{children} = [$empty, $slider];
2610 $self->SUPER::invoke_size_allocate ($w, $h) 2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2611} 2933}
2612 2934
2613sub get_layout { 2935sub get_layout {
2614 my ($self, $para) = @_; 2936 my ($self, $para) = @_;
2615 2937
… …
2643 2965
2644 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2645 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2646} 2968}
2647 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2648sub clear { 2985sub clear {
2649 my ($self) = @_; 2986 my ($self) = @_;
2650 2987
2651 my (undef, undef, @other) = @{ $self->{children} }; 2988 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other; 2989 $self->remove ($_) for @other;
… …
2655 $self->{height} = 0; 2992 $self->{height} = 0;
2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2657} 2994}
2658 2995
2659sub add_paragraph { 2996sub add_paragraph {
2660 my ($self, $color, $para, $indent) = @_; 2997 my $self = shift;
2661 2998
2662 my ($text, @w) = ref $para ? @$para : $para; 2999 for my $para (@_) {
2663
2664 $para = { 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
2665 w => 1e10, 3006 w => 1e10,
2666 wrapped => 1, 3007 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2671 }; 3008 };
2672 3009
2673 $self->add (@w) if @w; 3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2674 push @{$self->{par}}, $para; 3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
2675 3017
2676 $self->{need_reflow}++; 3018 $self->{need_reflow}++;
2677 $self->update; 3019 $self->update;
2678} 3020}
2679 3021
2680sub scroll_to_bottom { 3022sub scroll_to_bottom {
2681 my ($self) = @_; 3023 my ($self) = @_;
2682 3024
2683 $self->{scroll_to_bottom} = 1; 3025 $self->{scroll_to} = $#{$self->{par}};
2684 $self->update; 3026 $self->update;
2685} 3027}
2686 3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
3051 $self->{height} = $height;
3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3053
3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
3060}
3061
2687sub update { 3062sub update {
2688 my ($self) = @_; 3063 my ($self) = @_;
2689 3064
2690 $self->SUPER::update; 3065 $self->SUPER::update;
2691 3066
2692 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2693 3068
2694 delete $self->{texture}; 3069 delete $self->{texture};
2695 3070
2696 $ROOT->on_post_alloc ($self => sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2698 3075
2699 if (delete $self->{need_reflow}) {
2700 my $height = 0;
2701
2702 for my $para (@{$self->{par}}) {
2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2704 my $layout = $self->get_layout ($para);
2705 my ($w, $h) = $layout->size;
2706
2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2710 }
2711
2712 $height += $para->{h};
2713 }
2714
2715 $self->{height} = $height;
2716
2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2718
2719 delete $self->{texture};
2720 }
2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2724 }
2725
2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2727 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2728 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2729 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2730 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2731 3089
2732 my $y0 = $top; 3090 my $y0 = $top;
2733 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2734 3092
2735 my $y = 0;
2736
2737 for my $para (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2738 my $h = $para->{h}; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2739 3096
2740 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2741
2742 my $layout = $self->get_layout ($para); 3098 my $layout = $self->get_layout ($para);
2743 3099
2744 $layout->render ($para->{indent}, $y - $y0); 3100 $layout->render ($para->{indent}, $y - $y0);
2745 3101
2746 if (my @w = @{ $para->{widget} }) { 3102 if (my @w = @{ $para->{widget} }) {
… …
2755 $_->draw; 3111 $_->draw;
2756 } 3112 }
2757 } 3113 }
2758 } 3114 }
2759 3115
2760 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2761 } 3118 }
3119
3120 $self->{top_paragraph} = $top_paragraph;
2762 }; 3121 };
2763 }); 3122 });
2764} 3123}
2765 3124
2766sub reconfigure { 3125sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2785} 3144}
2786 3145
2787############################################################################# 3146#############################################################################
2788 3147
2789package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2790 3149
2791use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2792 3151
2793our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2794 3153
2795sub moveto { 3154sub moveto {
2796 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2797 3156
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3185 glPopMatrix;
2827} 3186}
2828 3187
2829############################################################################# 3188#############################################################################
2830 3189
2831package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2832 3191
2833our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2834 3193
2835sub new { 3194sub new {
2836 my $class = shift; 3195 my $class = shift;
2837 3196
2838 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2851} 3210}
2852 3211
2853############################################################################# 3212#############################################################################
2854 3213
2855package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2856 3215
2857our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2858 3217
2859use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2860 3219
2861sub new { 3220sub new {
2862 my $class = shift; 3221 my $class = shift;
2863 3222
2864 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2867 ) 3226 )
2868} 3227}
2869 3228
2870sub set_tooltip_from { 3229sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3234
2873 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2874 3236
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3242 }
2881 3243
2882 $tooltip =~ s/^\n+//; 3244 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3245 $tooltip =~ s/\n+$//;
2884 3246
2885 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3248 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3250 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3252 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3254 );
2893} 3255}
2894 3256
… …
2913 3275
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2916 or return; 3278 or return;
2917 3279
3280 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3282
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3284 if $x + $self->{w} > $self->{root}{w};
2922 3285
2923 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2924 }); 3290 });
2925} 3291}
2926 3292
2927sub _draw { 3293sub _draw {
2928 my ($self) = @_; 3294 my ($self) = @_;
… …
2952 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2953} 3319}
2954 3320
2955############################################################################# 3321#############################################################################
2956 3322
2957package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2958 3324
2959our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2960 3326
2961use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2962 3328
2963sub new { 3329sub new {
2964 my $class = shift; 3330 my $class = shift;
2965 3331
2966 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
3333 size_w => 32,
3334 size_h => 8,
2967 aspect => 1, 3335 aspect => 1,
2968 can_events => 0, 3336 can_events => 0,
2969 @_, 3337 @_,
2970 ); 3338 );
2971 3339
2972 if ($self->{anim} && $self->{animspeed}) { 3340 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3341 CFPlus::weaken (my $widget = $self);
2974 3342
2975 $self->{timer} = Event->timer ( 3343 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3345 hard => 1,
2978 interval => $self->{animspeed}, 3346 interval => $self->{animspeed},
2979 cb => sub { 3347 cb => sub {
3348 return unless $::CONN;
3349
2980 ++$widget->{frame}; 3350 ++$widget->{frame};
3351 $self->update_face;
2981 $widget->update; 3352 $self->update;
2982 }, 3353 },
2983 ); 3354 );
3355
3356 $self->update_face;
2984 } 3357 }
2985 3358
2986 $self 3359 $self
2987} 3360}
2988 3361
3362sub update_face {
3363 my ($self) = @_;
3364
3365 return unless $::CONN;
3366
3367 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3368 if ($anim && @$anim) {
3369 delete $self->{wait_face};
3370 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3371 }
3372 }
3373}
3374
2989sub size_request { 3375sub size_request {
2990 (32, 8) 3376 my ($self) = @_;
3377
3378 if ($::CONN) {
3379 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3380 if (my $tex = $::CONN->{texture}[$faceid]) {
3381 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3382 } else {
3383 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3384 $self->realloc;
3385 });
3386 }
3387 }
3388 }
3389
3390 ($self->{size_w} || 8, $self->{size_h} || 8)
2991} 3391}
2992 3392
2993sub update { 3393sub update {
2994 my ($self) = @_; 3394 my ($self) = @_;
2995 3395
… …
3001sub _draw { 3401sub _draw {
3002 my ($self) = @_; 3402 my ($self) = @_;
3003 3403
3004 return unless $::CONN; 3404 return unless $::CONN;
3005 3405
3006 my $face; 3406 $self->SUPER::_draw;
3007 3407
3008 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}]; 3408 my $faceid = $::CONN->{faceid}[$self->{face}]
3010 3409 or return;
3011 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim;
3013 }
3014 3410
3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3411 my $tex = $::CONN->{texture}[$faceid];
3016 3412
3017 if ($tex) { 3413 if ($tex) {
3018 glEnable GL_TEXTURE_2D; 3414 glEnable GL_TEXTURE_2D;
3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020 glColor 0, 0, 0, 1; 3416 glColor 0, 0, 0, 1;
… …
3032 $self->SUPER::destroy; 3428 $self->SUPER::destroy;
3033} 3429}
3034 3430
3035############################################################################# 3431#############################################################################
3036 3432
3037package CFClient::UI::Buttonbar; 3433package CFPlus::UI::Buttonbar;
3038 3434
3039our @ISA = CFClient::UI::HBox::; 3435our @ISA = CFPlus::UI::HBox::;
3040 3436
3041# TODO: should actualyl wrap buttons and other goodies. 3437# TODO: should actually wrap buttons and other goodies.
3042 3438
3043############################################################################# 3439#############################################################################
3044 3440
3045package CFClient::UI::Menu; 3441package CFPlus::UI::Menu;
3046 3442
3047our @ISA = CFClient::UI::FancyFrame::; 3443our @ISA = CFPlus::UI::Toplevel::;
3048 3444
3049use CFClient::OpenGL; 3445use CFPlus::OpenGL;
3050 3446
3051sub new { 3447sub new {
3052 my $class = shift; 3448 my $class = shift;
3053 3449
3054 my $self = $class->SUPER::new ( 3450 my $self = $class->SUPER::new (
3055 items => [], 3451 items => [],
3056 z => 100, 3452 z => 100,
3057 @_, 3453 @_,
3058 ); 3454 );
3059 3455
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3456 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3457
3062 for my $item (@{ $self->{items} }) { 3458 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3459 my ($widget, $cb, $tooltip) = @$item;
3064 3460
3065 # handle various types of items, only text for now 3461 # handle various types of items, only text for now
3066 if (!ref $widget) { 3462 if (!ref $widget) {
3463 if ($widget =~ /\t/) {
3464 my ($left, $right) = split /\t/, $widget, 2;
3465
3067 $widget = new CFClient::UI::Label 3466 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3467 can_hover => 1,
3069 can_events => 1, 3468 can_events => 1,
3469 tooltip => $tooltip,
3470 children => [
3471 (new CFPlus::UI::Label markup => $left, expand => 1),
3472 (new CFPlus::UI::Label markup => $right, align => +1),
3473 ],
3474 ;
3475
3476 } else {
3477 $widget = new CFPlus::UI::Label
3478 can_hover => 1,
3479 can_events => 1,
3070 markup => $widget, 3480 markup => $widget,
3071 tooltip => $tooltip 3481 tooltip => $tooltip;
3482 }
3072 } 3483 }
3073 3484
3074 $self->{item}{$widget} = $item; 3485 $self->{item}{$widget} = $item;
3075 3486
3076 $self->{vbox}->add ($widget); 3487 $self->{vbox}->add ($widget);
… …
3119 1 3530 1
3120} 3531}
3121 3532
3122############################################################################# 3533#############################################################################
3123 3534
3124package CFClient::UI::Multiplexer; 3535package CFPlus::UI::Multiplexer;
3125 3536
3126our @ISA = CFClient::UI::Container::; 3537our @ISA = CFPlus::UI::Container::;
3127 3538
3128sub new { 3539sub new {
3129 my $class = shift; 3540 my $class = shift;
3130 3541
3131 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
… …
3192 $self->{current}->draw; 3603 $self->{current}->draw;
3193} 3604}
3194 3605
3195############################################################################# 3606#############################################################################
3196 3607
3197package CFClient::UI::Notebook; 3608package CFPlus::UI::Notebook;
3198 3609
3199our @ISA = CFClient::UI::VBox::; 3610our @ISA = CFPlus::UI::VBox::;
3200 3611
3201sub new { 3612sub new {
3202 my $class = shift; 3613 my $class = shift;
3203 3614
3204 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar), 3616 buttonbar => (new CFPlus::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3617 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207 # filter => # will be put between multiplexer and $self 3618 # filter => # will be put between multiplexer and $self
3208 @_, 3619 @_,
3209 ); 3620 );
3210 3621
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3622 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3215} 3626}
3216 3627
3217sub add { 3628sub add {
3218 my ($self, $title, $widget, $tooltip) = @_; 3629 my ($self, $title, $widget, $tooltip) = @_;
3219 3630
3220 Scalar::Util::weaken $self; 3631 CFPlus::weaken $self;
3221 3632
3222 $self->{buttonbar}->add (new CFClient::UI::Button 3633 $self->{buttonbar}->add (new CFPlus::UI::Button
3223 markup => $title, 3634 markup => $title,
3224 tooltip => $tooltip, 3635 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) }, 3636 on_activate => sub { $self->set_current_page ($widget) },
3226 ); 3637 );
3227 3638
… …
3241 $self->emit (page_changed => $self->{multiplexer}{current}); 3652 $self->emit (page_changed => $self->{multiplexer}{current});
3242} 3653}
3243 3654
3244############################################################################# 3655#############################################################################
3245 3656
3246package CFClient::UI::Combobox; 3657package CFPlus::UI::Selector;
3247 3658
3248use utf8; 3659use utf8;
3249 3660
3250our @ISA = CFClient::UI::Button::; 3661our @ISA = CFPlus::UI::Button::;
3251 3662
3252sub new { 3663sub new {
3253 my $class = shift; 3664 my $class = shift;
3254 3665
3255 my $self = $class->SUPER::new ( 3666 my $self = $class->SUPER::new (
… …
3272 my ($value, $title, $tooltip) = @$_; 3683 my ($value, $title, $tooltip) = @$_;
3273 3684
3274 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3685 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3275 } 3686 }
3276 3687
3277 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3688 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3278} 3689}
3279 3690
3280sub _set_value { 3691sub _set_value {
3281 my ($self, $value) = @_; 3692 my ($self, $value) = @_;
3282 3693
… …
3297 $self->emit (changed => $value); 3708 $self->emit (changed => $value);
3298} 3709}
3299 3710
3300############################################################################# 3711#############################################################################
3301 3712
3302package CFClient::UI::Statusbox; 3713package CFPlus::UI::Statusbox;
3303 3714
3304our @ISA = CFClient::UI::VBox::; 3715our @ISA = CFPlus::UI::VBox::;
3305 3716
3306sub new { 3717sub new {
3307 my $class = shift; 3718 my $class = shift;
3308 3719
3309 my $self = $class->SUPER::new ( 3720 my $self = $class->SUPER::new (
3310 fontsize => 0.8, 3721 fontsize => 0.8,
3311 @_, 3722 @_,
3312 ); 3723 );
3313 3724
3314 Scalar::Util::weaken (my $this = $self); 3725 CFPlus::weaken (my $this = $self);
3315 3726
3316 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3727 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3317 3728
3318 $self 3729 $self
3319} 3730}
… …
3321sub reorder { 3732sub reorder {
3322 my ($self) = @_; 3733 my ($self) = @_;
3323 my $NOW = Time::HiRes::time; 3734 my $NOW = Time::HiRes::time;
3324 3735
3325 # freeze display when hovering over any label 3736 # freeze display when hovering over any label
3326 return if $CFClient::UI::TOOLTIP->{owner} 3737 return if $CFPlus::UI::TOOLTIP->{owner}
3327 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3738 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3328 values %{ $self->{item} }; 3739 values %{ $self->{item} };
3329 3740
3330 while (my ($k, $v) = each %{ $self->{item} }) { 3741 while (my ($k, $v) = each %{ $self->{item} }) {
3331 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3742 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3332 } 3743 }
… …
3353 for ($short) { 3764 for ($short) {
3354 s/^\s+//; 3765 s/^\s+//;
3355 s/\s+/ /g; 3766 s/\s+/ /g;
3356 } 3767 }
3357 3768
3358 new CFClient::UI::Label 3769 new CFPlus::UI::Label
3359 markup => $short, 3770 markup => $short,
3360 tooltip => $item->{tooltip}, 3771 tooltip => $item->{tooltip},
3361 tooltip_font => $::FONT_PROP, 3772 tooltip_font => $::FONT_PROP,
3362 tooltip_width => 0.67, 3773 tooltip_width => 0.67,
3363 fontsize => $item->{fontsize} || $self->{fontsize}, 3774 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3442 $self->SUPER::destroy; 3853 $self->SUPER::destroy;
3443} 3854}
3444 3855
3445############################################################################# 3856#############################################################################
3446 3857
3447package CFClient::UI::Inventory;
3448
3449our @ISA = CFClient::UI::Table::;
3450
3451sub new {
3452 my $class = shift;
3453
3454 my $self = $class->SUPER::new (
3455 col_expand => [0, 1, 0],
3456 @_,
3457 );
3458
3459 $self
3460}
3461
3462sub set_items {
3463 my ($self, $items) = @_;
3464
3465 $self->clear;
3466 return unless $items;
3467
3468 my @items = sort {
3469 ($a->{type} <=> $b->{type})
3470 or ($a->{name} cmp $b->{name})
3471 } values %$items;
3472
3473 $self->{real_items} = \@items;
3474
3475 my $row = 0;
3476 for my $item (@items) {
3477 CFClient::Item::update_widgets $item;
3478
3479 $self->add (0, $row, $item->{face_widget});
3480 $self->add (1, $row, $item->{desc_widget});
3481 $self->add (2, $row, $item->{weight_widget});
3482
3483 $row++;
3484 }
3485}
3486
3487#############################################################################
3488
3489package CFClient::UI::SpellList;
3490
3491our @ISA = CFClient::UI::Table::;
3492
3493sub new {
3494 my $class = shift;
3495
3496 my $self = $class->SUPER::new (
3497 binding => [],
3498 commands => [],
3499 @_,
3500 )
3501}
3502
3503my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3504
3505my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3507my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3509my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3510 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3511my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3512 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3513my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3514 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3515
3516sub rebuild_spell_list {
3517 my ($self) = @_;
3518
3519 $CFClient::UI::ROOT->on_refresh ($self => sub {
3520 $self->clear;
3521
3522 return unless $::CONN;
3523
3524 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3525 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3526 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3527 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3528 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3529
3530 my $row = 0;
3531
3532 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3533 my $spell = $self->{spell}{$_};
3534
3535 $row++;
3536
3537 my $spell_cb = sub {
3538 my ($widget, $ev) = @_;
3539
3540 if ($ev->{button} == 1) {
3541 $::CONN->user_send ("cast $spell->{name}");
3542 } elsif ($ev->{button} == 2) {
3543 $::CONN->user_send ("invoke $spell->{name}");
3544 } elsif ($ev->{button} == 3) {
3545 (new CFClient::UI::Menu
3546 items => [
3547 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3548 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3549 ],
3550 )->popup ($ev);
3551 } else {
3552 return 0;
3553 }
3554
3555 1
3556 };
3557
3558 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3559
3560 #TODO: add path info to tooltip
3561 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3562
3563 $self->add (0, $row, new CFClient::UI::Face
3564 face => $spell->{face},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (1, $row, new CFClient::UI::Label
3572 expand => 1,
3573 text => $spell->{name},
3574 can_hover => 1,
3575 can_events => 1,
3576 tooltip => $tooltip,
3577 on_button_down => $spell_cb,
3578 );
3579
3580 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3581 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3582 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3583 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3584 }
3585 });
3586}
3587
3588sub add_spell {
3589 my ($self, $spell) = @_;
3590
3591 $self->{spell}->{$spell->{name}} = $spell;
3592 $self->rebuild_spell_list;
3593}
3594
3595sub remove_spell {
3596 my ($self, $spell) = @_;
3597
3598 delete $self->{spell}->{$spell->{name}};
3599 $self->rebuild_spell_list;
3600}
3601
3602sub clear_spells {
3603 my ($self) = @_;
3604
3605 $self->{spell} = {};
3606 $self->rebuild_spell_list;
3607}
3608
3609#############################################################################
3610
3611package CFClient::UI::Root; 3858package CFPlus::UI::Root;
3612 3859
3613our @ISA = CFClient::UI::Container::; 3860our @ISA = CFPlus::UI::Container::;
3614 3861
3615use List::Util qw(min max); 3862use List::Util qw(min max);
3616 3863
3617use CFClient::OpenGL; 3864use CFPlus::OpenGL;
3618 3865
3619sub new { 3866sub new {
3620 my $class = shift; 3867 my $class = shift;
3621 3868
3622 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3623 visible => 1, 3870 visible => 1,
3624 @_, 3871 @_,
3625 ); 3872 );
3626 3873
3627 Scalar::Util::weaken ($self->{root} = $self); 3874 CFPlus::weaken ($self->{root} = $self);
3628 3875
3629 $self 3876 $self
3630} 3877}
3631 3878
3632sub size_request { 3879sub size_request {
… …
3798 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4045 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3799 4046
3800 $w = 0 if $w < 0; 4047 $w = 0 if $w < 0;
3801 $h = 0 if $h < 0; 4048 $h = 0 if $h < 0;
3802 4049
4050 $w = max $widget->{min_w}, $w;
4051 $h = max $widget->{min_h}, $h;
4052
4053# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4054# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4055
4056 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4057 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4058
3803 $w = int $w + 0.5; 4059 $w = int $w + 0.5;
3804 $h = int $h + 0.5; 4060 $h = int $h + 0.5;
3805 4061
3806 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4062 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3807 $widget->{old_w} = $widget->{w}; 4063 $widget->{old_w} = $widget->{w};
… …
3830 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4086 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3831 glMatrixMode GL_MODELVIEW; 4087 glMatrixMode GL_MODELVIEW;
3832 glLoadIdentity; 4088 glLoadIdentity;
3833 4089
3834 { 4090 {
3835 package CFClient::UI::Base; 4091 package CFPlus::UI::Base;
3836 4092
3837 ($draw_x, $draw_y, $draw_w, $draw_h) = 4093 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3838 (0, 0, $self->{w}, $self->{h}); 4094 (0, 0, $self->{w}, $self->{h});
3839 }
3840 4095
3841 $self->_draw; 4096 $self->_draw;
4097 }
3842} 4098}
3843 4099
3844############################################################################# 4100#############################################################################
3845 4101
3846package CFClient::UI; 4102package CFPlus::UI;
3847 4103
3848$ROOT = new CFClient::UI::Root; 4104$ROOT = new CFPlus::UI::Root;
3849$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4105$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3850 4106
38511 41071
3852 4108

Diff Legend

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