ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.383 by root, Fri Jul 20 16:32:04 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
345 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
346 376
347 if ($self->{aspect}) { 377 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
349 379
350 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 382
353 # use alignment to adjust x, y 383 # use alignment to adjust x, y
354 384
355 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub invoke_focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
424 458
425 return if $FOCUS == $self; 459 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
427 461
428 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
429 463
430 $focus->update if $focus; 464 $self->update;
431 $FOCUS->update;
432 465
433 0 466 0
434} 467}
435 468
436sub invoke_focus_out { 469sub invoke_focus_out {
437 my ($self) = @_; 470 my ($self) = @_;
438 471
439 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
440 473
441 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
442 475
443 $focus->update if $focus; #? 476 $self->update;
444 477
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 479 unless $FOCUS;
447 480
448 0 481 0
449} 482}
450 483
451sub grab_focus { 484sub grab_focus {
452 my ($self) = @_; 485 my ($self) = @_;
453 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 push @{ $self->{signal_cb}{$signal} }, $cb; 508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
474} 514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552sub find_widget {
486 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
487 554
… …
495} 562}
496 563
497sub set_parent { 564sub set_parent {
498 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
499 566
500 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
574 glEnd; 641 glEnd;
575 glPopMatrix; 642 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 } 644 }
578 645
579 $self->_draw; 646 $self->_draw;
580 glPopMatrix; 647 glPopMatrix;
581} 648}
… …
584 my ($self) = @_; 651 my ($self) = @_;
585 652
586 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
587} 654}
588 655
656my $cntx;#d#
589sub DESTROY { 657sub DESTROY {
590 my ($self) = @_; 658 my ($self) = @_;
591 659
592 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
593 661
594 eval { $self->destroy }; 662 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
596} 666}
597 667
598############################################################################# 668#############################################################################
599 669
600package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
601 671
602our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
603 673
604use strict; 674use strict;
605use CFClient::OpenGL; 675use CFPlus::OpenGL;
606 676
607sub new { 677sub new {
608 my $class = shift; 678 my $class = shift;
609 679
610 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
641 } 711 }
642} 712}
643 713
644############################################################################# 714#############################################################################
645 715
646package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
647 717
648our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
649 719
650sub new { 720sub new {
651 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
653} 723}
… …
660 730
661sub draw { } 731sub draw { }
662 732
663############################################################################# 733#############################################################################
664 734
665package CFClient::UI::Container; 735package CFPlus::UI::Container;
666 736
667our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
668 738
669sub new { 739sub new {
670 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
671 741
672 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
681 if $children; 751 if $children;
682 752
683 $self 753 $self
684} 754}
685 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
686sub add { 764sub add {
687 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
688 766
689 $_->set_parent ($self) 767 $_->set_parent ($self)
690 for @widgets; 768 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
751} 829}
752 830
753############################################################################# 831#############################################################################
754 832
755package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
756 834
757our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
758 836
759sub new { 837sub new {
760 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
761 839
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 841
764 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
765} 843}
766 844
767sub add { 845sub add {
… …
774sub remove { 852sub remove {
775 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
776 854
777 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
778 856
779 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 858 unless @{$self->{children}};
781} 859}
782 860
783sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
784 862
… …
796 874
797############################################################################# 875#############################################################################
798 876
799# back-buffered drawing area 877# back-buffered drawing area
800 878
801package CFClient::UI::Window; 879package CFPlus::UI::Window;
802 880
803our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
804 882
805use CFClient::OpenGL; 883use CFPlus::OpenGL;
806 884
807sub new { 885sub new {
808 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
809 887
810 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
832} 910}
833 911
834sub render_child { 912sub render_child {
835 my ($self) = @_; 913 my ($self) = @_;
836 914
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
840 918
841 { 919 {
842 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
843 921
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
846 } 926 }
847
848 $self->_render;
849 }; 927 };
850} 928}
851 929
852sub _draw { 930sub _draw {
853 my ($self) = @_; 931 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 932
857 my $tex = $self->{texture} 933 my $tex = $self->{texture}
858 or return; 934 or return;
859 935
860 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
863 939
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
865 941
866 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
867} 943}
868 944
869############################################################################# 945#############################################################################
870 946
871package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
872 948
949use List::Util qw(min max);
950
873our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
874 952
875sub new { 953sub new {
876 my $class = shift; 954 my $class = shift;
877 955
878 $class->SUPER::new ( 956 $class->SUPER::new (
… …
908} 986}
909 987
910sub set_offset { 988sub set_offset {
911 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
912 990
991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 995 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 996 $self->{view_y} = $y;
915 997
998 $self->emit (changed => $x, $y);
916 $self->update; 999 $self->update;
1000 }
917} 1001}
918 1002
919# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 1004sub coord2local {
921 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1024 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1026 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1027 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1028 }
945} 1029}
946 1030
947sub _render { 1031sub _render {
948 my ($self) = @_; 1032 my ($self) = @_;
949 1033
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1034 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}; 1035 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1036
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1037 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1038
955 $self->SUPER::_render; 1039 $self->SUPER::_render;
956} 1040}
957 1041
958############################################################################# 1042#############################################################################
959 1043
960package CFClient::UI::ScrolledWindow; 1044package CFPlus::UI::ScrolledWindow;
961 1045
962our @ISA = CFClient::UI::HBox::; 1046our @ISA = CFPlus::UI::Table::;
963 1047
964sub new { 1048sub new {
965 my ($class, %arg) = @_; 1049 my ($class, %arg) = @_;
966 1050
967 my $child = delete $arg{child}; 1051 my $child = delete $arg{child};
968 1052
969 my $self; 1053 my $self;
970 1054
971 my $slider = new CFClient::UI::Slider 1055 my $hslider = new CFPlus::UI::Slider
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1065 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1067 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1070 },
977 ; 1071 ;
978 1072
979 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
981 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
982 %arg, 1081 %arg,
983 ); 1082 );
984 1083
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 expand => 1,
1086 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1096 ;
1097
1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099
986 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
987 1101
988 $self 1102 $self
989} 1103}
990 1104
… …
997} 1111}
998 1112
999sub update_slider { 1113sub update_slider {
1000 my ($self) = @_; 1114 my ($self) = @_;
1001 1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 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]); 1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide;
1125 }
1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129
1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide;
1134 }
1003} 1135}
1004 1136
1005sub update { 1137sub update {
1006 my ($self) = @_; 1138 my ($self) = @_;
1007 1139
1008 $self->SUPER::update; 1140 $self->SUPER::update;
1009
1010 $self->update_slider; 1141 $self->update_slider;
1142}
1143
1144sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_;
1146
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev);
1150
1151 1
1152}
1153
1154sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_;
1156
1157 if ($ev->{button} == 2) {
1158 $self->grab_focus;
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1;
1171 }
1172
1173 0
1174}
1175
1176sub invoke_button_up {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if (delete $self->{motion}) {
1180 return 1;
1181 }
1182
1183 0
1184}
1185
1186sub invoke_mouse_motion {
1187 my ($self, $ev, $x, $y) = @_;
1188
1189 if ($self->{motion}) {
1190 $self->{motion}->($ev, $x, $y);
1191 return 1;
1192 }
1193
1194 0
1011} 1195}
1012 1196
1013sub invoke_size_allocate { 1197sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1015 1199
1016 $self->update_slider; 1200 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1202}
1020 1203
1021############################################################################# 1204#############################################################################
1022 1205
1023package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1024 1207
1025our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1026 1209
1027use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1028 1211
1029sub new { 1212sub new {
1030 my $class = shift; 1213 my $class = shift;
1031 1214
1032 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1059} 1242}
1060 1243
1061############################################################################# 1244#############################################################################
1062 1245
1063package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1064 1247
1065our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1066 1249
1067use CFClient::OpenGL; 1250use CFPlus::OpenGL;
1251
1252sub new {
1253 my ($class, %arg) = @_;
1254
1255 if ((exists $arg{label}) && !ref $arg{label}) {
1256 $arg{label} = new CFPlus::UI::Label
1257 align => 1,
1258 valign => 0,
1259 text => $arg{label},
1260 fontsize => ($arg{border} || 0.8) * 0.75;
1261 }
1262
1263 my $self = $class->SUPER::new (
1264 # label => "",
1265 fg => [0.6, 0.3, 0.1],
1266 border => 0.8,
1267 style => 'single',
1268 %arg,
1269 );
1270
1271 $self
1272}
1273
1274sub add {
1275 my ($self, @widgets) = @_;
1276
1277 $self->SUPER::add (@widgets);
1278 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1279}
1280
1281sub border {
1282 int $_[0]{border} * $::FONTSIZE
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 ($self->{label_w}, undef) = $self->{label}->size_request
1289 if $self->{label};
1290
1291 my ($w, $h) = $self->SUPER::size_request;
1292
1293 (
1294 $w + $self->border * 2,
1295 $h + $self->border * 2,
1296 )
1297}
1298
1299sub invoke_size_allocate {
1300 my ($self, $w, $h) = @_;
1301
1302 my $border = $self->border;
1303
1304 $w -= List::Util::max 0, $border * 2;
1305 $h -= List::Util::max 0, $border * 2;
1306
1307 if (my $label = $self->{label}) {
1308 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1309 $label->{h} = List::Util::min $h, $border;
1310 $label->invoke_size_allocate ($label->{w}, $label->{h});
1311 }
1312
1313 $self->child->configure ($border, $border, $w, $h);
1314
1315 1
1316}
1317
1318sub _draw {
1319 my ($self) = @_;
1320
1321 my $child = $self->{children}[0];
1322
1323 my $border = $self->border;
1324 my ($w, $h) = ($self->{w}, $self->{h});
1325
1326 $child->draw;
1327
1328 glColor @{$self->{fg}};
1329 glBegin GL_LINE_STRIP;
1330 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1334 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1336 glEnd;
1337
1338 if ($self->{label}) {
1339 glTranslate $border * 2, 0;
1340 $self->{label}->_draw;
1341 }
1342}
1343
1344#############################################################################
1345
1346package CFPlus::UI::Toplevel;
1347
1348our @ISA = CFPlus::UI::Bin::;
1349
1350use CFPlus::OpenGL;
1068 1351
1069my $bg = 1352my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1072 1355
1073my @border = 1356my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1357 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); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1076 1363
1077sub new { 1364sub new {
1078 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1079 1366
1080 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1369 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1370 border => 0.6,
1084 can_events => 1, 1371 can_events => 1,
1085 min_w => 16, 1372 min_w => 64,
1086 min_h => 16, 1373 min_h => 32,
1087 %arg, 1374 %arg,
1088 ); 1375 );
1089 1376
1090 $self->{title_widget} = new CFClient::UI::Label 1377 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1378 align => 0,
1092 valign => 1, 1379 valign => 1,
1093 text => $self->{title}, 1380 text => $self->{title},
1094 fontsize => $self->{border}, 1381 fontsize => $self->{border},
1095 if exists $self->{title}; 1382 if exists $self->{title};
1096 1383
1097 if ($self->{has_close_button}) { 1384 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1385 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1386 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1387 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1388 on_activate => sub { $self->emit ("delete") };
1102 1389
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1390 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1391 }
1105 1392
1106 $self 1393 $self
1107} 1394}
1108 1395
1109sub add { 1396sub add {
1110 my ($self, @widgets) = @_; 1397 my ($self, @widgets) = @_;
1111 1398
1112 $self->SUPER::add (@widgets); 1399 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1400 $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}; 1401 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1402}
1116 1403
1117sub border { 1404sub border {
1118 int $_[0]{border} * $::FONTSIZE 1405 int $_[0]{border} * $::FONTSIZE
1119} 1406}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1439 $self->child->configure ($border, $border, $w, $h);
1153 1440
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1441 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1442 if $self->{close_button};
1156 1443
1444 1
1445}
1446
1447sub invoke_delete {
1448 my ($self) = @_;
1449
1450 $self->hide;
1451
1157 1 1452 1
1158} 1453}
1159 1454
1160sub invoke_button_down { 1455sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1456 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1514 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1515
1221 ! ! $self->{motion} 1516 ! ! $self->{motion}
1222} 1517}
1223 1518
1519sub invoke_visibility_change {
1520 my ($self, $visible) = @_;
1521
1522 delete $self->{motion} unless $visible;
1523
1524 0
1525}
1526
1224sub _draw { 1527sub _draw {
1225 my ($self) = @_; 1528 my ($self) = @_;
1226 1529
1227 my $child = $self->{children}[0]; 1530 my $child = $self->{children}[0];
1228 1531
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1537
1235 my $border = $self->border; 1538 my $border = $self->border;
1236 1539
1237 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1559
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1245 1562
1246 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1582 if $self->{close_button};
1266} 1583}
1267 1584
1268############################################################################# 1585#############################################################################
1269 1586
1270package CFClient::UI::Table; 1587package CFPlus::UI::Table;
1271 1588
1272our @ISA = CFClient::UI::Base::; 1589our @ISA = CFPlus::UI::Base::;
1273 1590
1274use List::Util qw(max sum); 1591use List::Util qw(max sum);
1275 1592
1276use CFClient::OpenGL; 1593use CFPlus::OpenGL;
1277 1594
1278sub new { 1595sub new {
1279 my $class = shift; 1596 my $class = shift;
1280 1597
1281 $class->SUPER::new ( 1598 $class->SUPER::new (
1599 children => [],
1282 col_expand => [], 1600 col_expand => [],
1601 row_expand => [],
1283 @_, 1602 @_,
1284 ) 1603 )
1285} 1604}
1286 1605
1287sub children { 1606sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1608}
1290 1609
1610# TODO: store row/col info in child widget and use standard add/del
1291sub add { 1611sub add {
1292 my ($self, $x, $y, $child) = @_; 1612 my $self = shift;
1293 1613
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1620
1621 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1294 $child->set_parent ($self); 1624 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1626 }
1296 1627
1628 $self->{force_realloc} = 1;
1629 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1630 $self->realloc;
1298} 1631}
1299 1632
1300sub remove { 1633sub remove {
1301 my ($self, $child) = @_; 1634 my ($self, $child) = @_;
1302 1635
1303 # TODO: not yet implemented 1636 for (@{ $self->{children} }) {
1637 for (@{ $_ || [] }) {
1638 $_ = undef if $_ == $child;
1639 }
1640 }
1304} 1641}
1305 1642
1306# TODO: move to container class maybe? send children a signal on removal? 1643# TODO: move to container class maybe? send children a signal on removal?
1307sub clear { 1644sub clear {
1308 my ($self) = @_; 1645 my ($self) = @_;
… …
1357 my ($ws, $hs) = $self->get_wh; 1694 my ($ws, $hs) = $self->get_wh;
1358 1695
1359 my $req_w = (sum @$ws) || 1; 1696 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1697 my $req_h = (sum @$hs) || 1;
1361 1698
1362 # TODO: nicer code && do row_expand 1699 # TODO: nicer code
1363 my @col_expand = @{$self->{col_expand}}; 1700 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1701 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1702 my $col_expand = (sum @col_expand) || 1;
1366 1703
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1705
1371 CFClient::UI::harmonize $ws; 1706 CFPlus::UI::harmonize $ws;
1707
1708 my @row_expand = @{$self->{row_expand}};
1709 @row_expand = (1) x @$ws unless @row_expand;
1710 my $row_expand = (sum @row_expand) || 1;
1711
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713
1372 CFClient::UI::harmonize $hs; 1714 CFPlus::UI::harmonize $hs;
1373 1715
1374 my $y; 1716 my $y;
1375 1717
1376 for my $r (0 .. $#{$self->{children}}) { 1718 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1719 my $row = $self->{children}[$r]
… …
1420 } 1762 }
1421} 1763}
1422 1764
1423############################################################################# 1765#############################################################################
1424 1766
1425package CFClient::UI::Box; 1767package CFPlus::UI::Fixed;
1426 1768
1769use List::Util qw(min max);
1770
1427our @ISA = CFClient::UI::Container::; 1771our @ISA = CFPlus::UI::Container::;
1772
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) {
1781 my ($mode, $val, $max) = @_;
1782
1783 $mode eq "abs" ? $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786}
1787
1788sub size_request {
1789 my ($self) = @_;
1790
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792
1793 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1796
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1803 }
1804 }
1805
1806 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1;
1808
1809 # now layout remaining widgets
1810 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1812
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1821 }
1822 }
1823
1824 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1;
1826
1827 ($W, $H)
1828}
1829
1830sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_;
1832
1833 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1835
1836 $x = _scale $pos, $x, $W;
1837 $y = _scale $pos, $x, $H;
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840
1841 $child->configure ($x, $y, $w, $h);
1842 }
1843
1844 1
1845}
1846
1847#############################################################################
1848
1849package CFPlus::UI::Box;
1850
1851our @ISA = CFPlus::UI::Container::;
1428 1852
1429sub size_request { 1853sub size_request {
1430 my ($self) = @_; 1854 my ($self) = @_;
1431 1855
1432 $self->{vertical} 1856 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1889 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1890 for 0 .. $#children;
1467 } 1891 }
1468 } 1892 }
1469 1893
1470 CFClient::UI::harmonize \@req; 1894 CFPlus::UI::harmonize \@req;
1471 1895
1472 my $pos = 0; 1896 my $pos = 0;
1473 for (0 .. $#children) { 1897 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1898 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1899 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1904 1
1481} 1905}
1482 1906
1483############################################################################# 1907#############################################################################
1484 1908
1485package CFClient::UI::HBox; 1909package CFPlus::UI::HBox;
1486 1910
1487our @ISA = CFClient::UI::Box::; 1911our @ISA = CFPlus::UI::Box::;
1488 1912
1489sub new { 1913sub new {
1490 my $class = shift; 1914 my $class = shift;
1491 1915
1492 $class->SUPER::new ( 1916 $class->SUPER::new (
… …
1495 ) 1919 )
1496} 1920}
1497 1921
1498############################################################################# 1922#############################################################################
1499 1923
1500package CFClient::UI::VBox; 1924package CFPlus::UI::VBox;
1501 1925
1502our @ISA = CFClient::UI::Box::; 1926our @ISA = CFPlus::UI::Box::;
1503 1927
1504sub new { 1928sub new {
1505 my $class = shift; 1929 my $class = shift;
1506 1930
1507 $class->SUPER::new ( 1931 $class->SUPER::new (
… …
1510 ) 1934 )
1511} 1935}
1512 1936
1513############################################################################# 1937#############################################################################
1514 1938
1515package CFClient::UI::Label; 1939package CFPlus::UI::Label;
1516 1940
1517our @ISA = CFClient::UI::DrawBG::; 1941our @ISA = CFPlus::UI::DrawBG::;
1518 1942
1519use CFClient::OpenGL; 1943use CFPlus::OpenGL;
1520 1944
1521sub new { 1945sub new {
1522 my ($class, %arg) = @_; 1946 my ($class, %arg) = @_;
1523 1947
1524 my $self = $class->SUPER::new ( 1948 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1951 #active_bg => none
1528 #font => default_font 1952 #font => default_font
1529 #text => initial text 1953 #text => initial text
1530 #markup => initial narkup 1954 #markup => initial narkup
1531 #max_w => maximum pixel width 1955 #max_w => maximum pixel width
1956 #style => 0, # render flags
1532 ellipsise => 3, # end 1957 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1958 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1959 fontsize => 1,
1535 align => -1, 1960 align => -1,
1536 valign => -1, 1961 valign => -1,
1537 padding_x => 2, 1962 padding_x => 2,
1538 padding_y => 2, 1963 padding_y => 2,
1539 can_events => 0, 1964 can_events => 0,
1540 %arg 1965 %arg
1541 ); 1966 );
1542 1967
1543 if (exists $self->{template}) { 1968 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1969 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1970 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1971 $self->{template} = $layout;
1547 } 1972 }
1548 1973
1549 if (exists $self->{markup}) { 1974 if (exists $self->{markup}) {
… …
1553 } 1978 }
1554 1979
1555 $self 1980 $self
1556} 1981}
1557 1982
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1983sub update {
1569 my ($self) = @_; 1984 my ($self) = @_;
1570 1985
1571 delete $self->{texture}; 1986 delete $self->{texture};
1572 $self->SUPER::update; 1987 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1998 my ($self, $text) = @_;
1584 1999
1585 return if $self->{text} eq "T$text"; 2000 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 2001 $self->{text} = "T$text";
1587 2002
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 2003 $self->{layout}->set_text ($text);
1590 2004
1591 delete $self->{size_req}; 2005 delete $self->{size_req};
1592 $self->realloc; 2006 $self->realloc;
1593 $self->update; 2007 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 2013 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 2014 $self->{text} = "M$markup";
1601 2015
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2016 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 2017
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 2018 $self->{layout}->set_markup ($markup);
1606 2019
1607 delete $self->{size_req}; 2020 delete $self->{size_req};
1608 $self->realloc; 2021 $self->realloc;
1609 $self->update; 2022 $self->update;
… …
1621 2034
1622 my ($w, $h) = $self->{layout}->size; 2035 my ($w, $h) = $self->{layout}->size;
1623 2036
1624 if (exists $self->{template}) { 2037 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 2038 $self->{template}->set_font ($self->{font}) if $self->{font};
2039 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2040 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 2041
1628 my ($w2, $h2) = $self->{template}->size; 2042 my ($w2, $h2) = $self->{template}->size;
1629 2043
1630 $w = List::Util::max $w, $w2; 2044 $w = List::Util::max $w, $w2;
… …
1664 2078
1665sub reconfigure { 2079sub reconfigure {
1666 my ($self) = @_; 2080 my ($self) = @_;
1667 2081
1668 delete $self->{size_req}; 2082 delete $self->{size_req};
2083 delete $self->{texture};
1669 2084
1670 $self->SUPER::reconfigure; 2085 $self->SUPER::reconfigure;
1671} 2086}
1672 2087
1673sub _draw { 2088sub _draw {
1674 my ($self) = @_; 2089 my ($self) = @_;
1675 2090
1676 $self->SUPER::_draw; # draw background, if applicable 2091 $self->SUPER::_draw; # draw background, if applicable
1677 2092
1678 my $tex = $self->{texture} ||= do { 2093 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 2094 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2095 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 2096 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2097 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2098 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2099 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 2100
1686 new_from_layout CFClient::Texture $self->{layout} 2101 [$self->{layout}->size]
1687 }; 2102 };
1688 2103
1689 unless (exists $self->{ox}) { 2104 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2105 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2106 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 2107 : ($self->{w} - $size->[0]) * 0.5);
1693 2108
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2109 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2110 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 2111 : ($self->{h} - $size->[1]) * 0.5);
1697 }; 2112 };
1698 2113
1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2114 my $w = List::Util::min $self->{w} + 4, $size->[0];
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2115 my $h = List::Util::min $self->{h} + 2, $size->[1];
1703 2116
1704 if ($tex->{format} == GL_ALPHA) { 2117 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1712
1713 glDisable GL_TEXTURE_2D;
1714} 2118}
1715 2119
1716############################################################################# 2120#############################################################################
1717 2121
1718package CFClient::UI::EntryBase; 2122package CFPlus::UI::EntryBase;
1719 2123
1720our @ISA = CFClient::UI::Label::; 2124our @ISA = CFPlus::UI::Label::;
1721 2125
1722use CFClient::OpenGL; 2126use CFPlus::OpenGL;
1723 2127
1724sub new { 2128sub new {
1725 my $class = shift; 2129 my $class = shift;
1726 2130
1727 $class->SUPER::new ( 2131 $class->SUPER::new (
… …
1731 active_fg => [0, 0, 0], 2135 active_fg => [0, 0, 0],
1732 can_hover => 1, 2136 can_hover => 1,
1733 can_focus => 1, 2137 can_focus => 1,
1734 valign => 0, 2138 valign => 0,
1735 can_events => 1, 2139 can_events => 1,
2140 ellipsise => 0,
1736 #text => ... 2141 #text => ...
1737 #hidden => "*", 2142 #hidden => "*",
1738 @_ 2143 @_
1739 ) 2144 )
1740} 2145}
… …
1785 my $sym = $ev->{sym}; 2190 my $sym = $ev->{sym};
1786 my $uni = $ev->{unicode}; 2191 my $uni = $ev->{unicode};
1787 2192
1788 my $text = $self->get_text; 2193 my $text = $self->get_text;
1789 2194
2195 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2196
1790 if ($uni == 8) { 2197 if ($uni == 8) {
1791 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2198 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792 } elsif ($uni == 127) { 2199 } elsif ($uni == 127) {
1793 substr $text, $self->{cursor}, 1, ""; 2200 substr $text, $self->{cursor}, 1, "";
1794 } elsif ($sym == CFClient::SDLK_LEFT) { 2201 } elsif ($sym == CFPlus::SDLK_LEFT) {
1795 --$self->{cursor} if $self->{cursor}; 2202 --$self->{cursor} if $self->{cursor};
1796 } elsif ($sym == CFClient::SDLK_RIGHT) { 2203 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1797 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2204 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1798 } elsif ($sym == CFClient::SDLK_HOME) { 2205 } elsif ($sym == CFPlus::SDLK_HOME) {
2206 # what a hack
2207 $self->{cursor} =
2208 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2209 ? length $1
2210 : 0;
2211 } elsif ($sym == CFPlus::SDLK_END) {
2212 # uh, again
2213 $self->{cursor} =
2214 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2215 ? $self->{cursor} + length $1
2216 : length $self->{text};
2217 } elsif ($uni == 21) { # ctrl-u
2218 $text = "";
1799 $self->{cursor} = 0; 2219 $self->{cursor} = 0;
1800 } elsif ($sym == CFClient::SDLK_END) {
1801 $self->{cursor} = length $text;
1802 } elsif ($uni == 27) { 2220 } elsif ($uni == 27) {
1803 $self->emit ('escape'); 2221 $self->emit ('escape');
1804 } elsif ($uni) { 2222 } elsif ($uni == 0x0d) {
2223 substr $text, $self->{cursor}++, 0, "\012";
2224 } elsif ($uni >= 0x20) {
1805 substr $text, $self->{cursor}++, 0, chr $uni; 2225 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else { 2226 } else {
1807 return 0; 2227 return 0;
1808 } 2228 }
1809 2229
1810 $self->_set_text ($text); 2230 $self->_set_text ($text);
1811 2231
1812 $self->realloc; 2232 $self->realloc;
2233 $self->update;
1813 2234
1814 1 2235 1
1815} 2236}
1816 2237
1817sub invoke_focus_in { 2238sub invoke_focus_in {
… …
1829 2250
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 2251 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 2252
1832 # byte-index to char-index 2253 # byte-index to char-index
1833 my $text = $self->{text}; 2254 my $text = $self->{text};
1834 utf8::encode $text; 2255 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 2256 $self->{cursor} = length $text;
1836 2257
1837 $self->_set_text ($self->{text}); 2258 $self->_set_text ($self->{text});
1838 $self->update; 2259 $self->update;
1839 2260
1840 1 2261 1
… …
1879 utf8::encode $text; 2300 utf8::encode $text;
1880 2301
1881 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2302 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1882 } 2303 }
1883 2304
1884 glColor @{$self->{fg}};
1885 glBegin GL_LINES; 2305 glBegin GL_LINES;
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1887 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1888 glEnd; 2308 glEnd;
1889 } 2309 }
1890} 2310}
1891 2311
2312#############################################################################
2313
1892package CFClient::UI::Entry; 2314package CFPlus::UI::Entry;
1893 2315
1894our @ISA = CFClient::UI::EntryBase::; 2316our @ISA = CFPlus::UI::EntryBase::;
1895 2317
1896use CFClient::OpenGL; 2318use CFPlus::OpenGL;
1897 2319
1898sub invoke_key_down { 2320sub invoke_key_down {
1899 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1900 2322
1901 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1902 2324
1903 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1904 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1905 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
1906 2328
1907 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1908 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1909 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
1910 $self->update; 2332 $self->update;
1911 2333
1912 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == CFPlus::SDLK_UP) {
1913 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1914 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1915 } 2337 }
1916 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1917 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1919 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1920 } 2342 }
1921 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1922 } 2344 }
1923 2345
1924 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
1925 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1926 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927 2349
1928 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1938 1 2360 1
1939} 2361}
1940 2362
1941############################################################################# 2363#############################################################################
1942 2364
2365package CFPlus::UI::TextEdit;
2366
2367our @ISA = CFPlus::UI::EntryBase::;
2368
2369use CFPlus::OpenGL;
2370
2371sub move_cursor_ver {
2372 my ($self, $dy) = @_;
2373
2374 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2375
2376 $y += $dy;
2377
2378 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2379 $self->{cursor} = $index;
2380 delete $self->{cur_h};
2381 $self->update;
2382 return;
2383 }
2384}
2385
2386sub invoke_key_down {
2387 my ($self, $ev) = @_;
2388
2389 my $sym = $ev->{sym};
2390
2391 if ($sym == CFPlus::SDLK_UP) {
2392 $self->move_cursor_ver (-1);
2393 } elsif ($sym == CFPlus::SDLK_DOWN) {
2394 $self->move_cursor_ver (+1);
2395 } else {
2396 return $self->SUPER::invoke_key_down ($ev)
2397 }
2398
2399 1
2400}
2401
2402#############################################################################
2403
1943package CFClient::UI::Button; 2404package CFPlus::UI::Button;
1944 2405
1945our @ISA = CFClient::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
1946 2407
1947use CFClient::OpenGL; 2408use CFPlus::OpenGL;
1948 2409
1949my @tex = 2410my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
1952 2413
1953sub new { 2414sub new {
1954 my $class = shift; 2415 my $class = shift;
1955 2416
1956 $class->SUPER::new ( 2417 $class->SUPER::new (
1957 padding_x => 4, 2418 padding_x => 4,
1958 padding_y => 4, 2419 padding_y => 4,
1959 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
1960 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
1961 can_hover => 1, 2422 can_hover => 1,
1962 align => 0, 2423 align => 0,
1963 valign => 0, 2424 valign => 0,
1964 can_events => 1, 2425 can_events => 1,
1965 @_ 2426 @_
… …
1983 2444
1984 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
1987 2448
2449 my $tex = $tex[$GRAB == $self];
1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1989 2451
1990 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
1991 2453
1992 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
1993} 2455}
1994 2456
1995############################################################################# 2457#############################################################################
1996 2458
2459package CFPlus::UI::CheckBox;
2460
2461our @ISA = CFPlus::UI::DrawBG::;
2462
2463my @tex =
2464 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2465 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2466
2467use CFPlus::OpenGL;
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2473 padding_x => 2,
2474 padding_y => 2,
2475 fg => [1, 1, 1],
2476 active_fg => [1, 1, 0],
2477 bg => [0, 0, 0, 0.2],
2478 active_bg => [1, 1, 1, 0.5],
2479 state => 0,
2480 can_hover => 1,
2481 @_
2482 )
2483}
2484
2485sub size_request {
2486 my ($self) = @_;
2487
2488 (6) x 2
2489}
2490
2491sub toggle {
2492 my ($self) = @_;
2493
2494 $self->{state} = !$self->{state};
2495 $self->emit (changed => $self->{state});
2496 $self->update;
2497}
2498
2499sub invoke_button_down {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2503 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2504 $self->toggle;
2505 } else {
2506 return 0
2507 }
2508
2509 1
2510}
2511
2512sub _draw {
2513 my ($self) = @_;
2514
2515 $self->SUPER::_draw;
2516
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2518
2519 my ($w, $h) = @$self{qw(w h)};
2520
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522
2523 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2524
2525 my $tex = $self->{state} ? $tex[1] : $tex[0];
2526
2527 glEnable GL_TEXTURE_2D;
2528 $tex->draw_quad_alpha (0, 0, $s, $s);
2529 glDisable GL_TEXTURE_2D;
2530}
2531
2532#############################################################################
2533
2534package CFPlus::UI::Image;
2535
2536our @ISA = CFPlus::UI::Base::;
2537
2538use CFPlus::OpenGL;
2539
2540our %texture_cache;
2541
2542sub new {
2543 my $class = shift;
2544
2545 my $self = $class->SUPER::new (
2546 can_events => 0,
2547 @_,
2548 );
2549
2550 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required";
2552
2553 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2554 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2555
2556 CFPlus::weaken $texture_cache{$self->{path}};
2557
2558 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2559
2560 $self
2561}
2562
2563sub STORABLE_freeze {
2564 my ($self, $cloning) = @_;
2565
2566 $self->{path}
2567 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2568
2569 $self->{path}
2570}
2571
2572sub STORABLE_attach {
2573 my ($self, $cloning, $path) = @_;
2574
2575 $self->new (path => $path)
2576}
2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 ($self->{tex}{w}, $self->{tex}{h})
2582}
2583
2584sub _draw {
2585 my ($self) = @_;
2586
2587 my $tex = $self->{tex};
2588
2589 my ($w, $h) = ($self->{w}, $self->{h});
2590
2591 if ($self->{rot90}) {
2592 glRotate 90, 0, 0, 1;
2593 glTranslate 0, -$self->{w}, 0;
2594
2595 ($w, $h) = ($h, $w);
2596 }
2597
2598 glEnable GL_TEXTURE_2D;
2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2600
2601 $tex->draw_quad (0, 0, $w, $h);
2602
2603 glDisable GL_TEXTURE_2D;
2604}
2605
2606#############################################################################
2607
1997package CFClient::UI::ImageButton; 2608package CFPlus::UI::ImageButton;
1998 2609
1999our @ISA = CFClient::UI::Image::; 2610our @ISA = CFPlus::UI::Image::;
2000 2611
2001use CFClient::OpenGL; 2612use CFPlus::OpenGL;
2002 2613
2003my %textures; 2614my %textures;
2004 2615
2005sub new { 2616sub new {
2006 my $class = shift; 2617 my $class = shift;
… …
2028 1 2639 1
2029} 2640}
2030 2641
2031############################################################################# 2642#############################################################################
2032 2643
2033package CFClient::UI::CheckBox;
2034
2035our @ISA = CFClient::UI::DrawBG::;
2036
2037my @tex =
2038 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2039 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040
2041use CFClient::OpenGL;
2042
2043sub new {
2044 my $class = shift;
2045
2046 $class->SUPER::new (
2047 padding_x => 2,
2048 padding_y => 2,
2049 fg => [1, 1, 1],
2050 active_fg => [1, 1, 0],
2051 bg => [0, 0, 0, 0.2],
2052 active_bg => [1, 1, 1, 0.5],
2053 state => 0,
2054 can_hover => 1,
2055 @_
2056 )
2057}
2058
2059sub size_request {
2060 my ($self) = @_;
2061
2062 (6) x 2
2063}
2064
2065sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_;
2067
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state};
2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
2076 1
2077}
2078
2079sub _draw {
2080 my ($self) = @_;
2081
2082 $self->SUPER::_draw;
2083
2084 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2085
2086 my ($w, $h) = @$self{qw(w h)};
2087
2088 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2089
2090 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2091
2092 my $tex = $self->{state} ? $tex[1] : $tex[0];
2093
2094 glEnable GL_TEXTURE_2D;
2095 $tex->draw_quad_alpha (0, 0, $s, $s);
2096 glDisable GL_TEXTURE_2D;
2097}
2098
2099#############################################################################
2100
2101package CFClient::UI::Image; 2644package CFPlus::UI::VGauge;
2102 2645
2103our @ISA = CFClient::UI::Base::; 2646our @ISA = CFPlus::UI::Base::;
2104
2105use CFClient::OpenGL;
2106
2107our %texture_cache;
2108
2109sub new {
2110 my $class = shift;
2111
2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2116
2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2119
2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122
2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2124
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2126
2127 $self
2128}
2129
2130sub size_request {
2131 my ($self) = @_;
2132
2133 ($self->{tex}{w}, $self->{tex}{h})
2134}
2135
2136sub _draw {
2137 my ($self) = @_;
2138
2139 my $tex = $self->{tex};
2140
2141 my ($w, $h) = ($self->{w}, $self->{h});
2142
2143 if ($self->{rot90}) {
2144 glRotate 90, 0, 0, 1;
2145 glTranslate 0, -$self->{w}, 0;
2146
2147 ($w, $h) = ($h, $w);
2148 }
2149
2150 glEnable GL_TEXTURE_2D;
2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2152
2153 $tex->draw_quad_alpha (0, 0, $w, $h);
2154
2155 glDisable GL_TEXTURE_2D;
2156}
2157
2158#############################################################################
2159
2160package CFClient::UI::VGauge;
2161
2162our @ISA = CFClient::UI::Base::;
2163 2647
2164use List::Util qw(min max); 2648use List::Util qw(min max);
2165 2649
2166use CFClient::OpenGL; 2650use CFPlus::OpenGL;
2167 2651
2168my %tex = ( 2652my %tex = (
2169 food => [ 2653 food => [
2170 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2171 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2655 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172 ], 2656 ],
2173 grace => [ 2657 grace => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2175 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2659 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2176 ], 2660 ],
2177 hp => [ 2661 hp => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2662 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2179 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2663 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180 ], 2664 ],
2181 mana => [ 2665 mana => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2666 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2183 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2667 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2184 ], 2668 ],
2185); 2669);
2186 2670
2187# eg. VGauge->new (gauge => 'food'), default gauge: food 2671# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2731 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2732 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2733
2250 my $h1 = $self->{h} * (1 - $ycut1); 2734 my $h1 = $self->{h} * (1 - $ycut1);
2251 my $h2 = $self->{h} * (1 - $ycut2); 2735 my $h2 = $self->{h} * (1 - $ycut2);
2736 my $h3 = $self->{h};
2737
2738 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252 2739
2253 glEnable GL_BLEND; 2740 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2741 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2742 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2743 glEnable GL_TEXTURE_2D;
… …
2275 2762
2276 if ($t3) { 2763 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2764 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2765 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2766 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2767 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2768 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2769 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2770 glEnd;
2284 } 2771 }
2285 2772
2286 glDisable GL_BLEND; 2773 glDisable GL_BLEND;
2287 glDisable GL_TEXTURE_2D; 2774 glDisable GL_TEXTURE_2D;
2288} 2775}
2289 2776
2290############################################################################# 2777#############################################################################
2291 2778
2292package CFClient::UI::Gauge; 2779package CFPlus::UI::Gauge;
2293 2780
2294our @ISA = CFClient::UI::VBox::; 2781our @ISA = CFPlus::UI::VBox::;
2295 2782
2296sub new { 2783sub new {
2297 my ($class, %arg) = @_; 2784 my ($class, %arg) = @_;
2298 2785
2299 my $self = $class->SUPER::new ( 2786 my $self = $class->SUPER::new (
… …
2301 can_hover => 1, 2788 can_hover => 1,
2302 can_events => 1, 2789 can_events => 1,
2303 %arg, 2790 %arg,
2304 ); 2791 );
2305 2792
2306 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2793 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2307 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2794 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2308 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2795 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2309 2796
2310 $self 2797 $self
2311} 2798}
2312 2799
2313sub set_fontsize { 2800sub set_fontsize {
… …
2334 $self->{value}->set_text ($val); 2821 $self->{value}->set_text ($val);
2335} 2822}
2336 2823
2337############################################################################# 2824#############################################################################
2338 2825
2339package CFClient::UI::Slider; 2826package CFPlus::UI::Slider;
2340 2827
2341use strict; 2828use strict;
2342 2829
2343use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2344 2831
2345our @ISA = CFClient::UI::DrawBG::; 2832our @ISA = CFPlus::UI::DrawBG::;
2346 2833
2347my @tex = 2834my @tex =
2348 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2835 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2349 qw(s1_slider.png s1_slider_bg.png); 2836 qw(s1_slider.png s1_slider_bg.png);
2350 2837
2351sub new { 2838sub new {
2352 my $class = shift; 2839 my $class = shift;
2353 2840
… …
2442 } 2929 }
2443 2930
2444 1 2931 1
2445} 2932}
2446 2933
2934sub invoke_mouse_wheel {
2935 my ($self, $ev) = @_;
2936
2937 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2938
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940
2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2942
2943 ! ! $delta
2944}
2945
2447sub update { 2946sub update {
2448 my ($self) = @_; 2947 my ($self) = @_;
2449 2948
2450 delete $self->{knob_w}; 2949 delete $self->{knob_w};
2451 $self->SUPER::update; 2950 $self->SUPER::update;
… …
2498 glDisable GL_TEXTURE_2D; 2997 glDisable GL_TEXTURE_2D;
2499} 2998}
2500 2999
2501############################################################################# 3000#############################################################################
2502 3001
2503package CFClient::UI::ValSlider; 3002package CFPlus::UI::ValSlider;
2504 3003
2505our @ISA = CFClient::UI::HBox::; 3004our @ISA = CFPlus::UI::HBox::;
2506 3005
2507sub new { 3006sub new {
2508 my ($class, %arg) = @_; 3007 my ($class, %arg) = @_;
2509 3008
2510 my $range = delete $arg{range}; 3009 my $range = delete $arg{range};
2511 3010
2512 my $self = $class->SUPER::new ( 3011 my $self = $class->SUPER::new (
2513 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3012 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2514 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3013 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2515 to_value => sub { shift }, 3014 to_value => sub { shift },
2516 from_value => sub { shift }, 3015 from_value => sub { shift },
2517 %arg, 3016 %arg,
2518 ); 3017 );
2519 3018
… …
2539sub set_range { shift->{slider}->set_range (@_) } 3038sub set_range { shift->{slider}->set_range (@_) }
2540sub set_value { shift->{slider}->set_value (@_) } 3039sub set_value { shift->{slider}->set_value (@_) }
2541 3040
2542############################################################################# 3041#############################################################################
2543 3042
2544package CFClient::UI::TextScroller; 3043package CFPlus::UI::TextScroller;
2545 3044
2546our @ISA = CFClient::UI::HBox::; 3045our @ISA = CFPlus::UI::HBox::;
2547 3046
2548use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2549 3048
2550sub new { 3049sub new {
2551 my $class = shift; 3050 my $class = shift;
2552 3051
2553 my $self = $class->SUPER::new ( 3052 my $self = $class->SUPER::new (
2554 fontsize => 1, 3053 fontsize => 1,
2555 can_events => 0, 3054 can_events => 1,
2556 indent => 0, 3055 indent => 0,
2557 #font => default_font 3056 #font => default_font
2558 @_, 3057 @_,
2559 3058
2560 layout => (new CFClient::Layout 1), 3059 layout => (new CFPlus::Layout),
2561 par => [], 3060 par => [],
3061 max_par => 0,
2562 height => 0, 3062 height => 0,
2563 children => [ 3063 children => [
2564 (new CFClient::UI::Empty expand => 1), 3064 (new CFPlus::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 3065 (new CFPlus::UI::Slider vertical => 1),
2566 ], 3066 ],
2567 ); 3067 );
2568 3068
2569 $self->{children}[1]->connect (changed => sub { $self->update }); 3069 $self->{children}[1]->connect (changed => sub { $self->update });
2570 3070
… …
2600 3100
2601 $self->reflow; 3101 $self->reflow;
2602 3102
2603 local $self->{children} = [$empty, $slider]; 3103 local $self->{children} = [$empty, $slider];
2604 $self->SUPER::invoke_size_allocate ($w, $h) 3104 $self->SUPER::invoke_size_allocate ($w, $h)
3105}
3106
3107sub invoke_mouse_wheel {
3108 my ($self, $ev) = @_;
3109
3110 return 0 unless $ev->{dy}; # only vertical movements
3111
3112 $self->{children}[1]->emit (mouse_wheel => $ev);
3113
3114 1
2605} 3115}
2606 3116
2607sub get_layout { 3117sub get_layout {
2608 my ($self, $para) = @_; 3118 my ($self, $para) = @_;
2609 3119
… …
2637 3147
2638 # todo: base offset on lines or so, not on pixels 3148 # todo: base offset on lines or so, not on pixels
2639 $self->{children}[1]->set_value ($offset); 3149 $self->{children}[1]->set_value ($offset);
2640} 3150}
2641 3151
3152sub current_paragraph {
3153 my ($self) = @_;
3154
3155 $self->{top_paragraph} - 1
3156}
3157
3158sub scroll_to {
3159 my ($self, $para) = @_;
3160
3161 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3162
3163 $self->{scroll_to} = $para;
3164 $self->update;
3165}
3166
2642sub clear { 3167sub clear {
2643 my ($self) = @_; 3168 my ($self) = @_;
2644 3169
2645 my (undef, undef, @other) = @{ $self->{children} }; 3170 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other; 3171 $self->remove ($_) for @other;
… …
2649 $self->{height} = 0; 3174 $self->{height} = 0;
2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3175 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651} 3176}
2652 3177
2653sub add_paragraph { 3178sub add_paragraph {
2654 my ($self, $color, $para, $indent) = @_; 3179 my $self = shift;
2655 3180
2656 my ($text, @w) = ref $para ? @$para : $para; 3181 for my $para (@_) {
2657
2658 $para = { 3182 $para = {
3183 fg => [1, 1, 1, 1],
3184 indent => 0,
3185 markup => "",
3186 widget => [],
3187 ref $para ? %$para : (markup => $para),
2659 w => 1e10, 3188 w => 1e10,
2660 wrapped => 1, 3189 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2665 }; 3190 };
2666 3191
2667 $self->add (@w) if @w; 3192 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668 push @{$self->{par}}, $para; 3193 push @{$self->{par}}, $para;
3194 }
3195
3196 if (my $max = $self->{max_par}) {
3197 shift @{$self->{par}} while @{$self->{par}} > $max;
3198 }
2669 3199
2670 $self->{need_reflow}++; 3200 $self->{need_reflow}++;
2671 $self->update; 3201 $self->update;
2672} 3202}
2673 3203
2674sub scroll_to_bottom { 3204sub scroll_to_bottom {
2675 my ($self) = @_; 3205 my ($self) = @_;
2676 3206
2677 $self->{scroll_to_bottom} = 1; 3207 $self->{scroll_to} = $#{$self->{par}};
2678 $self->update; 3208 $self->update;
2679} 3209}
2680 3210
3211sub force_uptodate {
3212 my ($self) = @_;
3213
3214 if (delete $self->{need_reflow}) {
3215 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3216
3217 my $height = 0;
3218
3219 for my $para (@{$self->{par}}) {
3220 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3221 my $layout = $self->get_layout ($para);
3222 my ($w, $h) = $layout->size;
3223
3224 $para->{w} = $w + $para->{indent};
3225 $para->{h} = $h;
3226 $para->{wrapped} = $layout->has_wrapped;
3227 }
3228
3229 $para->{y} = $height;
3230 $height += $para->{h};
3231 }
3232
3233 $self->{height} = $height;
3234 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3235
3236 delete $self->{texture};
3237 }
3238
3239 if (my $paridx = delete $self->{scroll_to}) {
3240 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3241 }
3242}
3243
2681sub update { 3244sub update {
2682 my ($self) = @_; 3245 my ($self) = @_;
2683 3246
2684 $self->SUPER::update; 3247 $self->SUPER::update;
2685 3248
2686 return unless $self->{h} > 0; 3249 return unless $self->{h} > 0;
2687 3250
2688 delete $self->{texture}; 3251 delete $self->{texture};
2689 3252
2690 $ROOT->on_post_alloc ($self => sub { 3253 $ROOT->on_post_alloc ($self => sub {
3254 $self->force_uptodate;
3255
2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3256 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692 3257
2693 if (delete $self->{need_reflow}) {
2694 my $height = 0;
2695
2696 for my $para (@{$self->{par}}) {
2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698 my $layout = $self->get_layout ($para);
2699 my ($w, $h) = $layout->size;
2700
2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2704 }
2705
2706 $height += $para->{h};
2707 }
2708
2709 $self->{height} = $height;
2710
2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3258 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2721 glClearColor 0, 0, 0, 0; 3259 glClearColor 0, 0, 0, 0;
2722 glClear GL_COLOR_BUFFER_BIT; 3260 glClear GL_COLOR_BUFFER_BIT;
2723 3261
3262 package CFPlus::UI::Base;
3263 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3264 (0, 0, $self->{w}, $self->{h});
3265
3266 my $top = int $self->{children}[1]{range}[0];
3267
3268 my $paridx = 0;
3269 my $top_paragraph;
2724 my $top = int $self->{children}[1]{range}[0]; 3270 my $top = int $self->{children}[1]{range}[0];
2725 3271
2726 my $y0 = $top; 3272 my $y0 = $top;
2727 my $y1 = $top + $H; 3273 my $y1 = $top + $H;
2728 3274
2729 my $y = 0;
2730
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 3275 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 3276 my $h = $para->{h};
3277 my $y = $para->{y};
2737 3278
2738 if ($y0 < $y + $h && $y < $y1) { 3279 if ($y0 < $y + $h && $y < $y1) {
2739
2740 my $layout = $self->get_layout ($para); 3280 my $layout = $self->get_layout ($para);
2741 3281
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 3282 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746 3283
2747 if (my @w = @{ $para->{widget} }) { 3284 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 3285 my @s = $layout->get_shapes;
2749 3286
2750 glDisable GL_BLEND;
2751 for (@w) { 3287 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 3288 my ($dx, $dy) = splice @s, 0, 2, ();
2753 3289
2754 $_->{x} = $dx + $para->{indent}; 3290 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 3291 $_->{y} = $dy + $y - $y0;
2756 3292
2757 $_->draw; 3293 $_->draw;
2758 } 3294 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 3295 }
2762 } 3296 }
2763 3297
2764 $y += $h; 3298 $paridx++;
3299 $top_paragraph ||= $paridx if $y >= $top;
2765 } 3300 }
2766 3301
2767 glDisable GL_BLEND; 3302 $self->{top_paragraph} = $top_paragraph;
2768 }; 3303 };
2769 }); 3304 });
2770} 3305}
2771 3306
2772sub reconfigure { 3307sub reconfigure {
… …
2790 $self->{children}[1]->draw; 3325 $self->{children}[1]->draw;
2791} 3326}
2792 3327
2793############################################################################# 3328#############################################################################
2794 3329
2795package CFClient::UI::Animator; 3330package CFPlus::UI::Animator;
2796 3331
2797use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2798 3333
2799our @ISA = CFClient::UI::Bin::; 3334our @ISA = CFPlus::UI::Bin::;
2800 3335
2801sub moveto { 3336sub moveto {
2802 my ($self, $x, $y) = @_; 3337 my ($self, $x, $y) = @_;
2803 3338
2804 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3339 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2832 glPopMatrix; 3367 glPopMatrix;
2833} 3368}
2834 3369
2835############################################################################# 3370#############################################################################
2836 3371
2837package CFClient::UI::Flopper; 3372package CFPlus::UI::Flopper;
2838 3373
2839our @ISA = CFClient::UI::Button::; 3374our @ISA = CFPlus::UI::Button::;
2840 3375
2841sub new { 3376sub new {
2842 my $class = shift; 3377 my $class = shift;
2843 3378
2844 my $self = $class->SUPER::new ( 3379 my $self = $class->SUPER::new (
… …
2856 $self->{other}->toggle_visibility; 3391 $self->{other}->toggle_visibility;
2857} 3392}
2858 3393
2859############################################################################# 3394#############################################################################
2860 3395
2861package CFClient::UI::Tooltip; 3396package CFPlus::UI::Tooltip;
2862 3397
2863our @ISA = CFClient::UI::Bin::; 3398our @ISA = CFPlus::UI::Bin::;
2864 3399
2865use CFClient::OpenGL; 3400use CFPlus::OpenGL;
2866 3401
2867sub new { 3402sub new {
2868 my $class = shift; 3403 my $class = shift;
2869 3404
2870 $class->SUPER::new ( 3405 $class->SUPER::new (
… …
2873 ) 3408 )
2874} 3409}
2875 3410
2876sub set_tooltip_from { 3411sub set_tooltip_from {
2877 my ($self, $widget) = @_; 3412 my ($self, $widget) = @_;
3413
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
2878 3416
2879 my $tooltip = $widget->{tooltip}; 3417 my $tooltip = $widget->{tooltip};
2880 3418
2881 if ($ENV{CFPLUS_DEBUG} & 2) { 3419 if ($ENV{CFPLUS_DEBUG} & 2) {
2882 $tooltip .= "\n\n" . (ref $widget) . "\n" 3420 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2886 } 3424 }
2887 3425
2888 $tooltip =~ s/^\n+//; 3426 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//; 3427 $tooltip =~ s/\n+$//;
2890 3428
2891 $self->add (new CFClient::UI::Label 3429 $self->add (new CFPlus::UI::Label
2892 markup => $tooltip, 3430 markup => $tooltip,
2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2894 fontsize => 0.8, 3432 fontsize => 0.8,
2895 fg => [0, 0, 0, 1], 3433 style => 1, # FLAG_INVERSE
2896 ellipsise => 0, 3434 ellipsise => 0,
2897 font => ($widget->{tooltip_font} || $::FONT_PROP), 3435 font => ($widget->{tooltip_font} || $::FONT_PROP),
2898 ); 3436 );
2899} 3437}
2900 3438
… …
2919 3457
2920 $self->{root}->on_post_alloc ("move_$self" => sub { 3458 $self->{root}->on_post_alloc ("move_$self" => sub {
2921 my $widget = $self->{owner} 3459 my $widget = $self->{owner}
2922 or return; 3460 or return;
2923 3461
3462 if ($widget->{visible}) {
2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3463 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925 3464
2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3465 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927 if $x + $self->{w} > $self->{root}{w}; 3466 if $x + $self->{w} > $self->{root}{w};
2928 3467
2929 $self->move_abs ($x, $y); 3468 $self->move_abs ($x, $y);
3469 } else {
3470 $self->hide;
3471 }
2930 }); 3472 });
2931} 3473}
2932 3474
2933sub _draw { 3475sub _draw {
2934 my ($self) = @_; 3476 my ($self) = @_;
… …
2958 $self->SUPER::_draw; 3500 $self->SUPER::_draw;
2959} 3501}
2960 3502
2961############################################################################# 3503#############################################################################
2962 3504
2963package CFClient::UI::Face; 3505package CFPlus::UI::Face;
2964 3506
2965our @ISA = CFClient::UI::Base::; 3507our @ISA = CFPlus::UI::DrawBG::;
2966 3508
2967use CFClient::OpenGL; 3509use CFPlus::OpenGL;
2968 3510
2969sub new { 3511sub new {
2970 my $class = shift; 3512 my $class = shift;
2971 3513
2972 my $self = $class->SUPER::new ( 3514 my $self = $class->SUPER::new (
3515 size_w => 32,
3516 size_h => 8,
2973 aspect => 1, 3517 aspect => 1,
2974 can_events => 0, 3518 can_events => 0,
2975 @_, 3519 @_,
2976 ); 3520 );
2977 3521
2978 if ($self->{anim} && $self->{animspeed}) { 3522 if ($self->{anim} && $self->{animspeed}) {
2979 Scalar::Util::weaken (my $widget = $self); 3523 CFPlus::weaken (my $widget = $self);
2980 3524
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2981 $self->{timer} = Event->timer ( 3527 $self->{timer} = Event->timer (
2982 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983 hard => 1, 3528 parked => 1,
2984 interval => $self->{animspeed},
2985 cb => sub { 3529 cb => sub {
3530 return unless $::CONN && $widget;
3531
2986 ++$widget->{frame}; 3532 ++$widget->{frame};
3533 $widget->update_face;
2987 $widget->update; 3534 $widget->update;
3535
3536 $widget->update_timer;
2988 }, 3537 },
2989 ); 3538 );
3539
3540 $self->update_face;
3541 $self->update_timer;
2990 } 3542 }
2991 3543
2992 $self 3544 $self
2993} 3545}
2994 3546
3547sub update_timer {
3548 my ($self) = @_;
3549
3550 return unless $self->{timer};
3551
3552 if ($self->{visible}) {
3553 $self->{timer}->at (
3554 $self->{anim_start}
3555 + $self->{animspeed}
3556 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3557 );
3558 $self->{timer}->start;
3559 } else {
3560 $self->{timer}->stop;
3561 }
3562}
3563
3564sub update_face {
3565 my ($self) = @_;
3566
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
2995sub size_request { 3577sub size_request {
2996 (32, 8) 3578 my ($self) = @_;
3579
3580 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3584 } else {
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3586 $self->realloc;
3587 });
3588 }
3589 }
3590 }
3591
3592 ($self->{size_w} || 8, $self->{size_h} || 8)
2997} 3593}
2998 3594
2999sub update { 3595sub update {
3000 my ($self) = @_; 3596 my ($self) = @_;
3001 3597
3002 return unless $self->{visible}; 3598 return unless $self->{visible};
3003 3599
3004 $self->SUPER::update; 3600 $self->SUPER::update;
3005} 3601}
3006 3602
3603sub invoke_visibility_change {
3604 my ($self) = @_;
3605
3606 $self->update_timer;
3607
3608 0
3609}
3610
3007sub _draw { 3611sub _draw {
3008 my ($self) = @_; 3612 my ($self) = @_;
3009 3613
3010 return unless $::CONN; 3614 return unless $::CONN;
3011 3615
3012 my $face; 3616 $self->SUPER::_draw;
3013 3617
3014 if ($self->{frame}) {
3015 my $anim = $::CONN->{anim}[$self->{anim}]; 3618 my $faceid = $::CONN->{faceid}[$self->{face}]
3016 3619 or return;
3017 $face = $anim->[ $self->{frame} % @$anim ]
3018 if $anim && @$anim;
3019 }
3020 3620
3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3621 my $tex = $::CONN->{texture}[$faceid];
3022 3622
3023 if ($tex) { 3623 if ($tex) {
3024 glEnable GL_TEXTURE_2D; 3624 glEnable GL_TEXTURE_2D;
3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026 glColor 0, 0, 0, 1; 3626 glColor 0, 0, 0, 1;
… …
3030} 3630}
3031 3631
3032sub destroy { 3632sub destroy {
3033 my ($self) = @_; 3633 my ($self) = @_;
3034 3634
3035 $self->{timer}->cancel 3635 (delete $self->{timer})->cancel
3036 if $self->{timer}; 3636 if $self->{timer};
3037 3637
3038 $self->SUPER::destroy; 3638 $self->SUPER::destroy;
3039} 3639}
3040 3640
3041############################################################################# 3641#############################################################################
3042 3642
3043package CFClient::UI::Buttonbar; 3643package CFPlus::UI::Buttonbar;
3044 3644
3045our @ISA = CFClient::UI::HBox::; 3645our @ISA = CFPlus::UI::HBox::;
3046 3646
3047# TODO: should actualyl wrap buttons and other goodies. 3647# TODO: should actually wrap buttons and other goodies.
3048 3648
3049############################################################################# 3649#############################################################################
3050 3650
3051package CFClient::UI::Menu; 3651package CFPlus::UI::Menu;
3052 3652
3053our @ISA = CFClient::UI::FancyFrame::; 3653our @ISA = CFPlus::UI::Toplevel::;
3054 3654
3055use CFClient::OpenGL; 3655use CFPlus::OpenGL;
3056 3656
3057sub new { 3657sub new {
3058 my $class = shift; 3658 my $class = shift;
3059 3659
3060 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
3061 items => [], 3661 items => [],
3062 z => 100, 3662 z => 100,
3063 @_, 3663 @_,
3064 ); 3664 );
3065 3665
3066 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3666 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3067 3667
3068 for my $item (@{ $self->{items} }) { 3668 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3669 my ($widget, $cb, $tooltip) = @$item;
3070 3670
3071 # handle various types of items, only text for now 3671 # handle various types of items, only text for now
3072 if (!ref $widget) { 3672 if (!ref $widget) {
3673 if ($widget =~ /\t/) {
3674 my ($left, $right) = split /\t/, $widget, 2;
3675
3073 $widget = new CFClient::UI::Label 3676 $widget = new CFPlus::UI::HBox
3074 can_hover => 1, 3677 can_hover => 1,
3075 can_events => 1, 3678 can_events => 1,
3679 tooltip => $tooltip,
3680 children => [
3681 (new CFPlus::UI::Label markup => $left, expand => 1),
3682 (new CFPlus::UI::Label markup => $right, align => +1),
3683 ],
3684 ;
3685
3686 } else {
3687 $widget = new CFPlus::UI::Label
3688 can_hover => 1,
3689 can_events => 1,
3076 markup => $widget, 3690 markup => $widget,
3077 tooltip => $tooltip 3691 tooltip => $tooltip;
3692 }
3078 } 3693 }
3079 3694
3080 $self->{item}{$widget} = $item; 3695 $self->{item}{$widget} = $item;
3081 3696
3082 $self->{vbox}->add ($widget); 3697 $self->{vbox}->add ($widget);
… …
3125 1 3740 1
3126} 3741}
3127 3742
3128############################################################################# 3743#############################################################################
3129 3744
3130package CFClient::UI::Multiplexer; 3745package CFPlus::UI::Multiplexer;
3131 3746
3132our @ISA = CFClient::UI::Container::; 3747our @ISA = CFPlus::UI::Container::;
3133 3748
3134sub new { 3749sub new {
3135 my $class = shift; 3750 my $class = shift;
3136 3751
3137 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
… …
3151 3766
3152 $self->{current} = $self->{children}[0] 3767 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3768 if @{ $self->{children} };
3154} 3769}
3155 3770
3771sub get_current_page {
3772 my ($self) = @_;
3773
3774 $self->{current}
3775}
3776
3156sub set_current_page { 3777sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3778 my ($self, $page_or_widget) = @_;
3158 3779
3159 my $widget = ref $page_or_widget 3780 my $widget = ref $page_or_widget
3160 ? $page_or_widget 3781 ? $page_or_widget
… …
3192 $self->{current}->draw; 3813 $self->{current}->draw;
3193} 3814}
3194 3815
3195############################################################################# 3816#############################################################################
3196 3817
3197package CFClient::UI::Notebook; 3818package CFPlus::UI::Notebook;
3198 3819
3199our @ISA = CFClient::UI::VBox::; 3820our @ISA = CFPlus::UI::VBox::;
3200 3821
3201sub new { 3822sub new {
3202 my $class = shift; 3823 my $class = shift;
3203 3824
3204 my $self = $class->SUPER::new ( 3825 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar), 3826 buttonbar => (new CFPlus::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3207 # filter => # will be put between multiplexer and $self 3828 # filter => # will be put between multiplexer and $self
3208 @_, 3829 @_,
3209 ); 3830 );
3210 3831
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3215} 3836}
3216 3837
3217sub add { 3838sub add {
3218 my ($self, $title, $widget, $tooltip) = @_; 3839 my ($self, $title, $widget, $tooltip) = @_;
3219 3840
3220 Scalar::Util::weaken $self; 3841 CFPlus::weaken $self;
3221 3842
3222 $self->{buttonbar}->add (new CFClient::UI::Button 3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3223 markup => $title, 3844 markup => $title,
3224 tooltip => $tooltip, 3845 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) }, 3846 on_activate => sub { $self->set_current_page ($widget) },
3226 ); 3847 );
3227 3848
3228 $self->{multiplexer}->add ($widget); 3849 $self->{multiplexer}->add ($widget);
3229} 3850}
3230 3851
3852sub get_current_page {
3853 my ($self) = @_;
3854
3855 $self->{multiplexer}->get_current_page
3856}
3857
3231sub set_current_page { 3858sub set_current_page {
3232 my ($self, $page) = @_; 3859 my ($self, $page) = @_;
3233 3860
3234 $self->{multiplexer}->set_current_page ($page); 3861 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current}); 3862 $self->emit (page_changed => $self->{multiplexer}{current});
3236} 3863}
3237 3864
3238############################################################################# 3865#############################################################################
3239 3866
3240package CFClient::UI::Combobox; 3867package CFPlus::UI::Selector;
3241 3868
3242use utf8; 3869use utf8;
3243 3870
3244our @ISA = CFClient::UI::Button::; 3871our @ISA = CFPlus::UI::Button::;
3245 3872
3246sub new { 3873sub new {
3247 my $class = shift; 3874 my $class = shift;
3248 3875
3249 my $self = $class->SUPER::new ( 3876 my $self = $class->SUPER::new (
… …
3266 my ($value, $title, $tooltip) = @$_; 3893 my ($value, $title, $tooltip) = @$_;
3267 3894
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3895 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 } 3896 }
3270 3897
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3898 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272} 3899}
3273 3900
3274sub _set_value { 3901sub _set_value {
3275 my ($self, $value) = @_; 3902 my ($self, $value) = @_;
3276 3903
… …
3291 $self->emit (changed => $value); 3918 $self->emit (changed => $value);
3292} 3919}
3293 3920
3294############################################################################# 3921#############################################################################
3295 3922
3296package CFClient::UI::Statusbox; 3923package CFPlus::UI::Statusbox;
3297 3924
3298our @ISA = CFClient::UI::VBox::; 3925our @ISA = CFPlus::UI::VBox::;
3299 3926
3300sub new { 3927sub new {
3301 my $class = shift; 3928 my $class = shift;
3302 3929
3303 my $self = $class->SUPER::new ( 3930 my $self = $class->SUPER::new (
3304 fontsize => 0.8, 3931 fontsize => 0.8,
3305 @_, 3932 @_,
3306 ); 3933 );
3307 3934
3308 Scalar::Util::weaken (my $this = $self); 3935 CFPlus::weaken (my $this = $self);
3309 3936
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3937 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311 3938
3312 $self 3939 $self
3313} 3940}
… …
3315sub reorder { 3942sub reorder {
3316 my ($self) = @_; 3943 my ($self) = @_;
3317 my $NOW = Time::HiRes::time; 3944 my $NOW = Time::HiRes::time;
3318 3945
3319 # freeze display when hovering over any label 3946 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner} 3947 return if $CFPlus::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3948 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} }; 3949 values %{ $self->{item} };
3323 3950
3324 while (my ($k, $v) = each %{ $self->{item} }) { 3951 while (my ($k, $v) = each %{ $self->{item} }) {
3325 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3952 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326 } 3953 }
… …
3347 for ($short) { 3974 for ($short) {
3348 s/^\s+//; 3975 s/^\s+//;
3349 s/\s+/ /g; 3976 s/\s+/ /g;
3350 } 3977 }
3351 3978
3352 new CFClient::UI::Label 3979 new CFPlus::UI::Label
3353 markup => $short, 3980 markup => $short,
3354 tooltip => $item->{tooltip}, 3981 tooltip => $item->{tooltip},
3355 tooltip_font => $::FONT_PROP, 3982 tooltip_font => $::FONT_PROP,
3356 tooltip_width => 0.67, 3983 tooltip_width => 0.67,
3357 fontsize => $item->{fontsize} || $self->{fontsize}, 3984 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3436 $self->SUPER::destroy; 4063 $self->SUPER::destroy;
3437} 4064}
3438 4065
3439############################################################################# 4066#############################################################################
3440 4067
3441package CFClient::UI::Inventory;
3442
3443our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445sub new {
3446 my $class = shift;
3447
3448 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450 @_,
3451 );
3452
3453 $self
3454}
3455
3456sub set_items {
3457 my ($self, $items) = @_;
3458
3459 $self->{child}->clear;
3460 return unless $items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479}
3480
3481#############################################################################
3482
3483package CFClient::UI::SpellList;
3484
3485our @ISA = CFClient::UI::Table::;
3486
3487sub new {
3488 my $class = shift;
3489
3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
3493 @_,
3494 )
3495}
3496
3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3582sub add_spell {
3583 my ($self, $spell) = @_;
3584
3585 $self->{spell}->{$spell->{name}} = $spell;
3586 $self->rebuild_spell_list;
3587}
3588
3589sub remove_spell {
3590 my ($self, $spell) = @_;
3591
3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3603#############################################################################
3604
3605package CFClient::UI::Root; 4068package CFPlus::UI::Root;
3606 4069
3607our @ISA = CFClient::UI::Container::; 4070our @ISA = CFPlus::UI::Container::;
3608 4071
3609use List::Util qw(min max); 4072use List::Util qw(min max);
3610 4073
3611use CFClient::OpenGL; 4074use CFPlus::OpenGL;
3612 4075
3613sub new { 4076sub new {
3614 my $class = shift; 4077 my $class = shift;
3615 4078
3616 my $self = $class->SUPER::new ( 4079 my $self = $class->SUPER::new (
3617 visible => 1, 4080 visible => 1,
3618 @_, 4081 @_,
3619 ); 4082 );
3620 4083
3621 Scalar::Util::weaken ($self->{root} = $self); 4084 CFPlus::weaken ($self->{root} = $self);
3622 4085
3623 $self 4086 $self
3624} 4087}
3625 4088
3626sub size_request { 4089sub size_request {
… …
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 4256
3794 $w = 0 if $w < 0; 4257 $w = 0 if $w < 0;
3795 $h = 0 if $h < 0; 4258 $h = 0 if $h < 0;
3796 4259
4260 $w = max $widget->{min_w}, $w;
4261 $h = max $widget->{min_h}, $h;
4262
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265
4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4268
3797 $w = int $w + 0.5; 4269 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 4270 $h = int $h + 0.5;
3799 4271
3800 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4272 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801 $widget->{old_w} = $widget->{w}; 4273 $widget->{old_w} = $widget->{w};
… …
3811 4283
3812 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
3813 $_->() 4285 $_->()
3814 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
3815 } 4287 }
3816
3817 4288
3818 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3819 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3820 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
3821 4292
… …
3824 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4295 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825 glMatrixMode GL_MODELVIEW; 4296 glMatrixMode GL_MODELVIEW;
3826 glLoadIdentity; 4297 glLoadIdentity;
3827 4298
3828 { 4299 {
3829 package CFClient::UI::Base; 4300 package CFPlus::UI::Base;
3830 4301
3831 ($draw_x, $draw_y, $draw_w, $draw_h) = 4302 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832 (0, 0, $self->{w}, $self->{h}); 4303 (0, 0, $self->{w}, $self->{h});
3833 }
3834 4304
3835 $self->_draw; 4305 $self->_draw;
4306 }
3836} 4307}
3837 4308
3838############################################################################# 4309#############################################################################
3839 4310
3840package CFClient::UI; 4311package CFPlus::UI;
3841 4312
3842$ROOT = new CFClient::UI::Root; 4313$ROOT = new CFPlus::UI::Root;
3843$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4314$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3844 4315
38451 43161
3846 4317

Diff Legend

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