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.313 by root, Sat Jun 24 00:24:09 2006 UTC vs.
Revision 1.381 by root, Thu Jul 19 13:45:18 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}
1104
1105#TODO# update range on size_allocate depending on child
990 1106
991sub add { 1107sub add {
992 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
993 1109
994 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
995} 1111}
996 1112
1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
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 }
1135}
1136
997sub update { 1137sub update {
998 my ($self) = @_; 1138 my ($self) = @_;
999 1139
1000 $self->SUPER::update; 1140 $self->SUPER::update;
1141 $self->update_slider;
1142}
1001 1143
1002 # todo: overwrite size_allocate of child 1144sub invoke_mouse_wheel {
1003 my $child = $self->{vp}->child; 1145 my ($self, $ev) = @_;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 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
1005} 1195}
1006 1196
1007sub invoke_size_allocate { 1197sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1198 my ($self, $w, $h) = @_;
1009 1199
1010 my $child = $self->{vp}->child; 1200 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1201 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1202}
1015 1203
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1204#############################################################################
1020 1205
1021package CFClient::UI::Frame; 1206package CFPlus::UI::Frame;
1022 1207
1023our @ISA = CFClient::UI::Bin::; 1208our @ISA = CFPlus::UI::Bin::;
1024 1209
1025use CFClient::OpenGL; 1210use CFPlus::OpenGL;
1026 1211
1027sub new { 1212sub new {
1028 my $class = shift; 1213 my $class = shift;
1029 1214
1030 $class->SUPER::new ( 1215 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1241 $self->SUPER::_draw;
1057} 1242}
1058 1243
1059############################################################################# 1244#############################################################################
1060 1245
1061package CFClient::UI::FancyFrame; 1246package CFPlus::UI::FancyFrame;
1062 1247
1063our @ISA = CFClient::UI::Bin::; 1248our @ISA = CFPlus::UI::Bin::;
1064 1249
1065use 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;
1066 1351
1067my $bg = 1352my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1353 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1354 mipmap => 1, wrap => 1;
1070 1355
1071my @border = 1356my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 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);
1074 1359
1075sub new { 1360sub new {
1076 my ($class, %arg) = @_; 1361 my ($class, %arg) = @_;
1077 1362
1078 my $self = $class->SUPER::new ( 1363 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1364 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1365 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1366 border => 0.6,
1082 can_events => 1, 1367 can_events => 1,
1083 min_w => 16, 1368 min_w => 64,
1084 min_h => 16, 1369 min_h => 32,
1085 %arg, 1370 %arg,
1086 ); 1371 );
1087 1372
1088 $self->{title_widget} = new CFClient::UI::Label 1373 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1374 align => 0,
1090 valign => 1, 1375 valign => 1,
1091 text => $self->{title}, 1376 text => $self->{title},
1092 fontsize => $self->{border}, 1377 fontsize => $self->{border},
1093 if exists $self->{title}; 1378 if exists $self->{title};
1094 1379
1095 if ($self->{has_close_button}) { 1380 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1381 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1382 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1383 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1384 on_activate => sub { $self->emit ("delete") };
1100 1385
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1386 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1387 }
1103 1388
1104 $self 1389 $self
1105} 1390}
1106 1391
1107sub add { 1392sub add {
1108 my ($self, @widgets) = @_; 1393 my ($self, @widgets) = @_;
1109 1394
1110 $self->SUPER::add (@widgets); 1395 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1396 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1397 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1398}
1114 1399
1115sub border { 1400sub border {
1116 int $_[0]{border} * $::FONTSIZE 1401 int $_[0]{border} * $::FONTSIZE
1117} 1402}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1435 $self->child->configure ($border, $border, $w, $h);
1151 1436
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1437 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1438 if $self->{close_button};
1154 1439
1440 1
1441}
1442
1443sub invoke_delete {
1444 my ($self) = @_;
1445
1446 $self->hide;
1447
1155 1 1448 1
1156} 1449}
1157 1450
1158sub invoke_button_down { 1451sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1452 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1510 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1511
1219 ! ! $self->{motion} 1512 ! ! $self->{motion}
1220} 1513}
1221 1514
1515sub invoke_visibility_change {
1516 my ($self, $visible) = @_;
1517
1518 delete $self->{motion} unless $visible;
1519
1520 0
1521}
1522
1222sub _draw { 1523sub _draw {
1223 my ($self) = @_; 1524 my ($self) = @_;
1224 1525
1225 my $child = $self->{children}[0]; 1526 my $child = $self->{children}[0];
1226 1527
… …
1263 if $self->{close_button}; 1564 if $self->{close_button};
1264} 1565}
1265 1566
1266############################################################################# 1567#############################################################################
1267 1568
1268package CFClient::UI::Table; 1569package CFPlus::UI::Table;
1269 1570
1270our @ISA = CFClient::UI::Base::; 1571our @ISA = CFPlus::UI::Base::;
1271 1572
1272use List::Util qw(max sum); 1573use List::Util qw(max sum);
1273 1574
1274use CFClient::OpenGL; 1575use CFPlus::OpenGL;
1275 1576
1276sub new { 1577sub new {
1277 my $class = shift; 1578 my $class = shift;
1278 1579
1279 $class->SUPER::new ( 1580 $class->SUPER::new (
1581 children => [],
1280 col_expand => [], 1582 col_expand => [],
1583 row_expand => [],
1281 @_, 1584 @_,
1282 ) 1585 )
1283} 1586}
1284 1587
1285sub children { 1588sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1589 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287} 1590}
1288 1591
1592# TODO: store row/col info in child widget and use standard add/del
1289sub add { 1593sub add {
1290 my ($self, $x, $y, $child) = @_; 1594 my ($self) = shift;
1291 1595
1596 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, ();
1292 $child->set_parent ($self); 1598 $child->set_parent ($self);
1293 $self->{children}[$y][$x] = $child; 1599 $self->{children}[$y][$x] = $child;
1600 }
1294 1601
1602 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1;
1295 $self->realloc; 1604 $self->realloc;
1296} 1605}
1297 1606
1298sub remove { 1607sub remove {
1299 my ($self, $child) = @_; 1608 my ($self, $child) = @_;
1300 1609
1301 # TODO: not yet implemented 1610 for (@{ $self->{children} }) {
1611 for (@{ $_ || [] }) {
1612 $_ = undef if $_ == $child;
1613 }
1614 }
1302} 1615}
1303 1616
1304# TODO: move to container class maybe? send children a signal on removal? 1617# TODO: move to container class maybe? send children a signal on removal?
1305sub clear { 1618sub clear {
1306 my ($self) = @_; 1619 my ($self) = @_;
… …
1355 my ($ws, $hs) = $self->get_wh; 1668 my ($ws, $hs) = $self->get_wh;
1356 1669
1357 my $req_w = (sum @$ws) || 1; 1670 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1671 my $req_h = (sum @$hs) || 1;
1359 1672
1360 # TODO: nicer code && do row_expand 1673 # TODO: nicer code
1361 my @col_expand = @{$self->{col_expand}}; 1674 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1675 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1676 my $col_expand = (sum @col_expand) || 1;
1364 1677
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1678 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1679
1369 CFClient::UI::harmonize $ws; 1680 CFPlus::UI::harmonize $ws;
1681
1682 my @row_expand = @{$self->{row_expand}};
1683 @row_expand = (1) x @$ws unless @row_expand;
1684 my $row_expand = (sum @row_expand) || 1;
1685
1686 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687
1370 CFClient::UI::harmonize $hs; 1688 CFPlus::UI::harmonize $hs;
1371 1689
1372 my $y; 1690 my $y;
1373 1691
1374 for my $r (0 .. $#{$self->{children}}) { 1692 for my $r (0 .. $#{$self->{children}}) {
1375 my $row = $self->{children}[$r] 1693 my $row = $self->{children}[$r]
… …
1418 } 1736 }
1419} 1737}
1420 1738
1421############################################################################# 1739#############################################################################
1422 1740
1423package CFClient::UI::Box; 1741package CFPlus::UI::Fixed;
1424 1742
1743use List::Util qw(min max);
1744
1425our @ISA = CFClient::UI::Container::; 1745our @ISA = CFPlus::UI::Container::;
1746
1747sub add {
1748 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751 $self->SUPER::add ($child);
1752}
1753
1754sub _scale($$$) {
1755 my ($mode, $val, $max) = @_;
1756
1757 $mode eq "abs" ? $val
1758 : $mode eq "rel" ? $val * $max
1759 : 0
1760}
1761
1762sub size_request {
1763 my ($self) = @_;
1764
1765 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766
1767 # determine overall size by querying abs widgets
1768 for my $child ($self->visible_children) {
1769 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1770
1771 if ($pos eq "abs") {
1772 $w = _scale $size, $w, $child->{req_w};
1773 $h = _scale $size, $h, $child->{req_h};
1774
1775 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1776 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1777 }
1778 }
1779
1780 my $W = $x2 - $x1;
1781 my $H = $y2 - $y1;
1782
1783 # now layout remaining widgets
1784 for my $child ($self->visible_children) {
1785 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1786
1787 if ($pos ne "abs") {
1788 $x = _scale $pos, $x, $W;
1789 $y = _scale $pos, $x, $H;
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 ($W, $H)
1802}
1803
1804sub invoke_size_allocate {
1805 my ($self, $W, $H) = @_;
1806
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 $x = _scale $pos, $x, $W;
1811 $y = _scale $pos, $x, $H;
1812 $w = _scale $size, $w, $child->{req_w};
1813 $h = _scale $size, $h, $child->{req_h};
1814
1815 $child->configure ($x, $y, $w, $h);
1816 }
1817
1818 1
1819}
1820
1821#############################################################################
1822
1823package CFPlus::UI::Box;
1824
1825our @ISA = CFPlus::UI::Container::;
1426 1826
1427sub size_request { 1827sub size_request {
1428 my ($self) = @_; 1828 my ($self) = @_;
1429 1829
1430 $self->{vertical} 1830 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1863 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1864 for 0 .. $#children;
1465 } 1865 }
1466 } 1866 }
1467 1867
1468 CFClient::UI::harmonize \@req; 1868 CFPlus::UI::harmonize \@req;
1469 1869
1470 my $pos = 0; 1870 my $pos = 0;
1471 for (0 .. $#children) { 1871 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1872 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1873 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1878 1
1479} 1879}
1480 1880
1481############################################################################# 1881#############################################################################
1482 1882
1483package CFClient::UI::HBox; 1883package CFPlus::UI::HBox;
1484 1884
1485our @ISA = CFClient::UI::Box::; 1885our @ISA = CFPlus::UI::Box::;
1486 1886
1487sub new { 1887sub new {
1488 my $class = shift; 1888 my $class = shift;
1489 1889
1490 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1493 ) 1893 )
1494} 1894}
1495 1895
1496############################################################################# 1896#############################################################################
1497 1897
1498package CFClient::UI::VBox; 1898package CFPlus::UI::VBox;
1499 1899
1500our @ISA = CFClient::UI::Box::; 1900our @ISA = CFPlus::UI::Box::;
1501 1901
1502sub new { 1902sub new {
1503 my $class = shift; 1903 my $class = shift;
1504 1904
1505 $class->SUPER::new ( 1905 $class->SUPER::new (
… …
1508 ) 1908 )
1509} 1909}
1510 1910
1511############################################################################# 1911#############################################################################
1512 1912
1513package CFClient::UI::Label; 1913package CFPlus::UI::Label;
1514 1914
1515our @ISA = CFClient::UI::DrawBG::; 1915our @ISA = CFPlus::UI::DrawBG::;
1516 1916
1517use CFClient::OpenGL; 1917use CFPlus::OpenGL;
1518 1918
1519sub new { 1919sub new {
1520 my ($class, %arg) = @_; 1920 my ($class, %arg) = @_;
1521 1921
1522 my $self = $class->SUPER::new ( 1922 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1925 #active_bg => none
1526 #font => default_font 1926 #font => default_font
1527 #text => initial text 1927 #text => initial text
1528 #markup => initial narkup 1928 #markup => initial narkup
1529 #max_w => maximum pixel width 1929 #max_w => maximum pixel width
1930 #style => 0, # render flags
1530 ellipsise => 3, # end 1931 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1932 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1933 fontsize => 1,
1533 align => -1, 1934 align => -1,
1534 valign => -1, 1935 valign => -1,
1535 padding_x => 2, 1936 padding_x => 2,
1536 padding_y => 2, 1937 padding_y => 2,
1537 can_events => 0, 1938 can_events => 0,
1538 %arg 1939 %arg
1539 ); 1940 );
1540 1941
1541 if (exists $self->{template}) { 1942 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1943 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1944 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1945 $self->{template} = $layout;
1545 } 1946 }
1546 1947
1547 if (exists $self->{markup}) { 1948 if (exists $self->{markup}) {
… …
1551 } 1952 }
1552 1953
1553 $self 1954 $self
1554} 1955}
1555 1956
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1957sub update {
1567 my ($self) = @_; 1958 my ($self) = @_;
1568 1959
1569 delete $self->{texture}; 1960 delete $self->{texture};
1570 $self->SUPER::update; 1961 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1972 my ($self, $text) = @_;
1582 1973
1583 return if $self->{text} eq "T$text"; 1974 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1975 $self->{text} = "T$text";
1585 1976
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1977 $self->{layout}->set_text ($text);
1588 1978
1589 delete $self->{size_req}; 1979 delete $self->{size_req};
1590 $self->realloc; 1980 $self->realloc;
1591 $self->update; 1981 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1987 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1988 $self->{text} = "M$markup";
1599 1989
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1990 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1991
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1992 $self->{layout}->set_markup ($markup);
1604 1993
1605 delete $self->{size_req}; 1994 delete $self->{size_req};
1606 $self->realloc; 1995 $self->realloc;
1607 $self->update; 1996 $self->update;
… …
1619 2008
1620 my ($w, $h) = $self->{layout}->size; 2009 my ($w, $h) = $self->{layout}->size;
1621 2010
1622 if (exists $self->{template}) { 2011 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 2012 $self->{template}->set_font ($self->{font}) if $self->{font};
2013 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 2015
1626 my ($w2, $h2) = $self->{template}->size; 2016 my ($w2, $h2) = $self->{template}->size;
1627 2017
1628 $w = List::Util::max $w, $w2; 2018 $w = List::Util::max $w, $w2;
… …
1652 2042
1653sub set_fontsize { 2043sub set_fontsize {
1654 my ($self, $fontsize) = @_; 2044 my ($self, $fontsize) = @_;
1655 2045
1656 $self->{fontsize} = $fontsize; 2046 $self->{fontsize} = $fontsize;
2047 delete $self->{size_req};
1657 delete $self->{texture}; 2048 delete $self->{texture};
1658 2049
1659 $self->realloc; 2050 $self->realloc;
1660} 2051}
1661 2052
1662sub reconfigure { 2053sub reconfigure {
1663 my ($self) = @_; 2054 my ($self) = @_;
1664 2055
1665 delete $self->{size_req}; 2056 delete $self->{size_req};
2057 delete $self->{texture};
1666 2058
1667 $self->SUPER::reconfigure; 2059 $self->SUPER::reconfigure;
1668} 2060}
1669 2061
1670sub _draw { 2062sub _draw {
1671 my ($self) = @_; 2063 my ($self) = @_;
1672 2064
1673 $self->SUPER::_draw; # draw background, if applicable 2065 $self->SUPER::_draw; # draw background, if applicable
1674 2066
1675 my $tex = $self->{texture} ||= do { 2067 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 2068 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2069 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 2070 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2071 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2072 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2073 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 2074
1683 new_from_layout CFClient::Texture $self->{layout} 2075 [$self->{layout}->size]
1684 }; 2076 };
1685 2077
1686 unless (exists $self->{ox}) { 2078 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2079 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2080 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 2081 : ($self->{w} - $size->[0]) * 0.5);
1690 2082
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2083 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2084 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 2085 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 2086 };
1695 2087
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2088 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2089 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 2090
1701 if ($tex->{format} == GL_ALPHA) { 2091 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 2092}
1712 2093
1713############################################################################# 2094#############################################################################
1714 2095
1715package CFClient::UI::EntryBase; 2096package CFPlus::UI::EntryBase;
1716 2097
1717our @ISA = CFClient::UI::Label::; 2098our @ISA = CFPlus::UI::Label::;
1718 2099
1719use CFClient::OpenGL; 2100use CFPlus::OpenGL;
1720 2101
1721sub new { 2102sub new {
1722 my $class = shift; 2103 my $class = shift;
1723 2104
1724 $class->SUPER::new ( 2105 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 2109 active_fg => [0, 0, 0],
1729 can_hover => 1, 2110 can_hover => 1,
1730 can_focus => 1, 2111 can_focus => 1,
1731 valign => 0, 2112 valign => 0,
1732 can_events => 1, 2113 can_events => 1,
2114 ellipsise => 0,
1733 #text => ... 2115 #text => ...
1734 #hidden => "*", 2116 #hidden => "*",
1735 @_ 2117 @_
1736 ) 2118 )
1737} 2119}
… …
1782 my $sym = $ev->{sym}; 2164 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2165 my $uni = $ev->{unicode};
1784 2166
1785 my $text = $self->get_text; 2167 my $text = $self->get_text;
1786 2168
2169 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2170
1787 if ($uni == 8) { 2171 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2172 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2173 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2174 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2175 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2176 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2177 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2178 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2179 } elsif ($sym == CFPlus::SDLK_HOME) {
2180 # what a hack
2181 $self->{cursor} =
2182 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183 ? length $1
2184 : 0;
2185 } elsif ($sym == CFPlus::SDLK_END) {
2186 # uh, again
2187 $self->{cursor} =
2188 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189 ? $self->{cursor} + length $1
2190 : length $self->{text};
2191 } elsif ($uni == 21) { # ctrl-u
2192 $text = "";
1796 $self->{cursor} = 0; 2193 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2194 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2195 $self->emit ('escape');
1801 } elsif ($uni) { 2196 } elsif ($uni == 0x0d) {
2197 substr $text, $self->{cursor}++, 0, "\012";
2198 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2199 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2200 } else {
1804 return 0; 2201 return 0;
1805 } 2202 }
1806 2203
1807 $self->_set_text ($text); 2204 $self->_set_text ($text);
1808 2205
1809 $self->realloc; 2206 $self->realloc;
2207 $self->update;
1810 2208
1811 1 2209 1
1812} 2210}
1813 2211
1814sub invoke_focus_in { 2212sub invoke_focus_in {
… …
1826 2224
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2225 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2226
1829 # byte-index to char-index 2227 # byte-index to char-index
1830 my $text = $self->{text}; 2228 my $text = $self->{text};
1831 utf8::encode $text; 2229 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2230 $self->{cursor} = length $text;
1833 2231
1834 $self->_set_text ($self->{text}); 2232 $self->_set_text ($self->{text});
1835 $self->update; 2233 $self->update;
1836 2234
1837 1 2235 1
… …
1876 utf8::encode $text; 2274 utf8::encode $text;
1877 2275
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2276 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2277 }
1880 2278
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2279 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2280 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2281 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2282 glEnd;
1886 } 2283 }
1887} 2284}
1888 2285
2286#############################################################################
2287
1889package CFClient::UI::Entry; 2288package CFPlus::UI::Entry;
1890 2289
1891our @ISA = CFClient::UI::EntryBase::; 2290our @ISA = CFPlus::UI::EntryBase::;
1892 2291
1893use CFClient::OpenGL; 2292use CFPlus::OpenGL;
1894 2293
1895sub invoke_key_down { 2294sub invoke_key_down {
1896 my ($self, $ev) = @_; 2295 my ($self, $ev) = @_;
1897 2296
1898 my $sym = $ev->{sym}; 2297 my $sym = $ev->{sym};
1899 2298
1900 if ($sym == 13) { 2299 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2300 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2301 my $txt = $self->get_text;
1903 2302
1904 $self->{history_pointer} = -1; 2303 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2304 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2305 $self->emit (activate => $txt);
1907 $self->update; 2306 $self->update;
1908 2307
1909 } elsif ($sym == CFClient::SDLK_UP) { 2308 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2309 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2310 $self->{history_saveback} = $self->get_text;
1912 } 2311 }
1913 if (@{$self->{history} || []} > 0) { 2312 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2313 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2315 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2316 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2317 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2318 }
1920 2319
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2320 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2321 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2322 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2323
1925 if ($self->{history_pointer} >= 0) { 2324 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2325 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2334 1
1936} 2335}
1937 2336
1938############################################################################# 2337#############################################################################
1939 2338
2339package CFPlus::UI::TextEdit;
2340
2341our @ISA = CFPlus::UI::EntryBase::;
2342
2343use CFPlus::OpenGL;
2344
2345sub move_cursor_ver {
2346 my ($self, $dy) = @_;
2347
2348 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349
2350 $y += $dy;
2351
2352 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2353 $self->{cursor} = $index;
2354 delete $self->{cur_h};
2355 $self->update;
2356 return;
2357 }
2358}
2359
2360sub invoke_key_down {
2361 my ($self, $ev) = @_;
2362
2363 my $sym = $ev->{sym};
2364
2365 if ($sym == CFPlus::SDLK_UP) {
2366 $self->move_cursor_ver (-1);
2367 } elsif ($sym == CFPlus::SDLK_DOWN) {
2368 $self->move_cursor_ver (+1);
2369 } else {
2370 return $self->SUPER::invoke_key_down ($ev)
2371 }
2372
2373 1
2374}
2375
2376#############################################################################
2377
1940package CFClient::UI::Button; 2378package CFPlus::UI::Button;
1941 2379
1942our @ISA = CFClient::UI::Label::; 2380our @ISA = CFPlus::UI::Label::;
1943 2381
1944use CFClient::OpenGL; 2382use CFPlus::OpenGL;
1945 2383
1946my @tex = 2384my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2386 qw(b1_button_inactive.png b1_button_active.png);
1949 2387
1950sub new { 2388sub new {
1951 my $class = shift; 2389 my $class = shift;
1952 2390
1953 $class->SUPER::new ( 2391 $class->SUPER::new (
1954 padding_x => 4, 2392 padding_x => 4,
1955 padding_y => 4, 2393 padding_y => 4,
1956 fg => [1, 1, 1], 2394 fg => [1.0, 1.0, 1.0],
1957 active_fg => [0, 0, 1], 2395 active_fg => [0.8, 0.8, 0.8],
1958 can_hover => 1, 2396 can_hover => 1,
1959 align => 0, 2397 align => 0,
1960 valign => 0, 2398 valign => 0,
1961 can_events => 1, 2399 can_events => 1,
1962 @_ 2400 @_
… …
1980 2418
1981 glEnable GL_TEXTURE_2D; 2419 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 glColor 0, 0, 0, 1; 2421 glColor 0, 0, 0, 1;
1984 2422
2423 my $tex = $tex[$GRAB == $self];
1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2424 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1986 2425
1987 glDisable GL_TEXTURE_2D; 2426 glDisable GL_TEXTURE_2D;
1988 2427
1989 $self->SUPER::_draw; 2428 $self->SUPER::_draw;
1990} 2429}
1991 2430
1992############################################################################# 2431#############################################################################
1993 2432
2433package CFPlus::UI::CheckBox;
2434
2435our @ISA = CFPlus::UI::DrawBG::;
2436
2437my @tex =
2438 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2439 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2440
2441use CFPlus::OpenGL;
2442
2443sub new {
2444 my $class = shift;
2445
2446 $class->SUPER::new (
2447 padding_x => 2,
2448 padding_y => 2,
2449 fg => [1, 1, 1],
2450 active_fg => [1, 1, 0],
2451 bg => [0, 0, 0, 0.2],
2452 active_bg => [1, 1, 1, 0.5],
2453 state => 0,
2454 can_hover => 1,
2455 @_
2456 )
2457}
2458
2459sub size_request {
2460 my ($self) = @_;
2461
2462 (6) x 2
2463}
2464
2465sub toggle {
2466 my ($self) = @_;
2467
2468 $self->{state} = !$self->{state};
2469 $self->emit (changed => $self->{state});
2470 $self->update;
2471}
2472
2473sub invoke_button_down {
2474 my ($self, $ev, $x, $y) = @_;
2475
2476 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2477 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2478 $self->toggle;
2479 } else {
2480 return 0
2481 }
2482
2483 1
2484}
2485
2486sub _draw {
2487 my ($self) = @_;
2488
2489 $self->SUPER::_draw;
2490
2491 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2492
2493 my ($w, $h) = @$self{qw(w h)};
2494
2495 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2496
2497 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2498
2499 my $tex = $self->{state} ? $tex[1] : $tex[0];
2500
2501 glEnable GL_TEXTURE_2D;
2502 $tex->draw_quad_alpha (0, 0, $s, $s);
2503 glDisable GL_TEXTURE_2D;
2504}
2505
2506#############################################################################
2507
2508package CFPlus::UI::Image;
2509
2510our @ISA = CFPlus::UI::Base::;
2511
2512use CFPlus::OpenGL;
2513
2514our %texture_cache;
2515
2516sub new {
2517 my $class = shift;
2518
2519 my $self = $class->SUPER::new (
2520 can_events => 0,
2521 @_,
2522 );
2523
2524 $self->{path} || $self->{tex}
2525 or Carp::croak "'path' or 'tex' attributes required";
2526
2527 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2528 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2529
2530 CFPlus::weaken $texture_cache{$self->{path}};
2531
2532 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2533
2534 $self
2535}
2536
2537sub STORABLE_freeze {
2538 my ($self, $cloning) = @_;
2539
2540 $self->{path}
2541 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2542
2543 $self->{path}
2544}
2545
2546sub STORABLE_attach {
2547 my ($self, $cloning, $path) = @_;
2548
2549 $self->new (path => $path)
2550}
2551
2552sub size_request {
2553 my ($self) = @_;
2554
2555 ($self->{tex}{w}, $self->{tex}{h})
2556}
2557
2558sub _draw {
2559 my ($self) = @_;
2560
2561 my $tex = $self->{tex};
2562
2563 my ($w, $h) = ($self->{w}, $self->{h});
2564
2565 if ($self->{rot90}) {
2566 glRotate 90, 0, 0, 1;
2567 glTranslate 0, -$self->{w}, 0;
2568
2569 ($w, $h) = ($h, $w);
2570 }
2571
2572 glEnable GL_TEXTURE_2D;
2573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2574
2575 $tex->draw_quad (0, 0, $w, $h);
2576
2577 glDisable GL_TEXTURE_2D;
2578}
2579
2580#############################################################################
2581
1994package CFClient::UI::ImageButton; 2582package CFPlus::UI::ImageButton;
1995 2583
1996our @ISA = CFClient::UI::Image::; 2584our @ISA = CFPlus::UI::Image::;
1997 2585
1998use CFClient::OpenGL; 2586use CFPlus::OpenGL;
1999 2587
2000my %textures; 2588my %textures;
2001 2589
2002sub new { 2590sub new {
2003 my $class = shift; 2591 my $class = shift;
… …
2025 1 2613 1
2026} 2614}
2027 2615
2028############################################################################# 2616#############################################################################
2029 2617
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_;
2064
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
2073 1
2074}
2075
2076sub _draw {
2077 my ($self) = @_;
2078
2079 $self->SUPER::_draw;
2080
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091 glEnable GL_TEXTURE_2D;
2092 $tex->draw_quad_alpha (0, 0, $s, $s);
2093 glDisable GL_TEXTURE_2D;
2094}
2095
2096#############################################################################
2097
2098package CFClient::UI::Image; 2618package CFPlus::UI::VGauge;
2099 2619
2100our @ISA = CFClient::UI::Base::; 2620our @ISA = CFPlus::UI::Base::;
2101
2102use CFClient::OpenGL;
2103
2104our %texture_cache;
2105
2106sub new {
2107 my $class = shift;
2108
2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2113
2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2116
2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124 $self
2125}
2126
2127sub size_request {
2128 my ($self) = @_;
2129
2130 ($self->{tex}{w}, $self->{tex}{h})
2131}
2132
2133sub _draw {
2134 my ($self) = @_;
2135
2136 my $tex = $self->{tex};
2137
2138 my ($w, $h) = ($self->{w}, $self->{h});
2139
2140 if ($self->{rot90}) {
2141 glRotate 90, 0, 0, 1;
2142 glTranslate 0, -$self->{w}, 0;
2143
2144 ($w, $h) = ($h, $w);
2145 }
2146
2147 glEnable GL_TEXTURE_2D;
2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150 $tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::VGauge;
2158
2159our @ISA = CFClient::UI::Base::;
2160 2621
2161use List::Util qw(min max); 2622use List::Util qw(min max);
2162 2623
2163use CFClient::OpenGL; 2624use CFPlus::OpenGL;
2164 2625
2165my %tex = ( 2626my %tex = (
2166 food => [ 2627 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2629 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2630 ],
2170 grace => [ 2631 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2632 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2633 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2634 ],
2174 hp => [ 2635 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2636 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2637 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2638 ],
2178 mana => [ 2639 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2640 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2641 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2642 ],
2182); 2643);
2183 2644
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2645# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2705 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2706 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2707
2247 my $h1 = $self->{h} * (1 - $ycut1); 2708 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2709 my $h2 = $self->{h} * (1 - $ycut2);
2710 my $h3 = $self->{h};
2711
2712 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2713
2250 glEnable GL_BLEND; 2714 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2715 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2716 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2717 glEnable GL_TEXTURE_2D;
… …
2272 2736
2273 if ($t3) { 2737 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2738 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2739 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2740 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2741 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2742 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2743 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2744 glEnd;
2281 } 2745 }
2282 2746
2283 glDisable GL_BLEND; 2747 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2748 glDisable GL_TEXTURE_2D;
2285} 2749}
2286 2750
2287############################################################################# 2751#############################################################################
2288 2752
2289package CFClient::UI::Gauge; 2753package CFPlus::UI::Gauge;
2290 2754
2291our @ISA = CFClient::UI::VBox::; 2755our @ISA = CFPlus::UI::VBox::;
2292 2756
2293sub new { 2757sub new {
2294 my ($class, %arg) = @_; 2758 my ($class, %arg) = @_;
2295 2759
2296 my $self = $class->SUPER::new ( 2760 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2762 can_hover => 1,
2299 can_events => 1, 2763 can_events => 1,
2300 %arg, 2764 %arg,
2301 ); 2765 );
2302 2766
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2767 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2768 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2769 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2770
2307 $self 2771 $self
2308} 2772}
2309 2773
2310sub set_fontsize { 2774sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2795 $self->{value}->set_text ($val);
2332} 2796}
2333 2797
2334############################################################################# 2798#############################################################################
2335 2799
2336package CFClient::UI::Slider; 2800package CFPlus::UI::Slider;
2337 2801
2338use strict; 2802use strict;
2339 2803
2340use CFClient::OpenGL; 2804use CFPlus::OpenGL;
2341 2805
2342our @ISA = CFClient::UI::DrawBG::; 2806our @ISA = CFPlus::UI::DrawBG::;
2343 2807
2344my @tex = 2808my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2809 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2810 qw(s1_slider.png s1_slider_bg.png);
2347 2811
2348sub new { 2812sub new {
2349 my $class = shift; 2813 my $class = shift;
2350 2814
… …
2439 } 2903 }
2440 2904
2441 1 2905 1
2442} 2906}
2443 2907
2908sub invoke_mouse_wheel {
2909 my ($self, $ev) = @_;
2910
2911 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2912
2913 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2914
2915 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2916
2917 ! ! $delta
2918}
2919
2444sub update { 2920sub update {
2445 my ($self) = @_; 2921 my ($self) = @_;
2446 2922
2447 delete $self->{knob_w}; 2923 delete $self->{knob_w};
2448 $self->SUPER::update; 2924 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2971 glDisable GL_TEXTURE_2D;
2496} 2972}
2497 2973
2498############################################################################# 2974#############################################################################
2499 2975
2500package CFClient::UI::ValSlider; 2976package CFPlus::UI::ValSlider;
2501 2977
2502our @ISA = CFClient::UI::HBox::; 2978our @ISA = CFPlus::UI::HBox::;
2503 2979
2504sub new { 2980sub new {
2505 my ($class, %arg) = @_; 2981 my ($class, %arg) = @_;
2506 2982
2507 my $range = delete $arg{range}; 2983 my $range = delete $arg{range};
2508 2984
2509 my $self = $class->SUPER::new ( 2985 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2986 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2987 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2988 to_value => sub { shift },
2513 from_value => sub { shift }, 2989 from_value => sub { shift },
2514 %arg, 2990 %arg,
2515 ); 2991 );
2516 2992
… …
2536sub set_range { shift->{slider}->set_range (@_) } 3012sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 3013sub set_value { shift->{slider}->set_value (@_) }
2538 3014
2539############################################################################# 3015#############################################################################
2540 3016
2541package CFClient::UI::TextScroller; 3017package CFPlus::UI::TextScroller;
2542 3018
2543our @ISA = CFClient::UI::HBox::; 3019our @ISA = CFPlus::UI::HBox::;
2544 3020
2545use CFClient::OpenGL; 3021use CFPlus::OpenGL;
2546 3022
2547sub new { 3023sub new {
2548 my $class = shift; 3024 my $class = shift;
2549 3025
2550 my $self = $class->SUPER::new ( 3026 my $self = $class->SUPER::new (
2551 fontsize => 1, 3027 fontsize => 1,
2552 can_events => 0, 3028 can_events => 1,
2553 indent => 0, 3029 indent => 0,
2554 #font => default_font 3030 #font => default_font
2555 @_, 3031 @_,
2556 3032
2557 layout => (new CFClient::Layout 1), 3033 layout => (new CFPlus::Layout),
2558 par => [], 3034 par => [],
3035 max_par => 0,
2559 height => 0, 3036 height => 0,
2560 children => [ 3037 children => [
2561 (new CFClient::UI::Empty expand => 1), 3038 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 3039 (new CFPlus::UI::Slider vertical => 1),
2563 ], 3040 ],
2564 ); 3041 );
2565 3042
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 3043 $self->{children}[1]->connect (changed => sub { $self->update });
2567 3044
… …
2597 3074
2598 $self->reflow; 3075 $self->reflow;
2599 3076
2600 local $self->{children} = [$empty, $slider]; 3077 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 3078 $self->SUPER::invoke_size_allocate ($w, $h)
3079}
3080
3081sub invoke_mouse_wheel {
3082 my ($self, $ev) = @_;
3083
3084 return 0 unless $ev->{dy}; # only vertical movements
3085
3086 $self->{children}[1]->emit (mouse_wheel => $ev);
3087
3088 1
2602} 3089}
2603 3090
2604sub get_layout { 3091sub get_layout {
2605 my ($self, $para) = @_; 3092 my ($self, $para) = @_;
2606 3093
… …
2634 3121
2635 # todo: base offset on lines or so, not on pixels 3122 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 3123 $self->{children}[1]->set_value ($offset);
2637} 3124}
2638 3125
3126sub current_paragraph {
3127 my ($self) = @_;
3128
3129 $self->{top_paragraph} - 1
3130}
3131
3132sub scroll_to {
3133 my ($self, $para) = @_;
3134
3135 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3136
3137 $self->{scroll_to} = $para;
3138 $self->update;
3139}
3140
2639sub clear { 3141sub clear {
2640 my ($self) = @_; 3142 my ($self) = @_;
2641 3143
2642 my (undef, undef, @other) = @{ $self->{children} }; 3144 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 3145 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 3148 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3149 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 3150}
2649 3151
2650sub add_paragraph { 3152sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 3153 my $self = shift;
2652 3154
2653 my ($text, @w) = ref $para ? @$para : $para; 3155 for my $para (@_) {
2654
2655 $para = { 3156 $para = {
3157 fg => [1, 1, 1, 1],
3158 indent => 0,
3159 markup => "",
3160 widget => [],
3161 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 3162 w => 1e10,
2657 wrapped => 1, 3163 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 3164 };
2663 3165
2664 $self->add (@w) if @w; 3166 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 3167 push @{$self->{par}}, $para;
3168 }
3169
3170 if (my $max = $self->{max_par}) {
3171 shift @{$self->{par}} while @{$self->{par}} > $max;
3172 }
2666 3173
2667 $self->{need_reflow}++; 3174 $self->{need_reflow}++;
2668 $self->update; 3175 $self->update;
2669} 3176}
2670 3177
2671sub scroll_to_bottom { 3178sub scroll_to_bottom {
2672 my ($self) = @_; 3179 my ($self) = @_;
2673 3180
2674 $self->{scroll_to_bottom} = 1; 3181 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3182 $self->update;
2676} 3183}
2677 3184
3185sub force_uptodate {
3186 my ($self) = @_;
3187
3188 if (delete $self->{need_reflow}) {
3189 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3190
3191 my $height = 0;
3192
3193 for my $para (@{$self->{par}}) {
3194 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3195 my $layout = $self->get_layout ($para);
3196 my ($w, $h) = $layout->size;
3197
3198 $para->{w} = $w + $para->{indent};
3199 $para->{h} = $h;
3200 $para->{wrapped} = $layout->has_wrapped;
3201 }
3202
3203 $para->{y} = $height;
3204 $height += $para->{h};
3205 }
3206
3207 $self->{height} = $height;
3208 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3209
3210 delete $self->{texture};
3211 }
3212
3213 if (my $paridx = delete $self->{scroll_to}) {
3214 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3215 }
3216}
3217
2678sub update { 3218sub update {
2679 my ($self) = @_; 3219 my ($self) = @_;
2680 3220
2681 $self->SUPER::update; 3221 $self->SUPER::update;
2682 3222
2683 return unless $self->{h} > 0; 3223 return unless $self->{h} > 0;
2684 3224
2685 delete $self->{texture}; 3225 delete $self->{texture};
2686 3226
2687 $ROOT->on_post_alloc ($self => sub { 3227 $ROOT->on_post_alloc ($self => sub {
3228 $self->force_uptodate;
3229
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3230 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3231
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3232 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3233 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3234 glClear GL_COLOR_BUFFER_BIT;
2720 3235
3236 package CFPlus::UI::Base;
3237 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3238 (0, 0, $self->{w}, $self->{h});
3239
3240 my $top = int $self->{children}[1]{range}[0];
3241
3242 my $paridx = 0;
3243 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3244 my $top = int $self->{children}[1]{range}[0];
2722 3245
2723 my $y0 = $top; 3246 my $y0 = $top;
2724 my $y1 = $top + $H; 3247 my $y1 = $top + $H;
2725 3248
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3249 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3250 my $h = $para->{h};
3251 my $y = $para->{y};
2734 3252
2735 if ($y0 < $y + $h && $y < $y1) { 3253 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3254 my $layout = $self->get_layout ($para);
2738 3255
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3256 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3257
2744 if (my @w = @{ $para->{widget} }) { 3258 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3259 my @s = $layout->get_shapes;
2746 3260
2747 glDisable GL_BLEND;
2748 for (@w) { 3261 for (@w) {
2749 my ($dx, $dy) = splice @s, 0, 2, (); 3262 my ($dx, $dy) = splice @s, 0, 2, ();
2750 3263
2751 $_->{x} = $dx + $para->{indent}; 3264 $_->{x} = $dx + $para->{indent};
2752 $_->{y} = $dy + $y - $y0; 3265 $_->{y} = $dy + $y - $y0;
2753 3266
2754 $_->draw; 3267 $_->draw;
2755 } 3268 }
2756 glEnable GL_BLEND;
2757 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758 } 3269 }
2759 } 3270 }
2760 3271
2761 $y += $h; 3272 $paridx++;
3273 $top_paragraph ||= $paridx if $y >= $top;
2762 } 3274 }
2763 3275
2764 glDisable GL_BLEND; 3276 $self->{top_paragraph} = $top_paragraph;
2765 }; 3277 };
2766 }); 3278 });
2767} 3279}
2768 3280
2769sub reconfigure { 3281sub reconfigure {
… …
2787 $self->{children}[1]->draw; 3299 $self->{children}[1]->draw;
2788} 3300}
2789 3301
2790############################################################################# 3302#############################################################################
2791 3303
2792package CFClient::UI::Animator; 3304package CFPlus::UI::Animator;
2793 3305
2794use CFClient::OpenGL; 3306use CFPlus::OpenGL;
2795 3307
2796our @ISA = CFClient::UI::Bin::; 3308our @ISA = CFPlus::UI::Bin::;
2797 3309
2798sub moveto { 3310sub moveto {
2799 my ($self, $x, $y) = @_; 3311 my ($self, $x, $y) = @_;
2800 3312
2801 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3313 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2829 glPopMatrix; 3341 glPopMatrix;
2830} 3342}
2831 3343
2832############################################################################# 3344#############################################################################
2833 3345
2834package CFClient::UI::Flopper; 3346package CFPlus::UI::Flopper;
2835 3347
2836our @ISA = CFClient::UI::Button::; 3348our @ISA = CFPlus::UI::Button::;
2837 3349
2838sub new { 3350sub new {
2839 my $class = shift; 3351 my $class = shift;
2840 3352
2841 my $self = $class->SUPER::new ( 3353 my $self = $class->SUPER::new (
… …
2853 $self->{other}->toggle_visibility; 3365 $self->{other}->toggle_visibility;
2854} 3366}
2855 3367
2856############################################################################# 3368#############################################################################
2857 3369
2858package CFClient::UI::Tooltip; 3370package CFPlus::UI::Tooltip;
2859 3371
2860our @ISA = CFClient::UI::Bin::; 3372our @ISA = CFPlus::UI::Bin::;
2861 3373
2862use CFClient::OpenGL; 3374use CFPlus::OpenGL;
2863 3375
2864sub new { 3376sub new {
2865 my $class = shift; 3377 my $class = shift;
2866 3378
2867 $class->SUPER::new ( 3379 $class->SUPER::new (
… …
2870 ) 3382 )
2871} 3383}
2872 3384
2873sub set_tooltip_from { 3385sub set_tooltip_from {
2874 my ($self, $widget) = @_; 3386 my ($self, $widget) = @_;
3387
3388 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3389 if $widget->{tooltip} =~ /^#(.*)$/;
2875 3390
2876 my $tooltip = $widget->{tooltip}; 3391 my $tooltip = $widget->{tooltip};
2877 3392
2878 if ($ENV{CFPLUS_DEBUG} & 2) { 3393 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n" 3394 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2883 } 3398 }
2884 3399
2885 $tooltip =~ s/^\n+//; 3400 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//; 3401 $tooltip =~ s/\n+$//;
2887 3402
2888 $self->add (new CFClient::UI::Label 3403 $self->add (new CFPlus::UI::Label
2889 markup => $tooltip, 3404 markup => $tooltip,
2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3405 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891 fontsize => 0.8, 3406 fontsize => 0.8,
2892 fg => [0, 0, 0, 1], 3407 style => 1, # FLAG_INVERSE
2893 ellipsise => 0, 3408 ellipsise => 0,
2894 font => ($widget->{tooltip_font} || $::FONT_PROP), 3409 font => ($widget->{tooltip_font} || $::FONT_PROP),
2895 ); 3410 );
2896} 3411}
2897 3412
… …
2916 3431
2917 $self->{root}->on_post_alloc ("move_$self" => sub { 3432 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner} 3433 my $widget = $self->{owner}
2919 or return; 3434 or return;
2920 3435
3436 if ($widget->{visible}) {
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3437 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922 3438
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3439 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w}; 3440 if $x + $self->{w} > $self->{root}{w};
2925 3441
2926 $self->move_abs ($x, $y); 3442 $self->move_abs ($x, $y);
3443 } else {
3444 $self->hide;
3445 }
2927 }); 3446 });
2928} 3447}
2929 3448
2930sub _draw { 3449sub _draw {
2931 my ($self) = @_; 3450 my ($self) = @_;
… …
2955 $self->SUPER::_draw; 3474 $self->SUPER::_draw;
2956} 3475}
2957 3476
2958############################################################################# 3477#############################################################################
2959 3478
2960package CFClient::UI::Face; 3479package CFPlus::UI::Face;
2961 3480
2962our @ISA = CFClient::UI::Base::; 3481our @ISA = CFPlus::UI::DrawBG::;
2963 3482
2964use CFClient::OpenGL; 3483use CFPlus::OpenGL;
2965 3484
2966sub new { 3485sub new {
2967 my $class = shift; 3486 my $class = shift;
2968 3487
2969 my $self = $class->SUPER::new ( 3488 my $self = $class->SUPER::new (
3489 size_w => 32,
3490 size_h => 8,
2970 aspect => 1, 3491 aspect => 1,
2971 can_events => 0, 3492 can_events => 0,
2972 @_, 3493 @_,
2973 ); 3494 );
2974 3495
2975 if ($self->{anim} && $self->{animspeed}) { 3496 if ($self->{anim} && $self->{animspeed}) {
2976 Scalar::Util::weaken (my $widget = $self); 3497 CFPlus::weaken (my $widget = $self);
2977 3498
3499 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3500 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2978 $self->{timer} = Event->timer ( 3501 $self->{timer} = Event->timer (
2979 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980 hard => 1, 3502 parked => 1,
2981 interval => $self->{animspeed},
2982 cb => sub { 3503 cb => sub {
3504 return unless $::CONN && $widget;
3505
2983 ++$widget->{frame}; 3506 ++$widget->{frame};
3507 $widget->update_face;
2984 $widget->update; 3508 $widget->update;
3509
3510 $widget->update_timer;
2985 }, 3511 },
2986 ); 3512 );
3513
3514 $self->update_face;
3515 $self->update_timer;
2987 } 3516 }
2988 3517
2989 $self 3518 $self
2990} 3519}
2991 3520
3521sub update_timer {
3522 my ($self) = @_;
3523
3524 return unless $self->{timer};
3525
3526 if ($self->{visible}) {
3527 $self->{timer}->at (
3528 $self->{anim_start}
3529 + $self->{animspeed}
3530 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3531 );
3532 $self->{timer}->start;
3533 } else {
3534 $self->{timer}->stop;
3535 }
3536}
3537
3538sub update_face {
3539 my ($self) = @_;
3540
3541 return unless $::CONN;
3542
3543 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3544 if ($anim && @$anim) {
3545 delete $self->{wait_face};
3546 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3547 }
3548 }
3549}
3550
2992sub size_request { 3551sub size_request {
2993 (32, 8) 3552 my ($self) = @_;
3553
3554 if ($::CONN) {
3555 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3556 if (my $tex = $::CONN->{texture}[$faceid]) {
3557 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3558 } else {
3559 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3560 $self->realloc;
3561 });
3562 }
3563 }
3564 }
3565
3566 ($self->{size_w} || 8, $self->{size_h} || 8)
2994} 3567}
2995 3568
2996sub update { 3569sub update {
2997 my ($self) = @_; 3570 my ($self) = @_;
2998 3571
2999 return unless $self->{visible}; 3572 return unless $self->{visible};
3000 3573
3001 $self->SUPER::update; 3574 $self->SUPER::update;
3002} 3575}
3003 3576
3577sub invoke_visibility_change {
3578 my ($self) = @_;
3579
3580 $self->update_timer;
3581
3582 0
3583}
3584
3004sub _draw { 3585sub _draw {
3005 my ($self) = @_; 3586 my ($self) = @_;
3006 3587
3007 return unless $::CONN; 3588 return unless $::CONN;
3008 3589
3009 my $face; 3590 $self->SUPER::_draw;
3010 3591
3011 if ($self->{frame}) {
3012 my $anim = $::CONN->{anim}[$self->{anim}]; 3592 my $faceid = $::CONN->{faceid}[$self->{face}]
3013 3593 or return;
3014 $face = $anim->[ $self->{frame} % @$anim ]
3015 if $anim && @$anim;
3016 }
3017 3594
3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3595 my $tex = $::CONN->{texture}[$faceid];
3019 3596
3020 if ($tex) { 3597 if ($tex) {
3021 glEnable GL_TEXTURE_2D; 3598 glEnable GL_TEXTURE_2D;
3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3023 glColor 0, 0, 0, 1; 3600 glColor 0, 0, 0, 1;
… …
3027} 3604}
3028 3605
3029sub destroy { 3606sub destroy {
3030 my ($self) = @_; 3607 my ($self) = @_;
3031 3608
3032 $self->{timer}->cancel 3609 (delete $self->{timer})->cancel
3033 if $self->{timer}; 3610 if $self->{timer};
3034 3611
3035 $self->SUPER::destroy; 3612 $self->SUPER::destroy;
3036} 3613}
3037 3614
3038############################################################################# 3615#############################################################################
3039 3616
3040package CFClient::UI::Buttonbar; 3617package CFPlus::UI::Buttonbar;
3041 3618
3042our @ISA = CFClient::UI::HBox::; 3619our @ISA = CFPlus::UI::HBox::;
3043 3620
3044# TODO: should actualyl wrap buttons and other goodies. 3621# TODO: should actually wrap buttons and other goodies.
3045 3622
3046############################################################################# 3623#############################################################################
3047 3624
3048package CFClient::UI::Menu; 3625package CFPlus::UI::Menu;
3049 3626
3050our @ISA = CFClient::UI::FancyFrame::; 3627our @ISA = CFPlus::UI::Toplevel::;
3051 3628
3052use CFClient::OpenGL; 3629use CFPlus::OpenGL;
3053 3630
3054sub new { 3631sub new {
3055 my $class = shift; 3632 my $class = shift;
3056 3633
3057 my $self = $class->SUPER::new ( 3634 my $self = $class->SUPER::new (
3058 items => [], 3635 items => [],
3059 z => 100, 3636 z => 100,
3060 @_, 3637 @_,
3061 ); 3638 );
3062 3639
3063 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3640 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3064 3641
3065 for my $item (@{ $self->{items} }) { 3642 for my $item (@{ $self->{items} }) {
3066 my ($widget, $cb, $tooltip) = @$item; 3643 my ($widget, $cb, $tooltip) = @$item;
3067 3644
3068 # handle various types of items, only text for now 3645 # handle various types of items, only text for now
3069 if (!ref $widget) { 3646 if (!ref $widget) {
3647 if ($widget =~ /\t/) {
3648 my ($left, $right) = split /\t/, $widget, 2;
3649
3070 $widget = new CFClient::UI::Label 3650 $widget = new CFPlus::UI::HBox
3071 can_hover => 1, 3651 can_hover => 1,
3072 can_events => 1, 3652 can_events => 1,
3653 tooltip => $tooltip,
3654 children => [
3655 (new CFPlus::UI::Label markup => $left, expand => 1),
3656 (new CFPlus::UI::Label markup => $right, align => +1),
3657 ],
3658 ;
3659
3660 } else {
3661 $widget = new CFPlus::UI::Label
3662 can_hover => 1,
3663 can_events => 1,
3073 markup => $widget, 3664 markup => $widget,
3074 tooltip => $tooltip 3665 tooltip => $tooltip;
3666 }
3075 } 3667 }
3076 3668
3077 $self->{item}{$widget} = $item; 3669 $self->{item}{$widget} = $item;
3078 3670
3079 $self->{vbox}->add ($widget); 3671 $self->{vbox}->add ($widget);
… …
3122 1 3714 1
3123} 3715}
3124 3716
3125############################################################################# 3717#############################################################################
3126 3718
3127package CFClient::UI::Multiplexer; 3719package CFPlus::UI::Multiplexer;
3128 3720
3129our @ISA = CFClient::UI::Container::; 3721our @ISA = CFPlus::UI::Container::;
3130 3722
3131sub new { 3723sub new {
3132 my $class = shift; 3724 my $class = shift;
3133 3725
3134 my $self = $class->SUPER::new ( 3726 my $self = $class->SUPER::new (
… …
3148 3740
3149 $self->{current} = $self->{children}[0] 3741 $self->{current} = $self->{children}[0]
3150 if @{ $self->{children} }; 3742 if @{ $self->{children} };
3151} 3743}
3152 3744
3745sub get_current_page {
3746 my ($self) = @_;
3747
3748 $self->{current}
3749}
3750
3153sub set_current_page { 3751sub set_current_page {
3154 my ($self, $page_or_widget) = @_; 3752 my ($self, $page_or_widget) = @_;
3155 3753
3156 my $widget = ref $page_or_widget 3754 my $widget = ref $page_or_widget
3157 ? $page_or_widget 3755 ? $page_or_widget
… …
3189 $self->{current}->draw; 3787 $self->{current}->draw;
3190} 3788}
3191 3789
3192############################################################################# 3790#############################################################################
3193 3791
3194package CFClient::UI::Notebook; 3792package CFPlus::UI::Notebook;
3195 3793
3196our @ISA = CFClient::UI::VBox::; 3794our @ISA = CFPlus::UI::VBox::;
3197 3795
3198sub new { 3796sub new {
3199 my $class = shift; 3797 my $class = shift;
3200 3798
3201 my $self = $class->SUPER::new ( 3799 my $self = $class->SUPER::new (
3202 buttonbar => (new CFClient::UI::Buttonbar), 3800 buttonbar => (new CFPlus::UI::Buttonbar),
3203 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3801 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3204 # filter => # will be put between multiplexer and $self 3802 # filter => # will be put between multiplexer and $self
3205 @_, 3803 @_,
3206 ); 3804 );
3207 3805
3208 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3806 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3212} 3810}
3213 3811
3214sub add { 3812sub add {
3215 my ($self, $title, $widget, $tooltip) = @_; 3813 my ($self, $title, $widget, $tooltip) = @_;
3216 3814
3217 Scalar::Util::weaken $self; 3815 CFPlus::weaken $self;
3218 3816
3219 $self->{buttonbar}->add (new CFClient::UI::Button 3817 $self->{buttonbar}->add (new CFPlus::UI::Button
3220 markup => $title, 3818 markup => $title,
3221 tooltip => $tooltip, 3819 tooltip => $tooltip,
3222 on_activate => sub { $self->set_current_page ($widget) }, 3820 on_activate => sub { $self->set_current_page ($widget) },
3223 ); 3821 );
3224 3822
3225 $self->{multiplexer}->add ($widget); 3823 $self->{multiplexer}->add ($widget);
3226} 3824}
3227 3825
3826sub get_current_page {
3827 my ($self) = @_;
3828
3829 $self->{multiplexer}->get_current_page
3830}
3831
3228sub set_current_page { 3832sub set_current_page {
3229 my ($self, $page) = @_; 3833 my ($self, $page) = @_;
3230 3834
3231 $self->{multiplexer}->set_current_page ($page); 3835 $self->{multiplexer}->set_current_page ($page);
3232 $self->emit (page_changed => $self->{multiplexer}{current}); 3836 $self->emit (page_changed => $self->{multiplexer}{current});
3233} 3837}
3234 3838
3235############################################################################# 3839#############################################################################
3236 3840
3237package CFClient::UI::Combobox; 3841package CFPlus::UI::Selector;
3238 3842
3239use utf8; 3843use utf8;
3240 3844
3241our @ISA = CFClient::UI::Button::; 3845our @ISA = CFPlus::UI::Button::;
3242 3846
3243sub new { 3847sub new {
3244 my $class = shift; 3848 my $class = shift;
3245 3849
3246 my $self = $class->SUPER::new ( 3850 my $self = $class->SUPER::new (
… …
3263 my ($value, $title, $tooltip) = @$_; 3867 my ($value, $title, $tooltip) = @$_;
3264 3868
3265 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3869 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266 } 3870 }
3267 3871
3268 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3872 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269} 3873}
3270 3874
3271sub _set_value { 3875sub _set_value {
3272 my ($self, $value) = @_; 3876 my ($self, $value) = @_;
3273 3877
… …
3288 $self->emit (changed => $value); 3892 $self->emit (changed => $value);
3289} 3893}
3290 3894
3291############################################################################# 3895#############################################################################
3292 3896
3293package CFClient::UI::Statusbox; 3897package CFPlus::UI::Statusbox;
3294 3898
3295our @ISA = CFClient::UI::VBox::; 3899our @ISA = CFPlus::UI::VBox::;
3296 3900
3297sub new { 3901sub new {
3298 my $class = shift; 3902 my $class = shift;
3299 3903
3300 my $self = $class->SUPER::new ( 3904 my $self = $class->SUPER::new (
3301 fontsize => 0.8, 3905 fontsize => 0.8,
3302 @_, 3906 @_,
3303 ); 3907 );
3304 3908
3305 Scalar::Util::weaken (my $this = $self); 3909 CFPlus::weaken (my $this = $self);
3306 3910
3307 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3911 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3308 3912
3309 $self 3913 $self
3310} 3914}
… …
3312sub reorder { 3916sub reorder {
3313 my ($self) = @_; 3917 my ($self) = @_;
3314 my $NOW = Time::HiRes::time; 3918 my $NOW = Time::HiRes::time;
3315 3919
3316 # freeze display when hovering over any label 3920 # freeze display when hovering over any label
3317 return if $CFClient::UI::TOOLTIP->{owner} 3921 return if $CFPlus::UI::TOOLTIP->{owner}
3318 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3922 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3319 values %{ $self->{item} }; 3923 values %{ $self->{item} };
3320 3924
3321 while (my ($k, $v) = each %{ $self->{item} }) { 3925 while (my ($k, $v) = each %{ $self->{item} }) {
3322 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3926 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3323 } 3927 }
… …
3344 for ($short) { 3948 for ($short) {
3345 s/^\s+//; 3949 s/^\s+//;
3346 s/\s+/ /g; 3950 s/\s+/ /g;
3347 } 3951 }
3348 3952
3349 new CFClient::UI::Label 3953 new CFPlus::UI::Label
3350 markup => $short, 3954 markup => $short,
3351 tooltip => $item->{tooltip}, 3955 tooltip => $item->{tooltip},
3352 tooltip_font => $::FONT_PROP, 3956 tooltip_font => $::FONT_PROP,
3353 tooltip_width => 0.67, 3957 tooltip_width => 0.67,
3354 fontsize => $item->{fontsize} || $self->{fontsize}, 3958 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3408 count => 1, 4012 count => 1,
3409 %arg, 4013 %arg,
3410 }; 4014 };
3411 } 4015 }
3412 4016
4017 $ROOT->on_refresh (reorder => sub {
3413 $self->reorder; 4018 $self->reorder;
4019 });
3414} 4020}
3415 4021
3416sub reconfigure { 4022sub reconfigure {
3417 my ($self) = @_; 4023 my ($self) = @_;
3418 4024
… …
3431 $self->SUPER::destroy; 4037 $self->SUPER::destroy;
3432} 4038}
3433 4039
3434############################################################################# 4040#############################################################################
3435 4041
3436package CFClient::UI::Inventory;
3437
3438our @ISA = CFClient::UI::ScrolledWindow::;
3439
3440sub new {
3441 my $class = shift;
3442
3443 my $self = $class->SUPER::new (
3444 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3445 @_,
3446 );
3447
3448 $self
3449}
3450
3451sub set_items {
3452 my ($self, $items) = @_;
3453
3454 $self->{child}->clear;
3455 return unless $items;
3456
3457 my @items = sort {
3458 ($a->{type} <=> $b->{type})
3459 or ($a->{name} cmp $b->{name})
3460 } @$items;
3461
3462 $self->{real_items} = \@items;
3463
3464 my $row = 0;
3465 for my $item (@items) {
3466 CFClient::Item::update_widgets $item;
3467
3468 $self->{child}->add (0, $row, $item->{face_widget});
3469 $self->{child}->add (1, $row, $item->{desc_widget});
3470 $self->{child}->add (2, $row, $item->{weight_widget});
3471
3472 $row++;
3473 }
3474}
3475
3476#############################################################################
3477
3478package CFClient::UI::BindEditor;
3479
3480our @ISA = CFClient::UI::FancyFrame::;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487 $self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491 text => "start recording",
3492 tooltip => "Start/Stops recording of actions."
3493 ."All subsequent actions after the recording started will be captured."
3494 ."The actions are displayed after the record was stopped."
3495 ."To bind the action you have to click on the 'Bind' button",
3496 on_activate => sub {
3497 unless ($self->{recording}) {
3498 $self->start;
3499 } else {
3500 $self->stop;
3501 }
3502 });
3503
3504 $vb->add (new CFClient::UI::Label text => "Actions:");
3505 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3508 $vb->add (my $hb = new CFClient::UI::HBox);
3509 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510 $hb->add (new CFClient::UI::Button
3511 text => "bind",
3512 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513 on_activate => sub {
3514 $self->ask_for_bind;
3515 });
3516
3517 $vb->add (my $hb = new CFClient::UI::HBox);
3518 $hb->add (new CFClient::UI::Button
3519 text => "ok",
3520 expand => 1,
3521 tooltip => "This closes the binding editor and saves the binding",
3522 on_activate => sub {
3523 $self->hide;
3524 $self->commit;
3525 });
3526
3527 $hb->add (new CFClient::UI::Button
3528 text => "cancel",
3529 expand => 1,
3530 tooltip => "This closes the binding editor without saving",
3531 on_activate => sub {
3532 $self->hide;
3533 $self->{binding_cancel}->()
3534 if $self->{binding_cancel};
3535 });
3536
3537 $self->update_binding_widgets;
3538
3539 $self
3540}
3541
3542sub cfg_bind {
3543 my ($self, $mod, $sym, $cmds) = @_;
3544 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545 ::update_bindings ();
3546}
3547
3548sub cfg_unbind {
3549 my ($self, $mod, $sym, $cmds) = @_;
3550 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551 ::update_bindings ();
3552}
3553
3554sub commit {
3555 my ($self) = @_;
3556 my ($mod, $sym, $cmds) = $self->get_binding;
3557 if ($sym != 0 && @$cmds > 0) {
3558 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559 ."'. Don't forget 'Save Config'!");
3560 $self->{binding_change}->($mod, $sym, $cmds)
3561 if $self->{binding_change};
3562 } else {
3563 $::STATUSBOX->add ("No action bound, no key or action specified!");
3564 $self->{binding_cancel}->()
3565 if $self->{binding_cancel};
3566 }
3567}
3568
3569sub start {
3570 my ($self) = @_;
3571
3572 $self->{rec_btn}->set_text ("stop recording");
3573 $self->{recording} = 1;
3574 $self->clear_command_list;
3575 $::CONN->start_record if $::CONN;
3576}
3577
3578sub stop {
3579 my ($self) = @_;
3580
3581 $self->{rec_btn}->set_text ("start recording");
3582 $self->{recording} = 0;
3583
3584 my $rec;
3585 $rec = $::CONN->stop_record if $::CONN;
3586 return unless ref $rec eq 'ARRAY';
3587 $self->set_command_list ($rec);
3588}
3589
3590
3591sub ask_for_bind_and_commit {
3592 my ($self) = @_;
3593 $self->ask_for_bind (1);
3594}
3595
3596sub ask_for_bind {
3597 my ($self, $commit, $end_cb) = @_;
3598
3599 CFClient::Binder::open_binding_dialog (sub {
3600 my ($mod, $sym) = @_;
3601 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602 $self->update_binding_widgets;
3603 $self->commit if $commit;
3604 $end_cb->() if $end_cb;
3605 });
3606}
3607
3608# $mod and $sym are the modifiers and key symbol
3609# $cmds is a array ref of strings (the commands)
3610# $cb is the callback that is executed on OK
3611# $ccb is the callback that is executed on CANCEL and
3612# when the binding was unsuccessful on OK
3613sub set_binding {
3614 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616 $self->clear_command_list;
3617 $self->{recording} = 0;
3618 $self->{rec_btn}->set_text ("start recording");
3619
3620 $self->{binding} = [$mod, $sym];
3621 $self->{commands} = $cmds;
3622
3623 $self->{binding_change} = $cb;
3624 $self->{binding_cancel} = $ccb;
3625
3626 $self->update_binding_widgets;
3627}
3628
3629# this is a shortcut method that asks for a binding
3630# and then just binds it.
3631sub do_quick_binding {
3632 my ($self, $cmds, $end_cb) = @_;
3633 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634 $self->ask_for_bind (1, $end_cb);
3635}
3636
3637sub update_binding_widgets {
3638 my ($self) = @_;
3639 my ($mod, $sym, $cmds) = $self->get_binding;
3640 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641 $self->set_command_list ($cmds);
3642}
3643
3644sub get_binding {
3645 my ($self) = @_;
3646 return (
3647 $self->{binding}->[0],
3648 $self->{binding}->[1],
3649 [ grep { defined $_ } @{$self->{commands}} ]
3650 );
3651}
3652
3653sub clear_command_list {
3654 my ($self) = @_;
3655 $self->{cmdbox}->clear ();
3656}
3657
3658sub set_command_list {
3659 my ($self, $cmds) = @_;
3660
3661 $self->{cmdbox}->clear ();
3662 $self->{commands} = $cmds;
3663
3664 my $idx = 0;
3665
3666 for (@$cmds) {
3667 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669 my $i = $idx;
3670 $hb->add (new CFClient::UI::Label text => $_);
3671 $hb->add (new CFClient::UI::Button
3672 text => "delete",
3673 tooltip => "Deletes the action from the record",
3674 on_activate => sub {
3675 $self->{cmdbox}->remove ($hb);
3676 $cmds->[$i] = undef;
3677 });
3678
3679
3680 $idx++
3681 }
3682}
3683
3684#############################################################################
3685
3686package CFClient::UI::SpellList;
3687
3688our @ISA = CFClient::UI::Table::;
3689
3690sub new {
3691 my $class = shift;
3692
3693 my $self = $class->SUPER::new (
3694 binding => [],
3695 commands => [],
3696 @_,
3697 )
3698}
3699
3700my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3701
3702my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3703 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3704my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3705 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3706my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3707 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3708my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3709 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3710my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3711 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3712
3713sub rebuild_spell_list {
3714 my ($self) = @_;
3715
3716 $CFClient::UI::ROOT->on_refresh ($self => sub {
3717 $self->clear;
3718
3719 return unless $::CONN;
3720
3721 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3722 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3723 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3724 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3725 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3726
3727 my $row = 0;
3728
3729 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3730 my $spell = $self->{spell}{$_};
3731
3732 $row++;
3733
3734 my $spell_cb = sub {
3735 my ($widget, $ev) = @_;
3736
3737 if ($ev->{button} == 1) {
3738 $::CONN->user_send ("cast $spell->{name}");
3739 } elsif ($ev->{button} == 2) {
3740 $::CONN->user_send ("invoke $spell->{name}");
3741 } elsif ($ev->{button} == 3) {
3742 (new CFClient::UI::Menu
3743 items => [
3744 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3745 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746 ],
3747 )->popup ($ev);
3748 } else {
3749 return 0;
3750 }
3751
3752 1
3753 };
3754
3755 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3756
3757 #TODO: add path info to tooltip
3758 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3759
3760 $self->add (0, $row, new CFClient::UI::Face
3761 face => $spell->{face},
3762 can_hover => 1,
3763 can_events => 1,
3764 tooltip => $tooltip,
3765 on_button_down => $spell_cb,
3766 );
3767
3768 $self->add (1, $row, new CFClient::UI::Label
3769 expand => 1,
3770 text => $spell->{name},
3771 can_hover => 1,
3772 can_events => 1,
3773 tooltip => $tooltip,
3774 on_button_down => $spell_cb,
3775 );
3776
3777 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3778 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3779 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3780 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3781 }
3782 });
3783}
3784
3785sub add_spell {
3786 my ($self, $spell) = @_;
3787
3788 $self->{spell}->{$spell->{name}} = $spell;
3789 $self->rebuild_spell_list;
3790}
3791
3792sub remove_spell {
3793 my ($self, $spell) = @_;
3794
3795 delete $self->{spell}->{$spell->{name}};
3796 $self->rebuild_spell_list;
3797}
3798
3799sub clear_spells {
3800 my ($self) = @_;
3801
3802 $self->{spell} = {};
3803 $self->rebuild_spell_list;
3804}
3805
3806#############################################################################
3807
3808package CFClient::UI::Root; 4042package CFPlus::UI::Root;
3809 4043
3810our @ISA = CFClient::UI::Container::; 4044our @ISA = CFPlus::UI::Container::;
3811 4045
3812use List::Util qw(min max); 4046use List::Util qw(min max);
3813 4047
3814use CFClient::OpenGL; 4048use CFPlus::OpenGL;
3815 4049
3816sub new { 4050sub new {
3817 my $class = shift; 4051 my $class = shift;
3818 4052
3819 my $self = $class->SUPER::new ( 4053 my $self = $class->SUPER::new (
3820 visible => 1, 4054 visible => 1,
3821 @_, 4055 @_,
3822 ); 4056 );
3823 4057
3824 Scalar::Util::weaken ($self->{root} = $self); 4058 CFPlus::weaken ($self->{root} = $self);
3825 4059
3826 $self 4060 $self
3827} 4061}
3828 4062
3829sub size_request { 4063sub size_request {
… …
3995 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4229 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3996 4230
3997 $w = 0 if $w < 0; 4231 $w = 0 if $w < 0;
3998 $h = 0 if $h < 0; 4232 $h = 0 if $h < 0;
3999 4233
4234 $w = max $widget->{min_w}, $w;
4235 $h = max $widget->{min_h}, $h;
4236
4237# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4238# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4239
4240 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4241 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4242
4000 $w = int $w + 0.5; 4243 $w = int $w + 0.5;
4001 $h = int $h + 0.5; 4244 $h = int $h + 0.5;
4002 4245
4003 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4246 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004 $widget->{old_w} = $widget->{w}; 4247 $widget->{old_w} = $widget->{w};
… …
4014 4257
4015 while ($self->{post_alloc_hook}) { 4258 while ($self->{post_alloc_hook}) {
4016 $_->() 4259 $_->()
4017 for values %{delete $self->{post_alloc_hook}}; 4260 for values %{delete $self->{post_alloc_hook}};
4018 } 4261 }
4019
4020 4262
4021 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4263 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4022 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4264 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4023 glClear GL_COLOR_BUFFER_BIT; 4265 glClear GL_COLOR_BUFFER_BIT;
4024 4266
… …
4027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4269 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4028 glMatrixMode GL_MODELVIEW; 4270 glMatrixMode GL_MODELVIEW;
4029 glLoadIdentity; 4271 glLoadIdentity;
4030 4272
4031 { 4273 {
4032 package CFClient::UI::Base; 4274 package CFPlus::UI::Base;
4033 4275
4034 ($draw_x, $draw_y, $draw_w, $draw_h) = 4276 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4035 (0, 0, $self->{w}, $self->{h}); 4277 (0, 0, $self->{w}, $self->{h});
4036 }
4037 4278
4038 $self->_draw; 4279 $self->_draw;
4280 }
4039} 4281}
4040 4282
4041############################################################################# 4283#############################################################################
4042 4284
4043package CFClient::UI; 4285package CFPlus::UI;
4044 4286
4045$ROOT = new CFClient::UI::Root; 4287$ROOT = new CFPlus::UI::Root;
4046$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4288$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4047 4289
40481 42901
4049 4291

Diff Legend

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