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.315 by root, Wed Jun 28 21:17:01 2006 UTC vs.
Revision 1.387 by root, Fri Jul 20 18:19:45 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 { 552#sub find_widget {
486 my ($self, $x, $y) = @_; 553# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 554
497sub set_parent { 555sub set_parent {
498 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
499 557
500 Scalar::Util::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 559 $self->set_visible if $parent->{visible};
502} 560}
503 561
504sub realloc { 562sub realloc {
505 my ($self) = @_; 563 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 629 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 630 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 631 glVertex 0 , $self->{h} - 1;
574 glEnd; 632 glEnd;
575 glPopMatrix; 633 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 634 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 635 }
578 636
579 $self->_draw; 637 $self->_draw;
580 glPopMatrix; 638 glPopMatrix;
581} 639}
… …
584 my ($self) = @_; 642 my ($self) = @_;
585 643
586 warn "no draw defined for $self\n"; 644 warn "no draw defined for $self\n";
587} 645}
588 646
647my $cntx;#d#
589sub DESTROY { 648sub DESTROY {
590 my ($self) = @_; 649 my ($self) = @_;
591 650
592 delete $WIDGET{$self+0}; 651 return if CFPlus::in_destruct;
593 652
594 eval { $self->destroy }; 653 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 654 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
655
656 delete $WIDGET{$self+0};
596} 657}
597 658
598############################################################################# 659#############################################################################
599 660
600package CFClient::UI::DrawBG; 661package CFPlus::UI::DrawBG;
601 662
602our @ISA = CFClient::UI::Base::; 663our @ISA = CFPlus::UI::Base::;
603 664
604use strict; 665use strict;
605use CFClient::OpenGL; 666use CFPlus::OpenGL;
606 667
607sub new { 668sub new {
608 my $class = shift; 669 my $class = shift;
609 670
610 # range [value, low, high, page] 671 # range [value, low, high, page]
… …
641 } 702 }
642} 703}
643 704
644############################################################################# 705#############################################################################
645 706
646package CFClient::UI::Empty; 707package CFPlus::UI::Empty;
647 708
648our @ISA = CFClient::UI::Base::; 709our @ISA = CFPlus::UI::Base::;
649 710
650sub new { 711sub new {
651 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 713 $class->SUPER::new (can_events => 0, %arg);
653} 714}
… …
660 721
661sub draw { } 722sub draw { }
662 723
663############################################################################# 724#############################################################################
664 725
665package CFClient::UI::Container; 726package CFPlus::UI::Container;
666 727
667our @ISA = CFClient::UI::Base::; 728our @ISA = CFPlus::UI::Base::;
668 729
669sub new { 730sub new {
670 my ($class, %arg) = @_; 731 my ($class, %arg) = @_;
671 732
672 my $children = delete $arg{children}; 733 my $children = delete $arg{children};
… …
681 if $children; 742 if $children;
682 743
683 $self 744 $self
684} 745}
685 746
747sub realloc {
748 my ($self) = @_;
749
750 $self->{force_realloc} = 1;
751 $self->{force_size_alloc} = 1;
752 $self->SUPER::realloc;
753}
754
686sub add { 755sub add {
687 my ($self, @widgets) = @_; 756 my ($self, @widgets) = @_;
688 757
689 $_->set_parent ($self) 758 $_->set_parent ($self)
690 for @widgets; 759 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 819 $_->draw for @{$self->{children}};
751} 820}
752 821
753############################################################################# 822#############################################################################
754 823
755package CFClient::UI::Bin; 824package CFPlus::UI::Bin;
756 825
757our @ISA = CFClient::UI::Container::; 826our @ISA = CFPlus::UI::Container::;
758 827
759sub new { 828sub new {
760 my ($class, %arg) = @_; 829 my ($class, %arg) = @_;
761 830
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 831 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 832
764 $class->SUPER::new (children => [$child], %arg) 833 $class->SUPER::new (children => [$child], %arg)
765} 834}
766 835
767sub add { 836sub add {
… …
774sub remove { 843sub remove {
775 my ($self, $widget) = @_; 844 my ($self, $widget) = @_;
776 845
777 $self->SUPER::remove ($widget); 846 $self->SUPER::remove ($widget);
778 847
779 $self->{children} = [new CFClient::UI::Empty] 848 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 849 unless @{$self->{children}};
781} 850}
782 851
783sub child { $_[0]->{children}[0] } 852sub child { $_[0]->{children}[0] }
784 853
… …
796 865
797############################################################################# 866#############################################################################
798 867
799# back-buffered drawing area 868# back-buffered drawing area
800 869
801package CFClient::UI::Window; 870package CFPlus::UI::Window;
802 871
803our @ISA = CFClient::UI::Bin::; 872our @ISA = CFPlus::UI::Bin::;
804 873
805use CFClient::OpenGL; 874use CFPlus::OpenGL;
806 875
807sub new { 876sub new {
808 my ($class, %arg) = @_; 877 my ($class, %arg) = @_;
809 878
810 my $self = $class->SUPER::new (%arg); 879 my $self = $class->SUPER::new (%arg);
… …
832} 901}
833 902
834sub render_child { 903sub render_child {
835 my ($self) = @_; 904 my ($self) = @_;
836 905
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 906 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 907 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 908 glClear GL_COLOR_BUFFER_BIT;
840 909
841 { 910 {
842 package CFClient::UI::Base; 911 package CFPlus::UI::Base;
843 912
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 913 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 914 (0, 0, $self->{w}, $self->{h});
915
916 $self->_render;
846 } 917 }
847
848 $self->_render;
849 }; 918 };
850} 919}
851 920
852sub _draw { 921sub _draw {
853 my ($self) = @_; 922 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 923
857 my $tex = $self->{texture} 924 my $tex = $self->{texture}
858 or return; 925 or return;
859 926
860 glEnable GL_TEXTURE_2D; 927 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 928 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 929 glColor 0, 0, 0, 1;
863 930
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 931 $tex->draw_quad_alpha_premultiplied (0, 0);
865 932
866 glDisable GL_TEXTURE_2D; 933 glDisable GL_TEXTURE_2D;
867} 934}
868 935
869############################################################################# 936#############################################################################
870 937
871package CFClient::UI::ViewPort; 938package CFPlus::UI::ViewPort;
872 939
940use List::Util qw(min max);
941
873our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
874 943
875sub new { 944sub new {
876 my $class = shift; 945 my $class = shift;
877 946
878 $class->SUPER::new ( 947 $class->SUPER::new (
… …
908} 977}
909 978
910sub set_offset { 979sub set_offset {
911 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
912 981
982 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
983 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
984
985 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 986 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 987 $self->{view_y} = $y;
915 988
989 $self->emit (changed => $x, $y);
916 $self->update; 990 $self->update;
991 }
917} 992}
918 993
919# hmm, this does not work for topleft of $self... but we should not ask for that 994# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 995sub coord2local {
921 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 1011 my ($self, $x, $y) = @_;
937 1012
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1013 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1014 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1015 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1016 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1017 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1018 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1019 }
945} 1020}
946 1021
947sub _render { 1022sub _render {
948 my ($self) = @_; 1023 my ($self) = @_;
949 1024
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1025 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}; 1026 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1027
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1028 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1029
955 $self->SUPER::_render; 1030 $self->SUPER::_render;
956} 1031}
957 1032
958############################################################################# 1033#############################################################################
959 1034
960package CFClient::UI::ScrolledWindow; 1035package CFPlus::UI::ScrolledWindow;
961 1036
962our @ISA = CFClient::UI::HBox::; 1037our @ISA = CFPlus::UI::Table::;
963 1038
964sub new { 1039sub new {
965 my ($class, %arg) = @_; 1040 my ($class, %arg) = @_;
966 1041
967 my $child = delete $arg{child}; 1042 my $child = delete $arg{child};
968 1043
969 my $self; 1044 my $self;
970 1045
971 my $slider = new CFClient::UI::Slider 1046 my $hslider = new CFPlus::UI::Slider
1047 vertical => 0,
1048 range => [0, 0, 1, 0.01], # HACK fix
1049 on_changed => sub {
1050 $self->{hpos} = $_[1];
1051 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 },
1053 ;
1054
1055 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1056 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1057 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1058 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1059 $self->{vpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1061 },
977 ; 1062 ;
978 1063
979 $self = $class->SUPER::new ( 1064 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1065 scroll_x => 0,
1066 scroll_y => 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
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1075 $self->{vp} = new CFPlus::UI::ViewPort
1076 expand => 1,
1077 scroll_x => $self->{scroll_x},
1078 scroll_y => $self->{scroll_y},
1079 on_changed => sub {
1080 my ($vp, $x, $y) = @_;
1081
1082 $vp->{parent}{hslider}->set_value ($x);
1083 $vp->{parent}{vslider}->set_value ($y);
1084
1085 0
1086 },
1087 ;
1088
1089 $self->SUPER::add_at (0, 0, $self->{vp});
1090
986 $self->add ($child) if $child; 1091 $self->add ($child) if $child;
987 1092
988 $self 1093 $self
989} 1094}
990 1095
… …
997} 1102}
998 1103
999sub update_slider { 1104sub update_slider {
1000 my ($self) = @_; 1105 my ($self) = @_;
1001 1106
1107 my $child = ($self->{vp} or return)->child;
1108
1109 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1110 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1111
1112 my $visible = $w1 > $w2;
1113 if ($visible != $self->{hslider}{visible}) {
1114 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1115 : $self->{hslider}->hide;
1116 }
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120
1121 my $visible = $h1 > $h2;
1122 if ($visible != $self->{vslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1124 : $self->{vslider}->hide;
1125 }
1003} 1126}
1004 1127
1005sub update { 1128sub update {
1006 my ($self) = @_; 1129 my ($self) = @_;
1007 1130
1131 $self->update_slider;
1008 $self->SUPER::update; 1132 $self->SUPER::update;
1133}
1009 1134
1010 $self->update_slider; 1135sub invoke_mouse_wheel {
1136 my ($self, $ev) = @_;
1137
1138 return 0 unless $ev->{dy}; # only vertical movements for now
1139
1140 $self->{vslider}->emit (mouse_wheel => $ev);
1141
1142 1
1143}
1144
1145sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_;
1147
1148 if ($ev->{button} == 2) {
1149 $self->grab_focus;
1150
1151 my $ox = $self->{vp}{view_x} + $ev->{x};
1152 my $oy = $self->{vp}{view_y} + $ev->{y};
1153
1154 $self->{motion} = sub {
1155 my ($ev, $x, $y) = @_;
1156
1157 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1158 $self->update;
1159 };
1160
1161 return 1;
1162 }
1163
1164 0
1165}
1166
1167sub invoke_button_up {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if (delete $self->{motion}) {
1171 return 1;
1172 }
1173
1174 0
1175}
1176
1177sub invoke_mouse_motion {
1178 my ($self, $ev, $x, $y) = @_;
1179
1180 if ($self->{motion}) {
1181 $self->{motion}->($ev, $x, $y);
1182 return 1;
1183 }
1184
1185 0
1011} 1186}
1012 1187
1013sub invoke_size_allocate { 1188sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1189 my ($self, $w, $h) = @_;
1015 1190
1016 $self->update_slider; 1191 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1192 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1193}
1020 1194
1021############################################################################# 1195#############################################################################
1022 1196
1023package CFClient::UI::Frame; 1197package CFPlus::UI::Frame;
1024 1198
1025our @ISA = CFClient::UI::Bin::; 1199our @ISA = CFPlus::UI::Bin::;
1026 1200
1027use CFClient::OpenGL; 1201use CFPlus::OpenGL;
1028 1202
1029sub new { 1203sub new {
1030 my $class = shift; 1204 my $class = shift;
1031 1205
1032 $class->SUPER::new ( 1206 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1232 $self->SUPER::_draw;
1059} 1233}
1060 1234
1061############################################################################# 1235#############################################################################
1062 1236
1063package CFClient::UI::FancyFrame; 1237package CFPlus::UI::FancyFrame;
1064 1238
1065our @ISA = CFClient::UI::Bin::; 1239our @ISA = CFPlus::UI::Bin::;
1066 1240
1067use CFClient::OpenGL; 1241use CFPlus::OpenGL;
1242
1243sub new {
1244 my ($class, %arg) = @_;
1245
1246 if ((exists $arg{label}) && !ref $arg{label}) {
1247 $arg{label} = new CFPlus::UI::Label
1248 align => 1,
1249 valign => 0,
1250 text => $arg{label},
1251 fontsize => ($arg{border} || 0.8) * 0.75;
1252 }
1253
1254 my $self = $class->SUPER::new (
1255 # label => "",
1256 fg => [0.6, 0.3, 0.1],
1257 border => 0.8,
1258 style => 'single',
1259 %arg,
1260 );
1261
1262 $self
1263}
1264
1265sub add {
1266 my ($self, @widgets) = @_;
1267
1268 $self->SUPER::add (@widgets);
1269 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1270}
1271
1272sub border {
1273 int $_[0]{border} * $::FONTSIZE
1274}
1275
1276sub size_request {
1277 my ($self) = @_;
1278
1279 ($self->{label_w}, undef) = $self->{label}->size_request
1280 if $self->{label};
1281
1282 my ($w, $h) = $self->SUPER::size_request;
1283
1284 (
1285 $w + $self->border * 2,
1286 $h + $self->border * 2,
1287 )
1288}
1289
1290sub invoke_size_allocate {
1291 my ($self, $w, $h) = @_;
1292
1293 my $border = $self->border;
1294
1295 $w -= List::Util::max 0, $border * 2;
1296 $h -= List::Util::max 0, $border * 2;
1297
1298 if (my $label = $self->{label}) {
1299 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1300 $label->{h} = List::Util::min $h, $border;
1301 $label->invoke_size_allocate ($label->{w}, $label->{h});
1302 }
1303
1304 $self->child->configure ($border, $border, $w, $h);
1305
1306 1
1307}
1308
1309sub _draw {
1310 my ($self) = @_;
1311
1312 my $child = $self->{children}[0];
1313
1314 my $border = $self->border;
1315 my ($w, $h) = ($self->{w}, $self->{h});
1316
1317 $child->draw;
1318
1319 glColor @{$self->{fg}};
1320 glBegin GL_LINE_STRIP;
1321 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1322 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1323 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1324 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1325 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1327 glEnd;
1328
1329 if ($self->{label}) {
1330 glTranslate $border * 2, 0;
1331 $self->{label}->_draw;
1332 }
1333}
1334
1335#############################################################################
1336
1337package CFPlus::UI::Toplevel;
1338
1339our @ISA = CFPlus::UI::Bin::;
1340
1341use CFPlus::OpenGL;
1068 1342
1069my $bg = 1343my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1344 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1345 mipmap => 1, wrap => 1;
1072 1346
1073my @border = 1347my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1348 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); 1349 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1350
1351my @icon =
1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353 qw(x1_move.png x1_resize.png);
1076 1354
1077sub new { 1355sub new {
1078 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1079 1357
1080 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1361 border => 0.6,
1084 can_events => 1, 1362 can_events => 1,
1085 min_w => 16, 1363 min_w => 64,
1086 min_h => 16, 1364 min_h => 32,
1087 %arg, 1365 %arg,
1088 ); 1366 );
1089 1367
1090 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1369 align => 0,
1092 valign => 1, 1370 valign => 1,
1093 text => $self->{title}, 1371 text => $self->{title},
1094 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1095 if exists $self->{title}; 1373 if exists $self->{title};
1096 1374
1097 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1376 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1378 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1379 on_activate => sub { $self->emit ("delete") };
1102 1380
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1382 }
1105 1383
1106 $self 1384 $self
1107} 1385}
1108 1386
1109sub add { 1387sub add {
1110 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1111 1389
1112 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1391 $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}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1393}
1116 1394
1117sub border { 1395sub border {
1118 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1119} 1397}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1430 $self->child->configure ($border, $border, $w, $h);
1153 1431
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1432 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1433 if $self->{close_button};
1156 1434
1435 1
1436}
1437
1438sub invoke_delete {
1439 my ($self) = @_;
1440
1441 $self->hide;
1442
1157 1 1443 1
1158} 1444}
1159 1445
1160sub invoke_button_down { 1446sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1447 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1506
1221 ! ! $self->{motion} 1507 ! ! $self->{motion}
1222} 1508}
1223 1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1516}
1517
1224sub _draw { 1518sub _draw {
1225 my ($self) = @_; 1519 my ($self) = @_;
1226 1520
1227 my $child = $self->{children}[0]; 1521 my $child = $self->{children}[0];
1228 1522
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1528
1235 my $border = $self->border; 1529 my $border = $self->border;
1236 1530
1237 glColor @{ $self->{border_bg} }; 1531 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1532 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1533 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1534 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1535 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1536
1537 # move
1538 my $w2 = ($w - $border) * .5;
1539 my $h2 = ($h - $border) * .5;
1540 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1541 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1542 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1543
1544 # resize
1545 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1546 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1547 unless $self->{has_close_button};
1548 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1550
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1551 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1552 glColor @{ $self->{bg} };
1245 1553
1246 # TODO: repeat texture not scale 1554 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1573 if $self->{close_button};
1266} 1574}
1267 1575
1268############################################################################# 1576#############################################################################
1269 1577
1270package CFClient::UI::Table; 1578package CFPlus::UI::Table;
1271 1579
1272our @ISA = CFClient::UI::Base::; 1580our @ISA = CFPlus::UI::Base::;
1273 1581
1274use List::Util qw(max sum); 1582use List::Util qw(max sum);
1275 1583
1276use CFClient::OpenGL; 1584use CFPlus::OpenGL;
1277 1585
1278sub new { 1586sub new {
1279 my $class = shift; 1587 my $class = shift;
1280 1588
1281 $class->SUPER::new ( 1589 $class->SUPER::new (
1590 children => [],
1282 col_expand => [], 1591 col_expand => [],
1592 row_expand => [],
1283 @_, 1593 @_,
1284 ) 1594 )
1285} 1595}
1286 1596
1287sub children { 1597sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1598 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1599}
1290 1600
1601# TODO: store row/col info in child widget and use standard add/del
1291sub add { 1602sub add {
1292 my ($self, $x, $y, $child) = @_; 1603 my $self = shift;
1293 1604
1605 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1606 $self->add_at (@_);
1607}
1608
1609sub add_at {
1610 my $self = shift;
1611
1612 while (@_) {
1613 my ($col, $row, $child) = splice @_, 0, 3, ();
1614
1294 $child->set_parent ($self); 1615 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1616 $self->{children}[$row][$col] = $child;
1617 }
1296 1618
1619 $self->{force_realloc} = 1;
1620 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1621 $self->realloc;
1298} 1622}
1299 1623
1300sub remove { 1624sub remove {
1301 my ($self, $child) = @_; 1625 my ($self, $child) = @_;
1302 1626
1303 # TODO: not yet implemented 1627 for (@{ $self->{children} }) {
1628 for (@{ $_ || [] }) {
1629 $_ = undef if $_ == $child;
1630 }
1631 }
1304} 1632}
1305 1633
1306# TODO: move to container class maybe? send children a signal on removal? 1634# TODO: move to container class maybe? send children a signal on removal?
1307sub clear { 1635sub clear {
1308 my ($self) = @_; 1636 my ($self) = @_;
… …
1357 my ($ws, $hs) = $self->get_wh; 1685 my ($ws, $hs) = $self->get_wh;
1358 1686
1359 my $req_w = (sum @$ws) || 1; 1687 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1688 my $req_h = (sum @$hs) || 1;
1361 1689
1362 # TODO: nicer code && do row_expand 1690 # TODO: nicer code
1363 my @col_expand = @{$self->{col_expand}}; 1691 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1692 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1693 my $col_expand = (sum @col_expand) || 1;
1366 1694
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1695 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1696
1371 CFClient::UI::harmonize $ws; 1697 CFPlus::UI::harmonize $ws;
1698
1699 my @row_expand = @{$self->{row_expand}};
1700 @row_expand = (1) x @$ws unless @row_expand;
1701 my $row_expand = (sum @row_expand) || 1;
1702
1703 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1704
1372 CFClient::UI::harmonize $hs; 1705 CFPlus::UI::harmonize $hs;
1373 1706
1374 my $y; 1707 my $y;
1375 1708
1376 for my $r (0 .. $#{$self->{children}}) { 1709 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1710 my $row = $self->{children}[$r]
… …
1420 } 1753 }
1421} 1754}
1422 1755
1423############################################################################# 1756#############################################################################
1424 1757
1425package CFClient::UI::Box; 1758package CFPlus::UI::Fixed;
1426 1759
1760use List::Util qw(min max);
1761
1427our @ISA = CFClient::UI::Container::; 1762our @ISA = CFPlus::UI::Container::;
1763
1764sub add {
1765 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1766
1767 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1768 $self->SUPER::add ($child);
1769}
1770
1771sub _scale($$$) {
1772 my ($mode, $val, $max) = @_;
1773
1774 $mode eq "abs" ? $val
1775 : $mode eq "rel" ? $val * $max
1776 : 0
1777}
1778
1779sub size_request {
1780 my ($self) = @_;
1781
1782 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1783
1784 # determine overall size by querying abs widgets
1785 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1787
1788 if ($pos eq "abs") {
1789 $w = _scale $size, $w, $child->{req_w};
1790 $h = _scale $size, $h, $child->{req_h};
1791
1792 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1793 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1794 }
1795 }
1796
1797 my $W = $x2 - $x1;
1798 my $H = $y2 - $y1;
1799
1800 # now layout remaining widgets
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 if ($pos ne "abs") {
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1811 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1812 }
1813 }
1814
1815 my $W = $x2 - $x1;
1816 my $H = $y2 - $y1;
1817
1818 ($W, $H)
1819}
1820
1821sub invoke_size_allocate {
1822 my ($self, $W, $H) = @_;
1823
1824 for my $child ($self->visible_children) {
1825 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1826
1827 $x = _scale $pos, $x, $W;
1828 $y = _scale $pos, $x, $H;
1829 $w = _scale $size, $w, $child->{req_w};
1830 $h = _scale $size, $h, $child->{req_h};
1831
1832 $child->configure ($x, $y, $w, $h);
1833 }
1834
1835 1
1836}
1837
1838#############################################################################
1839
1840package CFPlus::UI::Box;
1841
1842our @ISA = CFPlus::UI::Container::;
1428 1843
1429sub size_request { 1844sub size_request {
1430 my ($self) = @_; 1845 my ($self) = @_;
1431 1846
1432 $self->{vertical} 1847 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1880 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1881 for 0 .. $#children;
1467 } 1882 }
1468 } 1883 }
1469 1884
1470 CFClient::UI::harmonize \@req; 1885 CFPlus::UI::harmonize \@req;
1471 1886
1472 my $pos = 0; 1887 my $pos = 0;
1473 for (0 .. $#children) { 1888 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1889 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1890 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1895 1
1481} 1896}
1482 1897
1483############################################################################# 1898#############################################################################
1484 1899
1485package CFClient::UI::HBox; 1900package CFPlus::UI::HBox;
1486 1901
1487our @ISA = CFClient::UI::Box::; 1902our @ISA = CFPlus::UI::Box::;
1488 1903
1489sub new { 1904sub new {
1490 my $class = shift; 1905 my $class = shift;
1491 1906
1492 $class->SUPER::new ( 1907 $class->SUPER::new (
… …
1495 ) 1910 )
1496} 1911}
1497 1912
1498############################################################################# 1913#############################################################################
1499 1914
1500package CFClient::UI::VBox; 1915package CFPlus::UI::VBox;
1501 1916
1502our @ISA = CFClient::UI::Box::; 1917our @ISA = CFPlus::UI::Box::;
1503 1918
1504sub new { 1919sub new {
1505 my $class = shift; 1920 my $class = shift;
1506 1921
1507 $class->SUPER::new ( 1922 $class->SUPER::new (
… …
1510 ) 1925 )
1511} 1926}
1512 1927
1513############################################################################# 1928#############################################################################
1514 1929
1515package CFClient::UI::Label; 1930package CFPlus::UI::Label;
1516 1931
1517our @ISA = CFClient::UI::DrawBG::; 1932our @ISA = CFPlus::UI::DrawBG::;
1518 1933
1519use CFClient::OpenGL; 1934use CFPlus::OpenGL;
1520 1935
1521sub new { 1936sub new {
1522 my ($class, %arg) = @_; 1937 my ($class, %arg) = @_;
1523 1938
1524 my $self = $class->SUPER::new ( 1939 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1942 #active_bg => none
1528 #font => default_font 1943 #font => default_font
1529 #text => initial text 1944 #text => initial text
1530 #markup => initial narkup 1945 #markup => initial narkup
1531 #max_w => maximum pixel width 1946 #max_w => maximum pixel width
1947 #style => 0, # render flags
1532 ellipsise => 3, # end 1948 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1949 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1950 fontsize => 1,
1535 align => -1, 1951 align => -1,
1536 valign => -1, 1952 valign => -1,
1537 padding_x => 2, 1953 padding_x => 2,
1538 padding_y => 2, 1954 padding_y => 2,
1539 can_events => 0, 1955 can_events => 0,
1540 %arg 1956 %arg
1541 ); 1957 );
1542 1958
1543 if (exists $self->{template}) { 1959 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1960 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1961 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1962 $self->{template} = $layout;
1547 } 1963 }
1548 1964
1549 if (exists $self->{markup}) { 1965 if (exists $self->{markup}) {
… …
1553 } 1969 }
1554 1970
1555 $self 1971 $self
1556} 1972}
1557 1973
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1974sub update {
1569 my ($self) = @_; 1975 my ($self) = @_;
1570 1976
1571 delete $self->{texture}; 1977 delete $self->{texture};
1572 $self->SUPER::update; 1978 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1989 my ($self, $text) = @_;
1584 1990
1585 return if $self->{text} eq "T$text"; 1991 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1992 $self->{text} = "T$text";
1587 1993
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1994 $self->{layout}->set_text ($text);
1590 1995
1591 delete $self->{size_req}; 1996 delete $self->{size_req};
1592 $self->realloc; 1997 $self->realloc;
1593 $self->update; 1998 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 2004 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 2005 $self->{text} = "M$markup";
1601 2006
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2007 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 2008
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 2009 $self->{layout}->set_markup ($markup);
1606 2010
1607 delete $self->{size_req}; 2011 delete $self->{size_req};
1608 $self->realloc; 2012 $self->realloc;
1609 $self->update; 2013 $self->update;
… …
1621 2025
1622 my ($w, $h) = $self->{layout}->size; 2026 my ($w, $h) = $self->{layout}->size;
1623 2027
1624 if (exists $self->{template}) { 2028 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 2029 $self->{template}->set_font ($self->{font}) if $self->{font};
2030 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 2032
1628 my ($w2, $h2) = $self->{template}->size; 2033 my ($w2, $h2) = $self->{template}->size;
1629 2034
1630 $w = List::Util::max $w, $w2; 2035 $w = List::Util::max $w, $w2;
… …
1654 2059
1655sub set_fontsize { 2060sub set_fontsize {
1656 my ($self, $fontsize) = @_; 2061 my ($self, $fontsize) = @_;
1657 2062
1658 $self->{fontsize} = $fontsize; 2063 $self->{fontsize} = $fontsize;
2064 delete $self->{size_req};
1659 delete $self->{texture}; 2065 delete $self->{texture};
1660 2066
1661 $self->realloc; 2067 $self->realloc;
1662} 2068}
1663 2069
1664sub reconfigure { 2070sub reconfigure {
1665 my ($self) = @_; 2071 my ($self) = @_;
1666 2072
1667 delete $self->{size_req}; 2073 delete $self->{size_req};
2074 delete $self->{texture};
1668 2075
1669 $self->SUPER::reconfigure; 2076 $self->SUPER::reconfigure;
1670} 2077}
1671 2078
1672sub _draw { 2079sub _draw {
1673 my ($self) = @_; 2080 my ($self) = @_;
1674 2081
1675 $self->SUPER::_draw; # draw background, if applicable 2082 $self->SUPER::_draw; # draw background, if applicable
1676 2083
1677 my $tex = $self->{texture} ||= do { 2084 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2085 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2086 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2087 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2088 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2089 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2090 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2091
1685 new_from_layout CFClient::Texture $self->{layout} 2092 [$self->{layout}->size]
1686 }; 2093 };
1687 2094
1688 unless (exists $self->{ox}) { 2095 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2096 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2097 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2098 : ($self->{w} - $size->[0]) * 0.5);
1692 2099
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2100 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2101 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2102 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2103 };
1697 2104
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2105 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2106 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 2107
1703 if ($tex->{format} == GL_ALPHA) { 2108 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 2109}
1714 2110
1715############################################################################# 2111#############################################################################
1716 2112
1717package CFClient::UI::EntryBase; 2113package CFPlus::UI::EntryBase;
1718 2114
1719our @ISA = CFClient::UI::Label::; 2115our @ISA = CFPlus::UI::Label::;
1720 2116
1721use CFClient::OpenGL; 2117use CFPlus::OpenGL;
1722 2118
1723sub new { 2119sub new {
1724 my $class = shift; 2120 my $class = shift;
1725 2121
1726 $class->SUPER::new ( 2122 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2126 active_fg => [0, 0, 0],
1731 can_hover => 1, 2127 can_hover => 1,
1732 can_focus => 1, 2128 can_focus => 1,
1733 valign => 0, 2129 valign => 0,
1734 can_events => 1, 2130 can_events => 1,
2131 ellipsise => 0,
1735 #text => ... 2132 #text => ...
1736 #hidden => "*", 2133 #hidden => "*",
1737 @_ 2134 @_
1738 ) 2135 )
1739} 2136}
… …
1784 my $sym = $ev->{sym}; 2181 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2182 my $uni = $ev->{unicode};
1786 2183
1787 my $text = $self->get_text; 2184 my $text = $self->get_text;
1788 2185
2186 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2187
1789 if ($uni == 8) { 2188 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2190 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2191 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2192 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2193 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2194 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2195 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2196 } elsif ($sym == CFPlus::SDLK_HOME) {
2197 # what a hack
2198 $self->{cursor} =
2199 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2200 ? length $1
2201 : 0;
2202 } elsif ($sym == CFPlus::SDLK_END) {
2203 # uh, again
2204 $self->{cursor} =
2205 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2206 ? $self->{cursor} + length $1
2207 : length $self->{text};
2208 } elsif ($uni == 21) { # ctrl-u
2209 $text = "";
1798 $self->{cursor} = 0; 2210 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2211 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2212 $self->emit ('escape');
1803 } elsif ($uni) { 2213 } elsif ($uni == 0x0d) {
2214 substr $text, $self->{cursor}++, 0, "\012";
2215 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2216 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2217 } else {
1806 return 0; 2218 return 0;
1807 } 2219 }
1808 2220
1809 $self->_set_text ($text); 2221 $self->_set_text ($text);
1810 2222
1811 $self->realloc; 2223 $self->realloc;
2224 $self->update;
1812 2225
1813 1 2226 1
1814} 2227}
1815 2228
1816sub invoke_focus_in { 2229sub invoke_focus_in {
… …
1828 2241
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2242 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2243
1831 # byte-index to char-index 2244 # byte-index to char-index
1832 my $text = $self->{text}; 2245 my $text = $self->{text};
1833 utf8::encode $text; 2246 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2247 $self->{cursor} = length $text;
1835 2248
1836 $self->_set_text ($self->{text}); 2249 $self->_set_text ($self->{text});
1837 $self->update; 2250 $self->update;
1838 2251
1839 1 2252 1
… …
1878 utf8::encode $text; 2291 utf8::encode $text;
1879 2292
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2293 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2294 }
1882 2295
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2296 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2297 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2299 glEnd;
1888 } 2300 }
1889} 2301}
1890 2302
2303#############################################################################
2304
1891package CFClient::UI::Entry; 2305package CFPlus::UI::Entry;
1892 2306
1893our @ISA = CFClient::UI::EntryBase::; 2307our @ISA = CFPlus::UI::EntryBase::;
1894 2308
1895use CFClient::OpenGL; 2309use CFPlus::OpenGL;
1896 2310
1897sub invoke_key_down { 2311sub invoke_key_down {
1898 my ($self, $ev) = @_; 2312 my ($self, $ev) = @_;
1899 2313
1900 my $sym = $ev->{sym}; 2314 my $sym = $ev->{sym};
1901 2315
1902 if ($sym == 13) { 2316 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2317 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2318 my $txt = $self->get_text;
1905 2319
1906 $self->{history_pointer} = -1; 2320 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2321 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2322 $self->emit (activate => $txt);
1909 $self->update; 2323 $self->update;
1910 2324
1911 } elsif ($sym == CFClient::SDLK_UP) { 2325 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2326 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2327 $self->{history_saveback} = $self->get_text;
1914 } 2328 }
1915 if (@{$self->{history} || []} > 0) { 2329 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2330 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2332 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2333 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2334 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2335 }
1922 2336
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2337 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2338 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2339 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2340
1927 if ($self->{history_pointer} >= 0) { 2341 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2342 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2351 1
1938} 2352}
1939 2353
1940############################################################################# 2354#############################################################################
1941 2355
2356package CFPlus::UI::TextEdit;
2357
2358our @ISA = CFPlus::UI::EntryBase::;
2359
2360use CFPlus::OpenGL;
2361
2362sub move_cursor_ver {
2363 my ($self, $dy) = @_;
2364
2365 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2366
2367 $y += $dy;
2368
2369 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2370 $self->{cursor} = $index;
2371 delete $self->{cur_h};
2372 $self->update;
2373 return;
2374 }
2375}
2376
2377sub invoke_key_down {
2378 my ($self, $ev) = @_;
2379
2380 my $sym = $ev->{sym};
2381
2382 if ($sym == CFPlus::SDLK_UP) {
2383 $self->move_cursor_ver (-1);
2384 } elsif ($sym == CFPlus::SDLK_DOWN) {
2385 $self->move_cursor_ver (+1);
2386 } else {
2387 return $self->SUPER::invoke_key_down ($ev)
2388 }
2389
2390 1
2391}
2392
2393#############################################################################
2394
1942package CFClient::UI::Button; 2395package CFPlus::UI::Button;
1943 2396
1944our @ISA = CFClient::UI::Label::; 2397our @ISA = CFPlus::UI::Label::;
1945 2398
1946use CFClient::OpenGL; 2399use CFPlus::OpenGL;
1947 2400
1948my @tex = 2401my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2402 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2403 qw(b1_button_inactive.png b1_button_active.png);
1951 2404
1952sub new { 2405sub new {
1953 my $class = shift; 2406 my $class = shift;
1954 2407
1955 $class->SUPER::new ( 2408 $class->SUPER::new (
1956 padding_x => 4, 2409 padding_x => 4,
1957 padding_y => 4, 2410 padding_y => 4,
1958 fg => [1, 1, 1], 2411 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2412 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2413 can_hover => 1,
1961 align => 0, 2414 align => 0,
1962 valign => 0, 2415 valign => 0,
1963 can_events => 1, 2416 can_events => 1,
1964 @_ 2417 @_
… …
1982 2435
1983 glEnable GL_TEXTURE_2D; 2436 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2437 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2438 glColor 0, 0, 0, 1;
1986 2439
2440 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2441 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2442
1989 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1990 2444
1991 $self->SUPER::_draw; 2445 $self->SUPER::_draw;
1992} 2446}
1993 2447
1994############################################################################# 2448#############################################################################
1995 2449
2450package CFPlus::UI::CheckBox;
2451
2452our @ISA = CFPlus::UI::DrawBG::;
2453
2454my @tex =
2455 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2456 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2457
2458use CFPlus::OpenGL;
2459
2460sub new {
2461 my $class = shift;
2462
2463 $class->SUPER::new (
2464 padding_x => 2,
2465 padding_y => 2,
2466 fg => [1, 1, 1],
2467 active_fg => [1, 1, 0],
2468 bg => [0, 0, 0, 0.2],
2469 active_bg => [1, 1, 1, 0.5],
2470 state => 0,
2471 can_hover => 1,
2472 @_
2473 )
2474}
2475
2476sub size_request {
2477 my ($self) = @_;
2478
2479 (6) x 2
2480}
2481
2482sub toggle {
2483 my ($self) = @_;
2484
2485 $self->{state} = !$self->{state};
2486 $self->emit (changed => $self->{state});
2487 $self->update;
2488}
2489
2490sub invoke_button_down {
2491 my ($self, $ev, $x, $y) = @_;
2492
2493 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2494 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2495 $self->toggle;
2496 } else {
2497 return 0
2498 }
2499
2500 1
2501}
2502
2503sub _draw {
2504 my ($self) = @_;
2505
2506 $self->SUPER::_draw;
2507
2508 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2509
2510 my ($w, $h) = @$self{qw(w h)};
2511
2512 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2513
2514 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2515
2516 my $tex = $self->{state} ? $tex[1] : $tex[0];
2517
2518 glEnable GL_TEXTURE_2D;
2519 $tex->draw_quad_alpha (0, 0, $s, $s);
2520 glDisable GL_TEXTURE_2D;
2521}
2522
2523#############################################################################
2524
2525package CFPlus::UI::Image;
2526
2527our @ISA = CFPlus::UI::Base::;
2528
2529use CFPlus::OpenGL;
2530
2531our %texture_cache;
2532
2533sub new {
2534 my $class = shift;
2535
2536 my $self = $class->SUPER::new (
2537 can_events => 0,
2538 @_,
2539 );
2540
2541 $self->{path} || $self->{tex}
2542 or Carp::croak "'path' or 'tex' attributes required";
2543
2544 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2545 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2546
2547 CFPlus::weaken $texture_cache{$self->{path}};
2548
2549 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2550
2551 $self
2552}
2553
2554sub STORABLE_freeze {
2555 my ($self, $cloning) = @_;
2556
2557 $self->{path}
2558 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2559
2560 $self->{path}
2561}
2562
2563sub STORABLE_attach {
2564 my ($self, $cloning, $path) = @_;
2565
2566 $self->new (path => $path)
2567}
2568
2569sub size_request {
2570 my ($self) = @_;
2571
2572 ($self->{tex}{w}, $self->{tex}{h})
2573}
2574
2575sub _draw {
2576 my ($self) = @_;
2577
2578 my $tex = $self->{tex};
2579
2580 my ($w, $h) = ($self->{w}, $self->{h});
2581
2582 if ($self->{rot90}) {
2583 glRotate 90, 0, 0, 1;
2584 glTranslate 0, -$self->{w}, 0;
2585
2586 ($w, $h) = ($h, $w);
2587 }
2588
2589 glEnable GL_TEXTURE_2D;
2590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2591
2592 $tex->draw_quad (0, 0, $w, $h);
2593
2594 glDisable GL_TEXTURE_2D;
2595}
2596
2597#############################################################################
2598
1996package CFClient::UI::ImageButton; 2599package CFPlus::UI::ImageButton;
1997 2600
1998our @ISA = CFClient::UI::Image::; 2601our @ISA = CFPlus::UI::Image::;
1999 2602
2000use CFClient::OpenGL; 2603use CFPlus::OpenGL;
2001 2604
2002my %textures; 2605my %textures;
2003 2606
2004sub new { 2607sub new {
2005 my $class = shift; 2608 my $class = shift;
… …
2027 1 2630 1
2028} 2631}
2029 2632
2030############################################################################# 2633#############################################################################
2031 2634
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2635package CFPlus::UI::VGauge;
2101 2636
2102our @ISA = CFClient::UI::Base::; 2637our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2638
2163use List::Util qw(min max); 2639use List::Util qw(min max);
2164 2640
2165use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2166 2642
2167my %tex = ( 2643my %tex = (
2168 food => [ 2644 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2645 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2646 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2647 ],
2172 grace => [ 2648 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2649 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2650 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2651 ],
2176 hp => [ 2652 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2654 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2655 ],
2180 mana => [ 2656 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2658 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2659 ],
2184); 2660);
2185 2661
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2662# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2722 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2723 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2724
2249 my $h1 = $self->{h} * (1 - $ycut1); 2725 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2726 my $h2 = $self->{h} * (1 - $ycut2);
2727 my $h3 = $self->{h};
2728
2729 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2730
2252 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2732 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2734 glEnable GL_TEXTURE_2D;
… …
2274 2753
2275 if ($t3) { 2754 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2755 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2756 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2757 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2758 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2759 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2760 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2761 glEnd;
2283 } 2762 }
2284 2763
2285 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2765 glDisable GL_TEXTURE_2D;
2287} 2766}
2288 2767
2289############################################################################# 2768#############################################################################
2290 2769
2291package CFClient::UI::Gauge; 2770package CFPlus::UI::Gauge;
2292 2771
2293our @ISA = CFClient::UI::VBox::; 2772our @ISA = CFPlus::UI::VBox::;
2294 2773
2295sub new { 2774sub new {
2296 my ($class, %arg) = @_; 2775 my ($class, %arg) = @_;
2297 2776
2298 my $self = $class->SUPER::new ( 2777 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2779 can_hover => 1,
2301 can_events => 1, 2780 can_events => 1,
2302 %arg, 2781 %arg,
2303 ); 2782 );
2304 2783
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2784 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2785 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2786 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2787
2309 $self 2788 $self
2310} 2789}
2311 2790
2312sub set_fontsize { 2791sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2812 $self->{value}->set_text ($val);
2334} 2813}
2335 2814
2336############################################################################# 2815#############################################################################
2337 2816
2338package CFClient::UI::Slider; 2817package CFPlus::UI::Slider;
2339 2818
2340use strict; 2819use strict;
2341 2820
2342use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2343 2822
2344our @ISA = CFClient::UI::DrawBG::; 2823our @ISA = CFPlus::UI::DrawBG::;
2345 2824
2346my @tex = 2825my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2826 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2827 qw(s1_slider.png s1_slider_bg.png);
2349 2828
2350sub new { 2829sub new {
2351 my $class = shift; 2830 my $class = shift;
2352 2831
… …
2441 } 2920 }
2442 2921
2443 1 2922 1
2444} 2923}
2445 2924
2925sub invoke_mouse_wheel {
2926 my ($self, $ev) = @_;
2927
2928 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2929
2930 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2931
2932 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2933
2934 ! ! $delta
2935}
2936
2446sub update { 2937sub update {
2447 my ($self) = @_; 2938 my ($self) = @_;
2448 2939
2449 delete $self->{knob_w}; 2940 delete $self->{knob_w};
2450 $self->SUPER::update; 2941 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2988 glDisable GL_TEXTURE_2D;
2498} 2989}
2499 2990
2500############################################################################# 2991#############################################################################
2501 2992
2502package CFClient::UI::ValSlider; 2993package CFPlus::UI::ValSlider;
2503 2994
2504our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2505 2996
2506sub new { 2997sub new {
2507 my ($class, %arg) = @_; 2998 my ($class, %arg) = @_;
2508 2999
2509 my $range = delete $arg{range}; 3000 my $range = delete $arg{range};
2510 3001
2511 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3003 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3004 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 3005 to_value => sub { shift },
2515 from_value => sub { shift }, 3006 from_value => sub { shift },
2516 %arg, 3007 %arg,
2517 ); 3008 );
2518 3009
… …
2538sub set_range { shift->{slider}->set_range (@_) } 3029sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 3030sub set_value { shift->{slider}->set_value (@_) }
2540 3031
2541############################################################################# 3032#############################################################################
2542 3033
2543package CFClient::UI::TextScroller; 3034package CFPlus::UI::TextScroller;
2544 3035
2545our @ISA = CFClient::UI::HBox::; 3036our @ISA = CFPlus::UI::HBox::;
2546 3037
2547use CFClient::OpenGL; 3038use CFPlus::OpenGL;
2548 3039
2549sub new { 3040sub new {
2550 my $class = shift; 3041 my $class = shift;
2551 3042
2552 my $self = $class->SUPER::new ( 3043 my $self = $class->SUPER::new (
2553 fontsize => 1, 3044 fontsize => 1,
2554 can_events => 0, 3045 can_events => 1,
2555 indent => 0, 3046 indent => 0,
2556 #font => default_font 3047 #font => default_font
2557 @_, 3048 @_,
2558 3049
2559 layout => (new CFClient::Layout 1), 3050 layout => (new CFPlus::Layout),
2560 par => [], 3051 par => [],
3052 max_par => 0,
2561 height => 0, 3053 height => 0,
2562 children => [ 3054 children => [
2563 (new CFClient::UI::Empty expand => 1), 3055 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 3056 (new CFPlus::UI::Slider vertical => 1),
2565 ], 3057 ],
2566 ); 3058 );
2567 3059
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3060 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3061
… …
2599 3091
2600 $self->reflow; 3092 $self->reflow;
2601 3093
2602 local $self->{children} = [$empty, $slider]; 3094 local $self->{children} = [$empty, $slider];
2603 $self->SUPER::invoke_size_allocate ($w, $h) 3095 $self->SUPER::invoke_size_allocate ($w, $h)
3096}
3097
3098sub invoke_mouse_wheel {
3099 my ($self, $ev) = @_;
3100
3101 return 0 unless $ev->{dy}; # only vertical movements
3102
3103 $self->{children}[1]->emit (mouse_wheel => $ev);
3104
3105 1
2604} 3106}
2605 3107
2606sub get_layout { 3108sub get_layout {
2607 my ($self, $para) = @_; 3109 my ($self, $para) = @_;
2608 3110
… …
2636 3138
2637 # todo: base offset on lines or so, not on pixels 3139 # todo: base offset on lines or so, not on pixels
2638 $self->{children}[1]->set_value ($offset); 3140 $self->{children}[1]->set_value ($offset);
2639} 3141}
2640 3142
3143sub current_paragraph {
3144 my ($self) = @_;
3145
3146 $self->{top_paragraph} - 1
3147}
3148
3149sub scroll_to {
3150 my ($self, $para) = @_;
3151
3152 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3153
3154 $self->{scroll_to} = $para;
3155 $self->update;
3156}
3157
2641sub clear { 3158sub clear {
2642 my ($self) = @_; 3159 my ($self) = @_;
2643 3160
2644 my (undef, undef, @other) = @{ $self->{children} }; 3161 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other; 3162 $self->remove ($_) for @other;
… …
2648 $self->{height} = 0; 3165 $self->{height} = 0;
2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3166 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650} 3167}
2651 3168
2652sub add_paragraph { 3169sub add_paragraph {
2653 my ($self, $color, $para, $indent) = @_; 3170 my $self = shift;
2654 3171
2655 my ($text, @w) = ref $para ? @$para : $para; 3172 for my $para (@_) {
2656
2657 $para = { 3173 $para = {
3174 fg => [1, 1, 1, 1],
3175 indent => 0,
3176 markup => "",
3177 widget => [],
3178 ref $para ? %$para : (markup => $para),
2658 w => 1e10, 3179 w => 1e10,
2659 wrapped => 1, 3180 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 }; 3181 };
2665 3182
2666 $self->add (@w) if @w; 3183 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667 push @{$self->{par}}, $para; 3184 push @{$self->{par}}, $para;
3185 }
3186
3187 if (my $max = $self->{max_par}) {
3188 shift @{$self->{par}} while @{$self->{par}} > $max;
3189 }
2668 3190
2669 $self->{need_reflow}++; 3191 $self->{need_reflow}++;
2670 $self->update; 3192 $self->update;
2671} 3193}
2672 3194
2673sub scroll_to_bottom { 3195sub scroll_to_bottom {
2674 my ($self) = @_; 3196 my ($self) = @_;
2675 3197
2676 $self->{scroll_to_bottom} = 1; 3198 $self->{scroll_to} = $#{$self->{par}};
2677 $self->update; 3199 $self->update;
2678} 3200}
2679 3201
3202sub force_uptodate {
3203 my ($self) = @_;
3204
3205 if (delete $self->{need_reflow}) {
3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3207
3208 my $height = 0;
3209
3210 for my $para (@{$self->{par}}) {
3211 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3212 my $layout = $self->get_layout ($para);
3213 my ($w, $h) = $layout->size;
3214
3215 $para->{w} = $w + $para->{indent};
3216 $para->{h} = $h;
3217 $para->{wrapped} = $layout->has_wrapped;
3218 }
3219
3220 $para->{y} = $height;
3221 $height += $para->{h};
3222 }
3223
3224 $self->{height} = $height;
3225 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3226
3227 delete $self->{texture};
3228 }
3229
3230 if (my $paridx = delete $self->{scroll_to}) {
3231 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3232 }
3233}
3234
2680sub update { 3235sub update {
2681 my ($self) = @_; 3236 my ($self) = @_;
2682 3237
2683 $self->SUPER::update; 3238 $self->SUPER::update;
2684 3239
2685 return unless $self->{h} > 0; 3240 return unless $self->{h} > 0;
2686 3241
2687 delete $self->{texture}; 3242 delete $self->{texture};
2688 3243
2689 $ROOT->on_post_alloc ($self => sub { 3244 $ROOT->on_post_alloc ($self => sub {
3245 $self->force_uptodate;
3246
2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3247 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691 3248
2692 if (delete $self->{need_reflow}) {
2693 my $height = 0;
2694
2695 for my $para (@{$self->{par}}) {
2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697 my $layout = $self->get_layout ($para);
2698 my ($w, $h) = $layout->size;
2699
2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2703 }
2704
2705 $height += $para->{h};
2706 }
2707
2708 $self->{height} = $height;
2709
2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712 delete $self->{texture};
2713 }
2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3249 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720 glClearColor 0, 0, 0, 0; 3250 glClearColor 0, 0, 0, 0;
2721 glClear GL_COLOR_BUFFER_BIT; 3251 glClear GL_COLOR_BUFFER_BIT;
2722 3252
3253 package CFPlus::UI::Base;
3254 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3255 (0, 0, $self->{w}, $self->{h});
3256
3257 my $top = int $self->{children}[1]{range}[0];
3258
3259 my $paridx = 0;
3260 my $top_paragraph;
2723 my $top = int $self->{children}[1]{range}[0]; 3261 my $top = int $self->{children}[1]{range}[0];
2724 3262
2725 my $y0 = $top; 3263 my $y0 = $top;
2726 my $y1 = $top + $H; 3264 my $y1 = $top + $H;
2727 3265
2728 my $y = 0;
2729
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 3266 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 3267 my $h = $para->{h};
3268 my $y = $para->{y};
2736 3269
2737 if ($y0 < $y + $h && $y < $y1) { 3270 if ($y0 < $y + $h && $y < $y1) {
2738
2739 my $layout = $self->get_layout ($para); 3271 my $layout = $self->get_layout ($para);
2740 3272
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 3273 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 3274
2746 if (my @w = @{ $para->{widget} }) { 3275 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 3276 my @s = $layout->get_shapes;
2748 3277
2749 glDisable GL_BLEND;
2750 for (@w) { 3278 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 3279 my ($dx, $dy) = splice @s, 0, 2, ();
2752 3280
2753 $_->{x} = $dx + $para->{indent}; 3281 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 3282 $_->{y} = $dy + $y - $y0;
2755 3283
2756 $_->draw; 3284 $_->draw;
2757 } 3285 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 3286 }
2761 } 3287 }
2762 3288
2763 $y += $h; 3289 $paridx++;
3290 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3291 }
2765 3292
2766 glDisable GL_BLEND; 3293 $self->{top_paragraph} = $top_paragraph;
2767 }; 3294 };
2768 }); 3295 });
2769} 3296}
2770 3297
2771sub reconfigure { 3298sub reconfigure {
… …
2789 $self->{children}[1]->draw; 3316 $self->{children}[1]->draw;
2790} 3317}
2791 3318
2792############################################################################# 3319#############################################################################
2793 3320
2794package CFClient::UI::Animator; 3321package CFPlus::UI::Animator;
2795 3322
2796use CFClient::OpenGL; 3323use CFPlus::OpenGL;
2797 3324
2798our @ISA = CFClient::UI::Bin::; 3325our @ISA = CFPlus::UI::Bin::;
2799 3326
2800sub moveto { 3327sub moveto {
2801 my ($self, $x, $y) = @_; 3328 my ($self, $x, $y) = @_;
2802 3329
2803 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3330 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2831 glPopMatrix; 3358 glPopMatrix;
2832} 3359}
2833 3360
2834############################################################################# 3361#############################################################################
2835 3362
2836package CFClient::UI::Flopper; 3363package CFPlus::UI::Flopper;
2837 3364
2838our @ISA = CFClient::UI::Button::; 3365our @ISA = CFPlus::UI::Button::;
2839 3366
2840sub new { 3367sub new {
2841 my $class = shift; 3368 my $class = shift;
2842 3369
2843 my $self = $class->SUPER::new ( 3370 my $self = $class->SUPER::new (
… …
2855 $self->{other}->toggle_visibility; 3382 $self->{other}->toggle_visibility;
2856} 3383}
2857 3384
2858############################################################################# 3385#############################################################################
2859 3386
2860package CFClient::UI::Tooltip; 3387package CFPlus::UI::Tooltip;
2861 3388
2862our @ISA = CFClient::UI::Bin::; 3389our @ISA = CFPlus::UI::Bin::;
2863 3390
2864use CFClient::OpenGL; 3391use CFPlus::OpenGL;
2865 3392
2866sub new { 3393sub new {
2867 my $class = shift; 3394 my $class = shift;
2868 3395
2869 $class->SUPER::new ( 3396 $class->SUPER::new (
… …
2872 ) 3399 )
2873} 3400}
2874 3401
2875sub set_tooltip_from { 3402sub set_tooltip_from {
2876 my ($self, $widget) = @_; 3403 my ($self, $widget) = @_;
3404
3405 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3406 if $widget->{tooltip} =~ /^#(.*)$/;
2877 3407
2878 my $tooltip = $widget->{tooltip}; 3408 my $tooltip = $widget->{tooltip};
2879 3409
2880 if ($ENV{CFPLUS_DEBUG} & 2) { 3410 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n" 3411 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2885 } 3415 }
2886 3416
2887 $tooltip =~ s/^\n+//; 3417 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//; 3418 $tooltip =~ s/\n+$//;
2889 3419
2890 $self->add (new CFClient::UI::Label 3420 $self->add (new CFPlus::UI::Label
2891 markup => $tooltip, 3421 markup => $tooltip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3422 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893 fontsize => 0.8, 3423 fontsize => 0.8,
2894 fg => [0, 0, 0, 1], 3424 style => 1, # FLAG_INVERSE
2895 ellipsise => 0, 3425 ellipsise => 0,
2896 font => ($widget->{tooltip_font} || $::FONT_PROP), 3426 font => ($widget->{tooltip_font} || $::FONT_PROP),
2897 ); 3427 );
2898} 3428}
2899 3429
… …
2918 3448
2919 $self->{root}->on_post_alloc ("move_$self" => sub { 3449 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner} 3450 my $widget = $self->{owner}
2921 or return; 3451 or return;
2922 3452
3453 if ($widget->{visible}) {
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3454 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924 3455
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3456 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w}; 3457 if $x + $self->{w} > $self->{root}{w};
2927 3458
2928 $self->move_abs ($x, $y); 3459 $self->move_abs ($x, $y);
3460 } else {
3461 $self->hide;
3462 }
2929 }); 3463 });
2930} 3464}
2931 3465
2932sub _draw { 3466sub _draw {
2933 my ($self) = @_; 3467 my ($self) = @_;
… …
2957 $self->SUPER::_draw; 3491 $self->SUPER::_draw;
2958} 3492}
2959 3493
2960############################################################################# 3494#############################################################################
2961 3495
2962package CFClient::UI::Face; 3496package CFPlus::UI::Face;
2963 3497
2964our @ISA = CFClient::UI::Base::; 3498our @ISA = CFPlus::UI::DrawBG::;
2965 3499
2966use CFClient::OpenGL; 3500use CFPlus::OpenGL;
2967 3501
2968sub new { 3502sub new {
2969 my $class = shift; 3503 my $class = shift;
2970 3504
2971 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
3506 size_w => 32,
3507 size_h => 8,
2972 aspect => 1, 3508 aspect => 1,
2973 can_events => 0, 3509 can_events => 0,
2974 @_, 3510 @_,
2975 ); 3511 );
2976 3512
2977 if ($self->{anim} && $self->{animspeed}) { 3513 if ($self->{anim} && $self->{animspeed}) {
2978 Scalar::Util::weaken (my $widget = $self); 3514 CFPlus::weaken (my $widget = $self);
2979 3515
3516 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3517 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2980 $self->{timer} = Event->timer ( 3518 $self->{timer} = Event->timer (
2981 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982 hard => 1, 3519 parked => 1,
2983 interval => $self->{animspeed},
2984 cb => sub { 3520 cb => sub {
3521 return unless $::CONN && $widget;
3522
2985 ++$widget->{frame}; 3523 ++$widget->{frame};
3524 $widget->update_face;
2986 $widget->update; 3525 $widget->update;
3526
3527 $widget->update_timer;
2987 }, 3528 },
2988 ); 3529 );
3530
3531 $self->update_face;
3532 $self->update_timer;
2989 } 3533 }
2990 3534
2991 $self 3535 $self
2992} 3536}
2993 3537
3538sub update_timer {
3539 my ($self) = @_;
3540
3541 return unless $self->{timer};
3542
3543 if ($self->{visible}) {
3544 $self->{timer}->at (
3545 $self->{anim_start}
3546 + $self->{animspeed}
3547 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3548 );
3549 $self->{timer}->start;
3550 } else {
3551 $self->{timer}->stop;
3552 }
3553}
3554
3555sub update_face {
3556 my ($self) = @_;
3557
3558 return unless $::CONN;
3559
3560 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3561 if ($anim && @$anim) {
3562 delete $self->{wait_face};
3563 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3564 }
3565 }
3566}
3567
2994sub size_request { 3568sub size_request {
2995 (32, 8) 3569 my ($self) = @_;
3570
3571 if ($::CONN) {
3572 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3573 if (my $tex = $::CONN->{texture}[$faceid]) {
3574 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3575 } else {
3576 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3577 $self->realloc;
3578 });
3579 }
3580 }
3581 }
3582
3583 ($self->{size_w} || 8, $self->{size_h} || 8)
2996} 3584}
2997 3585
2998sub update { 3586sub update {
2999 my ($self) = @_; 3587 my ($self) = @_;
3000 3588
3001 return unless $self->{visible}; 3589 return unless $self->{visible};
3002 3590
3003 $self->SUPER::update; 3591 $self->SUPER::update;
3004} 3592}
3005 3593
3594sub invoke_visibility_change {
3595 my ($self) = @_;
3596
3597 $self->update_timer;
3598
3599 0
3600}
3601
3006sub _draw { 3602sub _draw {
3007 my ($self) = @_; 3603 my ($self) = @_;
3008 3604
3009 return unless $::CONN; 3605 return unless $::CONN;
3010 3606
3011 my $face; 3607 $self->SUPER::_draw;
3012 3608
3013 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}]; 3609 my $faceid = $::CONN->{faceid}[$self->{face}]
3015 3610 or return;
3016 $face = $anim->[ $self->{frame} % @$anim ]
3017 if $anim && @$anim;
3018 }
3019 3611
3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3612 my $tex = $::CONN->{texture}[$faceid];
3021 3613
3022 if ($tex) { 3614 if ($tex) {
3023 glEnable GL_TEXTURE_2D; 3615 glEnable GL_TEXTURE_2D;
3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3616 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3025 glColor 0, 0, 0, 1; 3617 glColor 0, 0, 0, 1;
… …
3029} 3621}
3030 3622
3031sub destroy { 3623sub destroy {
3032 my ($self) = @_; 3624 my ($self) = @_;
3033 3625
3034 $self->{timer}->cancel 3626 (delete $self->{timer})->cancel
3035 if $self->{timer}; 3627 if $self->{timer};
3036 3628
3037 $self->SUPER::destroy; 3629 $self->SUPER::destroy;
3038} 3630}
3039 3631
3040############################################################################# 3632#############################################################################
3041 3633
3042package CFClient::UI::Buttonbar; 3634package CFPlus::UI::Buttonbar;
3043 3635
3044our @ISA = CFClient::UI::HBox::; 3636our @ISA = CFPlus::UI::HBox::;
3045 3637
3046# TODO: should actualyl wrap buttons and other goodies. 3638# TODO: should actually wrap buttons and other goodies.
3047 3639
3048############################################################################# 3640#############################################################################
3049 3641
3050package CFClient::UI::Menu; 3642package CFPlus::UI::Menu;
3051 3643
3052our @ISA = CFClient::UI::FancyFrame::; 3644our @ISA = CFPlus::UI::Toplevel::;
3053 3645
3054use CFClient::OpenGL; 3646use CFPlus::OpenGL;
3055 3647
3056sub new { 3648sub new {
3057 my $class = shift; 3649 my $class = shift;
3058 3650
3059 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3060 items => [], 3652 items => [],
3061 z => 100, 3653 z => 100,
3062 @_, 3654 @_,
3063 ); 3655 );
3064 3656
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3657 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066 3658
3067 for my $item (@{ $self->{items} }) { 3659 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3660 my ($widget, $cb, $tooltip) = @$item;
3069 3661
3070 # handle various types of items, only text for now 3662 # handle various types of items, only text for now
3071 if (!ref $widget) { 3663 if (!ref $widget) {
3664 if ($widget =~ /\t/) {
3665 my ($left, $right) = split /\t/, $widget, 2;
3666
3072 $widget = new CFClient::UI::Label 3667 $widget = new CFPlus::UI::HBox
3073 can_hover => 1, 3668 can_hover => 1,
3074 can_events => 1, 3669 can_events => 1,
3670 tooltip => $tooltip,
3671 children => [
3672 (new CFPlus::UI::Label markup => $left, expand => 1),
3673 (new CFPlus::UI::Label markup => $right, align => +1),
3674 ],
3675 ;
3676
3677 } else {
3678 $widget = new CFPlus::UI::Label
3679 can_hover => 1,
3680 can_events => 1,
3075 markup => $widget, 3681 markup => $widget,
3076 tooltip => $tooltip 3682 tooltip => $tooltip;
3683 }
3077 } 3684 }
3078 3685
3079 $self->{item}{$widget} = $item; 3686 $self->{item}{$widget} = $item;
3080 3687
3081 $self->{vbox}->add ($widget); 3688 $self->{vbox}->add ($widget);
… …
3124 1 3731 1
3125} 3732}
3126 3733
3127############################################################################# 3734#############################################################################
3128 3735
3129package CFClient::UI::Multiplexer; 3736package CFPlus::UI::Multiplexer;
3130 3737
3131our @ISA = CFClient::UI::Container::; 3738our @ISA = CFPlus::UI::Container::;
3132 3739
3133sub new { 3740sub new {
3134 my $class = shift; 3741 my $class = shift;
3135 3742
3136 my $self = $class->SUPER::new ( 3743 my $self = $class->SUPER::new (
… …
3150 3757
3151 $self->{current} = $self->{children}[0] 3758 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3759 if @{ $self->{children} };
3153} 3760}
3154 3761
3762sub get_current_page {
3763 my ($self) = @_;
3764
3765 $self->{current}
3766}
3767
3155sub set_current_page { 3768sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3769 my ($self, $page_or_widget) = @_;
3157 3770
3158 my $widget = ref $page_or_widget 3771 my $widget = ref $page_or_widget
3159 ? $page_or_widget 3772 ? $page_or_widget
… …
3191 $self->{current}->draw; 3804 $self->{current}->draw;
3192} 3805}
3193 3806
3194############################################################################# 3807#############################################################################
3195 3808
3196package CFClient::UI::Notebook; 3809package CFPlus::UI::Notebook;
3197 3810
3198our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3199 3812
3200sub new { 3813sub new {
3201 my $class = shift; 3814 my $class = shift;
3202 3815
3203 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar), 3817 buttonbar => (new CFPlus::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3818 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self 3819 # filter => # will be put between multiplexer and $self
3207 @_, 3820 @_,
3208 ); 3821 );
3209 3822
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3823 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3214} 3827}
3215 3828
3216sub add { 3829sub add {
3217 my ($self, $title, $widget, $tooltip) = @_; 3830 my ($self, $title, $widget, $tooltip) = @_;
3218 3831
3219 Scalar::Util::weaken $self; 3832 CFPlus::weaken $self;
3220 3833
3221 $self->{buttonbar}->add (new CFClient::UI::Button 3834 $self->{buttonbar}->add (new CFPlus::UI::Button
3222 markup => $title, 3835 markup => $title,
3223 tooltip => $tooltip, 3836 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3837 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3838 );
3226 3839
3227 $self->{multiplexer}->add ($widget); 3840 $self->{multiplexer}->add ($widget);
3228} 3841}
3229 3842
3843sub get_current_page {
3844 my ($self) = @_;
3845
3846 $self->{multiplexer}->get_current_page
3847}
3848
3230sub set_current_page { 3849sub set_current_page {
3231 my ($self, $page) = @_; 3850 my ($self, $page) = @_;
3232 3851
3233 $self->{multiplexer}->set_current_page ($page); 3852 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current}); 3853 $self->emit (page_changed => $self->{multiplexer}{current});
3235} 3854}
3236 3855
3237############################################################################# 3856#############################################################################
3238 3857
3239package CFClient::UI::Combobox; 3858package CFPlus::UI::Selector;
3240 3859
3241use utf8; 3860use utf8;
3242 3861
3243our @ISA = CFClient::UI::Button::; 3862our @ISA = CFPlus::UI::Button::;
3244 3863
3245sub new { 3864sub new {
3246 my $class = shift; 3865 my $class = shift;
3247 3866
3248 my $self = $class->SUPER::new ( 3867 my $self = $class->SUPER::new (
… …
3265 my ($value, $title, $tooltip) = @$_; 3884 my ($value, $title, $tooltip) = @$_;
3266 3885
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3886 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 } 3887 }
3269 3888
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3889 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271} 3890}
3272 3891
3273sub _set_value { 3892sub _set_value {
3274 my ($self, $value) = @_; 3893 my ($self, $value) = @_;
3275 3894
… …
3290 $self->emit (changed => $value); 3909 $self->emit (changed => $value);
3291} 3910}
3292 3911
3293############################################################################# 3912#############################################################################
3294 3913
3295package CFClient::UI::Statusbox; 3914package CFPlus::UI::Statusbox;
3296 3915
3297our @ISA = CFClient::UI::VBox::; 3916our @ISA = CFPlus::UI::VBox::;
3298 3917
3299sub new { 3918sub new {
3300 my $class = shift; 3919 my $class = shift;
3301 3920
3302 my $self = $class->SUPER::new ( 3921 my $self = $class->SUPER::new (
3303 fontsize => 0.8, 3922 fontsize => 0.8,
3304 @_, 3923 @_,
3305 ); 3924 );
3306 3925
3307 Scalar::Util::weaken (my $this = $self); 3926 CFPlus::weaken (my $this = $self);
3308 3927
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3928 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310 3929
3311 $self 3930 $self
3312} 3931}
… …
3314sub reorder { 3933sub reorder {
3315 my ($self) = @_; 3934 my ($self) = @_;
3316 my $NOW = Time::HiRes::time; 3935 my $NOW = Time::HiRes::time;
3317 3936
3318 # freeze display when hovering over any label 3937 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner} 3938 return if $CFPlus::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3939 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} }; 3940 values %{ $self->{item} };
3322 3941
3323 while (my ($k, $v) = each %{ $self->{item} }) { 3942 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3943 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 } 3944 }
… …
3346 for ($short) { 3965 for ($short) {
3347 s/^\s+//; 3966 s/^\s+//;
3348 s/\s+/ /g; 3967 s/\s+/ /g;
3349 } 3968 }
3350 3969
3351 new CFClient::UI::Label 3970 new CFPlus::UI::Label
3352 markup => $short, 3971 markup => $short,
3353 tooltip => $item->{tooltip}, 3972 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP, 3973 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67, 3974 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize}, 3975 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3435 $self->SUPER::destroy; 4054 $self->SUPER::destroy;
3436} 4055}
3437 4056
3438############################################################################# 4057#############################################################################
3439 4058
3440package CFClient::UI::Inventory;
3441
3442our @ISA = CFClient::UI::ScrolledWindow::;
3443
3444sub new {
3445 my $class = shift;
3446
3447 my $self = $class->SUPER::new (
3448 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3449 @_,
3450 );
3451
3452 $self
3453}
3454
3455sub set_items {
3456 my ($self, $items) = @_;
3457
3458 $self->{child}->clear;
3459 return unless $items;
3460
3461 my @items = sort {
3462 ($a->{type} <=> $b->{type})
3463 or ($a->{name} cmp $b->{name})
3464 } values %$items;
3465
3466 $self->{real_items} = \@items;
3467
3468 my $row = 0;
3469 for my $item (@items) {
3470 CFClient::Item::update_widgets $item;
3471
3472 $self->{child}->add (0, $row, $item->{face_widget});
3473 $self->{child}->add (1, $row, $item->{desc_widget});
3474 $self->{child}->add (2, $row, $item->{weight_widget});
3475
3476 $row++;
3477 }
3478}
3479
3480#############################################################################
3481
3482package CFClient::UI::SpellList;
3483
3484our @ISA = CFClient::UI::Table::;
3485
3486sub new {
3487 my $class = shift;
3488
3489 my $self = $class->SUPER::new (
3490 binding => [],
3491 commands => [],
3492 @_,
3493 )
3494}
3495
3496my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3497
3498my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3500my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3504my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3506my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3507 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511
3512 $CFClient::UI::ROOT->on_refresh ($self => sub {
3513 $self->clear;
3514
3515 return unless $::CONN;
3516
3517 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3518 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3519 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3520 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3521 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3522
3523 my $row = 0;
3524
3525 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3526 my $spell = $self->{spell}{$_};
3527
3528 $row++;
3529
3530 my $spell_cb = sub {
3531 my ($widget, $ev) = @_;
3532
3533 if ($ev->{button} == 1) {
3534 $::CONN->user_send ("cast $spell->{name}");
3535 } elsif ($ev->{button} == 2) {
3536 $::CONN->user_send ("invoke $spell->{name}");
3537 } elsif ($ev->{button} == 3) {
3538 (new CFClient::UI::Menu
3539 items => [
3540 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3541 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3542 ],
3543 )->popup ($ev);
3544 } else {
3545 return 0;
3546 }
3547
3548 1
3549 };
3550
3551 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3552
3553 #TODO: add path info to tooltip
3554 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3555
3556 $self->add (0, $row, new CFClient::UI::Face
3557 face => $spell->{face},
3558 can_hover => 1,
3559 can_events => 1,
3560 tooltip => $tooltip,
3561 on_button_down => $spell_cb,
3562 );
3563
3564 $self->add (1, $row, new CFClient::UI::Label
3565 expand => 1,
3566 text => $spell->{name},
3567 can_hover => 1,
3568 can_events => 1,
3569 tooltip => $tooltip,
3570 on_button_down => $spell_cb,
3571 );
3572
3573 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3574 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3575 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3576 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3577 }
3578 });
3579}
3580
3581sub add_spell {
3582 my ($self, $spell) = @_;
3583
3584 $self->{spell}->{$spell->{name}} = $spell;
3585 $self->rebuild_spell_list;
3586}
3587
3588sub remove_spell {
3589 my ($self, $spell) = @_;
3590
3591 delete $self->{spell}->{$spell->{name}};
3592 $self->rebuild_spell_list;
3593}
3594
3595sub clear_spells {
3596 my ($self) = @_;
3597
3598 $self->{spell} = {};
3599 $self->rebuild_spell_list;
3600}
3601
3602#############################################################################
3603
3604package CFClient::UI::Root; 4059package CFPlus::UI::Root;
3605 4060
3606our @ISA = CFClient::UI::Container::; 4061our @ISA = CFPlus::UI::Container::;
3607 4062
3608use List::Util qw(min max); 4063use List::Util qw(min max);
3609 4064
3610use CFClient::OpenGL; 4065use CFPlus::OpenGL;
3611 4066
3612sub new { 4067sub new {
3613 my $class = shift; 4068 my $class = shift;
3614 4069
3615 my $self = $class->SUPER::new ( 4070 my $self = $class->SUPER::new (
3616 visible => 1, 4071 visible => 1,
3617 @_, 4072 @_,
3618 ); 4073 );
3619 4074
3620 Scalar::Util::weaken ($self->{root} = $self); 4075 CFPlus::weaken ($self->{root} = $self);
3621 4076
3622 $self 4077 $self
3623} 4078}
3624 4079
3625sub size_request { 4080sub size_request {
… …
3791 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4246 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3792 4247
3793 $w = 0 if $w < 0; 4248 $w = 0 if $w < 0;
3794 $h = 0 if $h < 0; 4249 $h = 0 if $h < 0;
3795 4250
4251 $w = max $widget->{min_w}, $w;
4252 $h = max $widget->{min_h}, $h;
4253
4254# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4255# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4256
4257 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4258 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4259
3796 $w = int $w + 0.5; 4260 $w = int $w + 0.5;
3797 $h = int $h + 0.5; 4261 $h = int $h + 0.5;
3798 4262
3799 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4263 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3800 $widget->{old_w} = $widget->{w}; 4264 $widget->{old_w} = $widget->{w};
… …
3810 4274
3811 while ($self->{post_alloc_hook}) { 4275 while ($self->{post_alloc_hook}) {
3812 $_->() 4276 $_->()
3813 for values %{delete $self->{post_alloc_hook}}; 4277 for values %{delete $self->{post_alloc_hook}};
3814 } 4278 }
3815
3816 4279
3817 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4280 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3818 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4281 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3819 glClear GL_COLOR_BUFFER_BIT; 4282 glClear GL_COLOR_BUFFER_BIT;
3820 4283
… …
3823 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4286 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3824 glMatrixMode GL_MODELVIEW; 4287 glMatrixMode GL_MODELVIEW;
3825 glLoadIdentity; 4288 glLoadIdentity;
3826 4289
3827 { 4290 {
3828 package CFClient::UI::Base; 4291 package CFPlus::UI::Base;
3829 4292
3830 ($draw_x, $draw_y, $draw_w, $draw_h) = 4293 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3831 (0, 0, $self->{w}, $self->{h}); 4294 (0, 0, $self->{w}, $self->{h});
3832 }
3833 4295
3834 $self->_draw; 4296 $self->_draw;
4297 }
3835} 4298}
3836 4299
3837############################################################################# 4300#############################################################################
3838 4301
3839package CFClient::UI; 4302package CFPlus::UI;
3840 4303
3841$ROOT = new CFClient::UI::Root; 4304$ROOT = new CFPlus::UI::Root;
3842$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4305$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3843 4306
38441 43071
3845 4308

Diff Legend

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