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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 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) = @_;
424 458
425 return if $FOCUS == $self; 459 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
427 461
428 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
429 463
430 $focus->update if $focus; 464 $self->update;
431 $FOCUS->update;
432 465
433 0 466 0
434} 467}
435 468
436sub invoke_focus_out { 469sub invoke_focus_out {
437 my ($self) = @_; 470 my ($self) = @_;
438 471
439 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
440 473
441 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
442 475
443 $focus->update if $focus; #? 476 $self->update;
444 477
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 479 unless $FOCUS;
447 480
448 0 481 0
449} 482}
450 483
451sub grab_focus { 484sub grab_focus {
452 my ($self) = @_; 485 my ($self) = @_;
453 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
474} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552sub find_widget {
486 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
487 554
… …
495} 562}
496 563
497sub set_parent { 564sub set_parent {
498 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
499 566
500 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
574 glEnd; 641 glEnd;
575 glPopMatrix; 642 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 644 }
578 645
579 $self->_draw; 646 $self->_draw;
580 glPopMatrix; 647 glPopMatrix;
581} 648}
… …
584 my ($self) = @_; 651 my ($self) = @_;
585 652
586 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
587} 654}
588 655
656my $cntx;#d#
589sub DESTROY { 657sub DESTROY {
590 my ($self) = @_; 658 my ($self) = @_;
591 659
592 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
593 661
594 eval { $self->destroy }; 662 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
596} 666}
597 667
598############################################################################# 668#############################################################################
599 669
600package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
601 671
602our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
603 673
604use strict; 674use strict;
605use CFClient::OpenGL; 675use CFPlus::OpenGL;
606 676
607sub new { 677sub new {
608 my $class = shift; 678 my $class = shift;
609 679
610 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
641 } 711 }
642} 712}
643 713
644############################################################################# 714#############################################################################
645 715
646package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
647 717
648our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
649 719
650sub new { 720sub new {
651 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
653} 723}
… …
660 730
661sub draw { } 731sub draw { }
662 732
663############################################################################# 733#############################################################################
664 734
665package CFClient::UI::Container; 735package CFPlus::UI::Container;
666 736
667our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
668 738
669sub new { 739sub new {
670 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
671 741
672 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
681 if $children; 751 if $children;
682 752
683 $self 753 $self
684} 754}
685 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
686sub add { 764sub add {
687 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
688 766
689 $_->set_parent ($self) 767 $_->set_parent ($self)
690 for @widgets; 768 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
751} 829}
752 830
753############################################################################# 831#############################################################################
754 832
755package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
756 834
757our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
758 836
759sub new { 837sub new {
760 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
761 839
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 841
764 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
765} 843}
766 844
767sub add { 845sub add {
… …
774sub remove { 852sub remove {
775 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
776 854
777 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
778 856
779 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 858 unless @{$self->{children}};
781} 859}
782 860
783sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
784 862
… …
796 874
797############################################################################# 875#############################################################################
798 876
799# back-buffered drawing area 877# back-buffered drawing area
800 878
801package CFClient::UI::Window; 879package CFPlus::UI::Window;
802 880
803our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
804 882
805use CFClient::OpenGL; 883use CFPlus::OpenGL;
806 884
807sub new { 885sub new {
808 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
809 887
810 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
832} 910}
833 911
834sub render_child { 912sub render_child {
835 my ($self) = @_; 913 my ($self) = @_;
836 914
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
840 918
841 { 919 {
842 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
843 921
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
846 } 926 }
847
848 $self->_render;
849 }; 927 };
850} 928}
851 929
852sub _draw { 930sub _draw {
853 my ($self) = @_; 931 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 932
857 my $tex = $self->{texture} 933 my $tex = $self->{texture}
858 or return; 934 or return;
859 935
860 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
863 939
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
865 941
866 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
867} 943}
868 944
869############################################################################# 945#############################################################################
870 946
871package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
872 948
873our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
874 950
875sub new { 951sub new {
876 my $class = shift; 952 my $class = shift;
877 953
878 $class->SUPER::new ( 954 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1016 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1018 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1020 }
945} 1021}
946 1022
947sub _render { 1023sub _render {
948 my ($self) = @_; 1024 my ($self) = @_;
949 1025
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1028
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1030
955 $self->SUPER::_render; 1031 $self->SUPER::_render;
956} 1032}
957 1033
958############################################################################# 1034#############################################################################
959 1035
960package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
961 1037
962our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
963 1039
964sub new { 1040sub new {
965 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
966 1042
967 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
968 1044
969 my $self; 1045 my $self;
970 1046
971 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1057 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1059 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1062 },
977 ; 1063 ;
978 1064
979 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
981 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
982 %arg, 1072 %arg,
983 ); 1073 );
984 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
986 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
987 1080
988 $self 1081 $self
989} 1082}
990 1083
… …
994 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
995 1088
996 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
997} 1090}
998 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
999sub update_slider { 1102sub update_slider {
1000 my ($self) = @_; 1103 my ($self) = @_;
1001 1104
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1003} 1112}
1004 1113
1005sub update { 1114sub update {
1006 my ($self) = @_; 1115 my ($self) = @_;
1007 1116
1008 $self->SUPER::update; 1117 $self->SUPER::update;
1009
1010 $self->update_slider; 1118 $self->update_slider;
1011} 1119}
1012 1120
1013sub invoke_size_allocate { 1121sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1015 1123
1016 $self->update_slider; 1124 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1125 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1126}
1020 1127
1021############################################################################# 1128#############################################################################
1022 1129
1023package CFClient::UI::Frame; 1130package CFPlus::UI::Frame;
1024 1131
1025our @ISA = CFClient::UI::Bin::; 1132our @ISA = CFPlus::UI::Bin::;
1026 1133
1027use CFClient::OpenGL; 1134use CFPlus::OpenGL;
1028 1135
1029sub new { 1136sub new {
1030 my $class = shift; 1137 my $class = shift;
1031 1138
1032 $class->SUPER::new ( 1139 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1165 $self->SUPER::_draw;
1059} 1166}
1060 1167
1061############################################################################# 1168#############################################################################
1062 1169
1063package CFClient::UI::FancyFrame; 1170package CFPlus::UI::FancyFrame;
1064 1171
1065our @ISA = CFClient::UI::Bin::; 1172our @ISA = CFPlus::UI::Bin::;
1066 1173
1067use CFClient::OpenGL; 1174use CFPlus::OpenGL;
1175
1176sub new {
1177 my ($class, %arg) = @_;
1178
1179 if ((exists $arg{label}) && !ref $arg{label}) {
1180 $arg{label} = new CFPlus::UI::Label
1181 align => 1,
1182 valign => 0,
1183 text => $arg{label},
1184 fontsize => ($arg{border} || 0.8) * 0.75;
1185 }
1186
1187 my $self = $class->SUPER::new (
1188 # label => "",
1189 fg => [0.6, 0.3, 0.1],
1190 border => 0.8,
1191 style => 'single',
1192 %arg,
1193 );
1194
1195 $self
1196}
1197
1198sub add {
1199 my ($self, @widgets) = @_;
1200
1201 $self->SUPER::add (@widgets);
1202 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1203}
1204
1205sub border {
1206 int $_[0]{border} * $::FONTSIZE
1207}
1208
1209sub size_request {
1210 my ($self) = @_;
1211
1212 ($self->{label_w}, undef) = $self->{label}->size_request
1213 if $self->{label};
1214
1215 my ($w, $h) = $self->SUPER::size_request;
1216
1217 (
1218 $w + $self->border * 2,
1219 $h + $self->border * 2,
1220 )
1221}
1222
1223sub invoke_size_allocate {
1224 my ($self, $w, $h) = @_;
1225
1226 my $border = $self->border;
1227
1228 $w -= List::Util::max 0, $border * 2;
1229 $h -= List::Util::max 0, $border * 2;
1230
1231 if (my $label = $self->{label}) {
1232 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1233 $label->{h} = List::Util::min $h, $border;
1234 $label->invoke_size_allocate ($label->{w}, $label->{h});
1235 }
1236
1237 $self->child->configure ($border, $border, $w, $h);
1238
1239 1
1240}
1241
1242sub _draw {
1243 my ($self) = @_;
1244
1245 my $child = $self->{children}[0];
1246
1247 my $border = $self->border;
1248 my ($w, $h) = ($self->{w}, $self->{h});
1249
1250 $child->draw;
1251
1252 glColor @{$self->{fg}};
1253 glBegin GL_LINE_STRIP;
1254 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1255 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1256 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1257 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1258 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1259 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1260 glEnd;
1261
1262 if ($self->{label}) {
1263 glTranslate $border * 2, 0;
1264 $self->{label}->_draw;
1265 }
1266}
1267
1268#############################################################################
1269
1270package CFPlus::UI::Toplevel;
1271
1272our @ISA = CFPlus::UI::Bin::;
1273
1274use CFPlus::OpenGL;
1068 1275
1069my $bg = 1276my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1277 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1278 mipmap => 1, wrap => 1;
1072 1279
1073my @border = 1280my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1281 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); 1282 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1076 1283
1077sub new { 1284sub new {
1078 my ($class, %arg) = @_; 1285 my ($class, %arg) = @_;
1079 1286
1080 my $self = $class->SUPER::new ( 1287 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1288 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1289 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1290 border => 0.6,
1084 can_events => 1, 1291 can_events => 1,
1085 min_w => 16, 1292 min_w => 64,
1086 min_h => 16, 1293 min_h => 32,
1087 %arg, 1294 %arg,
1088 ); 1295 );
1089 1296
1090 $self->{title_widget} = new CFClient::UI::Label 1297 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1298 align => 0,
1092 valign => 1, 1299 valign => 1,
1093 text => $self->{title}, 1300 text => $self->{title},
1094 fontsize => $self->{border}, 1301 fontsize => $self->{border},
1095 if exists $self->{title}; 1302 if exists $self->{title};
1096 1303
1097 if ($self->{has_close_button}) { 1304 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1305 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1306 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1307 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1308 on_activate => sub { $self->emit ("delete") };
1102 1309
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1310 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1311 }
1105 1312
1106 $self 1313 $self
1107} 1314}
1108 1315
1109sub add { 1316sub add {
1110 my ($self, @widgets) = @_; 1317 my ($self, @widgets) = @_;
1111 1318
1112 $self->SUPER::add (@widgets); 1319 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1320 $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}; 1321 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1322}
1116 1323
1117sub border { 1324sub border {
1118 int $_[0]{border} * $::FONTSIZE 1325 int $_[0]{border} * $::FONTSIZE
1119} 1326}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1359 $self->child->configure ($border, $border, $w, $h);
1153 1360
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1361 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1362 if $self->{close_button};
1156 1363
1364 1
1365}
1366
1367sub invoke_delete {
1368 my ($self) = @_;
1369
1370 $self->hide;
1371
1157 1 1372 1
1158} 1373}
1159 1374
1160sub invoke_button_down { 1375sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1376 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1434 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1435
1221 ! ! $self->{motion} 1436 ! ! $self->{motion}
1222} 1437}
1223 1438
1439sub invoke_visibility_change {
1440 my ($self, $visible) = @_;
1441
1442 delete $self->{motion} unless $visible;
1443
1444 0
1445}
1446
1224sub _draw { 1447sub _draw {
1225 my ($self) = @_; 1448 my ($self) = @_;
1226 1449
1227 my $child = $self->{children}[0]; 1450 my $child = $self->{children}[0];
1228 1451
… …
1265 if $self->{close_button}; 1488 if $self->{close_button};
1266} 1489}
1267 1490
1268############################################################################# 1491#############################################################################
1269 1492
1270package CFClient::UI::Table; 1493package CFPlus::UI::Table;
1271 1494
1272our @ISA = CFClient::UI::Base::; 1495our @ISA = CFPlus::UI::Base::;
1273 1496
1274use List::Util qw(max sum); 1497use List::Util qw(max sum);
1275 1498
1276use CFClient::OpenGL; 1499use CFPlus::OpenGL;
1277 1500
1278sub new { 1501sub new {
1279 my $class = shift; 1502 my $class = shift;
1280 1503
1281 $class->SUPER::new ( 1504 $class->SUPER::new (
1282 col_expand => [], 1505 col_expand => [],
1506 row_expand => [],
1283 @_, 1507 @_,
1284 ) 1508 )
1285} 1509}
1286 1510
1287sub children { 1511sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1512 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1513}
1290 1514
1291sub add { 1515sub add {
1292 my ($self, $x, $y, $child) = @_; 1516 my ($self) = shift;
1293 1517
1518 while (@_) {
1519 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1520 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1521 $self->{children}[$y][$x] = $child;
1522 }
1296 1523
1524 $self->{force_realloc} = 1;
1525 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1526 $self->realloc;
1298} 1527}
1299 1528
1300sub remove { 1529sub remove {
1301 my ($self, $child) = @_; 1530 my ($self, $child) = @_;
… …
1357 my ($ws, $hs) = $self->get_wh; 1586 my ($ws, $hs) = $self->get_wh;
1358 1587
1359 my $req_w = (sum @$ws) || 1; 1588 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1589 my $req_h = (sum @$hs) || 1;
1361 1590
1362 # TODO: nicer code && do row_expand 1591 # TODO: nicer code
1363 my @col_expand = @{$self->{col_expand}}; 1592 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1593 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1594 my $col_expand = (sum @col_expand) || 1;
1366 1595
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1597
1371 CFClient::UI::harmonize $ws; 1598 CFPlus::UI::harmonize $ws;
1599
1600 my @row_expand = @{$self->{row_expand}};
1601 @row_expand = (1) x @$ws unless @row_expand;
1602 my $row_expand = (sum @row_expand) || 1;
1603
1604 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605
1372 CFClient::UI::harmonize $hs; 1606 CFPlus::UI::harmonize $hs;
1373 1607
1374 my $y; 1608 my $y;
1375 1609
1376 for my $r (0 .. $#{$self->{children}}) { 1610 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1611 my $row = $self->{children}[$r]
… …
1420 } 1654 }
1421} 1655}
1422 1656
1423############################################################################# 1657#############################################################################
1424 1658
1425package CFClient::UI::Box; 1659package CFPlus::UI::Box;
1426 1660
1427our @ISA = CFClient::UI::Container::; 1661our @ISA = CFPlus::UI::Container::;
1428 1662
1429sub size_request { 1663sub size_request {
1430 my ($self) = @_; 1664 my ($self) = @_;
1431 1665
1432 $self->{vertical} 1666 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1699 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1700 for 0 .. $#children;
1467 } 1701 }
1468 } 1702 }
1469 1703
1470 CFClient::UI::harmonize \@req; 1704 CFPlus::UI::harmonize \@req;
1471 1705
1472 my $pos = 0; 1706 my $pos = 0;
1473 for (0 .. $#children) { 1707 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1708 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1709 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1714 1
1481} 1715}
1482 1716
1483############################################################################# 1717#############################################################################
1484 1718
1485package CFClient::UI::HBox; 1719package CFPlus::UI::HBox;
1486 1720
1487our @ISA = CFClient::UI::Box::; 1721our @ISA = CFPlus::UI::Box::;
1488 1722
1489sub new { 1723sub new {
1490 my $class = shift; 1724 my $class = shift;
1491 1725
1492 $class->SUPER::new ( 1726 $class->SUPER::new (
… …
1495 ) 1729 )
1496} 1730}
1497 1731
1498############################################################################# 1732#############################################################################
1499 1733
1500package CFClient::UI::VBox; 1734package CFPlus::UI::VBox;
1501 1735
1502our @ISA = CFClient::UI::Box::; 1736our @ISA = CFPlus::UI::Box::;
1503 1737
1504sub new { 1738sub new {
1505 my $class = shift; 1739 my $class = shift;
1506 1740
1507 $class->SUPER::new ( 1741 $class->SUPER::new (
… …
1510 ) 1744 )
1511} 1745}
1512 1746
1513############################################################################# 1747#############################################################################
1514 1748
1515package CFClient::UI::Label; 1749package CFPlus::UI::Label;
1516 1750
1517our @ISA = CFClient::UI::DrawBG::; 1751our @ISA = CFPlus::UI::DrawBG::;
1518 1752
1519use CFClient::OpenGL; 1753use CFPlus::OpenGL;
1520 1754
1521sub new { 1755sub new {
1522 my ($class, %arg) = @_; 1756 my ($class, %arg) = @_;
1523 1757
1524 my $self = $class->SUPER::new ( 1758 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1761 #active_bg => none
1528 #font => default_font 1762 #font => default_font
1529 #text => initial text 1763 #text => initial text
1530 #markup => initial narkup 1764 #markup => initial narkup
1531 #max_w => maximum pixel width 1765 #max_w => maximum pixel width
1766 #style => 0, # render flags
1532 ellipsise => 3, # end 1767 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1768 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1769 fontsize => 1,
1535 align => -1, 1770 align => -1,
1536 valign => -1, 1771 valign => -1,
1537 padding_x => 2, 1772 padding_x => 2,
1538 padding_y => 2, 1773 padding_y => 2,
1539 can_events => 0, 1774 can_events => 0,
1540 %arg 1775 %arg
1541 ); 1776 );
1542 1777
1543 if (exists $self->{template}) { 1778 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1779 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1780 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1781 $self->{template} = $layout;
1547 } 1782 }
1548 1783
1549 if (exists $self->{markup}) { 1784 if (exists $self->{markup}) {
… …
1553 } 1788 }
1554 1789
1555 $self 1790 $self
1556} 1791}
1557 1792
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1793sub update {
1569 my ($self) = @_; 1794 my ($self) = @_;
1570 1795
1571 delete $self->{texture}; 1796 delete $self->{texture};
1572 $self->SUPER::update; 1797 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1808 my ($self, $text) = @_;
1584 1809
1585 return if $self->{text} eq "T$text"; 1810 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1811 $self->{text} = "T$text";
1587 1812
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1813 $self->{layout}->set_text ($text);
1590 1814
1591 delete $self->{size_req}; 1815 delete $self->{size_req};
1592 $self->realloc; 1816 $self->realloc;
1593 $self->update; 1817 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1823 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1824 $self->{text} = "M$markup";
1601 1825
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1826 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1827
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1828 $self->{layout}->set_markup ($markup);
1606 1829
1607 delete $self->{size_req}; 1830 delete $self->{size_req};
1608 $self->realloc; 1831 $self->realloc;
1609 $self->update; 1832 $self->update;
… …
1621 1844
1622 my ($w, $h) = $self->{layout}->size; 1845 my ($w, $h) = $self->{layout}->size;
1623 1846
1624 if (exists $self->{template}) { 1847 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1848 $self->{template}->set_font ($self->{font}) if $self->{font};
1849 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1850 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1851
1628 my ($w2, $h2) = $self->{template}->size; 1852 my ($w2, $h2) = $self->{template}->size;
1629 1853
1630 $w = List::Util::max $w, $w2; 1854 $w = List::Util::max $w, $w2;
… …
1664 1888
1665sub reconfigure { 1889sub reconfigure {
1666 my ($self) = @_; 1890 my ($self) = @_;
1667 1891
1668 delete $self->{size_req}; 1892 delete $self->{size_req};
1893 delete $self->{texture};
1669 1894
1670 $self->SUPER::reconfigure; 1895 $self->SUPER::reconfigure;
1671} 1896}
1672 1897
1673sub _draw { 1898sub _draw {
1674 my ($self) = @_; 1899 my ($self) = @_;
1675 1900
1676 $self->SUPER::_draw; # draw background, if applicable 1901 $self->SUPER::_draw; # draw background, if applicable
1677 1902
1678 my $tex = $self->{texture} ||= do { 1903 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 1904 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1905 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 1906 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1907 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1908 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 1910
1686 new_from_layout CFClient::Texture $self->{layout} 1911 [$self->{layout}->size]
1687 }; 1912 };
1688 1913
1689 unless (exists $self->{ox}) { 1914 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1915 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1916 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 1917 : ($self->{w} - $size->[0]) * 0.5);
1693 1918
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1919 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1920 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 1921 : ($self->{h} - $size->[1]) * 0.5);
1697 }; 1922 };
1698 1923
1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1924 my $w = List::Util::min $self->{w} + 4, $size->[0];
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1925 my $h = List::Util::min $self->{h} + 2, $size->[1];
1703 1926
1704 if ($tex->{format} == GL_ALPHA) { 1927 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1712
1713 glDisable GL_TEXTURE_2D;
1714} 1928}
1715 1929
1716############################################################################# 1930#############################################################################
1717 1931
1718package CFClient::UI::EntryBase; 1932package CFPlus::UI::EntryBase;
1719 1933
1720our @ISA = CFClient::UI::Label::; 1934our @ISA = CFPlus::UI::Label::;
1721 1935
1722use CFClient::OpenGL; 1936use CFPlus::OpenGL;
1723 1937
1724sub new { 1938sub new {
1725 my $class = shift; 1939 my $class = shift;
1726 1940
1727 $class->SUPER::new ( 1941 $class->SUPER::new (
… …
1731 active_fg => [0, 0, 0], 1945 active_fg => [0, 0, 0],
1732 can_hover => 1, 1946 can_hover => 1,
1733 can_focus => 1, 1947 can_focus => 1,
1734 valign => 0, 1948 valign => 0,
1735 can_events => 1, 1949 can_events => 1,
1950 ellipsise => 0,
1736 #text => ... 1951 #text => ...
1737 #hidden => "*", 1952 #hidden => "*",
1738 @_ 1953 @_
1739 ) 1954 )
1740} 1955}
… …
1785 my $sym = $ev->{sym}; 2000 my $sym = $ev->{sym};
1786 my $uni = $ev->{unicode}; 2001 my $uni = $ev->{unicode};
1787 2002
1788 my $text = $self->get_text; 2003 my $text = $self->get_text;
1789 2004
2005 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2006
1790 if ($uni == 8) { 2007 if ($uni == 8) {
1791 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792 } elsif ($uni == 127) { 2009 } elsif ($uni == 127) {
1793 substr $text, $self->{cursor}, 1, ""; 2010 substr $text, $self->{cursor}, 1, "";
1794 } elsif ($sym == CFClient::SDLK_LEFT) { 2011 } elsif ($sym == CFPlus::SDLK_LEFT) {
1795 --$self->{cursor} if $self->{cursor}; 2012 --$self->{cursor} if $self->{cursor};
1796 } elsif ($sym == CFClient::SDLK_RIGHT) { 2013 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1797 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2014 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1798 } elsif ($sym == CFClient::SDLK_HOME) { 2015 } elsif ($sym == CFPlus::SDLK_HOME) {
2016 # what a hack
2017 $self->{cursor} =
2018 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2019 ? length $1
2020 : 0;
2021 } elsif ($sym == CFPlus::SDLK_END) {
2022 # uh, again
2023 $self->{cursor} =
2024 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2025 ? $self->{cursor} + length $1
2026 : length $self->{text};
2027 } elsif ($uni == 21) { # ctrl-u
2028 $text = "";
1799 $self->{cursor} = 0; 2029 $self->{cursor} = 0;
1800 } elsif ($sym == CFClient::SDLK_END) {
1801 $self->{cursor} = length $text;
1802 } elsif ($uni == 27) { 2030 } elsif ($uni == 27) {
1803 $self->emit ('escape'); 2031 $self->emit ('escape');
1804 } elsif ($uni) { 2032 } elsif ($uni == 0x0d) {
2033 substr $text, $self->{cursor}++, 0, "\012";
2034 } elsif ($uni >= 0x20) {
1805 substr $text, $self->{cursor}++, 0, chr $uni; 2035 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else { 2036 } else {
1807 return 0; 2037 return 0;
1808 } 2038 }
1809 2039
1810 $self->_set_text ($text); 2040 $self->_set_text ($text);
1811 2041
1812 $self->realloc; 2042 $self->realloc;
2043 $self->update;
1813 2044
1814 1 2045 1
1815} 2046}
1816 2047
1817sub invoke_focus_in { 2048sub invoke_focus_in {
… …
1829 2060
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 2061 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 2062
1832 # byte-index to char-index 2063 # byte-index to char-index
1833 my $text = $self->{text}; 2064 my $text = $self->{text};
1834 utf8::encode $text; 2065 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 2066 $self->{cursor} = length $text;
1836 2067
1837 $self->_set_text ($self->{text}); 2068 $self->_set_text ($self->{text});
1838 $self->update; 2069 $self->update;
1839 2070
1840 1 2071 1
… …
1879 utf8::encode $text; 2110 utf8::encode $text;
1880 2111
1881 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2112 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1882 } 2113 }
1883 2114
1884 glColor @{$self->{fg}};
1885 glBegin GL_LINES; 2115 glBegin GL_LINES;
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2116 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1887 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2117 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1888 glEnd; 2118 glEnd;
1889 } 2119 }
1890} 2120}
1891 2121
2122#############################################################################
2123
1892package CFClient::UI::Entry; 2124package CFPlus::UI::Entry;
1893 2125
1894our @ISA = CFClient::UI::EntryBase::; 2126our @ISA = CFPlus::UI::EntryBase::;
1895 2127
1896use CFClient::OpenGL; 2128use CFPlus::OpenGL;
1897 2129
1898sub invoke_key_down { 2130sub invoke_key_down {
1899 my ($self, $ev) = @_; 2131 my ($self, $ev) = @_;
1900 2132
1901 my $sym = $ev->{sym}; 2133 my $sym = $ev->{sym};
1902 2134
1903 if ($sym == 13) { 2135 if ($ev->{uni} == 0x0d || $sym == 13) {
1904 unshift @{$self->{history}}, 2136 unshift @{$self->{history}},
1905 my $txt = $self->get_text; 2137 my $txt = $self->get_text;
1906 2138
1907 $self->{history_pointer} = -1; 2139 $self->{history_pointer} = -1;
1908 $self->{history_saveback} = ''; 2140 $self->{history_saveback} = '';
1909 $self->emit (activate => $txt); 2141 $self->emit (activate => $txt);
1910 $self->update; 2142 $self->update;
1911 2143
1912 } elsif ($sym == CFClient::SDLK_UP) { 2144 } elsif ($sym == CFPlus::SDLK_UP) {
1913 if ($self->{history_pointer} < 0) { 2145 if ($self->{history_pointer} < 0) {
1914 $self->{history_saveback} = $self->get_text; 2146 $self->{history_saveback} = $self->get_text;
1915 } 2147 }
1916 if (@{$self->{history} || []} > 0) { 2148 if (@{$self->{history} || []} > 0) {
1917 $self->{history_pointer}++; 2149 $self->{history_pointer}++;
… …
1919 $self->{history_pointer} = @{$self->{history} || []} - 1; 2151 $self->{history_pointer} = @{$self->{history} || []} - 1;
1920 } 2152 }
1921 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2153 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1922 } 2154 }
1923 2155
1924 } elsif ($sym == CFClient::SDLK_DOWN) { 2156 } elsif ($sym == CFPlus::SDLK_DOWN) {
1925 $self->{history_pointer}--; 2157 $self->{history_pointer}--;
1926 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2158 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927 2159
1928 if ($self->{history_pointer} >= 0) { 2160 if ($self->{history_pointer} >= 0) {
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2161 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1938 1 2170 1
1939} 2171}
1940 2172
1941############################################################################# 2173#############################################################################
1942 2174
2175package CFPlus::UI::TextEdit;
2176
2177our @ISA = CFPlus::UI::EntryBase::;
2178
2179use CFPlus::OpenGL;
2180
2181sub move_cursor_ver {
2182 my ($self, $dy) = @_;
2183
2184 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2185
2186 $y += $dy;
2187
2188 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2189 $self->{cursor} = $index;
2190 delete $self->{cur_h};
2191 $self->update;
2192 return;
2193 }
2194}
2195
2196sub invoke_key_down {
2197 my ($self, $ev) = @_;
2198
2199 my $sym = $ev->{sym};
2200
2201 if ($sym == CFPlus::SDLK_UP) {
2202 $self->move_cursor_ver (-1);
2203 } elsif ($sym == CFPlus::SDLK_DOWN) {
2204 $self->move_cursor_ver (+1);
2205 } else {
2206 return $self->SUPER::invoke_key_down ($ev)
2207 }
2208
2209 1
2210}
2211
2212#############################################################################
2213
1943package CFClient::UI::Button; 2214package CFPlus::UI::Button;
1944 2215
1945our @ISA = CFClient::UI::Label::; 2216our @ISA = CFPlus::UI::Label::;
1946 2217
1947use CFClient::OpenGL; 2218use CFPlus::OpenGL;
1948 2219
1949my @tex = 2220my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2221 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951 qw(b1_button_active.png); 2222 qw(b1_button_active.png);
1952 2223
1953sub new { 2224sub new {
1954 my $class = shift; 2225 my $class = shift;
1955 2226
… …
1992 $self->SUPER::_draw; 2263 $self->SUPER::_draw;
1993} 2264}
1994 2265
1995############################################################################# 2266#############################################################################
1996 2267
2268package CFPlus::UI::CheckBox;
2269
2270our @ISA = CFPlus::UI::DrawBG::;
2271
2272my @tex =
2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2275
2276use CFPlus::OpenGL;
2277
2278sub new {
2279 my $class = shift;
2280
2281 $class->SUPER::new (
2282 padding_x => 2,
2283 padding_y => 2,
2284 fg => [1, 1, 1],
2285 active_fg => [1, 1, 0],
2286 bg => [0, 0, 0, 0.2],
2287 active_bg => [1, 1, 1, 0.5],
2288 state => 0,
2289 can_hover => 1,
2290 @_
2291 )
2292}
2293
2294sub size_request {
2295 my ($self) = @_;
2296
2297 (6) x 2
2298}
2299
2300sub toggle {
2301 my ($self) = @_;
2302
2303 $self->{state} = !$self->{state};
2304 $self->emit (changed => $self->{state});
2305 $self->update;
2306}
2307
2308sub invoke_button_down {
2309 my ($self, $ev, $x, $y) = @_;
2310
2311 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2312 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2313 $self->toggle;
2314 } else {
2315 return 0
2316 }
2317
2318 1
2319}
2320
2321sub _draw {
2322 my ($self) = @_;
2323
2324 $self->SUPER::_draw;
2325
2326 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2327
2328 my ($w, $h) = @$self{qw(w h)};
2329
2330 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2331
2332 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2333
2334 my $tex = $self->{state} ? $tex[1] : $tex[0];
2335
2336 glEnable GL_TEXTURE_2D;
2337 $tex->draw_quad_alpha (0, 0, $s, $s);
2338 glDisable GL_TEXTURE_2D;
2339}
2340
2341#############################################################################
2342
2343package CFPlus::UI::Image;
2344
2345our @ISA = CFPlus::UI::Base::;
2346
2347use CFPlus::OpenGL;
2348
2349our %texture_cache;
2350
2351sub new {
2352 my $class = shift;
2353
2354 my $self = $class->SUPER::new (
2355 can_events => 0,
2356 @_,
2357 );
2358
2359 $self->{path} || $self->{tex}
2360 or Carp::croak "'path' or 'tex' attributes required";
2361
2362 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2363 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2364
2365 CFPlus::weaken $texture_cache{$self->{path}};
2366
2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2368
2369 $self
2370}
2371
2372sub STORABLE_freeze {
2373 my ($self, $cloning) = @_;
2374
2375 $self->{path}
2376 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2377
2378 $self->{path}
2379}
2380
2381sub STORABLE_attach {
2382 my ($self, $cloning, $path) = @_;
2383
2384 $self->new (path => $path)
2385}
2386
2387sub size_request {
2388 my ($self) = @_;
2389
2390 ($self->{tex}{w}, $self->{tex}{h})
2391}
2392
2393sub _draw {
2394 my ($self) = @_;
2395
2396 my $tex = $self->{tex};
2397
2398 my ($w, $h) = ($self->{w}, $self->{h});
2399
2400 if ($self->{rot90}) {
2401 glRotate 90, 0, 0, 1;
2402 glTranslate 0, -$self->{w}, 0;
2403
2404 ($w, $h) = ($h, $w);
2405 }
2406
2407 glEnable GL_TEXTURE_2D;
2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2409
2410 $tex->draw_quad (0, 0, $w, $h);
2411
2412 glDisable GL_TEXTURE_2D;
2413}
2414
2415#############################################################################
2416
1997package CFClient::UI::ImageButton; 2417package CFPlus::UI::ImageButton;
1998 2418
1999our @ISA = CFClient::UI::Image::; 2419our @ISA = CFPlus::UI::Image::;
2000 2420
2001use CFClient::OpenGL; 2421use CFPlus::OpenGL;
2002 2422
2003my %textures; 2423my %textures;
2004 2424
2005sub new { 2425sub new {
2006 my $class = shift; 2426 my $class = shift;
… …
2028 1 2448 1
2029} 2449}
2030 2450
2031############################################################################# 2451#############################################################################
2032 2452
2033package CFClient::UI::CheckBox;
2034
2035our @ISA = CFClient::UI::DrawBG::;
2036
2037my @tex =
2038 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041use CFClient::OpenGL;
2042
2043sub new {
2044 my $class = shift;
2045
2046 $class->SUPER::new (
2047 padding_x => 2,
2048 padding_y => 2,
2049 fg => [1, 1, 1],
2050 active_fg => [1, 1, 0],
2051 bg => [0, 0, 0, 0.2],
2052 active_bg => [1, 1, 1, 0.5],
2053 state => 0,
2054 can_hover => 1,
2055 @_
2056 )
2057}
2058
2059sub size_request {
2060 my ($self) = @_;
2061
2062 (6) x 2
2063}
2064
2065sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_;
2067
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state};
2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
2076 1
2077}
2078
2079sub _draw {
2080 my ($self) = @_;
2081
2082 $self->SUPER::_draw;
2083
2084 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086 my ($w, $h) = @$self{qw(w h)};
2087
2088 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092 my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094 glEnable GL_TEXTURE_2D;
2095 $tex->draw_quad_alpha (0, 0, $s, $s);
2096 glDisable GL_TEXTURE_2D;
2097}
2098
2099#############################################################################
2100
2101package CFClient::UI::Image; 2453package CFPlus::UI::VGauge;
2102 2454
2103our @ISA = CFClient::UI::Base::; 2455our @ISA = CFPlus::UI::Base::;
2104
2105use CFClient::OpenGL;
2106
2107our %texture_cache;
2108
2109sub new {
2110 my $class = shift;
2111
2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2116
2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2119
2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127 $self
2128}
2129
2130sub size_request {
2131 my ($self) = @_;
2132
2133 ($self->{tex}{w}, $self->{tex}{h})
2134}
2135
2136sub _draw {
2137 my ($self) = @_;
2138
2139 my $tex = $self->{tex};
2140
2141 my ($w, $h) = ($self->{w}, $self->{h});
2142
2143 if ($self->{rot90}) {
2144 glRotate 90, 0, 0, 1;
2145 glTranslate 0, -$self->{w}, 0;
2146
2147 ($w, $h) = ($h, $w);
2148 }
2149
2150 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153 $tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155 glDisable GL_TEXTURE_2D;
2156}
2157
2158#############################################################################
2159
2160package CFClient::UI::VGauge;
2161
2162our @ISA = CFClient::UI::Base::;
2163 2456
2164use List::Util qw(min max); 2457use List::Util qw(min max);
2165 2458
2166use CFClient::OpenGL; 2459use CFPlus::OpenGL;
2167 2460
2168my %tex = ( 2461my %tex = (
2169 food => [ 2462 food => [
2170 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2463 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2464 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172 ], 2465 ],
2173 grace => [ 2466 grace => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2467 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2468 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2176 ], 2469 ],
2177 hp => [ 2470 hp => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2472 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180 ], 2473 ],
2181 mana => [ 2474 mana => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2475 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2476 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2184 ], 2477 ],
2185); 2478);
2186 2479
2187# eg. VGauge->new (gauge => 'food'), default gauge: food 2480# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2540 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2541 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2542
2250 my $h1 = $self->{h} * (1 - $ycut1); 2543 my $h1 = $self->{h} * (1 - $ycut1);
2251 my $h2 = $self->{h} * (1 - $ycut2); 2544 my $h2 = $self->{h} * (1 - $ycut2);
2545 my $h3 = $self->{h};
2546
2547 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252 2548
2253 glEnable GL_BLEND; 2549 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2550 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2551 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2552 glEnable GL_TEXTURE_2D;
… …
2275 2571
2276 if ($t3) { 2572 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2573 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2574 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2575 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2576 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2577 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2578 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2579 glEnd;
2284 } 2580 }
2285 2581
2286 glDisable GL_BLEND; 2582 glDisable GL_BLEND;
2287 glDisable GL_TEXTURE_2D; 2583 glDisable GL_TEXTURE_2D;
2288} 2584}
2289 2585
2290############################################################################# 2586#############################################################################
2291 2587
2292package CFClient::UI::Gauge; 2588package CFPlus::UI::Gauge;
2293 2589
2294our @ISA = CFClient::UI::VBox::; 2590our @ISA = CFPlus::UI::VBox::;
2295 2591
2296sub new { 2592sub new {
2297 my ($class, %arg) = @_; 2593 my ($class, %arg) = @_;
2298 2594
2299 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
… …
2301 can_hover => 1, 2597 can_hover => 1,
2302 can_events => 1, 2598 can_events => 1,
2303 %arg, 2599 %arg,
2304 ); 2600 );
2305 2601
2306 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2602 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2307 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2603 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2308 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2604 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2309 2605
2310 $self 2606 $self
2311} 2607}
2312 2608
2313sub set_fontsize { 2609sub set_fontsize {
… …
2334 $self->{value}->set_text ($val); 2630 $self->{value}->set_text ($val);
2335} 2631}
2336 2632
2337############################################################################# 2633#############################################################################
2338 2634
2339package CFClient::UI::Slider; 2635package CFPlus::UI::Slider;
2340 2636
2341use strict; 2637use strict;
2342 2638
2343use CFClient::OpenGL; 2639use CFPlus::OpenGL;
2344 2640
2345our @ISA = CFClient::UI::DrawBG::; 2641our @ISA = CFPlus::UI::DrawBG::;
2346 2642
2347my @tex = 2643my @tex =
2348 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2644 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349 qw(s1_slider.png s1_slider_bg.png); 2645 qw(s1_slider.png s1_slider_bg.png);
2350 2646
2351sub new { 2647sub new {
2352 my $class = shift; 2648 my $class = shift;
2353 2649
… …
2442 } 2738 }
2443 2739
2444 1 2740 1
2445} 2741}
2446 2742
2743sub invoke_mouse_wheel {
2744 my ($self, $ev) = @_;
2745
2746 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2747
2748 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2749
2750 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2751
2752 ! ! $delta
2753}
2754
2447sub update { 2755sub update {
2448 my ($self) = @_; 2756 my ($self) = @_;
2449 2757
2450 delete $self->{knob_w}; 2758 delete $self->{knob_w};
2451 $self->SUPER::update; 2759 $self->SUPER::update;
… …
2498 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2499} 2807}
2500 2808
2501############################################################################# 2809#############################################################################
2502 2810
2503package CFClient::UI::ValSlider; 2811package CFPlus::UI::ValSlider;
2504 2812
2505our @ISA = CFClient::UI::HBox::; 2813our @ISA = CFPlus::UI::HBox::;
2506 2814
2507sub new { 2815sub new {
2508 my ($class, %arg) = @_; 2816 my ($class, %arg) = @_;
2509 2817
2510 my $range = delete $arg{range}; 2818 my $range = delete $arg{range};
2511 2819
2512 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2513 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2821 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2822 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515 to_value => sub { shift }, 2823 to_value => sub { shift },
2516 from_value => sub { shift }, 2824 from_value => sub { shift },
2517 %arg, 2825 %arg,
2518 ); 2826 );
2519 2827
… …
2539sub set_range { shift->{slider}->set_range (@_) } 2847sub set_range { shift->{slider}->set_range (@_) }
2540sub set_value { shift->{slider}->set_value (@_) } 2848sub set_value { shift->{slider}->set_value (@_) }
2541 2849
2542############################################################################# 2850#############################################################################
2543 2851
2544package CFClient::UI::TextScroller; 2852package CFPlus::UI::TextScroller;
2545 2853
2546our @ISA = CFClient::UI::HBox::; 2854our @ISA = CFPlus::UI::HBox::;
2547 2855
2548use CFClient::OpenGL; 2856use CFPlus::OpenGL;
2549 2857
2550sub new { 2858sub new {
2551 my $class = shift; 2859 my $class = shift;
2552 2860
2553 my $self = $class->SUPER::new ( 2861 my $self = $class->SUPER::new (
2554 fontsize => 1, 2862 fontsize => 1,
2555 can_events => 0, 2863 can_events => 1,
2556 indent => 0, 2864 indent => 0,
2557 #font => default_font 2865 #font => default_font
2558 @_, 2866 @_,
2559 2867
2560 layout => (new CFClient::Layout 1), 2868 layout => (new CFPlus::Layout),
2561 par => [], 2869 par => [],
2870 max_par => 0,
2562 height => 0, 2871 height => 0,
2563 children => [ 2872 children => [
2564 (new CFClient::UI::Empty expand => 1), 2873 (new CFPlus::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 2874 (new CFPlus::UI::Slider vertical => 1),
2566 ], 2875 ],
2567 ); 2876 );
2568 2877
2569 $self->{children}[1]->connect (changed => sub { $self->update }); 2878 $self->{children}[1]->connect (changed => sub { $self->update });
2570 2879
… …
2600 2909
2601 $self->reflow; 2910 $self->reflow;
2602 2911
2603 local $self->{children} = [$empty, $slider]; 2912 local $self->{children} = [$empty, $slider];
2604 $self->SUPER::invoke_size_allocate ($w, $h) 2913 $self->SUPER::invoke_size_allocate ($w, $h)
2914}
2915
2916sub invoke_mouse_wheel {
2917 my ($self, $ev) = @_;
2918
2919 return 0 unless $ev->{dy}; # only vertical movements
2920
2921 $self->{children}[1]->emit (mouse_wheel => $ev);
2922
2923 1
2605} 2924}
2606 2925
2607sub get_layout { 2926sub get_layout {
2608 my ($self, $para) = @_; 2927 my ($self, $para) = @_;
2609 2928
… …
2637 2956
2638 # todo: base offset on lines or so, not on pixels 2957 # todo: base offset on lines or so, not on pixels
2639 $self->{children}[1]->set_value ($offset); 2958 $self->{children}[1]->set_value ($offset);
2640} 2959}
2641 2960
2961sub current_paragraph {
2962 my ($self) = @_;
2963
2964 $self->{top_paragraph} - 1
2965}
2966
2967sub scroll_to {
2968 my ($self, $para) = @_;
2969
2970 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2971
2972 $self->{scroll_to} = $para;
2973 $self->update;
2974}
2975
2642sub clear { 2976sub clear {
2643 my ($self) = @_; 2977 my ($self) = @_;
2644 2978
2645 my (undef, undef, @other) = @{ $self->{children} }; 2979 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other; 2980 $self->remove ($_) for @other;
… …
2649 $self->{height} = 0; 2983 $self->{height} = 0;
2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2984 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651} 2985}
2652 2986
2653sub add_paragraph { 2987sub add_paragraph {
2654 my ($self, $color, $para, $indent) = @_; 2988 my $self = shift;
2655 2989
2656 my ($text, @w) = ref $para ? @$para : $para; 2990 for my $para (@_) {
2657
2658 $para = { 2991 $para = {
2992 fg => [1, 1, 1, 1],
2993 indent => 0,
2994 markup => "",
2995 widget => [],
2996 ref $para ? %$para : (markup => $para),
2659 w => 1e10, 2997 w => 1e10,
2660 wrapped => 1, 2998 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2665 }; 2999 };
2666 3000
2667 $self->add (@w) if @w; 3001 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668 push @{$self->{par}}, $para; 3002 push @{$self->{par}}, $para;
3003 }
3004
3005 if (my $max = $self->{max_par}) {
3006 shift @{$self->{par}} while @{$self->{par}} > $max;
3007 }
2669 3008
2670 $self->{need_reflow}++; 3009 $self->{need_reflow}++;
2671 $self->update; 3010 $self->update;
2672} 3011}
2673 3012
2674sub scroll_to_bottom { 3013sub scroll_to_bottom {
2675 my ($self) = @_; 3014 my ($self) = @_;
2676 3015
2677 $self->{scroll_to_bottom} = 1; 3016 $self->{scroll_to} = $#{$self->{par}};
2678 $self->update; 3017 $self->update;
2679} 3018}
2680 3019
3020sub force_uptodate {
3021 my ($self) = @_;
3022
3023 if (delete $self->{need_reflow}) {
3024 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3025
3026 my $height = 0;
3027
3028 for my $para (@{$self->{par}}) {
3029 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3030 my $layout = $self->get_layout ($para);
3031 my ($w, $h) = $layout->size;
3032
3033 $para->{w} = $w + $para->{indent};
3034 $para->{h} = $h;
3035 $para->{wrapped} = $layout->has_wrapped;
3036 }
3037
3038 $para->{y} = $height;
3039 $height += $para->{h};
3040 }
3041
3042 $self->{height} = $height;
3043 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3044
3045 delete $self->{texture};
3046 }
3047
3048 if (my $paridx = delete $self->{scroll_to}) {
3049 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3050 }
3051}
3052
2681sub update { 3053sub update {
2682 my ($self) = @_; 3054 my ($self) = @_;
2683 3055
2684 $self->SUPER::update; 3056 $self->SUPER::update;
2685 3057
2686 return unless $self->{h} > 0; 3058 return unless $self->{h} > 0;
2687 3059
2688 delete $self->{texture}; 3060 delete $self->{texture};
2689 3061
2690 $ROOT->on_post_alloc ($self => sub { 3062 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate;
3064
2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692 3066
2693 if (delete $self->{need_reflow}) {
2694 my $height = 0;
2695
2696 for my $para (@{$self->{par}}) {
2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698 my $layout = $self->get_layout ($para);
2699 my ($w, $h) = $layout->size;
2700
2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2704 }
2705
2706 $height += $para->{h};
2707 }
2708
2709 $self->{height} = $height;
2710
2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721 glClearColor 0, 0, 0, 0; 3068 glClearColor 0, 0, 0, 0;
2722 glClear GL_COLOR_BUFFER_BIT; 3069 glClear GL_COLOR_BUFFER_BIT;
2723 3070
3071 package CFPlus::UI::Base;
3072 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3073 (0, 0, $self->{w}, $self->{h});
3074
3075 my $top = int $self->{children}[1]{range}[0];
3076
3077 my $paridx = 0;
3078 my $top_paragraph;
2724 my $top = int $self->{children}[1]{range}[0]; 3079 my $top = int $self->{children}[1]{range}[0];
2725 3080
2726 my $y0 = $top; 3081 my $y0 = $top;
2727 my $y1 = $top + $H; 3082 my $y1 = $top + $H;
2728 3083
2729 my $y = 0;
2730
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 3084 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 3085 my $h = $para->{h};
3086 my $y = $para->{y};
2737 3087
2738 if ($y0 < $y + $h && $y < $y1) { 3088 if ($y0 < $y + $h && $y < $y1) {
2739
2740 my $layout = $self->get_layout ($para); 3089 my $layout = $self->get_layout ($para);
2741 3090
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 3091 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746 3092
2747 if (my @w = @{ $para->{widget} }) { 3093 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 3094 my @s = $layout->get_shapes;
2749 3095
2750 glDisable GL_BLEND;
2751 for (@w) { 3096 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 3097 my ($dx, $dy) = splice @s, 0, 2, ();
2753 3098
2754 $_->{x} = $dx + $para->{indent}; 3099 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 3100 $_->{y} = $dy + $y - $y0;
2756 3101
2757 $_->draw; 3102 $_->draw;
2758 } 3103 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 3104 }
2762 } 3105 }
2763 3106
2764 $y += $h; 3107 $paridx++;
3108 $top_paragraph ||= $paridx if $y >= $top;
2765 } 3109 }
2766 3110
2767 glDisable GL_BLEND; 3111 $self->{top_paragraph} = $top_paragraph;
2768 }; 3112 };
2769 }); 3113 });
2770} 3114}
2771 3115
2772sub reconfigure { 3116sub reconfigure {
… …
2790 $self->{children}[1]->draw; 3134 $self->{children}[1]->draw;
2791} 3135}
2792 3136
2793############################################################################# 3137#############################################################################
2794 3138
2795package CFClient::UI::Animator; 3139package CFPlus::UI::Animator;
2796 3140
2797use CFClient::OpenGL; 3141use CFPlus::OpenGL;
2798 3142
2799our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2800 3144
2801sub moveto { 3145sub moveto {
2802 my ($self, $x, $y) = @_; 3146 my ($self, $x, $y) = @_;
2803 3147
2804 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3148 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2832 glPopMatrix; 3176 glPopMatrix;
2833} 3177}
2834 3178
2835############################################################################# 3179#############################################################################
2836 3180
2837package CFClient::UI::Flopper; 3181package CFPlus::UI::Flopper;
2838 3182
2839our @ISA = CFClient::UI::Button::; 3183our @ISA = CFPlus::UI::Button::;
2840 3184
2841sub new { 3185sub new {
2842 my $class = shift; 3186 my $class = shift;
2843 3187
2844 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
… …
2856 $self->{other}->toggle_visibility; 3200 $self->{other}->toggle_visibility;
2857} 3201}
2858 3202
2859############################################################################# 3203#############################################################################
2860 3204
2861package CFClient::UI::Tooltip; 3205package CFPlus::UI::Tooltip;
2862 3206
2863our @ISA = CFClient::UI::Bin::; 3207our @ISA = CFPlus::UI::Bin::;
2864 3208
2865use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2866 3210
2867sub new { 3211sub new {
2868 my $class = shift; 3212 my $class = shift;
2869 3213
2870 $class->SUPER::new ( 3214 $class->SUPER::new (
… …
2873 ) 3217 )
2874} 3218}
2875 3219
2876sub set_tooltip_from { 3220sub set_tooltip_from {
2877 my ($self, $widget) = @_; 3221 my ($self, $widget) = @_;
3222
3223 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224 if $widget->{tooltip} =~ /^#(.*)$/;
2878 3225
2879 my $tooltip = $widget->{tooltip}; 3226 my $tooltip = $widget->{tooltip};
2880 3227
2881 if ($ENV{CFPLUS_DEBUG} & 2) { 3228 if ($ENV{CFPLUS_DEBUG} & 2) {
2882 $tooltip .= "\n\n" . (ref $widget) . "\n" 3229 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2886 } 3233 }
2887 3234
2888 $tooltip =~ s/^\n+//; 3235 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//; 3236 $tooltip =~ s/\n+$//;
2890 3237
2891 $self->add (new CFClient::UI::Label 3238 $self->add (new CFPlus::UI::Label
2892 markup => $tooltip, 3239 markup => $tooltip,
2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3240 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894 fontsize => 0.8, 3241 fontsize => 0.8,
2895 fg => [0, 0, 0, 1], 3242 style => 1, # FLAG_INVERSE
2896 ellipsise => 0, 3243 ellipsise => 0,
2897 font => ($widget->{tooltip_font} || $::FONT_PROP), 3244 font => ($widget->{tooltip_font} || $::FONT_PROP),
2898 ); 3245 );
2899} 3246}
2900 3247
… …
2919 3266
2920 $self->{root}->on_post_alloc ("move_$self" => sub { 3267 $self->{root}->on_post_alloc ("move_$self" => sub {
2921 my $widget = $self->{owner} 3268 my $widget = $self->{owner}
2922 or return; 3269 or return;
2923 3270
3271 if ($widget->{visible}) {
2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3272 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925 3273
2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3274 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927 if $x + $self->{w} > $self->{root}{w}; 3275 if $x + $self->{w} > $self->{root}{w};
2928 3276
2929 $self->move_abs ($x, $y); 3277 $self->move_abs ($x, $y);
3278 } else {
3279 $self->hide;
3280 }
2930 }); 3281 });
2931} 3282}
2932 3283
2933sub _draw { 3284sub _draw {
2934 my ($self) = @_; 3285 my ($self) = @_;
… …
2958 $self->SUPER::_draw; 3309 $self->SUPER::_draw;
2959} 3310}
2960 3311
2961############################################################################# 3312#############################################################################
2962 3313
2963package CFClient::UI::Face; 3314package CFPlus::UI::Face;
2964 3315
2965our @ISA = CFClient::UI::Base::; 3316our @ISA = CFPlus::UI::DrawBG::;
2966 3317
2967use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2968 3319
2969sub new { 3320sub new {
2970 my $class = shift; 3321 my $class = shift;
2971 3322
2972 my $self = $class->SUPER::new ( 3323 my $self = $class->SUPER::new (
… …
2974 can_events => 0, 3325 can_events => 0,
2975 @_, 3326 @_,
2976 ); 3327 );
2977 3328
2978 if ($self->{anim} && $self->{animspeed}) { 3329 if ($self->{anim} && $self->{animspeed}) {
2979 Scalar::Util::weaken (my $widget = $self); 3330 CFPlus::weaken (my $widget = $self);
2980 3331
2981 $self->{timer} = Event->timer ( 3332 $self->{timer} = Event->timer (
2982 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983 hard => 1, 3334 hard => 1,
2984 interval => $self->{animspeed}, 3335 interval => $self->{animspeed},
… …
3007sub _draw { 3358sub _draw {
3008 my ($self) = @_; 3359 my ($self) = @_;
3009 3360
3010 return unless $::CONN; 3361 return unless $::CONN;
3011 3362
3363 $self->SUPER::_draw;
3364
3012 my $face; 3365 my $face;
3013 3366
3014 if ($self->{frame}) { 3367 if ($self->{frame}) {
3015 my $anim = $::CONN->{anim}[$self->{anim}]; 3368 my $anim = $::CONN->{anim}[$self->{anim}];
3016 3369
… …
3038 $self->SUPER::destroy; 3391 $self->SUPER::destroy;
3039} 3392}
3040 3393
3041############################################################################# 3394#############################################################################
3042 3395
3043package CFClient::UI::Buttonbar; 3396package CFPlus::UI::Buttonbar;
3044 3397
3045our @ISA = CFClient::UI::HBox::; 3398our @ISA = CFPlus::UI::HBox::;
3046 3399
3047# TODO: should actualyl wrap buttons and other goodies. 3400# TODO: should actually wrap buttons and other goodies.
3048 3401
3049############################################################################# 3402#############################################################################
3050 3403
3051package CFClient::UI::Menu; 3404package CFPlus::UI::Menu;
3052 3405
3053our @ISA = CFClient::UI::FancyFrame::; 3406our @ISA = CFPlus::UI::Toplevel::;
3054 3407
3055use CFClient::OpenGL; 3408use CFPlus::OpenGL;
3056 3409
3057sub new { 3410sub new {
3058 my $class = shift; 3411 my $class = shift;
3059 3412
3060 my $self = $class->SUPER::new ( 3413 my $self = $class->SUPER::new (
3061 items => [], 3414 items => [],
3062 z => 100, 3415 z => 100,
3063 @_, 3416 @_,
3064 ); 3417 );
3065 3418
3066 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3419 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067 3420
3068 for my $item (@{ $self->{items} }) { 3421 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3422 my ($widget, $cb, $tooltip) = @$item;
3070 3423
3071 # handle various types of items, only text for now 3424 # handle various types of items, only text for now
3072 if (!ref $widget) { 3425 if (!ref $widget) {
3426 if ($widget =~ /\t/) {
3427 my ($left, $right) = split /\t/, $widget, 2;
3428
3073 $widget = new CFClient::UI::Label 3429 $widget = new CFPlus::UI::HBox
3074 can_hover => 1, 3430 can_hover => 1,
3075 can_events => 1, 3431 can_events => 1,
3432 tooltip => $tooltip,
3433 children => [
3434 (new CFPlus::UI::Label markup => $left, expand => 1),
3435 (new CFPlus::UI::Label markup => $right, align => +1),
3436 ],
3437 ;
3438
3439 } else {
3440 $widget = new CFPlus::UI::Label
3441 can_hover => 1,
3442 can_events => 1,
3076 markup => $widget, 3443 markup => $widget,
3077 tooltip => $tooltip 3444 tooltip => $tooltip;
3445 }
3078 } 3446 }
3079 3447
3080 $self->{item}{$widget} = $item; 3448 $self->{item}{$widget} = $item;
3081 3449
3082 $self->{vbox}->add ($widget); 3450 $self->{vbox}->add ($widget);
… …
3125 1 3493 1
3126} 3494}
3127 3495
3128############################################################################# 3496#############################################################################
3129 3497
3130package CFClient::UI::Multiplexer; 3498package CFPlus::UI::Multiplexer;
3131 3499
3132our @ISA = CFClient::UI::Container::; 3500our @ISA = CFPlus::UI::Container::;
3133 3501
3134sub new { 3502sub new {
3135 my $class = shift; 3503 my $class = shift;
3136 3504
3137 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
… …
3151 3519
3152 $self->{current} = $self->{children}[0] 3520 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3521 if @{ $self->{children} };
3154} 3522}
3155 3523
3524sub get_current_page {
3525 my ($self) = @_;
3526
3527 $self->{current}
3528}
3529
3156sub set_current_page { 3530sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3531 my ($self, $page_or_widget) = @_;
3158 3532
3159 my $widget = ref $page_or_widget 3533 my $widget = ref $page_or_widget
3160 ? $page_or_widget 3534 ? $page_or_widget
… …
3192 $self->{current}->draw; 3566 $self->{current}->draw;
3193} 3567}
3194 3568
3195############################################################################# 3569#############################################################################
3196 3570
3197package CFClient::UI::Notebook; 3571package CFPlus::UI::Notebook;
3198 3572
3199our @ISA = CFClient::UI::VBox::; 3573our @ISA = CFPlus::UI::VBox::;
3200 3574
3201sub new { 3575sub new {
3202 my $class = shift; 3576 my $class = shift;
3203 3577
3204 my $self = $class->SUPER::new ( 3578 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar), 3579 buttonbar => (new CFPlus::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3580 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207 # filter => # will be put between multiplexer and $self 3581 # filter => # will be put between multiplexer and $self
3208 @_, 3582 @_,
3209 ); 3583 );
3210 3584
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3585 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3215} 3589}
3216 3590
3217sub add { 3591sub add {
3218 my ($self, $title, $widget, $tooltip) = @_; 3592 my ($self, $title, $widget, $tooltip) = @_;
3219 3593
3220 Scalar::Util::weaken $self; 3594 CFPlus::weaken $self;
3221 3595
3222 $self->{buttonbar}->add (new CFClient::UI::Button 3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3223 markup => $title, 3597 markup => $title,
3224 tooltip => $tooltip, 3598 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) }, 3599 on_activate => sub { $self->set_current_page ($widget) },
3226 ); 3600 );
3227 3601
3228 $self->{multiplexer}->add ($widget); 3602 $self->{multiplexer}->add ($widget);
3229} 3603}
3230 3604
3605sub get_current_page {
3606 my ($self) = @_;
3607
3608 $self->{multiplexer}->get_current_page
3609}
3610
3231sub set_current_page { 3611sub set_current_page {
3232 my ($self, $page) = @_; 3612 my ($self, $page) = @_;
3233 3613
3234 $self->{multiplexer}->set_current_page ($page); 3614 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current}); 3615 $self->emit (page_changed => $self->{multiplexer}{current});
3236} 3616}
3237 3617
3238############################################################################# 3618#############################################################################
3239 3619
3240package CFClient::UI::Combobox; 3620package CFPlus::UI::Selector;
3241 3621
3242use utf8; 3622use utf8;
3243 3623
3244our @ISA = CFClient::UI::Button::; 3624our @ISA = CFPlus::UI::Button::;
3245 3625
3246sub new { 3626sub new {
3247 my $class = shift; 3627 my $class = shift;
3248 3628
3249 my $self = $class->SUPER::new ( 3629 my $self = $class->SUPER::new (
… …
3266 my ($value, $title, $tooltip) = @$_; 3646 my ($value, $title, $tooltip) = @$_;
3267 3647
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3648 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 } 3649 }
3270 3650
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3651 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272} 3652}
3273 3653
3274sub _set_value { 3654sub _set_value {
3275 my ($self, $value) = @_; 3655 my ($self, $value) = @_;
3276 3656
… …
3291 $self->emit (changed => $value); 3671 $self->emit (changed => $value);
3292} 3672}
3293 3673
3294############################################################################# 3674#############################################################################
3295 3675
3296package CFClient::UI::Statusbox; 3676package CFPlus::UI::Statusbox;
3297 3677
3298our @ISA = CFClient::UI::VBox::; 3678our @ISA = CFPlus::UI::VBox::;
3299 3679
3300sub new { 3680sub new {
3301 my $class = shift; 3681 my $class = shift;
3302 3682
3303 my $self = $class->SUPER::new ( 3683 my $self = $class->SUPER::new (
3304 fontsize => 0.8, 3684 fontsize => 0.8,
3305 @_, 3685 @_,
3306 ); 3686 );
3307 3687
3308 Scalar::Util::weaken (my $this = $self); 3688 CFPlus::weaken (my $this = $self);
3309 3689
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311 3691
3312 $self 3692 $self
3313} 3693}
… …
3315sub reorder { 3695sub reorder {
3316 my ($self) = @_; 3696 my ($self) = @_;
3317 my $NOW = Time::HiRes::time; 3697 my $NOW = Time::HiRes::time;
3318 3698
3319 # freeze display when hovering over any label 3699 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner} 3700 return if $CFPlus::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3701 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} }; 3702 values %{ $self->{item} };
3323 3703
3324 while (my ($k, $v) = each %{ $self->{item} }) { 3704 while (my ($k, $v) = each %{ $self->{item} }) {
3325 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3705 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326 } 3706 }
… …
3347 for ($short) { 3727 for ($short) {
3348 s/^\s+//; 3728 s/^\s+//;
3349 s/\s+/ /g; 3729 s/\s+/ /g;
3350 } 3730 }
3351 3731
3352 new CFClient::UI::Label 3732 new CFPlus::UI::Label
3353 markup => $short, 3733 markup => $short,
3354 tooltip => $item->{tooltip}, 3734 tooltip => $item->{tooltip},
3355 tooltip_font => $::FONT_PROP, 3735 tooltip_font => $::FONT_PROP,
3356 tooltip_width => 0.67, 3736 tooltip_width => 0.67,
3357 fontsize => $item->{fontsize} || $self->{fontsize}, 3737 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3436 $self->SUPER::destroy; 3816 $self->SUPER::destroy;
3437} 3817}
3438 3818
3439############################################################################# 3819#############################################################################
3440 3820
3441package CFClient::UI::Inventory;
3442
3443our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445sub new {
3446 my $class = shift;
3447
3448 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450 @_,
3451 );
3452
3453 $self
3454}
3455
3456sub set_items {
3457 my ($self, $items) = @_;
3458
3459 $self->{child}->clear;
3460 return unless $items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479}
3480
3481#############################################################################
3482
3483package CFClient::UI::SpellList;
3484
3485our @ISA = CFClient::UI::Table::;
3486
3487sub new {
3488 my $class = shift;
3489
3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
3493 @_,
3494 )
3495}
3496
3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3582sub add_spell {
3583 my ($self, $spell) = @_;
3584
3585 $self->{spell}->{$spell->{name}} = $spell;
3586 $self->rebuild_spell_list;
3587}
3588
3589sub remove_spell {
3590 my ($self, $spell) = @_;
3591
3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3603#############################################################################
3604
3605package CFClient::UI::Root; 3821package CFPlus::UI::Root;
3606 3822
3607our @ISA = CFClient::UI::Container::; 3823our @ISA = CFPlus::UI::Container::;
3608 3824
3609use List::Util qw(min max); 3825use List::Util qw(min max);
3610 3826
3611use CFClient::OpenGL; 3827use CFPlus::OpenGL;
3612 3828
3613sub new { 3829sub new {
3614 my $class = shift; 3830 my $class = shift;
3615 3831
3616 my $self = $class->SUPER::new ( 3832 my $self = $class->SUPER::new (
3617 visible => 1, 3833 visible => 1,
3618 @_, 3834 @_,
3619 ); 3835 );
3620 3836
3621 Scalar::Util::weaken ($self->{root} = $self); 3837 CFPlus::weaken ($self->{root} = $self);
3622 3838
3623 $self 3839 $self
3624} 3840}
3625 3841
3626sub size_request { 3842sub size_request {
… …
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4008 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 4009
3794 $w = 0 if $w < 0; 4010 $w = 0 if $w < 0;
3795 $h = 0 if $h < 0; 4011 $h = 0 if $h < 0;
3796 4012
4013 $w = max $widget->{min_w}, $w;
4014 $h = max $widget->{min_h}, $h;
4015
4016# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4017# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4018
4019 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4020 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4021
3797 $w = int $w + 0.5; 4022 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 4023 $h = int $h + 0.5;
3799 4024
3800 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4025 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801 $widget->{old_w} = $widget->{w}; 4026 $widget->{old_w} = $widget->{w};
… …
3824 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4049 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825 glMatrixMode GL_MODELVIEW; 4050 glMatrixMode GL_MODELVIEW;
3826 glLoadIdentity; 4051 glLoadIdentity;
3827 4052
3828 { 4053 {
3829 package CFClient::UI::Base; 4054 package CFPlus::UI::Base;
3830 4055
3831 ($draw_x, $draw_y, $draw_w, $draw_h) = 4056 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832 (0, 0, $self->{w}, $self->{h}); 4057 (0, 0, $self->{w}, $self->{h});
3833 }
3834 4058
3835 $self->_draw; 4059 $self->_draw;
4060 }
3836} 4061}
3837 4062
3838############################################################################# 4063#############################################################################
3839 4064
3840package CFClient::UI; 4065package CFPlus::UI;
3841 4066
3842$ROOT = new CFClient::UI::Root; 4067$ROOT = new CFPlus::UI::Root;
3843$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4068$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844 4069
38451 40701
3846 4071

Diff Legend

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