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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.386 by root, Fri Jul 20 16:33:45 2007 UTC

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

Diff Legend

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