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.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30: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) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $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; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $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}; 256 $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}; 257 $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}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
278 delete $self->{root}; 312 delete $self->{root};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
454
455 Carp::confess unless $self->{parent};#d#
418 456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
… …
456 494
457sub invoke_mouse_motion { 0 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 0 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 0 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 0 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
… …
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
474} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480 544
481 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
485} 554}
486 555
487sub find_widget { 556#sub find_widget {
488 my ($self, $x, $y) = @_; 557# in .xs
489
490 return () unless $self->{can_events};
491
492 return $self
493 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
494 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
495
496 ()
497}
498 558
499sub set_parent { 559sub set_parent {
500 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
501 561
502 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
503 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
504} 564}
505 565
506sub realloc { 566sub realloc {
507 my ($self) = @_; 567 my ($self) = @_;
… …
533 593
534# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless. 595# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
537 597
538sub draw { 598#sub draw {
539 my ($self) = @_; 599#CFPlus.xs
540
541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550
551 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0;
553
554 if ($self == $HOVER && $self->{can_hover}) {
555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
556 glEnable GL_BLEND;
557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
558 glBegin GL_QUADS;
559 glVertex 0 , 0;
560 glVertex $self->{w}, 0;
561 glVertex $self->{w}, $self->{h};
562 glVertex 0 , $self->{h};
563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
577 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 }
580
581 $self->_draw;
582 glPopMatrix;
583}
584 600
585sub _draw { 601sub _draw {
586 my ($self) = @_; 602 my ($self) = @_;
587 603
588 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
589} 605}
590 606
591sub DESTROY { 607sub DESTROY {
592 my ($self) = @_; 608 my ($self) = @_;
593 609
594 return if CFClient::in_destruct; 610 return if CFPlus::in_destruct;
595
596 delete $WIDGET{$self+0};
597 611
598 eval { $self->destroy }; 612 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614
615 delete $WIDGET{$self+0};
600} 616}
601 617
602############################################################################# 618#############################################################################
603 619
604package CFClient::UI::DrawBG; 620package CFPlus::UI::DrawBG;
605 621
606our @ISA = CFClient::UI::Base::; 622our @ISA = CFPlus::UI::Base::;
607 623
608use strict; 624use strict;
609use CFClient::OpenGL; 625use CFPlus::OpenGL;
610 626
611sub new { 627sub new {
612 my $class = shift; 628 my $class = shift;
613 629
614 # range [value, low, high, page] 630 # range [value, low, high, page]
… …
645 } 661 }
646} 662}
647 663
648############################################################################# 664#############################################################################
649 665
650package CFClient::UI::Empty; 666package CFPlus::UI::Empty;
651 667
652our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
653 669
654sub new { 670sub new {
655 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
656 $class->SUPER::new (can_events => 0, %arg); 672 $class->SUPER::new (can_events => 0, %arg);
657} 673}
… …
664 680
665sub draw { } 681sub draw { }
666 682
667############################################################################# 683#############################################################################
668 684
669package CFClient::UI::Container; 685package CFPlus::UI::Container;
670 686
671our @ISA = CFClient::UI::Base::; 687our @ISA = CFPlus::UI::Base::;
672 688
673sub new { 689sub new {
674 my ($class, %arg) = @_; 690 my ($class, %arg) = @_;
675 691
676 my $children = delete $arg{children}; 692 my $children = delete $arg{children};
… …
680 can_events => 0, 696 can_events => 0,
681 %arg, 697 %arg,
682 ); 698 );
683 699
684 $self->add (@$children) 700 $self->add (@$children)
685 if $children; 701 if $children && @$children;
686 702
687 $self 703 $self
704}
705
706sub realloc {
707 my ($self) = @_;
708
709 $self->{force_realloc} = 1;
710 $self->{force_size_alloc} = 1;
711 $self->SUPER::realloc;
688} 712}
689 713
690sub add { 714sub add {
691 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
692 716
693 $_->set_parent ($self) 717 $_->set_parent ($self)
694 for @widgets; 718 for @widgets;
695 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
696 use sort 'stable'; 721 use sort 'stable';
697 722
698 $self->{children} = [ 723 $self->{children} = [
699 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
700 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
701 ]; 726 ];
702 727
703 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
704} 733}
705 734
706sub children { 735sub children {
707 @{ $_[0]{children} } 736 @{ $_[0]{children} }
708} 737}
709 738
710sub remove { 739sub remove {
711 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
712 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
713 delete $child->{parent}; 745 delete $child->{parent};
714 $child->hide; 746 $child->hide;
715
716 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
717 749
718 $self->realloc; 750 $self->realloc;
719} 751}
720 752
721sub clear { 753sub clear {
722 my ($self) = @_; 754 my ($self) = @_;
723 755
724 my $children = delete $self->{children}; 756 my $children = $self->{children};
725 $self->{children} = []; 757 $self->{children} = [];
726 758
727 for (@$children) { 759 for (@$children) {
728 delete $_->{parent}; 760 delete $_->{parent};
729 $_->hide; 761 $_->hide;
… …
749} 781}
750 782
751sub _draw { 783sub _draw {
752 my ($self) = @_; 784 my ($self) = @_;
753 785
754 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
755} 787}
756 788
757############################################################################# 789#############################################################################
758 790
759package CFClient::UI::Bin; 791package CFPlus::UI::Bin;
760 792
761our @ISA = CFClient::UI::Container::; 793our @ISA = CFPlus::UI::Container::;
762 794
763sub new { 795sub new {
764 my ($class, %arg) = @_; 796 my ($class, %arg) = @_;
765 797
766 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 798 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767 799
768 $class->SUPER::new (children => [$child], %arg) 800 $class->SUPER::new (children => [$child], %arg)
769} 801}
770 802
771sub add { 803sub add {
772 my ($self, $child) = @_; 804 my ($self, $child) = @_;
773 805
774 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
775 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
776} 808}
777 809
778sub remove { 810sub remove {
779 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
780 812
781 $self->SUPER::remove ($widget); 813 $self->SUPER::remove ($widget);
782 814
783 $self->{children} = [new CFClient::UI::Empty] 815 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 816 unless @{$self->{children}};
785} 817}
786 818
787sub child { $_[0]->{children}[0] } 819sub child { $_[0]->{children}[0] }
788 820
… …
800 832
801############################################################################# 833#############################################################################
802 834
803# back-buffered drawing area 835# back-buffered drawing area
804 836
805package CFClient::UI::Window; 837package CFPlus::UI::Window;
806 838
807our @ISA = CFClient::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
808 840
809use CFClient::OpenGL; 841use CFPlus::OpenGL;
810 842
811sub new { 843sub new {
812 my ($class, %arg) = @_; 844 my ($class, %arg) = @_;
813 845
814 my $self = $class->SUPER::new (%arg); 846 my $self = $class->SUPER::new (%arg);
… …
836} 868}
837 869
838sub render_child { 870sub render_child {
839 my ($self) = @_; 871 my ($self) = @_;
840 872
841 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 873 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
842 glClearColor 0, 0, 0, 0; 874 glClearColor 0, 0, 0, 0;
843 glClear GL_COLOR_BUFFER_BIT; 875 glClear GL_COLOR_BUFFER_BIT;
844 876
845 { 877 {
846 package CFClient::UI::Base; 878 package CFPlus::UI::Base;
847 879
848 ($draw_x, $draw_y, $draw_w, $draw_h) = 880 local ($draw_x, $draw_y, $draw_w, $draw_h) =
849 (0, 0, $self->{w}, $self->{h}); 881 (0, 0, $self->{w}, $self->{h});
882
883 $self->_render;
850 } 884 }
851
852 $self->_render;
853 }; 885 };
854} 886}
855 887
856sub _draw { 888sub _draw {
857 my ($self) = @_; 889 my ($self) = @_;
858
859 my ($w, $h) = @$self{qw(w h)};
860 890
861 my $tex = $self->{texture} 891 my $tex = $self->{texture}
862 or return; 892 or return;
863 893
864 glEnable GL_TEXTURE_2D; 894 glEnable GL_TEXTURE_2D;
865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866 glColor 0, 0, 0, 1; 896 glColor 0, 0, 0, 1;
867 897
868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 898 $tex->draw_quad_alpha_premultiplied (0, 0);
869 899
870 glDisable GL_TEXTURE_2D; 900 glDisable GL_TEXTURE_2D;
871} 901}
872 902
873############################################################################# 903#############################################################################
874 904
875package CFClient::UI::ViewPort; 905package CFPlus::UI::ViewPort;
876 906
907use List::Util qw(min max);
908
877our @ISA = CFClient::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
878 910
879sub new { 911sub new {
880 my $class = shift; 912 my $class = shift;
881 913
882 $class->SUPER::new ( 914 $class->SUPER::new (
… …
889sub size_request { 921sub size_request {
890 my ($self) = @_; 922 my ($self) = @_;
891 923
892 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
893 925
894 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
895 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
896 928
897 ($w, $h) 929 ($w, $h)
898} 930}
899 931
900sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
912} 944}
913 945
914sub set_offset { 946sub set_offset {
915 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
916 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
917 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
918 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
919 955
956 $self->emit (changed => $x, $y);
920 $self->update; 957 $self->update;
958 }
921} 959}
922 960
923# hmm, this does not work for topleft of $self... but we should not ask for that 961# hmm, this does not work for topleft of $self... but we should not ask for that
924sub coord2local { 962sub coord2local {
925 my ($self, $x, $y) = @_; 963 my ($self, $x, $y) = @_;
… …
940 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
941 979
942 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 980 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 981 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
944 ) { 982 ) {
945 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946 } else { 984 } else {
947 $self->CFClient::UI::Base::find_widget ($x, $y) 985 $self->CFPlus::UI::Base::find_widget ($x, $y)
948 } 986 }
949} 987}
950 988
951sub _render { 989sub _render {
952 my ($self) = @_; 990 my ($self) = @_;
953 991
954 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 992 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
955 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 993 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
956 994
957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 995 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958 996
959 $self->SUPER::_render; 997 $self->SUPER::_render;
960} 998}
961 999
962############################################################################# 1000#############################################################################
963 1001
964package CFClient::UI::ScrolledWindow; 1002package CFPlus::UI::ScrolledWindow;
965 1003
966our @ISA = CFClient::UI::HBox::; 1004our @ISA = CFPlus::UI::Table::;
967 1005
968sub new { 1006sub new {
969 my ($class, %arg) = @_; 1007 my ($class, %arg) = @_;
970 1008
971 my $child = delete $arg{child}; 1009 my $child = delete $arg{child};
972 1010
973 my $self; 1011 my $self;
974 1012
975 my $slider = new CFClient::UI::Slider 1013 my $hslider = new CFPlus::UI::Slider
1014 col => 0,
1015 row => 1,
1016 vertical => 0,
1017 range => [0, 0, 1, 0.01], # HACK fix
1018 on_changed => sub {
1019 $self->{hpos} = $_[1];
1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1021 },
1022 ;
1023
1024 my $vslider = new CFPlus::UI::Slider
1025 col => 1,
1026 row => 0,
976 vertical => 1, 1027 vertical => 1,
977 range => [0, 0, 1, 0.01], # HACK fix 1028 range => [0, 0, 1, 0.01], # HACK fix
978 on_changed => sub { 1029 on_changed => sub {
979 $self->{vp}->set_offset (0, $_[1]); 1030 $self->{vpos} = $_[1];
1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
980 }, 1032 },
981 ; 1033 ;
982 1034
983 $self = $class->SUPER::new ( 1035 $self = $class->SUPER::new (
984 vp => (new CFClient::UI::ViewPort expand => 1), 1036 scroll_x => 0,
1037 scroll_y => 1,
1038 can_events => 1,
985 slider => $slider, 1039 hslider => $hslider,
1040 vslider => $vslider,
1041 col_expand => [1, 0],
1042 row_expand => [1, 0],
986 %arg, 1043 %arg,
987 ); 1044 );
988 1045
1046 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0,
1048 row => 0,
1049 expand => 1,
1050 scroll_x => $self->{scroll_x},
1051 scroll_y => $self->{scroll_y},
1052 on_changed => sub {
1053 my ($vp, $x, $y) = @_;
1054
1055 $vp->{parent}{hslider}->set_value ($x);
1056 $vp->{parent}{vslider}->set_value ($y);
1057
1058 0
1059 },
1060 on_size_allocate => sub {
1061 my ($vp, $w, $h) = @_;
1062 $vp->{parent}->update_slider;
1063 0
1064 },
1065 ;
1066
989 $self->SUPER::add ($self->{vp}, $self->{slider}); 1067 $self->SUPER::add ($self->{vp});
1068
990 $self->add ($child) if $child; 1069 $self->add ($child) if $child;
991 1070
992 $self 1071 $self
993} 1072}
994
995#TODO# update range on size_allocate depending on child
996 1073
997sub add { 1074sub add {
998 my ($self, $widget) = @_; 1075 my ($self, $widget) = @_;
999 1076
1000 $self->{vp}->add ($self->{child} = $widget); 1077 $self->{vp}->add ($self->{child} = $widget);
1001} 1078}
1002 1079
1080sub update_slider {
1081 my ($self) = @_;
1082
1083 my $child = ($self->{vp} or return)->child;
1084
1085 if ($self->{scroll_x}) {
1086 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1087 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1088
1089 my $visible = $w1 > $w2;
1090 if ($visible != $self->{hslider_visible}) {
1091 $self->{hslider_visible} = $visible;
1092 $visible ? $self->SUPER::add ($self->{hslider})
1093 : $self->SUPER::remove ($self->{hslider});
1094 }
1095 }
1096
1097 if ($self->{scroll_y}) {
1098 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1099 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1100
1101 my $visible = $h1 > $h2;
1102 if ($visible != $self->{vslider_visible}) {
1103 $self->{vslider_visible} = $visible;
1104 $visible ? $self->SUPER::add ($self->{vslider})
1105 : $self->SUPER::remove ($self->{vslider});
1106 }
1107 }
1108}
1109
1110sub start_dragging {
1111 my ($self, $ev) = @_;
1112
1113 $self->grab_focus;
1114
1115 my $ox = $self->{vp}{view_x};
1116 my $oy = $self->{vp}{view_y};
1117
1118 $self->{motion} = sub {
1119 my ($ev, $x, $y) = @_;
1120
1121 $ox -= $ev->{xrel};
1122 $oy -= $ev->{yrel};
1123
1124 $self->{vp}->set_offset ($ox, $oy);
1125 };
1126}
1127
1128sub invoke_mouse_wheel {
1129 my ($self, $ev) = @_;
1130
1131 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1132 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1133
1134 1
1135}
1136
1137sub invoke_button_down {
1138 my ($self, $ev, $x, $y) = @_;
1139
1140 if ($ev->{button} == 2) {
1141 $self->start_dragging ($ev);
1142 return 1;
1143 }
1144
1145 0
1146}
1147
1003sub invoke_button_up { 1148sub invoke_button_up {
1004 my ($self, $ev) = @_; 1149 my ($self, $ev, $x, $y) = @_;
1005 1150
1006 warn "button up $ev->{button}\n";#d# 1151 if (delete $self->{motion}) {
1152 return 1;
1007 1153 }
1154
1008 0 1155 0
1009} 1156}
1010 1157
1011sub update_slider { 1158sub invoke_mouse_motion {
1012 my ($self) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1013 1160
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1161 if ($self->{motion}) {
1015} 1162 $self->{motion}->($ev, $x, $y);
1163 return 1;
1164 }
1016 1165
1017sub update { 1166 0
1018 my ($self) = @_;
1019
1020 $self->SUPER::update;
1021
1022 $self->update_slider;
1023} 1167}
1024 1168
1025sub invoke_size_allocate { 1169sub invoke_size_allocate {
1026 my ($self, $w, $h) = @_; 1170 my ($self, $w, $h) = @_;
1027 1171
1028 $self->update_slider; 1172 $self->update_slider;
1029
1030 $self->SUPER::invoke_size_allocate ($w, $h) 1173 $self->SUPER::invoke_size_allocate ($w, $h)
1031} 1174}
1032 1175
1033############################################################################# 1176#############################################################################
1034 1177
1035package CFClient::UI::Frame; 1178package CFPlus::UI::Frame;
1036 1179
1037our @ISA = CFClient::UI::Bin::; 1180our @ISA = CFPlus::UI::Bin::;
1038 1181
1039use CFClient::OpenGL; 1182use CFPlus::OpenGL;
1040 1183
1041sub new { 1184sub new {
1042 my $class = shift; 1185 my $class = shift;
1043 1186
1044 $class->SUPER::new ( 1187 $class->SUPER::new (
… …
1070 $self->SUPER::_draw; 1213 $self->SUPER::_draw;
1071} 1214}
1072 1215
1073############################################################################# 1216#############################################################################
1074 1217
1075package CFClient::UI::FancyFrame; 1218package CFPlus::UI::FancyFrame;
1076 1219
1077our @ISA = CFClient::UI::Bin::; 1220our @ISA = CFPlus::UI::Bin::;
1078 1221
1079use CFClient::OpenGL; 1222use CFPlus::OpenGL;
1223
1224sub new {
1225 my ($class, %arg) = @_;
1226
1227 if ((exists $arg{label}) && !ref $arg{label}) {
1228 $arg{label} = new CFPlus::UI::Label
1229 align => 1,
1230 valign => 0,
1231 text => $arg{label},
1232 fontsize => ($arg{border} || 0.8) * 0.75;
1233 }
1234
1235 my $self = $class->SUPER::new (
1236 # label => "",
1237 fg => [0.6, 0.3, 0.1],
1238 border => 0.8,
1239 style => 'single',
1240 %arg,
1241 );
1242
1243 $self
1244}
1245
1246sub add {
1247 my ($self, @widgets) = @_;
1248
1249 $self->SUPER::add (@widgets);
1250 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1251}
1252
1253sub border {
1254 int $_[0]{border} * $::FONTSIZE
1255}
1256
1257sub size_request {
1258 my ($self) = @_;
1259
1260 ($self->{label_w}, undef) = $self->{label}->size_request
1261 if $self->{label};
1262
1263 my ($w, $h) = $self->SUPER::size_request;
1264
1265 (
1266 $w + $self->border * 2,
1267 $h + $self->border * 2,
1268 )
1269}
1270
1271sub invoke_size_allocate {
1272 my ($self, $w, $h) = @_;
1273
1274 my $border = $self->border;
1275
1276 $w -= List::Util::max 0, $border * 2;
1277 $h -= List::Util::max 0, $border * 2;
1278
1279 if (my $label = $self->{label}) {
1280 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1281 $label->{h} = List::Util::min $h, $border;
1282 $label->invoke_size_allocate ($label->{w}, $label->{h});
1283 }
1284
1285 $self->child->configure ($border, $border, $w, $h);
1286
1287 1
1288}
1289
1290sub _draw {
1291 my ($self) = @_;
1292
1293 my $child = $self->{children}[0];
1294
1295 my $border = $self->border;
1296 my ($w, $h) = ($self->{w}, $self->{h});
1297
1298 $child->draw;
1299
1300 glColor @{$self->{fg}};
1301 glBegin GL_LINE_STRIP;
1302 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1303 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1304 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1305 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1306 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1307 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1308 glEnd;
1309
1310 if ($self->{label}) {
1311 glTranslate $border * 2, 0;
1312 $self->{label}->_draw;
1313 }
1314}
1315
1316#############################################################################
1317
1318package CFPlus::UI::Toplevel;
1319
1320our @ISA = CFPlus::UI::Bin::;
1321
1322use CFPlus::OpenGL;
1080 1323
1081my $bg = 1324my $bg =
1082 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1325 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083 mipmap => 1, wrap => 1; 1326 mipmap => 1, wrap => 1;
1084 1327
1085my @border = 1328my @border =
1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1329 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1330 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1331
1332my @icon =
1333 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1334 qw(x1_move.png x1_resize.png);
1088 1335
1089sub new { 1336sub new {
1090 my ($class, %arg) = @_; 1337 my ($class, %arg) = @_;
1091 1338
1092 my $self = $class->SUPER::new ( 1339 my $self = $class->SUPER::new (
… …
1097 min_w => 64, 1344 min_w => 64,
1098 min_h => 32, 1345 min_h => 32,
1099 %arg, 1346 %arg,
1100 ); 1347 );
1101 1348
1102 $self->{title_widget} = new CFClient::UI::Label 1349 $self->{title_widget} = new CFPlus::UI::Label
1103 align => 0, 1350 align => 0,
1104 valign => 1, 1351 valign => 1,
1105 text => $self->{title}, 1352 text => $self->{title},
1106 fontsize => $self->{border}, 1353 fontsize => $self->{border},
1107 if exists $self->{title}; 1354 if exists $self->{title};
1108 1355
1109 if ($self->{has_close_button}) { 1356 if ($self->{has_close_button}) {
1110 $self->{close_button} = 1357 $self->{close_button} =
1111 new CFClient::UI::ImageButton 1358 new CFPlus::UI::ImageButton
1112 path => 'x1_close.png', 1359 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") }; 1360 on_activate => sub { $self->emit ("delete") };
1114 1361
1115 $self->CFClient::UI::Container::add ($self->{close_button}); 1362 $self->CFPlus::UI::Container::add ($self->{close_button});
1116 } 1363 }
1117 1364
1118 $self 1365 $self
1119} 1366}
1120 1367
1121sub add { 1368sub add {
1122 my ($self, @widgets) = @_; 1369 my ($self, @widgets) = @_;
1123 1370
1124 $self->SUPER::add (@widgets); 1371 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1372 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1373 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127} 1374}
1128 1375
1129sub border { 1376sub border {
1130 int $_[0]{border} * $::FONTSIZE 1377 int $_[0]{border} * $::FONTSIZE
1131} 1378}
… …
1239 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1486 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240 1487
1241 ! ! $self->{motion} 1488 ! ! $self->{motion}
1242} 1489}
1243 1490
1491sub invoke_visibility_change {
1492 my ($self, $visible) = @_;
1493
1494 delete $self->{motion} unless $visible;
1495
1496 0
1497}
1498
1244sub _draw { 1499sub _draw {
1245 my ($self) = @_; 1500 my ($self) = @_;
1246 1501
1247 my $child = $self->{children}[0]; 1502 my $child = $self->{children}[0];
1248 1503
… …
1253 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1508 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1254 1509
1255 my $border = $self->border; 1510 my $border = $self->border;
1256 1511
1257 glColor @{ $self->{border_bg} }; 1512 glColor @{ $self->{border_bg} };
1258 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1513 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1259 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1514 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1260 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1515 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1261 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1516 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1517
1518 # move
1519 my $w2 = ($w - $border) * .5;
1520 my $h2 = ($h - $border) * .5;
1521 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1522 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1523 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1524
1525 # resize
1526 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1527 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1528 unless $self->{has_close_button};
1529 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1530 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1262 1531
1263 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1532 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1264 glColor @{ $self->{bg} }; 1533 glColor @{ $self->{bg} };
1265 1534
1266 # TODO: repeat texture not scale 1535 # TODO: repeat texture not scale
… …
1285 if $self->{close_button}; 1554 if $self->{close_button};
1286} 1555}
1287 1556
1288############################################################################# 1557#############################################################################
1289 1558
1290package CFClient::UI::Table; 1559package CFPlus::UI::Table;
1291 1560
1292our @ISA = CFClient::UI::Base::; 1561our @ISA = CFPlus::UI::Container::;
1293 1562
1294use List::Util qw(max sum); 1563use List::Util qw(max sum);
1295 1564
1296use CFClient::OpenGL; 1565use CFPlus::OpenGL;
1297 1566
1298sub new { 1567sub new {
1299 my $class = shift; 1568 my $class = shift;
1300 1569
1301 $class->SUPER::new ( 1570 $class->SUPER::new (
1302 col_expand => [], 1571 col_expand => [],
1572 row_expand => [],
1303 @_, 1573 @_,
1304 ) 1574 )
1305} 1575}
1306 1576
1307sub children {
1308 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309}
1310
1311sub add { 1577sub add {
1312 my ($self, $x, $y, $child) = @_; 1578 my ($self, @widgets) = @_;
1313 1579
1314 $child->set_parent ($self); 1580 for my $child (@widgets) {
1315 $self->{children}[$y][$x] = $child; 1581 $child->{rowspan} ||= 1;
1582 $child->{colspan} ||= 1;
1583 }
1316 1584
1317 $self->realloc; 1585 $self->SUPER::add (@widgets);
1318} 1586}
1319 1587
1320sub remove { 1588sub add_at {
1589 my $self = shift;
1590
1591 my @widgets;
1592
1593 while (@_) {
1594 my ($col, $row, $child) = splice @_, 0, 3, ();
1595
1596 $child->{row} = $row;
1597 $child->{col} = $col;
1598
1599 push @widgets, $child;
1600 }
1601
1602 $self->add (@widgets);
1603}
1604
1605sub get_wh {
1321 my ($self, $child) = @_; 1606 my ($self) = @_;
1322 1607
1323 # TODO: not yet implemented 1608 my (@w, @h);
1324}
1325
1326# TODO: move to container class maybe? send children a signal on removal?
1327sub clear {
1328 my ($self) = @_;
1329 1609
1330 my @children = $self->children; 1610 my @children = $self->children;
1331 delete $self->{children}; 1611
1612 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1615
1616 my $sw = sum @w[$c .. $c + $cs - 1];
1617
1618 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1620 }
1332 1621 }
1333 for (@children) {
1334 delete $_->{parent};
1335 $_->hide;
1336 }
1337 1622
1338 $self->realloc; 1623 # second pass, rows
1339} 1624 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1340
1341sub get_wh {
1342 my ($self) = @_;
1343
1344 my (@w, @h);
1345
1346 for my $y (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$y]
1348 or next;
1349
1350 for my $x (0 .. $#$row) {
1351 my $widget = $row->[$x]
1352 or next;
1353 my ($w, $h) = @$widget{qw(req_w req_h)}; 1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1354 1626
1355 $w[$x] = max $w[$x], $w; 1627 my $sh = sum @h[$r .. $r + $rs - 1];
1356 $h[$y] = max $h[$y], $h; 1628
1629 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1357 } 1631 }
1358 } 1632 }
1359 1633
1360 (\@w, \@h) 1634 (\@w, \@h)
1361} 1635}
… …
1377 my ($ws, $hs) = $self->get_wh; 1651 my ($ws, $hs) = $self->get_wh;
1378 1652
1379 my $req_w = (sum @$ws) || 1; 1653 my $req_w = (sum @$ws) || 1;
1380 my $req_h = (sum @$hs) || 1; 1654 my $req_h = (sum @$hs) || 1;
1381 1655
1382 # TODO: nicer code && do row_expand 1656 # now linearly scale the rows/columns to the allocated size
1383 my @col_expand = @{$self->{col_expand}}; 1657 my @col_expand = @{$self->{col_expand}};
1384 @col_expand = (1) x @$ws unless @col_expand; 1658 @col_expand = (1) x @$ws unless @col_expand;
1385 my $col_expand = (sum @col_expand) || 1; 1659 my $col_expand = (sum @col_expand) || 1;
1386 1660
1387 # linearly scale sizes
1388 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1661 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390 1662
1391 CFClient::UI::harmonize $ws; 1663 CFPlus::UI::harmonize $ws;
1664
1665 my @row_expand = @{$self->{row_expand}};
1666 @row_expand = (1) x @$ws unless @row_expand;
1667 my $row_expand = (sum @row_expand) || 1;
1668
1669 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1670
1392 CFClient::UI::harmonize $hs; 1671 CFPlus::UI::harmonize $hs;
1393 1672
1394 my $y; 1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1395 1675
1396 for my $r (0 .. $#{$self->{children}}) { 1676 for my $widget ($self->children) {
1397 my $row = $self->{children}[$r] 1677 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1398 or next;
1399 1678
1400 my $x = 0; 1679 $widget->configure (
1401 my $row_h = $hs->[$r]; 1680 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1402 1682 );
1403 for my $c (0 .. $#$row) { 1683 }
1404 my $col_w = $ws->[$c];
1405 1684
1406 if (my $widget = $row->[$c]) { 1685 1
1407 $widget->configure ($x, $y, $col_w, $row_h); 1686}
1408 }
1409 1687
1410 $x += $col_w; 1688#############################################################################
1689
1690package CFPlus::UI::Fixed;
1691
1692use List::Util qw(min max);
1693
1694our @ISA = CFPlus::UI::Container::;
1695
1696sub _scale($$$) {
1697 my ($rel, $val, $max) = @_;
1698
1699 $rel ? $val * $max : $val
1700}
1701
1702sub size_request {
1703 my ($self) = @_;
1704
1705 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1706
1707 # determine overall size by querying abs widgets
1708 for my $child ($self->visible_children) {
1709 unless ($child->{c_rel}) {
1710 my $x = $child->{c_x};
1711 my $y = $child->{c_y};
1712
1713 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1714 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1411 } 1715 }
1716 }
1412 1717
1413 $y += $row_h; 1718 my $W = $x2 - $x1;
1719 my $H = $y2 - $y1;
1720
1721 # now layout remaining widgets
1722 for my $child ($self->visible_children) {
1723 if ($child->{c_rel}) {
1724 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1725 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1726
1727 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1728 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1729 }
1730 }
1731
1732 my $W = $x2 - $x1;
1733 my $H = $y2 - $y1;
1734
1735 ($W, $H)
1736}
1737
1738sub invoke_size_allocate {
1739 my ($self, $W, $H) = @_;
1740
1741 for my $child ($self->visible_children) {
1742 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1743 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1744
1745 $x += $child->{c_halign} * $child->{req_w};
1746 $y += $child->{c_valign} * $child->{req_h};
1747
1748 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1414 } 1749 }
1415 1750
1416 1 1751 1
1417} 1752}
1418 1753
1419sub find_widget {
1420 my ($self, $x, $y) = @_;
1421
1422 $x -= $self->{x};
1423 $y -= $self->{y};
1424
1425 my $res;
1426
1427 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1428 $res = $_->find_widget ($x, $y)
1429 and return $res;
1430 }
1431
1432 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1433}
1434
1435sub _draw {
1436 my ($self) = @_;
1437
1438 for (grep $_, @{$self->{children}}) {
1439 $_->draw for grep $_, @$_;
1440 }
1441}
1442
1443############################################################################# 1754#############################################################################
1444 1755
1445package CFClient::UI::Box; 1756package CFPlus::UI::Box;
1446 1757
1447our @ISA = CFClient::UI::Container::; 1758our @ISA = CFPlus::UI::Container::;
1448 1759
1449sub size_request { 1760sub size_request {
1450 my ($self) = @_; 1761 my ($self) = @_;
1762
1763 my @children = $self->visible_children;
1451 1764
1452 $self->{vertical} 1765 $self->{vertical}
1453 ? ( 1766 ? (
1454 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1767 (List::Util::max map $_->{req_w}, @children),
1455 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1768 (List::Util::sum map $_->{req_h}, @children),
1456 ) 1769 )
1457 : ( 1770 : (
1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_w}, @children),
1459 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1772 (List::Util::max map $_->{req_h}, @children),
1460 ) 1773 )
1461} 1774}
1462 1775
1463sub invoke_size_allocate { 1776sub invoke_size_allocate {
1464 my ($self, $w, $h) = @_; 1777 my ($self, $w, $h) = @_;
… …
1485 $req[$_] += $space * $children[$_]{expand} 1798 $req[$_] += $space * $children[$_]{expand}
1486 for 0 .. $#children; 1799 for 0 .. $#children;
1487 } 1800 }
1488 } 1801 }
1489 1802
1490 CFClient::UI::harmonize \@req; 1803 CFPlus::UI::harmonize \@req;
1491 1804
1492 my $pos = 0; 1805 my $pos = 0;
1493 for (0 .. $#children) { 1806 for (0 .. $#children) {
1494 my $alloc = $req[$_]; 1807 my $alloc = $req[$_];
1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1808 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1500 1 1813 1
1501} 1814}
1502 1815
1503############################################################################# 1816#############################################################################
1504 1817
1505package CFClient::UI::HBox; 1818package CFPlus::UI::HBox;
1506 1819
1507our @ISA = CFClient::UI::Box::; 1820our @ISA = CFPlus::UI::Box::;
1508 1821
1509sub new { 1822sub new {
1510 my $class = shift; 1823 my $class = shift;
1511 1824
1512 $class->SUPER::new ( 1825 $class->SUPER::new (
… …
1515 ) 1828 )
1516} 1829}
1517 1830
1518############################################################################# 1831#############################################################################
1519 1832
1520package CFClient::UI::VBox; 1833package CFPlus::UI::VBox;
1521 1834
1522our @ISA = CFClient::UI::Box::; 1835our @ISA = CFPlus::UI::Box::;
1523 1836
1524sub new { 1837sub new {
1525 my $class = shift; 1838 my $class = shift;
1526 1839
1527 $class->SUPER::new ( 1840 $class->SUPER::new (
… …
1530 ) 1843 )
1531} 1844}
1532 1845
1533############################################################################# 1846#############################################################################
1534 1847
1535package CFClient::UI::Label; 1848package CFPlus::UI::Label;
1536 1849
1537our @ISA = CFClient::UI::DrawBG::; 1850our @ISA = CFPlus::UI::DrawBG::;
1538 1851
1539use CFClient::OpenGL; 1852use CFPlus::OpenGL;
1540 1853
1541sub new { 1854sub new {
1542 my ($class, %arg) = @_; 1855 my ($class, %arg) = @_;
1543 1856
1544 my $self = $class->SUPER::new ( 1857 my $self = $class->SUPER::new (
… …
1547 #active_bg => none 1860 #active_bg => none
1548 #font => default_font 1861 #font => default_font
1549 #text => initial text 1862 #text => initial text
1550 #markup => initial narkup 1863 #markup => initial narkup
1551 #max_w => maximum pixel width 1864 #max_w => maximum pixel width
1865 #style => 0, # render flags
1552 ellipsise => 3, # end 1866 ellipsise => 3, # end
1553 layout => (new CFClient::Layout), 1867 layout => (new CFPlus::Layout),
1554 fontsize => 1, 1868 fontsize => 1,
1555 align => -1, 1869 align => -1,
1556 valign => -1, 1870 valign => -1,
1557 padding_x => 2, 1871 padding_x => 2,
1558 padding_y => 2, 1872 padding_y => 2,
1559 can_events => 0, 1873 can_events => 0,
1560 %arg 1874 %arg
1561 ); 1875 );
1562 1876
1563 if (exists $self->{template}) { 1877 if (exists $self->{template}) {
1564 my $layout = new CFClient::Layout; 1878 my $layout = new CFPlus::Layout;
1565 $layout->set_text (delete $self->{template}); 1879 $layout->set_text (delete $self->{template});
1566 $self->{template} = $layout; 1880 $self->{template} = $layout;
1567 } 1881 }
1568 1882
1569 if (exists $self->{markup}) { 1883 if (exists $self->{markup}) {
… …
1571 } else { 1885 } else {
1572 $self->set_text (delete $self->{text}); 1886 $self->set_text (delete $self->{text});
1573 } 1887 }
1574 1888
1575 $self 1889 $self
1576}
1577
1578sub escape($) {
1579 local $_ = $_[0];
1580
1581 s/&/&amp;/g;
1582 s/>/&gt;/g;
1583 s/</&lt;/g;
1584
1585 $_
1586} 1890}
1587 1891
1588sub update { 1892sub update {
1589 my ($self) = @_; 1893 my ($self) = @_;
1590 1894
… …
1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1716 : ($self->{h} - $size->[1]) * 0.5); 2020 : ($self->{h} - $size->[1]) * 0.5);
1717 }; 2021 };
1718 2022
1719 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2023# unless ($self->{list}) {
1720 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2024# $self->{list} = CFPlus::OpenGL::glGenList;
2025# CFPlus::OpenGL::glNewList $self->{list};
2026# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2027# CFPlus::OpenGL::glEndList;
2028# }
2029#
2030# CFPlus::OpenGL::glCallList $self->{list};
1721 2031
1722 $self->{layout}->render ($self->{ox}, $self->{oy}); 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723} 2033}
2034
2035#sub destroy {
2036# my ($self) = @_;
2037#
2038# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2039#
2040# $self->SUPER::destroy;
2041#}
1724 2042
1725############################################################################# 2043#############################################################################
1726 2044
1727package CFClient::UI::EntryBase; 2045package CFPlus::UI::EntryBase;
1728 2046
1729our @ISA = CFClient::UI::Label::; 2047our @ISA = CFPlus::UI::Label::;
1730 2048
1731use CFClient::OpenGL; 2049use CFPlus::OpenGL;
1732 2050
1733sub new { 2051sub new {
1734 my $class = shift; 2052 my $class = shift;
1735 2053
1736 $class->SUPER::new ( 2054 $class->SUPER::new (
… …
1740 active_fg => [0, 0, 0], 2058 active_fg => [0, 0, 0],
1741 can_hover => 1, 2059 can_hover => 1,
1742 can_focus => 1, 2060 can_focus => 1,
1743 valign => 0, 2061 valign => 0,
1744 can_events => 1, 2062 can_events => 1,
2063 ellipsise => 0,
1745 #text => ... 2064 #text => ...
1746 #hidden => "*", 2065 #hidden => "*",
1747 @_ 2066 @_
1748 ) 2067 )
1749} 2068}
… …
1794 my $sym = $ev->{sym}; 2113 my $sym = $ev->{sym};
1795 my $uni = $ev->{unicode}; 2114 my $uni = $ev->{unicode};
1796 2115
1797 my $text = $self->get_text; 2116 my $text = $self->get_text;
1798 2117
2118 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2119
1799 if ($uni == 8) { 2120 if ($uni == 8) {
1800 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2121 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801 } elsif ($uni == 127) { 2122 } elsif ($uni == 127) {
1802 substr $text, $self->{cursor}, 1, ""; 2123 substr $text, $self->{cursor}, 1, "";
1803 } elsif ($sym == CFClient::SDLK_LEFT) { 2124 } elsif ($sym == CFPlus::SDLK_LEFT) {
1804 --$self->{cursor} if $self->{cursor}; 2125 --$self->{cursor} if $self->{cursor};
1805 } elsif ($sym == CFClient::SDLK_RIGHT) { 2126 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1806 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2127 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1807 } elsif ($sym == CFClient::SDLK_HOME) { 2128 } elsif ($sym == CFPlus::SDLK_HOME) {
2129 # what a hack
2130 $self->{cursor} =
2131 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2132 ? length $1
2133 : 0;
2134 } elsif ($sym == CFPlus::SDLK_END) {
2135 # uh, again
2136 $self->{cursor} =
2137 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2138 ? $self->{cursor} + length $1
2139 : length $self->{text};
2140 } elsif ($uni == 21) { # ctrl-u
2141 $text = "";
1808 $self->{cursor} = 0; 2142 $self->{cursor} = 0;
1809 } elsif ($sym == CFClient::SDLK_END) {
1810 $self->{cursor} = length $text;
1811 } elsif ($uni == 27) { 2143 } elsif ($uni == 27) {
1812 $self->emit ('escape'); 2144 $self->emit ('escape');
1813 } elsif ($uni) { 2145 } elsif ($uni == 0x0d) {
2146 substr $text, $self->{cursor}++, 0, "\012";
2147 } elsif ($uni >= 0x20) {
1814 substr $text, $self->{cursor}++, 0, chr $uni; 2148 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else { 2149 } else {
1816 return 0; 2150 return 0;
1817 } 2151 }
1818 2152
1819 $self->_set_text ($text); 2153 $self->_set_text ($text);
1820 2154
1821 $self->realloc; 2155 $self->realloc;
2156 $self->update;
1822 2157
1823 1 2158 1
1824} 2159}
1825 2160
1826sub invoke_focus_in { 2161sub invoke_focus_in {
… …
1888 utf8::encode $text; 2223 utf8::encode $text;
1889 2224
1890 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2225 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1891 } 2226 }
1892 2227
1893 glColor @{$self->{fg}};
1894 glBegin GL_LINES; 2228 glBegin GL_LINES;
1895 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2229 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1896 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2230 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897 glEnd; 2231 glEnd;
1898 } 2232 }
1899} 2233}
1900 2234
2235#############################################################################
2236
1901package CFClient::UI::Entry; 2237package CFPlus::UI::Entry;
1902 2238
1903our @ISA = CFClient::UI::EntryBase::; 2239our @ISA = CFPlus::UI::EntryBase::;
1904 2240
1905use CFClient::OpenGL; 2241use CFPlus::OpenGL;
1906 2242
1907sub invoke_key_down { 2243sub invoke_key_down {
1908 my ($self, $ev) = @_; 2244 my ($self, $ev) = @_;
1909 2245
1910 my $sym = $ev->{sym}; 2246 my $sym = $ev->{sym};
1911 2247
1912 if ($sym == 13) { 2248 if ($ev->{uni} == 0x0d || $sym == 13) {
1913 unshift @{$self->{history}}, 2249 unshift @{$self->{history}},
1914 my $txt = $self->get_text; 2250 my $txt = $self->get_text;
1915 2251
1916 $self->{history_pointer} = -1; 2252 $self->{history_pointer} = -1;
1917 $self->{history_saveback} = ''; 2253 $self->{history_saveback} = '';
1918 $self->emit (activate => $txt); 2254 $self->emit (activate => $txt);
1919 $self->update; 2255 $self->update;
1920 2256
1921 } elsif ($sym == CFClient::SDLK_UP) { 2257 } elsif ($sym == CFPlus::SDLK_UP) {
1922 if ($self->{history_pointer} < 0) { 2258 if ($self->{history_pointer} < 0) {
1923 $self->{history_saveback} = $self->get_text; 2259 $self->{history_saveback} = $self->get_text;
1924 } 2260 }
1925 if (@{$self->{history} || []} > 0) { 2261 if (@{$self->{history} || []} > 0) {
1926 $self->{history_pointer}++; 2262 $self->{history_pointer}++;
… …
1928 $self->{history_pointer} = @{$self->{history} || []} - 1; 2264 $self->{history_pointer} = @{$self->{history} || []} - 1;
1929 } 2265 }
1930 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1931 } 2267 }
1932 2268
1933 } elsif ($sym == CFClient::SDLK_DOWN) { 2269 } elsif ($sym == CFPlus::SDLK_DOWN) {
1934 $self->{history_pointer}--; 2270 $self->{history_pointer}--;
1935 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2271 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936 2272
1937 if ($self->{history_pointer} >= 0) { 2273 if ($self->{history_pointer} >= 0) {
1938 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2274 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1947 1 2283 1
1948} 2284}
1949 2285
1950############################################################################# 2286#############################################################################
1951 2287
2288package CFPlus::UI::TextEdit;
2289
2290our @ISA = CFPlus::UI::EntryBase::;
2291
2292use CFPlus::OpenGL;
2293
2294sub move_cursor_ver {
2295 my ($self, $dy) = @_;
2296
2297 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2298
2299 $y += $dy;
2300
2301 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2302 $self->{cursor} = $index;
2303 delete $self->{cur_h};
2304 $self->update;
2305 return;
2306 }
2307}
2308
2309sub invoke_key_down {
2310 my ($self, $ev) = @_;
2311
2312 my $sym = $ev->{sym};
2313
2314 if ($sym == CFPlus::SDLK_UP) {
2315 $self->move_cursor_ver (-1);
2316 } elsif ($sym == CFPlus::SDLK_DOWN) {
2317 $self->move_cursor_ver (+1);
2318 } else {
2319 return $self->SUPER::invoke_key_down ($ev)
2320 }
2321
2322 1
2323}
2324
2325#############################################################################
2326
1952package CFClient::UI::Button; 2327package CFPlus::UI::Button;
1953 2328
1954our @ISA = CFClient::UI::Label::; 2329our @ISA = CFPlus::UI::Label::;
1955 2330
1956use CFClient::OpenGL; 2331use CFPlus::OpenGL;
1957 2332
1958my @tex = 2333my @tex =
1959 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2334 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960 qw(b1_button_active.png); 2335 qw(b1_button_inactive.png b1_button_active.png);
1961 2336
1962sub new { 2337sub new {
1963 my $class = shift; 2338 my $class = shift;
1964 2339
1965 $class->SUPER::new ( 2340 $class->SUPER::new (
1966 padding_x => 4, 2341 padding_x => 4,
1967 padding_y => 4, 2342 padding_y => 4,
1968 fg => [1, 1, 1], 2343 fg => [1.0, 1.0, 1.0],
1969 active_fg => [0, 0, 1], 2344 active_fg => [0.8, 0.8, 0.8],
1970 can_hover => 1, 2345 can_hover => 1,
1971 align => 0, 2346 align => 0,
1972 valign => 0, 2347 valign => 0,
1973 can_events => 1, 2348 can_events => 1,
1974 @_ 2349 @_
… …
1992 2367
1993 glEnable GL_TEXTURE_2D; 2368 glEnable GL_TEXTURE_2D;
1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2369 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1995 glColor 0, 0, 0, 1; 2370 glColor 0, 0, 0, 1;
1996 2371
2372 my $tex = $tex[$GRAB == $self];
1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2373 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1998 2374
1999 glDisable GL_TEXTURE_2D; 2375 glDisable GL_TEXTURE_2D;
2000 2376
2001 $self->SUPER::_draw; 2377 $self->SUPER::_draw;
2002} 2378}
2003 2379
2004############################################################################# 2380#############################################################################
2005 2381
2382package CFPlus::UI::CheckBox;
2383
2384our @ISA = CFPlus::UI::DrawBG::;
2385
2386my @tex =
2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2388 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2389
2390use CFPlus::OpenGL;
2391
2392sub new {
2393 my $class = shift;
2394
2395 $class->SUPER::new (
2396 padding_x => 2,
2397 padding_y => 2,
2398 fg => [1, 1, 1],
2399 active_fg => [1, 1, 0],
2400 bg => [0, 0, 0, 0.2],
2401 active_bg => [1, 1, 1, 0.5],
2402 state => 0,
2403 can_hover => 1,
2404 @_
2405 )
2406}
2407
2408sub size_request {
2409 my ($self) = @_;
2410
2411 (6) x 2
2412}
2413
2414sub toggle {
2415 my ($self) = @_;
2416
2417 $self->{state} = !$self->{state};
2418 $self->emit (changed => $self->{state});
2419 $self->update;
2420}
2421
2422sub invoke_button_down {
2423 my ($self, $ev, $x, $y) = @_;
2424
2425 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2426 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2427 $self->toggle;
2428 } else {
2429 return 0
2430 }
2431
2432 1
2433}
2434
2435sub _draw {
2436 my ($self) = @_;
2437
2438 $self->SUPER::_draw;
2439
2440 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2441
2442 my ($w, $h) = @$self{qw(w h)};
2443
2444 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2445
2446 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2447
2448 my $tex = $self->{state} ? $tex[1] : $tex[0];
2449
2450 glEnable GL_TEXTURE_2D;
2451 $tex->draw_quad_alpha (0, 0, $s, $s);
2452 glDisable GL_TEXTURE_2D;
2453}
2454
2455#############################################################################
2456
2457package CFPlus::UI::Image;
2458
2459our @ISA = CFPlus::UI::Base::;
2460
2461use CFPlus::OpenGL;
2462
2463our %texture_cache;
2464
2465sub new {
2466 my $class = shift;
2467
2468 my $self = $class->SUPER::new (
2469 can_events => 0,
2470 @_,
2471 );
2472
2473 $self->{path} || $self->{tex}
2474 or Carp::croak "'path' or 'tex' attributes required";
2475
2476 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2477 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2478
2479 CFPlus::weaken $texture_cache{$self->{path}};
2480
2481 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2482
2483 $self
2484}
2485
2486sub STORABLE_freeze {
2487 my ($self, $cloning) = @_;
2488
2489 $self->{path}
2490 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2491
2492 $self->{path}
2493}
2494
2495sub STORABLE_attach {
2496 my ($self, $cloning, $path) = @_;
2497
2498 $self->new (path => $path)
2499}
2500
2501sub size_request {
2502 my ($self) = @_;
2503
2504 ($self->{tex}{w}, $self->{tex}{h})
2505}
2506
2507sub _draw {
2508 my ($self) = @_;
2509
2510 my $tex = $self->{tex};
2511
2512 my ($w, $h) = ($self->{w}, $self->{h});
2513
2514 if ($self->{rot90}) {
2515 glRotate 90, 0, 0, 1;
2516 glTranslate 0, -$self->{w}, 0;
2517
2518 ($w, $h) = ($h, $w);
2519 }
2520
2521 glEnable GL_TEXTURE_2D;
2522 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2523
2524 $tex->draw_quad (0, 0, $w, $h);
2525
2526 glDisable GL_TEXTURE_2D;
2527}
2528
2529#############################################################################
2530
2006package CFClient::UI::ImageButton; 2531package CFPlus::UI::ImageButton;
2007 2532
2008our @ISA = CFClient::UI::Image::; 2533our @ISA = CFPlus::UI::Image::;
2009 2534
2010use CFClient::OpenGL; 2535use CFPlus::OpenGL;
2011 2536
2012my %textures; 2537my %textures;
2013 2538
2014sub new { 2539sub new {
2015 my $class = shift; 2540 my $class = shift;
… …
2037 1 2562 1
2038} 2563}
2039 2564
2040############################################################################# 2565#############################################################################
2041 2566
2042package CFClient::UI::CheckBox;
2043
2044our @ISA = CFClient::UI::DrawBG::;
2045
2046my @tex =
2047 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2048 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2049
2050use CFClient::OpenGL;
2051
2052sub new {
2053 my $class = shift;
2054
2055 $class->SUPER::new (
2056 padding_x => 2,
2057 padding_y => 2,
2058 fg => [1, 1, 1],
2059 active_fg => [1, 1, 0],
2060 bg => [0, 0, 0, 0.2],
2061 active_bg => [1, 1, 1, 0.5],
2062 state => 0,
2063 can_hover => 1,
2064 @_
2065 )
2066}
2067
2068sub size_request {
2069 my ($self) = @_;
2070
2071 (6) x 2
2072}
2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
2082sub invoke_button_down {
2083 my ($self, $ev, $x, $y) = @_;
2084
2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2087 $self->toggle;
2088 } else {
2089 return 0
2090 }
2091
2092 1
2093}
2094
2095sub _draw {
2096 my ($self) = @_;
2097
2098 $self->SUPER::_draw;
2099
2100 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2101
2102 my ($w, $h) = @$self{qw(w h)};
2103
2104 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2105
2106 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2107
2108 my $tex = $self->{state} ? $tex[1] : $tex[0];
2109
2110 glEnable GL_TEXTURE_2D;
2111 $tex->draw_quad_alpha (0, 0, $s, $s);
2112 glDisable GL_TEXTURE_2D;
2113}
2114
2115#############################################################################
2116
2117package CFClient::UI::Image; 2567package CFPlus::UI::VGauge;
2118 2568
2119our @ISA = CFClient::UI::Base::; 2569our @ISA = CFPlus::UI::Base::;
2120
2121use CFClient::OpenGL;
2122
2123our %texture_cache;
2124
2125sub new {
2126 my $class = shift;
2127
2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2132
2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
2135
2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2138
2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2140
2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2142
2143 $self
2144}
2145
2146sub size_request {
2147 my ($self) = @_;
2148
2149 ($self->{tex}{w}, $self->{tex}{h})
2150}
2151
2152sub _draw {
2153 my ($self) = @_;
2154
2155 my $tex = $self->{tex};
2156
2157 my ($w, $h) = ($self->{w}, $self->{h});
2158
2159 if ($self->{rot90}) {
2160 glRotate 90, 0, 0, 1;
2161 glTranslate 0, -$self->{w}, 0;
2162
2163 ($w, $h) = ($h, $w);
2164 }
2165
2166 glEnable GL_TEXTURE_2D;
2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2168
2169 $tex->draw_quad_alpha (0, 0, $w, $h);
2170
2171 glDisable GL_TEXTURE_2D;
2172}
2173
2174#############################################################################
2175
2176package CFClient::UI::VGauge;
2177
2178our @ISA = CFClient::UI::Base::;
2179 2570
2180use List::Util qw(min max); 2571use List::Util qw(min max);
2181 2572
2182use CFClient::OpenGL; 2573use CFPlus::OpenGL;
2183 2574
2184my %tex = ( 2575my %tex = (
2185 food => [ 2576 food => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2577 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2578 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188 ], 2579 ],
2189 grace => [ 2580 grace => [
2190 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2581 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2191 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2582 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192 ], 2583 ],
2193 hp => [ 2584 hp => [
2194 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2585 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2586 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196 ], 2587 ],
2197 mana => [ 2588 mana => [
2198 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2589 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2199 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2590 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200 ], 2591 ],
2201); 2592);
2202 2593
2203# eg. VGauge->new (gauge => 'food'), default gauge: food 2594# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2306 glDisable GL_TEXTURE_2D; 2697 glDisable GL_TEXTURE_2D;
2307} 2698}
2308 2699
2309############################################################################# 2700#############################################################################
2310 2701
2311package CFClient::UI::Gauge; 2702package CFPlus::UI::Gauge;
2312 2703
2313our @ISA = CFClient::UI::VBox::; 2704our @ISA = CFPlus::UI::VBox::;
2314 2705
2315sub new { 2706sub new {
2316 my ($class, %arg) = @_; 2707 my ($class, %arg) = @_;
2317 2708
2318 my $self = $class->SUPER::new ( 2709 my $self = $class->SUPER::new (
… …
2320 can_hover => 1, 2711 can_hover => 1,
2321 can_events => 1, 2712 can_events => 1,
2322 %arg, 2713 %arg,
2323 ); 2714 );
2324 2715
2325 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2716 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2326 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2717 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2327 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2718 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328 2719
2329 $self 2720 $self
2330} 2721}
2331 2722
2332sub set_fontsize { 2723sub set_fontsize {
… …
2353 $self->{value}->set_text ($val); 2744 $self->{value}->set_text ($val);
2354} 2745}
2355 2746
2356############################################################################# 2747#############################################################################
2357 2748
2358package CFClient::UI::Slider; 2749package CFPlus::UI::Slider;
2359 2750
2360use strict; 2751use strict;
2361 2752
2362use CFClient::OpenGL; 2753use CFPlus::OpenGL;
2363 2754
2364our @ISA = CFClient::UI::DrawBG::; 2755our @ISA = CFPlus::UI::DrawBG::;
2365 2756
2366my @tex = 2757my @tex =
2367 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2758 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368 qw(s1_slider.png s1_slider_bg.png); 2759 qw(s1_slider.png s1_slider_bg.png);
2369 2760
2370sub new { 2761sub new {
2371 my $class = shift; 2762 my $class = shift;
2372 2763
… …
2440 2831
2441 $self->SUPER::invoke_button_down ($ev, $x, $y); 2832 $self->SUPER::invoke_button_down ($ev, $x, $y);
2442 2833
2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2834 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2444 2835
2445 $self->invoke_mouse_motion ($ev, $x, $y) 2836 $self->invoke_mouse_motion ($ev, $x, $y);
2837
2838 1
2446} 2839}
2447 2840
2448sub invoke_mouse_motion { 2841sub invoke_mouse_motion {
2449 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2450 2843
… …
2457 2850
2458 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2851 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2459 } else { 2852 } else {
2460 return 0; 2853 return 0;
2461 } 2854 }
2855
2856 1
2857}
2858
2859sub invoke_mouse_wheel {
2860 my ($self, $ev) = @_;
2861
2862 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2863
2864 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2865
2866 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2462 2867
2463 1 2868 1
2464} 2869}
2465 2870
2466sub update { 2871sub update {
… …
2517 glDisable GL_TEXTURE_2D; 2922 glDisable GL_TEXTURE_2D;
2518} 2923}
2519 2924
2520############################################################################# 2925#############################################################################
2521 2926
2522package CFClient::UI::ValSlider; 2927package CFPlus::UI::ValSlider;
2523 2928
2524our @ISA = CFClient::UI::HBox::; 2929our @ISA = CFPlus::UI::HBox::;
2525 2930
2526sub new { 2931sub new {
2527 my ($class, %arg) = @_; 2932 my ($class, %arg) = @_;
2528 2933
2529 my $range = delete $arg{range}; 2934 my $range = delete $arg{range};
2530 2935
2531 my $self = $class->SUPER::new ( 2936 my $self = $class->SUPER::new (
2532 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2937 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2938 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534 to_value => sub { shift }, 2939 to_value => sub { shift },
2535 from_value => sub { shift }, 2940 from_value => sub { shift },
2536 %arg, 2941 %arg,
2537 ); 2942 );
2538 2943
… …
2558sub set_range { shift->{slider}->set_range (@_) } 2963sub set_range { shift->{slider}->set_range (@_) }
2559sub set_value { shift->{slider}->set_value (@_) } 2964sub set_value { shift->{slider}->set_value (@_) }
2560 2965
2561############################################################################# 2966#############################################################################
2562 2967
2563package CFClient::UI::TextScroller; 2968package CFPlus::UI::TextScroller;
2564 2969
2565our @ISA = CFClient::UI::HBox::; 2970our @ISA = CFPlus::UI::HBox::;
2566 2971
2567use CFClient::OpenGL; 2972use CFPlus::OpenGL;
2568 2973
2569sub new { 2974sub new {
2570 my $class = shift; 2975 my $class = shift;
2571 2976
2572 my $self = $class->SUPER::new ( 2977 my $self = $class->SUPER::new (
2573 fontsize => 1, 2978 fontsize => 1,
2574 can_events => 0, 2979 can_events => 1,
2575 indent => 0, 2980 indent => 0,
2576 #font => default_font 2981 #font => default_font
2577 @_, 2982 @_,
2578 2983
2579 layout => (new CFClient::Layout), 2984 layout => (new CFPlus::Layout),
2580 par => [], 2985 par => [],
2986 max_par => 0,
2581 height => 0, 2987 height => 0,
2582 children => [ 2988 children => [
2583 (new CFClient::UI::Empty expand => 1), 2989 (new CFPlus::UI::Empty expand => 1),
2584 (new CFClient::UI::Slider vertical => 1), 2990 (new CFPlus::UI::Slider vertical => 1),
2585 ], 2991 ],
2586 ); 2992 );
2587 2993
2588 $self->{children}[1]->connect (changed => sub { $self->update }); 2994 $self->{children}[1]->connect (changed => sub { $self->update });
2589 2995
… …
2598} 3004}
2599 3005
2600sub size_request { 3006sub size_request {
2601 my ($self) = @_; 3007 my ($self) = @_;
2602 3008
2603 my ($empty, $slider) = @{ $self->{children} }; 3009 my ($empty, $slider) = $self->visible_children;
2604 3010
2605 local $self->{children} = [$empty, $slider]; 3011 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request 3012 $self->SUPER::size_request
2607} 3013}
2608 3014
… …
2619 3025
2620 $self->reflow; 3026 $self->reflow;
2621 3027
2622 local $self->{children} = [$empty, $slider]; 3028 local $self->{children} = [$empty, $slider];
2623 $self->SUPER::invoke_size_allocate ($w, $h) 3029 $self->SUPER::invoke_size_allocate ($w, $h)
3030}
3031
3032sub invoke_mouse_wheel {
3033 my ($self, $ev) = @_;
3034
3035 return 0 unless $ev->{dy}; # only vertical movements
3036
3037 $self->{children}[1]->emit (mouse_wheel => $ev);
3038
3039 1
2624} 3040}
2625 3041
2626sub get_layout { 3042sub get_layout {
2627 my ($self, $para) = @_; 3043 my ($self, $para) = @_;
2628 3044
… …
2656 3072
2657 # todo: base offset on lines or so, not on pixels 3073 # todo: base offset on lines or so, not on pixels
2658 $self->{children}[1]->set_value ($offset); 3074 $self->{children}[1]->set_value ($offset);
2659} 3075}
2660 3076
3077sub current_paragraph {
3078 my ($self) = @_;
3079
3080 $self->{top_paragraph} - 1
3081}
3082
3083sub scroll_to {
3084 my ($self, $para) = @_;
3085
3086 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3087
3088 $self->{scroll_to} = $para;
3089 $self->update;
3090}
3091
2661sub clear { 3092sub clear {
2662 my ($self) = @_; 3093 my ($self) = @_;
2663 3094
2664 my (undef, undef, @other) = @{ $self->{children} }; 3095 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other; 3096 $self->remove ($_) for @other;
… …
2668 $self->{height} = 0; 3099 $self->{height} = 0;
2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3100 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670} 3101}
2671 3102
2672sub add_paragraph { 3103sub add_paragraph {
2673 my ($self, $color, $para, $indent) = @_; 3104 my $self = shift;
2674 3105
2675 my ($text, @w) = ref $para ? @$para : $para; 3106 for my $para (@_) {
2676
2677 $para = { 3107 $para = {
3108 fg => [1, 1, 1, 1],
3109 indent => 0,
3110 markup => "",
3111 widget => [],
3112 ref $para ? %$para : (markup => $para),
2678 w => 1e10, 3113 w => 1e10,
2679 wrapped => 1, 3114 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2684 }; 3115 };
2685 3116
2686 $self->add (@w) if @w; 3117 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687 push @{$self->{par}}, $para; 3118 push @{$self->{par}}, $para;
3119 }
3120
3121 if (my $max = $self->{max_par}) {
3122 shift @{$self->{par}} while @{$self->{par}} > $max;
3123 }
2688 3124
2689 $self->{need_reflow}++; 3125 $self->{need_reflow}++;
2690 $self->update; 3126 $self->update;
2691} 3127}
2692 3128
2693sub scroll_to_bottom { 3129sub scroll_to_bottom {
2694 my ($self) = @_; 3130 my ($self) = @_;
2695 3131
2696 $self->{scroll_to_bottom} = 1; 3132 $self->{scroll_to} = $#{$self->{par}};
2697 $self->update; 3133 $self->update;
2698} 3134}
2699 3135
3136sub force_uptodate {
3137 my ($self) = @_;
3138
3139 if (delete $self->{need_reflow}) {
3140 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3141
3142 my $height = 0;
3143
3144 for my $para (@{$self->{par}}) {
3145 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3146 my $layout = $self->get_layout ($para);
3147 my ($w, $h) = $layout->size;
3148
3149 $para->{w} = $w + $para->{indent};
3150 $para->{h} = $h;
3151 $para->{wrapped} = $layout->has_wrapped;
3152 }
3153
3154 $para->{y} = $height;
3155 $height += $para->{h};
3156 }
3157
3158 $self->{height} = $height;
3159 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3160
3161 delete $self->{texture};
3162 }
3163
3164 if (my $paridx = delete $self->{scroll_to}) {
3165 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3166 }
3167}
3168
2700sub update { 3169sub update {
2701 my ($self) = @_; 3170 my ($self) = @_;
2702 3171
2703 $self->SUPER::update; 3172 $self->SUPER::update;
2704 3173
2705 return unless $self->{h} > 0; 3174 return unless $self->{h} > 0;
2706 3175
2707 delete $self->{texture}; 3176 delete $self->{texture};
2708 3177
2709 $ROOT->on_post_alloc ($self => sub { 3178 $ROOT->on_post_alloc ($self => sub {
3179 $self->force_uptodate;
3180
2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3181 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711 3182
2712 if (delete $self->{need_reflow}) {
2713 my $height = 0;
2714
2715 for my $para (@{$self->{par}}) {
2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2717 my $layout = $self->get_layout ($para);
2718 my ($w, $h) = $layout->size;
2719
2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2723 }
2724
2725 $height += $para->{h};
2726 }
2727
2728 $self->{height} = $height;
2729
2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2731
2732 delete $self->{texture};
2733 }
2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3183 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740 glClearColor 0, 0, 0, 0; 3184 glClearColor 0, 0, 0, 0;
2741 glClear GL_COLOR_BUFFER_BIT; 3185 glClear GL_COLOR_BUFFER_BIT;
2742 3186
3187 package CFPlus::UI::Base;
3188 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3189 (0, 0, $self->{w}, $self->{h});
3190
3191 my $top = int $self->{children}[1]{range}[0];
3192
3193 my $paridx = 0;
3194 my $top_paragraph;
2743 my $top = int $self->{children}[1]{range}[0]; 3195 my $top = int $self->{children}[1]{range}[0];
2744 3196
2745 my $y0 = $top; 3197 my $y0 = $top;
2746 my $y1 = $top + $H; 3198 my $y1 = $top + $H;
2747 3199
2748 my $y = 0;
2749
2750 for my $para (@{$self->{par}}) { 3200 for my $para (@{$self->{par}}) {
2751 my $h = $para->{h}; 3201 my $h = $para->{h};
3202 my $y = $para->{y};
2752 3203
2753 if ($y0 < $y + $h && $y < $y1) { 3204 if ($y0 < $y + $h && $y < $y1) {
2754
2755 my $layout = $self->get_layout ($para); 3205 my $layout = $self->get_layout ($para);
2756 3206
2757 $layout->render ($para->{indent}, $y - $y0); 3207 $layout->render ($para->{indent}, $y - $y0);
2758 3208
2759 if (my @w = @{ $para->{widget} }) { 3209 if (my @w = @{ $para->{widget} }) {
… …
2768 $_->draw; 3218 $_->draw;
2769 } 3219 }
2770 } 3220 }
2771 } 3221 }
2772 3222
2773 $y += $h; 3223 $paridx++;
3224 $top_paragraph ||= $paridx if $y >= $top;
2774 } 3225 }
3226
3227 $self->{top_paragraph} = $top_paragraph;
2775 }; 3228 };
2776 }); 3229 });
2777} 3230}
2778 3231
2779sub reconfigure { 3232sub reconfigure {
… …
2797 $self->{children}[1]->draw; 3250 $self->{children}[1]->draw;
2798} 3251}
2799 3252
2800############################################################################# 3253#############################################################################
2801 3254
2802package CFClient::UI::Animator; 3255package CFPlus::UI::Animator;
2803 3256
2804use CFClient::OpenGL; 3257use CFPlus::OpenGL;
2805 3258
2806our @ISA = CFClient::UI::Bin::; 3259our @ISA = CFPlus::UI::Bin::;
2807 3260
2808sub moveto { 3261sub moveto {
2809 my ($self, $x, $y) = @_; 3262 my ($self, $x, $y) = @_;
2810 3263
2811 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3264 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2839 glPopMatrix; 3292 glPopMatrix;
2840} 3293}
2841 3294
2842############################################################################# 3295#############################################################################
2843 3296
2844package CFClient::UI::Flopper; 3297package CFPlus::UI::Flopper;
2845 3298
2846our @ISA = CFClient::UI::Button::; 3299our @ISA = CFPlus::UI::Button::;
2847 3300
2848sub new { 3301sub new {
2849 my $class = shift; 3302 my $class = shift;
2850 3303
2851 my $self = $class->SUPER::new ( 3304 my $self = $class->SUPER::new (
… …
2863 $self->{other}->toggle_visibility; 3316 $self->{other}->toggle_visibility;
2864} 3317}
2865 3318
2866############################################################################# 3319#############################################################################
2867 3320
2868package CFClient::UI::Tooltip; 3321package CFPlus::UI::Tooltip;
2869 3322
2870our @ISA = CFClient::UI::Bin::; 3323our @ISA = CFPlus::UI::Bin::;
2871 3324
2872use CFClient::OpenGL; 3325use CFPlus::OpenGL;
2873 3326
2874sub new { 3327sub new {
2875 my $class = shift; 3328 my $class = shift;
2876 3329
2877 $class->SUPER::new ( 3330 $class->SUPER::new (
… …
2880 ) 3333 )
2881} 3334}
2882 3335
2883sub set_tooltip_from { 3336sub set_tooltip_from {
2884 my ($self, $widget) = @_; 3337 my ($self, $widget) = @_;
3338
3339 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3340 if $widget->{tooltip} =~ /^#(.*)$/;
2885 3341
2886 my $tooltip = $widget->{tooltip}; 3342 my $tooltip = $widget->{tooltip};
2887 3343
2888 if ($ENV{CFPLUS_DEBUG} & 2) { 3344 if ($ENV{CFPLUS_DEBUG} & 2) {
2889 $tooltip .= "\n\n" . (ref $widget) . "\n" 3345 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2893 } 3349 }
2894 3350
2895 $tooltip =~ s/^\n+//; 3351 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//; 3352 $tooltip =~ s/\n+$//;
2897 3353
2898 $self->add (new CFClient::UI::Label 3354 $self->add (new CFPlus::UI::Label
2899 markup => $tooltip, 3355 markup => $tooltip,
2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3356 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901 fontsize => 0.8, 3357 fontsize => 0.8,
2902 fg => [0, 0, 0, 1], 3358 style => 1, # FLAG_INVERSE
2903 ellipsise => 0, 3359 ellipsise => 0,
2904 font => ($widget->{tooltip_font} || $::FONT_PROP), 3360 font => ($widget->{tooltip_font} || $::FONT_PROP),
2905 ); 3361 );
2906} 3362}
2907 3363
… …
2926 3382
2927 $self->{root}->on_post_alloc ("move_$self" => sub { 3383 $self->{root}->on_post_alloc ("move_$self" => sub {
2928 my $widget = $self->{owner} 3384 my $widget = $self->{owner}
2929 or return; 3385 or return;
2930 3386
3387 if ($widget->{visible}) {
2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3388 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932 3389
2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3390 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934 if $x + $self->{w} > $self->{root}{w}; 3391 if $x + $self->{w} > $self->{root}{w};
2935 3392
2936 $self->move_abs ($x, $y); 3393 $self->move_abs ($x, $y);
3394 } else {
3395 $self->hide;
3396 }
2937 }); 3397 });
2938} 3398}
2939 3399
2940sub _draw { 3400sub _draw {
2941 my ($self) = @_; 3401 my ($self) = @_;
… …
2965 $self->SUPER::_draw; 3425 $self->SUPER::_draw;
2966} 3426}
2967 3427
2968############################################################################# 3428#############################################################################
2969 3429
2970package CFClient::UI::Face; 3430package CFPlus::UI::Face;
2971 3431
2972our @ISA = CFClient::UI::Base::; 3432our @ISA = CFPlus::UI::DrawBG::;
2973 3433
2974use CFClient::OpenGL; 3434use CFPlus::OpenGL;
2975 3435
2976sub new { 3436sub new {
2977 my $class = shift; 3437 my $class = shift;
2978 3438
2979 my $self = $class->SUPER::new ( 3439 my $self = $class->SUPER::new (
3440 size_w => 32,
3441 size_h => 8,
2980 aspect => 1, 3442 aspect => 1,
2981 can_events => 0, 3443 can_events => 0,
2982 @_, 3444 @_,
2983 ); 3445 );
2984 3446
2985 if ($self->{anim} && $self->{animspeed}) { 3447 if ($self->{anim} && $self->{animspeed}) {
2986 Scalar::Util::weaken (my $widget = $self); 3448 CFPlus::weaken (my $widget = $self);
2987 3449
3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2988 $self->{timer} = Event->timer ( 3452 $self->{timer} = Event->timer (
2989 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2990 hard => 1, 3453 parked => 1,
2991 interval => $self->{animspeed},
2992 cb => sub { 3454 cb => sub {
3455 return unless $::CONN && $widget;
3456
2993 ++$widget->{frame}; 3457 ++$widget->{frame};
3458 $widget->update_face;
2994 $widget->update; 3459 $widget->update;
3460
3461 $widget->update_timer;
2995 }, 3462 },
2996 ); 3463 );
3464
3465 $self->update_face;
3466 $self->update_timer;
2997 } 3467 }
2998 3468
2999 $self 3469 $self
3000} 3470}
3001 3471
3472sub update_timer {
3473 my ($self) = @_;
3474
3475 return unless $self->{timer};
3476
3477 if ($self->{visible}) {
3478 $self->{timer}->at (
3479 $self->{anim_start}
3480 + $self->{animspeed}
3481 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3482 );
3483 $self->{timer}->start;
3484 } else {
3485 $self->{timer}->stop;
3486 }
3487}
3488
3489sub update_face {
3490 my ($self) = @_;
3491
3492 return unless $::CONN;
3493
3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3495 if ($anim && @$anim) {
3496 delete $self->{wait_face};
3497 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3499 }
3500 }
3501}
3502
3002sub size_request { 3503sub size_request {
3003 (32, 8) 3504 my ($self) = @_;
3505
3506 if ($::CONN) {
3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3508 if (my $tex = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex;
3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3511 } else {
3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3513 $self->realloc;
3514 });
3515 }
3516 }
3517 }
3518
3519 ($self->{size_w} || 8, $self->{size_h} || 8)
3004} 3520}
3005 3521
3006sub update { 3522sub update {
3007 my ($self) = @_; 3523 my ($self) = @_;
3008 3524
3009 return unless $self->{visible}; 3525 return unless $self->{visible};
3010 3526
3011 $self->SUPER::update; 3527 $self->SUPER::update;
3012} 3528}
3013 3529
3530sub invoke_visibility_change {
3531 my ($self) = @_;
3532
3533 $self->update_timer;
3534
3535 0
3536}
3537
3014sub _draw { 3538sub _draw {
3015 my ($self) = @_; 3539 my ($self) = @_;
3016 3540
3017 return unless $::CONN; 3541 $self->SUPER::_draw;
3018 3542
3019 my $face; 3543 if (my $tex = $self->{tex}) {
3020
3021 if ($self->{frame}) {
3022 my $anim = $::CONN->{anim}[$self->{anim}];
3023
3024 $face = $anim->[ $self->{frame} % @$anim ]
3025 if $anim && @$anim;
3026 }
3027
3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3029
3030 if ($tex) {
3031 glEnable GL_TEXTURE_2D; 3544 glEnable GL_TEXTURE_2D;
3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3033 glColor 0, 0, 0, 1; 3546 glColor 0, 0, 0, 1;
3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3547 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3035 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
… …
3037} 3550}
3038 3551
3039sub destroy { 3552sub destroy {
3040 my ($self) = @_; 3553 my ($self) = @_;
3041 3554
3042 $self->{timer}->cancel 3555 (delete $self->{timer})->cancel
3043 if $self->{timer}; 3556 if $self->{timer};
3044 3557
3045 $self->SUPER::destroy; 3558 $self->SUPER::destroy;
3046} 3559}
3047 3560
3048############################################################################# 3561#############################################################################
3049 3562
3050package CFClient::UI::Buttonbar; 3563package CFPlus::UI::Buttonbar;
3051 3564
3052our @ISA = CFClient::UI::HBox::; 3565our @ISA = CFPlus::UI::HBox::;
3053 3566
3054# TODO: should actualyl wrap buttons and other goodies. 3567# TODO: should actually wrap buttons and other goodies.
3055 3568
3056############################################################################# 3569#############################################################################
3057 3570
3058package CFClient::UI::Menu; 3571package CFPlus::UI::Menu;
3059 3572
3060our @ISA = CFClient::UI::FancyFrame::; 3573our @ISA = CFPlus::UI::Toplevel::;
3061 3574
3062use CFClient::OpenGL; 3575use CFPlus::OpenGL;
3063 3576
3064sub new { 3577sub new {
3065 my $class = shift; 3578 my $class = shift;
3066 3579
3067 my $self = $class->SUPER::new ( 3580 my $self = $class->SUPER::new (
3068 items => [], 3581 items => [],
3069 z => 100, 3582 z => 100,
3070 @_, 3583 @_,
3071 ); 3584 );
3072 3585
3073 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3586 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074 3587
3075 for my $item (@{ $self->{items} }) { 3588 for my $item (@{ $self->{items} }) {
3076 my ($widget, $cb, $tooltip) = @$item; 3589 my ($widget, $cb, $tooltip) = @$item;
3077 3590
3078 # handle various types of items, only text for now 3591 # handle various types of items, only text for now
3079 if (!ref $widget) { 3592 if (!ref $widget) {
3080 if ($widget =~ /\t/) { 3593 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2; 3594 my ($left, $right) = split /\t/, $widget, 2;
3082 3595
3083 $widget = new CFClient::UI::HBox 3596 $widget = new CFPlus::UI::HBox
3084 can_hover => 1, 3597 can_hover => 1,
3085 can_events => 1, 3598 can_events => 1,
3086 tooltip => $tooltip, 3599 tooltip => $tooltip,
3087 children => [ 3600 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1), 3601 (new CFPlus::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1), 3602 (new CFPlus::UI::Label markup => $right, align => +1),
3090 ], 3603 ],
3091 ; 3604 ;
3092 3605
3093 } else { 3606 } else {
3094 $widget = new CFClient::UI::Label 3607 $widget = new CFPlus::UI::Label
3095 can_hover => 1, 3608 can_hover => 1,
3096 can_events => 1, 3609 can_events => 1,
3097 markup => $widget, 3610 markup => $widget,
3098 tooltip => $tooltip; 3611 tooltip => $tooltip;
3099 } 3612 }
… …
3147 1 3660 1
3148} 3661}
3149 3662
3150############################################################################# 3663#############################################################################
3151 3664
3152package CFClient::UI::Multiplexer; 3665package CFPlus::UI::Multiplexer;
3153 3666
3154our @ISA = CFClient::UI::Container::; 3667our @ISA = CFPlus::UI::Container::;
3155 3668
3156sub new { 3669sub new {
3157 my $class = shift; 3670 my $class = shift;
3158 3671
3159 my $self = $class->SUPER::new ( 3672 my $self = $class->SUPER::new (
… …
3220 $self->{current}->draw; 3733 $self->{current}->draw;
3221} 3734}
3222 3735
3223############################################################################# 3736#############################################################################
3224 3737
3225package CFClient::UI::Notebook; 3738package CFPlus::UI::Notebook;
3226 3739
3227our @ISA = CFClient::UI::VBox::; 3740our @ISA = CFPlus::UI::VBox::;
3228 3741
3229sub new { 3742sub new {
3230 my $class = shift; 3743 my $class = shift;
3231 3744
3232 my $self = $class->SUPER::new ( 3745 my $self = $class->SUPER::new (
3233 buttonbar => (new CFClient::UI::Buttonbar), 3746 buttonbar => (new CFPlus::UI::Buttonbar),
3234 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3747 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235 # filter => # will be put between multiplexer and $self 3748 # filter => # will be put between multiplexer and $self
3236 @_, 3749 @_,
3237 ); 3750 );
3238 3751
3239 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3240 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3241 3754
3755 {
3756 Scalar::Util::weaken (my $wself = $self);
3757
3758 $self->{multiplexer}->connect (c_add => sub {
3759 my ($mplex, $widgets) = @_;
3760
3761 for my $child (@$widgets) {
3762 Scalar::Util::weaken $child;
3763 $child->{c_tab_} ||= do {
3764 my $tab =
3765 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3766 ? $child->{c_tab}
3767 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3768
3769 $tab->connect (activate => sub {
3770 $wself->set_current_page ($child);
3771 });
3772
3773 $tab
3774 };
3775
3776 $self->{buttonbar}->add ($child->{c_tab_});
3777 }
3778 });
3779
3780 $self->{multiplexer}->connect (c_remove => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 $wself->{buttonbar}->remove ($child->{c_tab_});
3785 }
3786 });
3787 }
3788
3242 $self 3789 $self
3243} 3790}
3244 3791
3245sub add { 3792sub add {
3793 my ($self, @widgets) = @_;
3794
3795 $self->{multiplexer}->add (@widgets)
3796}
3797
3798sub remove {
3799 my ($self, @widgets) = @_;
3800
3801 $self->{multiplexer}->remove (@widgets)
3802}
3803
3804sub add_tab {
3246 my ($self, $title, $widget, $tooltip) = @_; 3805 my ($self, $title, $widget, $tooltip) = @_;
3247 3806
3248 Scalar::Util::weaken $self; 3807 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title;
3249 3809
3250 $self->{buttonbar}->add (new CFClient::UI::Button
3251 markup => $title,
3252 tooltip => $tooltip,
3253 on_activate => sub { $self->set_current_page ($widget) },
3254 );
3255
3256 $self->{multiplexer}->add ($widget); 3810 $self->add ($widget);
3257} 3811}
3258 3812
3259sub get_current_page { 3813sub get_current_page {
3260 my ($self) = @_; 3814 my ($self) = @_;
3261 3815
… …
3269 $self->emit (page_changed => $self->{multiplexer}{current}); 3823 $self->emit (page_changed => $self->{multiplexer}{current});
3270} 3824}
3271 3825
3272############################################################################# 3826#############################################################################
3273 3827
3274package CFClient::UI::Combobox; 3828package CFPlus::UI::Selector;
3275 3829
3276use utf8; 3830use utf8;
3277 3831
3278our @ISA = CFClient::UI::Button::; 3832our @ISA = CFPlus::UI::Button::;
3279 3833
3280sub new { 3834sub new {
3281 my $class = shift; 3835 my $class = shift;
3282 3836
3283 my $self = $class->SUPER::new ( 3837 my $self = $class->SUPER::new (
… …
3300 my ($value, $title, $tooltip) = @$_; 3854 my ($value, $title, $tooltip) = @$_;
3301 3855
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3856 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 } 3857 }
3304 3858
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3859 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306} 3860}
3307 3861
3308sub _set_value { 3862sub _set_value {
3309 my ($self, $value) = @_; 3863 my ($self, $value) = @_;
3310 3864
… …
3325 $self->emit (changed => $value); 3879 $self->emit (changed => $value);
3326} 3880}
3327 3881
3328############################################################################# 3882#############################################################################
3329 3883
3330package CFClient::UI::Statusbox; 3884package CFPlus::UI::Statusbox;
3331 3885
3332our @ISA = CFClient::UI::VBox::; 3886our @ISA = CFPlus::UI::VBox::;
3333 3887
3334sub new { 3888sub new {
3335 my $class = shift; 3889 my $class = shift;
3336 3890
3337 my $self = $class->SUPER::new ( 3891 my $self = $class->SUPER::new (
3338 fontsize => 0.8, 3892 fontsize => 0.8,
3339 @_, 3893 @_,
3340 ); 3894 );
3341 3895
3342 Scalar::Util::weaken (my $this = $self); 3896 CFPlus::weaken (my $this = $self);
3343 3897
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3898 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345 3899
3346 $self 3900 $self
3347} 3901}
… …
3349sub reorder { 3903sub reorder {
3350 my ($self) = @_; 3904 my ($self) = @_;
3351 my $NOW = Time::HiRes::time; 3905 my $NOW = Time::HiRes::time;
3352 3906
3353 # freeze display when hovering over any label 3907 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner} 3908 return if $CFPlus::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3909 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} }; 3910 values %{ $self->{item} };
3357 3911
3358 while (my ($k, $v) = each %{ $self->{item} }) { 3912 while (my ($k, $v) = each %{ $self->{item} }) {
3359 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3913 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360 } 3914 }
… …
3381 for ($short) { 3935 for ($short) {
3382 s/^\s+//; 3936 s/^\s+//;
3383 s/\s+/ /g; 3937 s/\s+/ /g;
3384 } 3938 }
3385 3939
3386 new CFClient::UI::Label 3940 new CFPlus::UI::Label
3387 markup => $short, 3941 markup => $short,
3388 tooltip => $item->{tooltip}, 3942 tooltip => $item->{tooltip},
3389 tooltip_font => $::FONT_PROP, 3943 tooltip_font => $::FONT_PROP,
3390 tooltip_width => 0.67, 3944 tooltip_width => 0.67,
3391 fontsize => $item->{fontsize} || $self->{fontsize}, 3945 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3470 $self->SUPER::destroy; 4024 $self->SUPER::destroy;
3471} 4025}
3472 4026
3473############################################################################# 4027#############################################################################
3474 4028
3475package CFClient::UI::Inventory;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 col_expand => [0, 1, 0],
3484 @_,
3485 );
3486
3487 $self
3488}
3489
3490sub set_items {
3491 my ($self, $items) = @_;
3492
3493 $self->clear;
3494 return unless $items;
3495
3496 my @items = sort {
3497 ($a->{type} <=> $b->{type})
3498 or ($a->{name} cmp $b->{name})
3499 } values %$items;
3500
3501 $self->{real_items} = \@items;
3502
3503 my $row = 0;
3504 for my $item (@items) {
3505 CFClient::Item::update_widgets $item;
3506
3507 $self->add (0, $row, $item->{face_widget});
3508 $self->add (1, $row, $item->{desc_widget});
3509 $self->add (2, $row, $item->{weight_widget});
3510
3511 $row++;
3512 }
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::SpellList;
3518
3519our @ISA = CFClient::UI::Table::;
3520
3521sub new {
3522 my $class = shift;
3523
3524 my $self = $class->SUPER::new (
3525 binding => [],
3526 commands => [],
3527 @_,
3528 )
3529}
3530
3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544sub rebuild_spell_list {
3545 my ($self) = @_;
3546
3547 $CFClient::UI::ROOT->on_refresh ($self => sub {
3548 $self->clear;
3549
3550 return unless $::CONN;
3551
3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558 my $row = 0;
3559
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_};
3562
3563 $row++;
3564
3565 my $spell_cb = sub {
3566 my ($widget, $ev) = @_;
3567
3568 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu
3574 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ],
3578 )->popup ($ev);
3579 } else {
3580 return 0;
3581 }
3582
3583 1
3584 };
3585
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591 $self->add (0, $row, new CFClient::UI::Face
3592 face => $spell->{face},
3593 can_hover => 1,
3594 can_events => 1,
3595 tooltip => $tooltip,
3596 on_button_down => $spell_cb,
3597 );
3598
3599 $self->add (1, $row, new CFClient::UI::Label
3600 expand => 1,
3601 text => $spell->{name},
3602 can_hover => 1,
3603 can_events => 1,
3604 tooltip => $tooltip,
3605 on_button_down => $spell_cb,
3606 );
3607
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612 }
3613 });
3614}
3615
3616sub add_spell {
3617 my ($self, $spell) = @_;
3618
3619 $self->{spell}->{$spell->{name}} = $spell;
3620 $self->rebuild_spell_list;
3621}
3622
3623sub remove_spell {
3624 my ($self, $spell) = @_;
3625
3626 delete $self->{spell}->{$spell->{name}};
3627 $self->rebuild_spell_list;
3628}
3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3637#############################################################################
3638
3639package CFClient::UI::Root; 4029package CFPlus::UI::Root;
3640 4030
3641our @ISA = CFClient::UI::Container::; 4031our @ISA = CFPlus::UI::Container::;
3642 4032
3643use List::Util qw(min max); 4033use List::Util qw(min max);
3644 4034
3645use CFClient::OpenGL; 4035use CFPlus::OpenGL;
3646 4036
3647sub new { 4037sub new {
3648 my $class = shift; 4038 my $class = shift;
3649 4039
3650 my $self = $class->SUPER::new ( 4040 my $self = $class->SUPER::new (
3651 visible => 1, 4041 visible => 1,
3652 @_, 4042 @_,
3653 ); 4043 );
3654 4044
3655 Scalar::Util::weaken ($self->{root} = $self); 4045 CFPlus::weaken ($self->{root} = $self);
3656 4046
3657 $self 4047 $self
3658} 4048}
3659 4049
3660sub size_request { 4050sub size_request {
… …
3755 while ($self->{refresh_hook}) { 4145 while ($self->{refresh_hook}) {
3756 $_->() 4146 $_->()
3757 for values %{delete $self->{refresh_hook}}; 4147 for values %{delete $self->{refresh_hook}};
3758 } 4148 }
3759 4149
3760 if ($self->{realloc}) { 4150 while ($self->{realloc}) {
3761 my %queue; 4151 my %queue;
3762 my @queue; 4152 my @queue;
3763 my $widget; 4153 my $widget;
3764 4154
3765 outer: 4155 outer:
… …
3812 } 4202 }
3813 } 4203 }
3814 4204
3815 delete $self->{realloc}{$widget+0}; 4205 delete $self->{realloc}{$widget+0};
3816 } 4206 }
3817 }
3818 4207
3819 while (my $size_alloc = delete $self->{size_alloc}) { 4208 while (my $size_alloc = delete $self->{size_alloc}) {
3820 my @queue = sort { $b->{visible} <=> $a->{visible} } 4209 my @queue = sort { $a->{visible} <=> $b->{visible} }
3821 values %$size_alloc; 4210 values %$size_alloc;
3822 4211
3823 while () { 4212 while () {
3824 my $widget = pop @queue || last; 4213 my $widget = pop @queue || last;
3825 4214
3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4215 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3827 4216
3828 $w = 0 if $w < 0;
3829 $h = 0 if $h < 0;
3830
3831 $w = max $widget->{min_w}, $w; 4217 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h; 4218 $h = max $widget->{min_h}, $h;
3833 4219
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836 4225
3837 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
3838 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
3839 4228
3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3841 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
3842 $widget->{old_h} = $widget->{h}; 4231 $widget->{old_h} = $widget->{h};
3843 4232
3844 $widget->{w} = $w; 4233 $widget->{w} = $w;
3845 $widget->{h} = $h; 4234 $widget->{h} = $h;
3846 4235
3847 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
3848 } 4238 }
3849 } 4239 }
3850 } 4240 }
3851 4241
3852 while ($self->{post_alloc_hook}) { 4242 while ($self->{post_alloc_hook}) {
3853 $_->() 4243 $_->()
3854 for values %{delete $self->{post_alloc_hook}}; 4244 for values %{delete $self->{post_alloc_hook}};
3855 } 4245 }
3856
3857 4246
3858 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4247 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3859 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4248 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3860 glClear GL_COLOR_BUFFER_BIT; 4249 glClear GL_COLOR_BUFFER_BIT;
3861 4250
… …
3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4253 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865 glMatrixMode GL_MODELVIEW; 4254 glMatrixMode GL_MODELVIEW;
3866 glLoadIdentity; 4255 glLoadIdentity;
3867 4256
3868 { 4257 {
3869 package CFClient::UI::Base; 4258 package CFPlus::UI::Base;
3870 4259
3871 ($draw_x, $draw_y, $draw_w, $draw_h) = 4260 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872 (0, 0, $self->{w}, $self->{h}); 4261 (0, 0, $self->{w}, $self->{h});
3873 }
3874 4262
3875 $self->_draw; 4263 $self->_draw;
4264 }
3876} 4265}
3877 4266
3878############################################################################# 4267#############################################################################
3879 4268
3880package CFClient::UI; 4269package CFPlus::UI;
3881 4270
3882$ROOT = new CFClient::UI::Root; 4271$ROOT = new CFPlus::UI::Root;
3883$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4272$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884 4273
38851 42741
3886 4275

Diff Legend

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