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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.382 by root, Thu Jul 19 19:58:56 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
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
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1098 $self->SUPER::add (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 (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 (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 while (@_) {
1615 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1616 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1617 $self->{children}[$y][$x] = $child;
1618 }
1296 1619
1620 $self->{force_realloc} = 1;
1621 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1622 $self->realloc;
1298} 1623}
1299 1624
1300sub remove { 1625sub remove {
1301 my ($self, $child) = @_; 1626 my ($self, $child) = @_;
1302 1627
1303 # TODO: not yet implemented 1628 for (@{ $self->{children} }) {
1629 for (@{ $_ || [] }) {
1630 $_ = undef if $_ == $child;
1631 }
1632 }
1304} 1633}
1305 1634
1306# TODO: move to container class maybe? send children a signal on removal? 1635# TODO: move to container class maybe? send children a signal on removal?
1307sub clear { 1636sub clear {
1308 my ($self) = @_; 1637 my ($self) = @_;
… …
1357 my ($ws, $hs) = $self->get_wh; 1686 my ($ws, $hs) = $self->get_wh;
1358 1687
1359 my $req_w = (sum @$ws) || 1; 1688 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1689 my $req_h = (sum @$hs) || 1;
1361 1690
1362 # TODO: nicer code && do row_expand 1691 # TODO: nicer code
1363 my @col_expand = @{$self->{col_expand}}; 1692 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1693 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1694 my $col_expand = (sum @col_expand) || 1;
1366 1695
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1696 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1697
1371 CFClient::UI::harmonize $ws; 1698 CFPlus::UI::harmonize $ws;
1699
1700 my @row_expand = @{$self->{row_expand}};
1701 @row_expand = (1) x @$ws unless @row_expand;
1702 my $row_expand = (sum @row_expand) || 1;
1703
1704 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1705
1372 CFClient::UI::harmonize $hs; 1706 CFPlus::UI::harmonize $hs;
1373 1707
1374 my $y; 1708 my $y;
1375 1709
1376 for my $r (0 .. $#{$self->{children}}) { 1710 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1711 my $row = $self->{children}[$r]
… …
1420 } 1754 }
1421} 1755}
1422 1756
1423############################################################################# 1757#############################################################################
1424 1758
1425package CFClient::UI::Box; 1759package CFPlus::UI::Fixed;
1426 1760
1761use List::Util qw(min max);
1762
1427our @ISA = CFClient::UI::Container::; 1763our @ISA = CFPlus::UI::Container::;
1764
1765sub add {
1766 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1767
1768 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1769 $self->SUPER::add ($child);
1770}
1771
1772sub _scale($$$) {
1773 my ($mode, $val, $max) = @_;
1774
1775 $mode eq "abs" ? $val
1776 : $mode eq "rel" ? $val * $max
1777 : 0
1778}
1779
1780sub size_request {
1781 my ($self) = @_;
1782
1783 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1784
1785 # determine overall size by querying abs widgets
1786 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1788
1789 if ($pos eq "abs") {
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792
1793 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1794 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1795 }
1796 }
1797
1798 my $W = $x2 - $x1;
1799 my $H = $y2 - $y1;
1800
1801 # now layout remaining widgets
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 if ($pos ne "abs") {
1806 $x = _scale $pos, $x, $W;
1807 $y = _scale $pos, $x, $H;
1808 $w = _scale $size, $w, $child->{req_w};
1809 $h = _scale $size, $h, $child->{req_h};
1810
1811 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1812 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1813 }
1814 }
1815
1816 my $W = $x2 - $x1;
1817 my $H = $y2 - $y1;
1818
1819 ($W, $H)
1820}
1821
1822sub invoke_size_allocate {
1823 my ($self, $W, $H) = @_;
1824
1825 for my $child ($self->visible_children) {
1826 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1827
1828 $x = _scale $pos, $x, $W;
1829 $y = _scale $pos, $x, $H;
1830 $w = _scale $size, $w, $child->{req_w};
1831 $h = _scale $size, $h, $child->{req_h};
1832
1833 $child->configure ($x, $y, $w, $h);
1834 }
1835
1836 1
1837}
1838
1839#############################################################################
1840
1841package CFPlus::UI::Box;
1842
1843our @ISA = CFPlus::UI::Container::;
1428 1844
1429sub size_request { 1845sub size_request {
1430 my ($self) = @_; 1846 my ($self) = @_;
1431 1847
1432 $self->{vertical} 1848 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1881 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1882 for 0 .. $#children;
1467 } 1883 }
1468 } 1884 }
1469 1885
1470 CFClient::UI::harmonize \@req; 1886 CFPlus::UI::harmonize \@req;
1471 1887
1472 my $pos = 0; 1888 my $pos = 0;
1473 for (0 .. $#children) { 1889 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1890 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1891 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1896 1
1481} 1897}
1482 1898
1483############################################################################# 1899#############################################################################
1484 1900
1485package CFClient::UI::HBox; 1901package CFPlus::UI::HBox;
1486 1902
1487our @ISA = CFClient::UI::Box::; 1903our @ISA = CFPlus::UI::Box::;
1488 1904
1489sub new { 1905sub new {
1490 my $class = shift; 1906 my $class = shift;
1491 1907
1492 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1495 ) 1911 )
1496} 1912}
1497 1913
1498############################################################################# 1914#############################################################################
1499 1915
1500package CFClient::UI::VBox; 1916package CFPlus::UI::VBox;
1501 1917
1502our @ISA = CFClient::UI::Box::; 1918our @ISA = CFPlus::UI::Box::;
1503 1919
1504sub new { 1920sub new {
1505 my $class = shift; 1921 my $class = shift;
1506 1922
1507 $class->SUPER::new ( 1923 $class->SUPER::new (
… …
1510 ) 1926 )
1511} 1927}
1512 1928
1513############################################################################# 1929#############################################################################
1514 1930
1515package CFClient::UI::Label; 1931package CFPlus::UI::Label;
1516 1932
1517our @ISA = CFClient::UI::DrawBG::; 1933our @ISA = CFPlus::UI::DrawBG::;
1518 1934
1519use CFClient::OpenGL; 1935use CFPlus::OpenGL;
1520 1936
1521sub new { 1937sub new {
1522 my ($class, %arg) = @_; 1938 my ($class, %arg) = @_;
1523 1939
1524 my $self = $class->SUPER::new ( 1940 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1943 #active_bg => none
1528 #font => default_font 1944 #font => default_font
1529 #text => initial text 1945 #text => initial text
1530 #markup => initial narkup 1946 #markup => initial narkup
1531 #max_w => maximum pixel width 1947 #max_w => maximum pixel width
1948 #style => 0, # render flags
1532 ellipsise => 3, # end 1949 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1950 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1951 fontsize => 1,
1535 align => -1, 1952 align => -1,
1536 valign => -1, 1953 valign => -1,
1537 padding_x => 2, 1954 padding_x => 2,
1538 padding_y => 2, 1955 padding_y => 2,
1539 can_events => 0, 1956 can_events => 0,
1540 %arg 1957 %arg
1541 ); 1958 );
1542 1959
1543 if (exists $self->{template}) { 1960 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1961 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1962 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1963 $self->{template} = $layout;
1547 } 1964 }
1548 1965
1549 if (exists $self->{markup}) { 1966 if (exists $self->{markup}) {
… …
1553 } 1970 }
1554 1971
1555 $self 1972 $self
1556} 1973}
1557 1974
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1975sub update {
1569 my ($self) = @_; 1976 my ($self) = @_;
1570 1977
1571 delete $self->{texture}; 1978 delete $self->{texture};
1572 $self->SUPER::update; 1979 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1990 my ($self, $text) = @_;
1584 1991
1585 return if $self->{text} eq "T$text"; 1992 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1993 $self->{text} = "T$text";
1587 1994
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1995 $self->{layout}->set_text ($text);
1590 1996
1591 delete $self->{size_req}; 1997 delete $self->{size_req};
1592 $self->realloc; 1998 $self->realloc;
1593 $self->update; 1999 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 2005 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 2006 $self->{text} = "M$markup";
1601 2007
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2008 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 2009
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 2010 $self->{layout}->set_markup ($markup);
1606 2011
1607 delete $self->{size_req}; 2012 delete $self->{size_req};
1608 $self->realloc; 2013 $self->realloc;
1609 $self->update; 2014 $self->update;
… …
1621 2026
1622 my ($w, $h) = $self->{layout}->size; 2027 my ($w, $h) = $self->{layout}->size;
1623 2028
1624 if (exists $self->{template}) { 2029 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 2030 $self->{template}->set_font ($self->{font}) if $self->{font};
2031 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2032 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 2033
1628 my ($w2, $h2) = $self->{template}->size; 2034 my ($w2, $h2) = $self->{template}->size;
1629 2035
1630 $w = List::Util::max $w, $w2; 2036 $w = List::Util::max $w, $w2;
… …
1654 2060
1655sub set_fontsize { 2061sub set_fontsize {
1656 my ($self, $fontsize) = @_; 2062 my ($self, $fontsize) = @_;
1657 2063
1658 $self->{fontsize} = $fontsize; 2064 $self->{fontsize} = $fontsize;
2065 delete $self->{size_req};
1659 delete $self->{texture}; 2066 delete $self->{texture};
1660 2067
1661 $self->realloc; 2068 $self->realloc;
1662} 2069}
1663 2070
1664sub reconfigure { 2071sub reconfigure {
1665 my ($self) = @_; 2072 my ($self) = @_;
1666 2073
1667 delete $self->{size_req}; 2074 delete $self->{size_req};
2075 delete $self->{texture};
1668 2076
1669 $self->SUPER::reconfigure; 2077 $self->SUPER::reconfigure;
1670} 2078}
1671 2079
1672sub _draw { 2080sub _draw {
1673 my ($self) = @_; 2081 my ($self) = @_;
1674 2082
1675 $self->SUPER::_draw; # draw background, if applicable 2083 $self->SUPER::_draw; # draw background, if applicable
1676 2084
1677 my $tex = $self->{texture} ||= do { 2085 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2086 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2087 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2088 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2089 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2090 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2092
1685 new_from_layout CFClient::Texture $self->{layout} 2093 [$self->{layout}->size]
1686 }; 2094 };
1687 2095
1688 unless (exists $self->{ox}) { 2096 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2097 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2098 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2099 : ($self->{w} - $size->[0]) * 0.5);
1692 2100
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2101 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2102 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2103 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2104 };
1697 2105
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2106 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2107 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 2108
1703 if ($tex->{format} == GL_ALPHA) { 2109 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 2110}
1714 2111
1715############################################################################# 2112#############################################################################
1716 2113
1717package CFClient::UI::EntryBase; 2114package CFPlus::UI::EntryBase;
1718 2115
1719our @ISA = CFClient::UI::Label::; 2116our @ISA = CFPlus::UI::Label::;
1720 2117
1721use CFClient::OpenGL; 2118use CFPlus::OpenGL;
1722 2119
1723sub new { 2120sub new {
1724 my $class = shift; 2121 my $class = shift;
1725 2122
1726 $class->SUPER::new ( 2123 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2127 active_fg => [0, 0, 0],
1731 can_hover => 1, 2128 can_hover => 1,
1732 can_focus => 1, 2129 can_focus => 1,
1733 valign => 0, 2130 valign => 0,
1734 can_events => 1, 2131 can_events => 1,
2132 ellipsise => 0,
1735 #text => ... 2133 #text => ...
1736 #hidden => "*", 2134 #hidden => "*",
1737 @_ 2135 @_
1738 ) 2136 )
1739} 2137}
… …
1784 my $sym = $ev->{sym}; 2182 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2183 my $uni = $ev->{unicode};
1786 2184
1787 my $text = $self->get_text; 2185 my $text = $self->get_text;
1788 2186
2187 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2188
1789 if ($uni == 8) { 2189 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2190 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2191 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2192 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2193 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2194 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2195 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2196 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2197 } elsif ($sym == CFPlus::SDLK_HOME) {
2198 # what a hack
2199 $self->{cursor} =
2200 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2201 ? length $1
2202 : 0;
2203 } elsif ($sym == CFPlus::SDLK_END) {
2204 # uh, again
2205 $self->{cursor} =
2206 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2207 ? $self->{cursor} + length $1
2208 : length $self->{text};
2209 } elsif ($uni == 21) { # ctrl-u
2210 $text = "";
1798 $self->{cursor} = 0; 2211 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2212 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2213 $self->emit ('escape');
1803 } elsif ($uni) { 2214 } elsif ($uni == 0x0d) {
2215 substr $text, $self->{cursor}++, 0, "\012";
2216 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2217 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2218 } else {
1806 return 0; 2219 return 0;
1807 } 2220 }
1808 2221
1809 $self->_set_text ($text); 2222 $self->_set_text ($text);
1810 2223
1811 $self->realloc; 2224 $self->realloc;
2225 $self->update;
1812 2226
1813 1 2227 1
1814} 2228}
1815 2229
1816sub invoke_focus_in { 2230sub invoke_focus_in {
… …
1828 2242
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2243 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2244
1831 # byte-index to char-index 2245 # byte-index to char-index
1832 my $text = $self->{text}; 2246 my $text = $self->{text};
1833 utf8::encode $text; 2247 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2248 $self->{cursor} = length $text;
1835 2249
1836 $self->_set_text ($self->{text}); 2250 $self->_set_text ($self->{text});
1837 $self->update; 2251 $self->update;
1838 2252
1839 1 2253 1
… …
1878 utf8::encode $text; 2292 utf8::encode $text;
1879 2293
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2294 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2295 }
1882 2296
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2297 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2298 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2299 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2300 glEnd;
1888 } 2301 }
1889} 2302}
1890 2303
2304#############################################################################
2305
1891package CFClient::UI::Entry; 2306package CFPlus::UI::Entry;
1892 2307
1893our @ISA = CFClient::UI::EntryBase::; 2308our @ISA = CFPlus::UI::EntryBase::;
1894 2309
1895use CFClient::OpenGL; 2310use CFPlus::OpenGL;
1896 2311
1897sub invoke_key_down { 2312sub invoke_key_down {
1898 my ($self, $ev) = @_; 2313 my ($self, $ev) = @_;
1899 2314
1900 my $sym = $ev->{sym}; 2315 my $sym = $ev->{sym};
1901 2316
1902 if ($sym == 13) { 2317 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2318 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2319 my $txt = $self->get_text;
1905 2320
1906 $self->{history_pointer} = -1; 2321 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2322 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2323 $self->emit (activate => $txt);
1909 $self->update; 2324 $self->update;
1910 2325
1911 } elsif ($sym == CFClient::SDLK_UP) { 2326 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2327 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2328 $self->{history_saveback} = $self->get_text;
1914 } 2329 }
1915 if (@{$self->{history} || []} > 0) { 2330 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2331 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2333 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2334 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2335 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2336 }
1922 2337
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2338 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2339 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2340 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2341
1927 if ($self->{history_pointer} >= 0) { 2342 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2352 1
1938} 2353}
1939 2354
1940############################################################################# 2355#############################################################################
1941 2356
2357package CFPlus::UI::TextEdit;
2358
2359our @ISA = CFPlus::UI::EntryBase::;
2360
2361use CFPlus::OpenGL;
2362
2363sub move_cursor_ver {
2364 my ($self, $dy) = @_;
2365
2366 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2367
2368 $y += $dy;
2369
2370 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2371 $self->{cursor} = $index;
2372 delete $self->{cur_h};
2373 $self->update;
2374 return;
2375 }
2376}
2377
2378sub invoke_key_down {
2379 my ($self, $ev) = @_;
2380
2381 my $sym = $ev->{sym};
2382
2383 if ($sym == CFPlus::SDLK_UP) {
2384 $self->move_cursor_ver (-1);
2385 } elsif ($sym == CFPlus::SDLK_DOWN) {
2386 $self->move_cursor_ver (+1);
2387 } else {
2388 return $self->SUPER::invoke_key_down ($ev)
2389 }
2390
2391 1
2392}
2393
2394#############################################################################
2395
1942package CFClient::UI::Button; 2396package CFPlus::UI::Button;
1943 2397
1944our @ISA = CFClient::UI::Label::; 2398our @ISA = CFPlus::UI::Label::;
1945 2399
1946use CFClient::OpenGL; 2400use CFPlus::OpenGL;
1947 2401
1948my @tex = 2402my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2403 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2404 qw(b1_button_inactive.png b1_button_active.png);
1951 2405
1952sub new { 2406sub new {
1953 my $class = shift; 2407 my $class = shift;
1954 2408
1955 $class->SUPER::new ( 2409 $class->SUPER::new (
1956 padding_x => 4, 2410 padding_x => 4,
1957 padding_y => 4, 2411 padding_y => 4,
1958 fg => [1, 1, 1], 2412 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2413 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2414 can_hover => 1,
1961 align => 0, 2415 align => 0,
1962 valign => 0, 2416 valign => 0,
1963 can_events => 1, 2417 can_events => 1,
1964 @_ 2418 @_
… …
1982 2436
1983 glEnable GL_TEXTURE_2D; 2437 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2438 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2439 glColor 0, 0, 0, 1;
1986 2440
2441 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2442 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2443
1989 glDisable GL_TEXTURE_2D; 2444 glDisable GL_TEXTURE_2D;
1990 2445
1991 $self->SUPER::_draw; 2446 $self->SUPER::_draw;
1992} 2447}
1993 2448
1994############################################################################# 2449#############################################################################
1995 2450
2451package CFPlus::UI::CheckBox;
2452
2453our @ISA = CFPlus::UI::DrawBG::;
2454
2455my @tex =
2456 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2457 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2458
2459use CFPlus::OpenGL;
2460
2461sub new {
2462 my $class = shift;
2463
2464 $class->SUPER::new (
2465 padding_x => 2,
2466 padding_y => 2,
2467 fg => [1, 1, 1],
2468 active_fg => [1, 1, 0],
2469 bg => [0, 0, 0, 0.2],
2470 active_bg => [1, 1, 1, 0.5],
2471 state => 0,
2472 can_hover => 1,
2473 @_
2474 )
2475}
2476
2477sub size_request {
2478 my ($self) = @_;
2479
2480 (6) x 2
2481}
2482
2483sub toggle {
2484 my ($self) = @_;
2485
2486 $self->{state} = !$self->{state};
2487 $self->emit (changed => $self->{state});
2488 $self->update;
2489}
2490
2491sub invoke_button_down {
2492 my ($self, $ev, $x, $y) = @_;
2493
2494 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2495 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2496 $self->toggle;
2497 } else {
2498 return 0
2499 }
2500
2501 1
2502}
2503
2504sub _draw {
2505 my ($self) = @_;
2506
2507 $self->SUPER::_draw;
2508
2509 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2510
2511 my ($w, $h) = @$self{qw(w h)};
2512
2513 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2514
2515 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2516
2517 my $tex = $self->{state} ? $tex[1] : $tex[0];
2518
2519 glEnable GL_TEXTURE_2D;
2520 $tex->draw_quad_alpha (0, 0, $s, $s);
2521 glDisable GL_TEXTURE_2D;
2522}
2523
2524#############################################################################
2525
2526package CFPlus::UI::Image;
2527
2528our @ISA = CFPlus::UI::Base::;
2529
2530use CFPlus::OpenGL;
2531
2532our %texture_cache;
2533
2534sub new {
2535 my $class = shift;
2536
2537 my $self = $class->SUPER::new (
2538 can_events => 0,
2539 @_,
2540 );
2541
2542 $self->{path} || $self->{tex}
2543 or Carp::croak "'path' or 'tex' attributes required";
2544
2545 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2546 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2547
2548 CFPlus::weaken $texture_cache{$self->{path}};
2549
2550 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2551
2552 $self
2553}
2554
2555sub STORABLE_freeze {
2556 my ($self, $cloning) = @_;
2557
2558 $self->{path}
2559 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2560
2561 $self->{path}
2562}
2563
2564sub STORABLE_attach {
2565 my ($self, $cloning, $path) = @_;
2566
2567 $self->new (path => $path)
2568}
2569
2570sub size_request {
2571 my ($self) = @_;
2572
2573 ($self->{tex}{w}, $self->{tex}{h})
2574}
2575
2576sub _draw {
2577 my ($self) = @_;
2578
2579 my $tex = $self->{tex};
2580
2581 my ($w, $h) = ($self->{w}, $self->{h});
2582
2583 if ($self->{rot90}) {
2584 glRotate 90, 0, 0, 1;
2585 glTranslate 0, -$self->{w}, 0;
2586
2587 ($w, $h) = ($h, $w);
2588 }
2589
2590 glEnable GL_TEXTURE_2D;
2591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2592
2593 $tex->draw_quad (0, 0, $w, $h);
2594
2595 glDisable GL_TEXTURE_2D;
2596}
2597
2598#############################################################################
2599
1996package CFClient::UI::ImageButton; 2600package CFPlus::UI::ImageButton;
1997 2601
1998our @ISA = CFClient::UI::Image::; 2602our @ISA = CFPlus::UI::Image::;
1999 2603
2000use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2001 2605
2002my %textures; 2606my %textures;
2003 2607
2004sub new { 2608sub new {
2005 my $class = shift; 2609 my $class = shift;
… …
2027 1 2631 1
2028} 2632}
2029 2633
2030############################################################################# 2634#############################################################################
2031 2635
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2636package CFPlus::UI::VGauge;
2101 2637
2102our @ISA = CFClient::UI::Base::; 2638our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2639
2163use List::Util qw(min max); 2640use List::Util qw(min max);
2164 2641
2165use CFClient::OpenGL; 2642use CFPlus::OpenGL;
2166 2643
2167my %tex = ( 2644my %tex = (
2168 food => [ 2645 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2647 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2648 ],
2172 grace => [ 2649 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2650 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2651 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2652 ],
2176 hp => [ 2653 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2654 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2655 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2656 ],
2180 mana => [ 2657 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2658 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2659 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2660 ],
2184); 2661);
2185 2662
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2663# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2723 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2724 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2725
2249 my $h1 = $self->{h} * (1 - $ycut1); 2726 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2727 my $h2 = $self->{h} * (1 - $ycut2);
2728 my $h3 = $self->{h};
2729
2730 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2731
2252 glEnable GL_BLEND; 2732 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2733 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2734 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2735 glEnable GL_TEXTURE_2D;
… …
2274 2754
2275 if ($t3) { 2755 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2756 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2757 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2758 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2759 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2760 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2761 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2762 glEnd;
2283 } 2763 }
2284 2764
2285 glDisable GL_BLEND; 2765 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2287} 2767}
2288 2768
2289############################################################################# 2769#############################################################################
2290 2770
2291package CFClient::UI::Gauge; 2771package CFPlus::UI::Gauge;
2292 2772
2293our @ISA = CFClient::UI::VBox::; 2773our @ISA = CFPlus::UI::VBox::;
2294 2774
2295sub new { 2775sub new {
2296 my ($class, %arg) = @_; 2776 my ($class, %arg) = @_;
2297 2777
2298 my $self = $class->SUPER::new ( 2778 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2780 can_hover => 1,
2301 can_events => 1, 2781 can_events => 1,
2302 %arg, 2782 %arg,
2303 ); 2783 );
2304 2784
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2785 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2786 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2787 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2788
2309 $self 2789 $self
2310} 2790}
2311 2791
2312sub set_fontsize { 2792sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2813 $self->{value}->set_text ($val);
2334} 2814}
2335 2815
2336############################################################################# 2816#############################################################################
2337 2817
2338package CFClient::UI::Slider; 2818package CFPlus::UI::Slider;
2339 2819
2340use strict; 2820use strict;
2341 2821
2342use CFClient::OpenGL; 2822use CFPlus::OpenGL;
2343 2823
2344our @ISA = CFClient::UI::DrawBG::; 2824our @ISA = CFPlus::UI::DrawBG::;
2345 2825
2346my @tex = 2826my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2827 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2828 qw(s1_slider.png s1_slider_bg.png);
2349 2829
2350sub new { 2830sub new {
2351 my $class = shift; 2831 my $class = shift;
2352 2832
… …
2441 } 2921 }
2442 2922
2443 1 2923 1
2444} 2924}
2445 2925
2926sub invoke_mouse_wheel {
2927 my ($self, $ev) = @_;
2928
2929 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2930
2931 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2932
2933 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2934
2935 ! ! $delta
2936}
2937
2446sub update { 2938sub update {
2447 my ($self) = @_; 2939 my ($self) = @_;
2448 2940
2449 delete $self->{knob_w}; 2941 delete $self->{knob_w};
2450 $self->SUPER::update; 2942 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2989 glDisable GL_TEXTURE_2D;
2498} 2990}
2499 2991
2500############################################################################# 2992#############################################################################
2501 2993
2502package CFClient::UI::ValSlider; 2994package CFPlus::UI::ValSlider;
2503 2995
2504our @ISA = CFClient::UI::HBox::; 2996our @ISA = CFPlus::UI::HBox::;
2505 2997
2506sub new { 2998sub new {
2507 my ($class, %arg) = @_; 2999 my ($class, %arg) = @_;
2508 3000
2509 my $range = delete $arg{range}; 3001 my $range = delete $arg{range};
2510 3002
2511 my $self = $class->SUPER::new ( 3003 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3004 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3005 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 3006 to_value => sub { shift },
2515 from_value => sub { shift }, 3007 from_value => sub { shift },
2516 %arg, 3008 %arg,
2517 ); 3009 );
2518 3010
… …
2538sub set_range { shift->{slider}->set_range (@_) } 3030sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 3031sub set_value { shift->{slider}->set_value (@_) }
2540 3032
2541############################################################################# 3033#############################################################################
2542 3034
2543package CFClient::UI::TextScroller; 3035package CFPlus::UI::TextScroller;
2544 3036
2545our @ISA = CFClient::UI::HBox::; 3037our @ISA = CFPlus::UI::HBox::;
2546 3038
2547use CFClient::OpenGL; 3039use CFPlus::OpenGL;
2548 3040
2549sub new { 3041sub new {
2550 my $class = shift; 3042 my $class = shift;
2551 3043
2552 my $self = $class->SUPER::new ( 3044 my $self = $class->SUPER::new (
2553 fontsize => 1, 3045 fontsize => 1,
2554 can_events => 0, 3046 can_events => 1,
2555 indent => 0, 3047 indent => 0,
2556 #font => default_font 3048 #font => default_font
2557 @_, 3049 @_,
2558 3050
2559 layout => (new CFClient::Layout 1), 3051 layout => (new CFPlus::Layout),
2560 par => [], 3052 par => [],
3053 max_par => 0,
2561 height => 0, 3054 height => 0,
2562 children => [ 3055 children => [
2563 (new CFClient::UI::Empty expand => 1), 3056 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 3057 (new CFPlus::UI::Slider vertical => 1),
2565 ], 3058 ],
2566 ); 3059 );
2567 3060
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3061 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3062
… …
2599 3092
2600 $self->reflow; 3093 $self->reflow;
2601 3094
2602 local $self->{children} = [$empty, $slider]; 3095 local $self->{children} = [$empty, $slider];
2603 $self->SUPER::invoke_size_allocate ($w, $h) 3096 $self->SUPER::invoke_size_allocate ($w, $h)
3097}
3098
3099sub invoke_mouse_wheel {
3100 my ($self, $ev) = @_;
3101
3102 return 0 unless $ev->{dy}; # only vertical movements
3103
3104 $self->{children}[1]->emit (mouse_wheel => $ev);
3105
3106 1
2604} 3107}
2605 3108
2606sub get_layout { 3109sub get_layout {
2607 my ($self, $para) = @_; 3110 my ($self, $para) = @_;
2608 3111
… …
2636 3139
2637 # todo: base offset on lines or so, not on pixels 3140 # todo: base offset on lines or so, not on pixels
2638 $self->{children}[1]->set_value ($offset); 3141 $self->{children}[1]->set_value ($offset);
2639} 3142}
2640 3143
3144sub current_paragraph {
3145 my ($self) = @_;
3146
3147 $self->{top_paragraph} - 1
3148}
3149
3150sub scroll_to {
3151 my ($self, $para) = @_;
3152
3153 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3154
3155 $self->{scroll_to} = $para;
3156 $self->update;
3157}
3158
2641sub clear { 3159sub clear {
2642 my ($self) = @_; 3160 my ($self) = @_;
2643 3161
2644 my (undef, undef, @other) = @{ $self->{children} }; 3162 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other; 3163 $self->remove ($_) for @other;
… …
2648 $self->{height} = 0; 3166 $self->{height} = 0;
2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3167 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650} 3168}
2651 3169
2652sub add_paragraph { 3170sub add_paragraph {
2653 my ($self, $color, $para, $indent) = @_; 3171 my $self = shift;
2654 3172
2655 my ($text, @w) = ref $para ? @$para : $para; 3173 for my $para (@_) {
2656
2657 $para = { 3174 $para = {
3175 fg => [1, 1, 1, 1],
3176 indent => 0,
3177 markup => "",
3178 widget => [],
3179 ref $para ? %$para : (markup => $para),
2658 w => 1e10, 3180 w => 1e10,
2659 wrapped => 1, 3181 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 }; 3182 };
2665 3183
2666 $self->add (@w) if @w; 3184 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667 push @{$self->{par}}, $para; 3185 push @{$self->{par}}, $para;
3186 }
3187
3188 if (my $max = $self->{max_par}) {
3189 shift @{$self->{par}} while @{$self->{par}} > $max;
3190 }
2668 3191
2669 $self->{need_reflow}++; 3192 $self->{need_reflow}++;
2670 $self->update; 3193 $self->update;
2671} 3194}
2672 3195
2673sub scroll_to_bottom { 3196sub scroll_to_bottom {
2674 my ($self) = @_; 3197 my ($self) = @_;
2675 3198
2676 $self->{scroll_to_bottom} = 1; 3199 $self->{scroll_to} = $#{$self->{par}};
2677 $self->update; 3200 $self->update;
2678} 3201}
2679 3202
3203sub force_uptodate {
3204 my ($self) = @_;
3205
3206 if (delete $self->{need_reflow}) {
3207 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3208
3209 my $height = 0;
3210
3211 for my $para (@{$self->{par}}) {
3212 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3213 my $layout = $self->get_layout ($para);
3214 my ($w, $h) = $layout->size;
3215
3216 $para->{w} = $w + $para->{indent};
3217 $para->{h} = $h;
3218 $para->{wrapped} = $layout->has_wrapped;
3219 }
3220
3221 $para->{y} = $height;
3222 $height += $para->{h};
3223 }
3224
3225 $self->{height} = $height;
3226 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3227
3228 delete $self->{texture};
3229 }
3230
3231 if (my $paridx = delete $self->{scroll_to}) {
3232 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3233 }
3234}
3235
2680sub update { 3236sub update {
2681 my ($self) = @_; 3237 my ($self) = @_;
2682 3238
2683 $self->SUPER::update; 3239 $self->SUPER::update;
2684 3240
2685 return unless $self->{h} > 0; 3241 return unless $self->{h} > 0;
2686 3242
2687 delete $self->{texture}; 3243 delete $self->{texture};
2688 3244
2689 $ROOT->on_post_alloc ($self => sub { 3245 $ROOT->on_post_alloc ($self => sub {
3246 $self->force_uptodate;
3247
2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3248 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691 3249
2692 if (delete $self->{need_reflow}) {
2693 my $height = 0;
2694
2695 for my $para (@{$self->{par}}) {
2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697 my $layout = $self->get_layout ($para);
2698 my ($w, $h) = $layout->size;
2699
2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2703 }
2704
2705 $height += $para->{h};
2706 }
2707
2708 $self->{height} = $height;
2709
2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712 delete $self->{texture};
2713 }
2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3250 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720 glClearColor 0, 0, 0, 0; 3251 glClearColor 0, 0, 0, 0;
2721 glClear GL_COLOR_BUFFER_BIT; 3252 glClear GL_COLOR_BUFFER_BIT;
2722 3253
3254 package CFPlus::UI::Base;
3255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3256 (0, 0, $self->{w}, $self->{h});
3257
3258 my $top = int $self->{children}[1]{range}[0];
3259
3260 my $paridx = 0;
3261 my $top_paragraph;
2723 my $top = int $self->{children}[1]{range}[0]; 3262 my $top = int $self->{children}[1]{range}[0];
2724 3263
2725 my $y0 = $top; 3264 my $y0 = $top;
2726 my $y1 = $top + $H; 3265 my $y1 = $top + $H;
2727 3266
2728 my $y = 0;
2729
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 3267 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 3268 my $h = $para->{h};
3269 my $y = $para->{y};
2736 3270
2737 if ($y0 < $y + $h && $y < $y1) { 3271 if ($y0 < $y + $h && $y < $y1) {
2738
2739 my $layout = $self->get_layout ($para); 3272 my $layout = $self->get_layout ($para);
2740 3273
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 3274 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 3275
2746 if (my @w = @{ $para->{widget} }) { 3276 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 3277 my @s = $layout->get_shapes;
2748 3278
2749 glDisable GL_BLEND;
2750 for (@w) { 3279 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 3280 my ($dx, $dy) = splice @s, 0, 2, ();
2752 3281
2753 $_->{x} = $dx + $para->{indent}; 3282 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 3283 $_->{y} = $dy + $y - $y0;
2755 3284
2756 $_->draw; 3285 $_->draw;
2757 } 3286 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 3287 }
2761 } 3288 }
2762 3289
2763 $y += $h; 3290 $paridx++;
3291 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3292 }
2765 3293
2766 glDisable GL_BLEND; 3294 $self->{top_paragraph} = $top_paragraph;
2767 }; 3295 };
2768 }); 3296 });
2769} 3297}
2770 3298
2771sub reconfigure { 3299sub reconfigure {
… …
2789 $self->{children}[1]->draw; 3317 $self->{children}[1]->draw;
2790} 3318}
2791 3319
2792############################################################################# 3320#############################################################################
2793 3321
2794package CFClient::UI::Animator; 3322package CFPlus::UI::Animator;
2795 3323
2796use CFClient::OpenGL; 3324use CFPlus::OpenGL;
2797 3325
2798our @ISA = CFClient::UI::Bin::; 3326our @ISA = CFPlus::UI::Bin::;
2799 3327
2800sub moveto { 3328sub moveto {
2801 my ($self, $x, $y) = @_; 3329 my ($self, $x, $y) = @_;
2802 3330
2803 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3331 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2831 glPopMatrix; 3359 glPopMatrix;
2832} 3360}
2833 3361
2834############################################################################# 3362#############################################################################
2835 3363
2836package CFClient::UI::Flopper; 3364package CFPlus::UI::Flopper;
2837 3365
2838our @ISA = CFClient::UI::Button::; 3366our @ISA = CFPlus::UI::Button::;
2839 3367
2840sub new { 3368sub new {
2841 my $class = shift; 3369 my $class = shift;
2842 3370
2843 my $self = $class->SUPER::new ( 3371 my $self = $class->SUPER::new (
… …
2855 $self->{other}->toggle_visibility; 3383 $self->{other}->toggle_visibility;
2856} 3384}
2857 3385
2858############################################################################# 3386#############################################################################
2859 3387
2860package CFClient::UI::Tooltip; 3388package CFPlus::UI::Tooltip;
2861 3389
2862our @ISA = CFClient::UI::Bin::; 3390our @ISA = CFPlus::UI::Bin::;
2863 3391
2864use CFClient::OpenGL; 3392use CFPlus::OpenGL;
2865 3393
2866sub new { 3394sub new {
2867 my $class = shift; 3395 my $class = shift;
2868 3396
2869 $class->SUPER::new ( 3397 $class->SUPER::new (
… …
2872 ) 3400 )
2873} 3401}
2874 3402
2875sub set_tooltip_from { 3403sub set_tooltip_from {
2876 my ($self, $widget) = @_; 3404 my ($self, $widget) = @_;
3405
3406 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3407 if $widget->{tooltip} =~ /^#(.*)$/;
2877 3408
2878 my $tooltip = $widget->{tooltip}; 3409 my $tooltip = $widget->{tooltip};
2879 3410
2880 if ($ENV{CFPLUS_DEBUG} & 2) { 3411 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n" 3412 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2885 } 3416 }
2886 3417
2887 $tooltip =~ s/^\n+//; 3418 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//; 3419 $tooltip =~ s/\n+$//;
2889 3420
2890 $self->add (new CFClient::UI::Label 3421 $self->add (new CFPlus::UI::Label
2891 markup => $tooltip, 3422 markup => $tooltip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3423 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893 fontsize => 0.8, 3424 fontsize => 0.8,
2894 fg => [0, 0, 0, 1], 3425 style => 1, # FLAG_INVERSE
2895 ellipsise => 0, 3426 ellipsise => 0,
2896 font => ($widget->{tooltip_font} || $::FONT_PROP), 3427 font => ($widget->{tooltip_font} || $::FONT_PROP),
2897 ); 3428 );
2898} 3429}
2899 3430
… …
2918 3449
2919 $self->{root}->on_post_alloc ("move_$self" => sub { 3450 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner} 3451 my $widget = $self->{owner}
2921 or return; 3452 or return;
2922 3453
3454 if ($widget->{visible}) {
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3455 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924 3456
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3457 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w}; 3458 if $x + $self->{w} > $self->{root}{w};
2927 3459
2928 $self->move_abs ($x, $y); 3460 $self->move_abs ($x, $y);
3461 } else {
3462 $self->hide;
3463 }
2929 }); 3464 });
2930} 3465}
2931 3466
2932sub _draw { 3467sub _draw {
2933 my ($self) = @_; 3468 my ($self) = @_;
… …
2957 $self->SUPER::_draw; 3492 $self->SUPER::_draw;
2958} 3493}
2959 3494
2960############################################################################# 3495#############################################################################
2961 3496
2962package CFClient::UI::Face; 3497package CFPlus::UI::Face;
2963 3498
2964our @ISA = CFClient::UI::Base::; 3499our @ISA = CFPlus::UI::DrawBG::;
2965 3500
2966use CFClient::OpenGL; 3501use CFPlus::OpenGL;
2967 3502
2968sub new { 3503sub new {
2969 my $class = shift; 3504 my $class = shift;
2970 3505
2971 my $self = $class->SUPER::new ( 3506 my $self = $class->SUPER::new (
3507 size_w => 32,
3508 size_h => 8,
2972 aspect => 1, 3509 aspect => 1,
2973 can_events => 0, 3510 can_events => 0,
2974 @_, 3511 @_,
2975 ); 3512 );
2976 3513
2977 if ($self->{anim} && $self->{animspeed}) { 3514 if ($self->{anim} && $self->{animspeed}) {
2978 Scalar::Util::weaken (my $widget = $self); 3515 CFPlus::weaken (my $widget = $self);
2979 3516
3517 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3518 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2980 $self->{timer} = Event->timer ( 3519 $self->{timer} = Event->timer (
2981 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982 hard => 1, 3520 parked => 1,
2983 interval => $self->{animspeed},
2984 cb => sub { 3521 cb => sub {
3522 return unless $::CONN && $widget;
3523
2985 ++$widget->{frame}; 3524 ++$widget->{frame};
3525 $widget->update_face;
2986 $widget->update; 3526 $widget->update;
3527
3528 $widget->update_timer;
2987 }, 3529 },
2988 ); 3530 );
3531
3532 $self->update_face;
3533 $self->update_timer;
2989 } 3534 }
2990 3535
2991 $self 3536 $self
2992} 3537}
2993 3538
3539sub update_timer {
3540 my ($self) = @_;
3541
3542 return unless $self->{timer};
3543
3544 if ($self->{visible}) {
3545 $self->{timer}->at (
3546 $self->{anim_start}
3547 + $self->{animspeed}
3548 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3549 );
3550 $self->{timer}->start;
3551 } else {
3552 $self->{timer}->stop;
3553 }
3554}
3555
3556sub update_face {
3557 my ($self) = @_;
3558
3559 return unless $::CONN;
3560
3561 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3562 if ($anim && @$anim) {
3563 delete $self->{wait_face};
3564 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3565 }
3566 }
3567}
3568
2994sub size_request { 3569sub size_request {
2995 (32, 8) 3570 my ($self) = @_;
3571
3572 if ($::CONN) {
3573 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3574 if (my $tex = $::CONN->{texture}[$faceid]) {
3575 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3576 } else {
3577 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3578 $self->realloc;
3579 });
3580 }
3581 }
3582 }
3583
3584 ($self->{size_w} || 8, $self->{size_h} || 8)
2996} 3585}
2997 3586
2998sub update { 3587sub update {
2999 my ($self) = @_; 3588 my ($self) = @_;
3000 3589
3001 return unless $self->{visible}; 3590 return unless $self->{visible};
3002 3591
3003 $self->SUPER::update; 3592 $self->SUPER::update;
3004} 3593}
3005 3594
3595sub invoke_visibility_change {
3596 my ($self) = @_;
3597
3598 $self->update_timer;
3599
3600 0
3601}
3602
3006sub _draw { 3603sub _draw {
3007 my ($self) = @_; 3604 my ($self) = @_;
3008 3605
3009 return unless $::CONN; 3606 return unless $::CONN;
3010 3607
3011 my $face; 3608 $self->SUPER::_draw;
3012 3609
3013 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}]; 3610 my $faceid = $::CONN->{faceid}[$self->{face}]
3015 3611 or return;
3016 $face = $anim->[ $self->{frame} % @$anim ]
3017 if $anim && @$anim;
3018 }
3019 3612
3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3613 my $tex = $::CONN->{texture}[$faceid];
3021 3614
3022 if ($tex) { 3615 if ($tex) {
3023 glEnable GL_TEXTURE_2D; 3616 glEnable GL_TEXTURE_2D;
3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3025 glColor 0, 0, 0, 1; 3618 glColor 0, 0, 0, 1;
… …
3029} 3622}
3030 3623
3031sub destroy { 3624sub destroy {
3032 my ($self) = @_; 3625 my ($self) = @_;
3033 3626
3034 $self->{timer}->cancel 3627 (delete $self->{timer})->cancel
3035 if $self->{timer}; 3628 if $self->{timer};
3036 3629
3037 $self->SUPER::destroy; 3630 $self->SUPER::destroy;
3038} 3631}
3039 3632
3040############################################################################# 3633#############################################################################
3041 3634
3042package CFClient::UI::Buttonbar; 3635package CFPlus::UI::Buttonbar;
3043 3636
3044our @ISA = CFClient::UI::HBox::; 3637our @ISA = CFPlus::UI::HBox::;
3045 3638
3046# TODO: should actualyl wrap buttons and other goodies. 3639# TODO: should actually wrap buttons and other goodies.
3047 3640
3048############################################################################# 3641#############################################################################
3049 3642
3050package CFClient::UI::Menu; 3643package CFPlus::UI::Menu;
3051 3644
3052our @ISA = CFClient::UI::FancyFrame::; 3645our @ISA = CFPlus::UI::Toplevel::;
3053 3646
3054use CFClient::OpenGL; 3647use CFPlus::OpenGL;
3055 3648
3056sub new { 3649sub new {
3057 my $class = shift; 3650 my $class = shift;
3058 3651
3059 my $self = $class->SUPER::new ( 3652 my $self = $class->SUPER::new (
3060 items => [], 3653 items => [],
3061 z => 100, 3654 z => 100,
3062 @_, 3655 @_,
3063 ); 3656 );
3064 3657
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3658 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066 3659
3067 for my $item (@{ $self->{items} }) { 3660 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3661 my ($widget, $cb, $tooltip) = @$item;
3069 3662
3070 # handle various types of items, only text for now 3663 # handle various types of items, only text for now
3071 if (!ref $widget) { 3664 if (!ref $widget) {
3665 if ($widget =~ /\t/) {
3666 my ($left, $right) = split /\t/, $widget, 2;
3667
3072 $widget = new CFClient::UI::Label 3668 $widget = new CFPlus::UI::HBox
3073 can_hover => 1, 3669 can_hover => 1,
3074 can_events => 1, 3670 can_events => 1,
3671 tooltip => $tooltip,
3672 children => [
3673 (new CFPlus::UI::Label markup => $left, expand => 1),
3674 (new CFPlus::UI::Label markup => $right, align => +1),
3675 ],
3676 ;
3677
3678 } else {
3679 $widget = new CFPlus::UI::Label
3680 can_hover => 1,
3681 can_events => 1,
3075 markup => $widget, 3682 markup => $widget,
3076 tooltip => $tooltip 3683 tooltip => $tooltip;
3684 }
3077 } 3685 }
3078 3686
3079 $self->{item}{$widget} = $item; 3687 $self->{item}{$widget} = $item;
3080 3688
3081 $self->{vbox}->add ($widget); 3689 $self->{vbox}->add ($widget);
… …
3124 1 3732 1
3125} 3733}
3126 3734
3127############################################################################# 3735#############################################################################
3128 3736
3129package CFClient::UI::Multiplexer; 3737package CFPlus::UI::Multiplexer;
3130 3738
3131our @ISA = CFClient::UI::Container::; 3739our @ISA = CFPlus::UI::Container::;
3132 3740
3133sub new { 3741sub new {
3134 my $class = shift; 3742 my $class = shift;
3135 3743
3136 my $self = $class->SUPER::new ( 3744 my $self = $class->SUPER::new (
… …
3150 3758
3151 $self->{current} = $self->{children}[0] 3759 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3760 if @{ $self->{children} };
3153} 3761}
3154 3762
3763sub get_current_page {
3764 my ($self) = @_;
3765
3766 $self->{current}
3767}
3768
3155sub set_current_page { 3769sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3770 my ($self, $page_or_widget) = @_;
3157 3771
3158 my $widget = ref $page_or_widget 3772 my $widget = ref $page_or_widget
3159 ? $page_or_widget 3773 ? $page_or_widget
… …
3191 $self->{current}->draw; 3805 $self->{current}->draw;
3192} 3806}
3193 3807
3194############################################################################# 3808#############################################################################
3195 3809
3196package CFClient::UI::Notebook; 3810package CFPlus::UI::Notebook;
3197 3811
3198our @ISA = CFClient::UI::VBox::; 3812our @ISA = CFPlus::UI::VBox::;
3199 3813
3200sub new { 3814sub new {
3201 my $class = shift; 3815 my $class = shift;
3202 3816
3203 my $self = $class->SUPER::new ( 3817 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar), 3818 buttonbar => (new CFPlus::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3819 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self 3820 # filter => # will be put between multiplexer and $self
3207 @_, 3821 @_,
3208 ); 3822 );
3209 3823
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3824 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3214} 3828}
3215 3829
3216sub add { 3830sub add {
3217 my ($self, $title, $widget, $tooltip) = @_; 3831 my ($self, $title, $widget, $tooltip) = @_;
3218 3832
3219 Scalar::Util::weaken $self; 3833 CFPlus::weaken $self;
3220 3834
3221 $self->{buttonbar}->add (new CFClient::UI::Button 3835 $self->{buttonbar}->add (new CFPlus::UI::Button
3222 markup => $title, 3836 markup => $title,
3223 tooltip => $tooltip, 3837 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3838 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3839 );
3226 3840
3227 $self->{multiplexer}->add ($widget); 3841 $self->{multiplexer}->add ($widget);
3228} 3842}
3229 3843
3844sub get_current_page {
3845 my ($self) = @_;
3846
3847 $self->{multiplexer}->get_current_page
3848}
3849
3230sub set_current_page { 3850sub set_current_page {
3231 my ($self, $page) = @_; 3851 my ($self, $page) = @_;
3232 3852
3233 $self->{multiplexer}->set_current_page ($page); 3853 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current}); 3854 $self->emit (page_changed => $self->{multiplexer}{current});
3235} 3855}
3236 3856
3237############################################################################# 3857#############################################################################
3238 3858
3239package CFClient::UI::Combobox; 3859package CFPlus::UI::Selector;
3240 3860
3241use utf8; 3861use utf8;
3242 3862
3243our @ISA = CFClient::UI::Button::; 3863our @ISA = CFPlus::UI::Button::;
3244 3864
3245sub new { 3865sub new {
3246 my $class = shift; 3866 my $class = shift;
3247 3867
3248 my $self = $class->SUPER::new ( 3868 my $self = $class->SUPER::new (
… …
3265 my ($value, $title, $tooltip) = @$_; 3885 my ($value, $title, $tooltip) = @$_;
3266 3886
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3887 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 } 3888 }
3269 3889
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3890 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271} 3891}
3272 3892
3273sub _set_value { 3893sub _set_value {
3274 my ($self, $value) = @_; 3894 my ($self, $value) = @_;
3275 3895
… …
3290 $self->emit (changed => $value); 3910 $self->emit (changed => $value);
3291} 3911}
3292 3912
3293############################################################################# 3913#############################################################################
3294 3914
3295package CFClient::UI::Statusbox; 3915package CFPlus::UI::Statusbox;
3296 3916
3297our @ISA = CFClient::UI::VBox::; 3917our @ISA = CFPlus::UI::VBox::;
3298 3918
3299sub new { 3919sub new {
3300 my $class = shift; 3920 my $class = shift;
3301 3921
3302 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
3303 fontsize => 0.8, 3923 fontsize => 0.8,
3304 @_, 3924 @_,
3305 ); 3925 );
3306 3926
3307 Scalar::Util::weaken (my $this = $self); 3927 CFPlus::weaken (my $this = $self);
3308 3928
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3929 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310 3930
3311 $self 3931 $self
3312} 3932}
… …
3314sub reorder { 3934sub reorder {
3315 my ($self) = @_; 3935 my ($self) = @_;
3316 my $NOW = Time::HiRes::time; 3936 my $NOW = Time::HiRes::time;
3317 3937
3318 # freeze display when hovering over any label 3938 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner} 3939 return if $CFPlus::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3940 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} }; 3941 values %{ $self->{item} };
3322 3942
3323 while (my ($k, $v) = each %{ $self->{item} }) { 3943 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3944 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 } 3945 }
… …
3346 for ($short) { 3966 for ($short) {
3347 s/^\s+//; 3967 s/^\s+//;
3348 s/\s+/ /g; 3968 s/\s+/ /g;
3349 } 3969 }
3350 3970
3351 new CFClient::UI::Label 3971 new CFPlus::UI::Label
3352 markup => $short, 3972 markup => $short,
3353 tooltip => $item->{tooltip}, 3973 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP, 3974 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67, 3975 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize}, 3976 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3410 count => 1, 4030 count => 1,
3411 %arg, 4031 %arg,
3412 }; 4032 };
3413 } 4033 }
3414 4034
4035 $ROOT->on_refresh (reorder => sub {
3415 $self->reorder; 4036 $self->reorder;
4037 });
3416} 4038}
3417 4039
3418sub reconfigure { 4040sub reconfigure {
3419 my ($self) = @_; 4041 my ($self) = @_;
3420 4042
… …
3433 $self->SUPER::destroy; 4055 $self->SUPER::destroy;
3434} 4056}
3435 4057
3436############################################################################# 4058#############################################################################
3437 4059
3438package CFClient::UI::Inventory;
3439
3440our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442sub new {
3443 my $class = shift;
3444
3445 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447 @_,
3448 );
3449
3450 $self
3451}
3452
3453sub set_items {
3454 my ($self, $items) = @_;
3455
3456 $self->{child}->clear;
3457 return unless $items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476}
3477
3478#############################################################################
3479
3480package CFClient::UI::SpellList;
3481
3482our @ISA = CFClient::UI::Table::;
3483
3484sub new {
3485 my $class = shift;
3486
3487 my $self = $class->SUPER::new (
3488 binding => [],
3489 commands => [],
3490 @_,
3491 )
3492}
3493
3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3579sub add_spell {
3580 my ($self, $spell) = @_;
3581
3582 $self->{spell}->{$spell->{name}} = $spell;
3583 $self->rebuild_spell_list;
3584}
3585
3586sub remove_spell {
3587 my ($self, $spell) = @_;
3588
3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3600#############################################################################
3601
3602package CFClient::UI::Root; 4060package CFPlus::UI::Root;
3603 4061
3604our @ISA = CFClient::UI::Container::; 4062our @ISA = CFPlus::UI::Container::;
3605 4063
3606use List::Util qw(min max); 4064use List::Util qw(min max);
3607 4065
3608use CFClient::OpenGL; 4066use CFPlus::OpenGL;
3609 4067
3610sub new { 4068sub new {
3611 my $class = shift; 4069 my $class = shift;
3612 4070
3613 my $self = $class->SUPER::new ( 4071 my $self = $class->SUPER::new (
3614 visible => 1, 4072 visible => 1,
3615 @_, 4073 @_,
3616 ); 4074 );
3617 4075
3618 Scalar::Util::weaken ($self->{root} = $self); 4076 CFPlus::weaken ($self->{root} = $self);
3619 4077
3620 $self 4078 $self
3621} 4079}
3622 4080
3623sub size_request { 4081sub size_request {
… …
3789 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4247 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790 4248
3791 $w = 0 if $w < 0; 4249 $w = 0 if $w < 0;
3792 $h = 0 if $h < 0; 4250 $h = 0 if $h < 0;
3793 4251
4252 $w = max $widget->{min_w}, $w;
4253 $h = max $widget->{min_h}, $h;
4254
4255# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4256# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4257
4258 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4259 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4260
3794 $w = int $w + 0.5; 4261 $w = int $w + 0.5;
3795 $h = int $h + 0.5; 4262 $h = int $h + 0.5;
3796 4263
3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4264 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w}; 4265 $widget->{old_w} = $widget->{w};
… …
3808 4275
3809 while ($self->{post_alloc_hook}) { 4276 while ($self->{post_alloc_hook}) {
3810 $_->() 4277 $_->()
3811 for values %{delete $self->{post_alloc_hook}}; 4278 for values %{delete $self->{post_alloc_hook}};
3812 } 4279 }
3813
3814 4280
3815 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4281 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3816 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4282 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3817 glClear GL_COLOR_BUFFER_BIT; 4283 glClear GL_COLOR_BUFFER_BIT;
3818 4284
… …
3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4287 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3822 glMatrixMode GL_MODELVIEW; 4288 glMatrixMode GL_MODELVIEW;
3823 glLoadIdentity; 4289 glLoadIdentity;
3824 4290
3825 { 4291 {
3826 package CFClient::UI::Base; 4292 package CFPlus::UI::Base;
3827 4293
3828 ($draw_x, $draw_y, $draw_w, $draw_h) = 4294 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h}); 4295 (0, 0, $self->{w}, $self->{h});
3830 }
3831 4296
3832 $self->_draw; 4297 $self->_draw;
4298 }
3833} 4299}
3834 4300
3835############################################################################# 4301#############################################################################
3836 4302
3837package CFClient::UI; 4303package CFPlus::UI;
3838 4304
3839$ROOT = new CFClient::UI::Root; 4305$ROOT = new CFPlus::UI::Root;
3840$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4306$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3841 4307
38421 43081
3843 4309

Diff Legend

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