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.408 by root, Sun Jul 22 15:26:01 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 map $_+0, @widgets
704} 731}
705 732
706sub children { 733sub children {
707 @{ $_[0]{children} } 734 @{ $_[0]{children} }
708} 735}
… …
719} 746}
720 747
721sub clear { 748sub clear {
722 my ($self) = @_; 749 my ($self) = @_;
723 750
724 my $children = delete $self->{children}; 751 my $children = $self->{children};
725 $self->{children} = []; 752 $self->{children} = [];
726 753
727 for (@$children) { 754 for (@$children) {
728 delete $_->{parent}; 755 delete $_->{parent};
729 $_->hide; 756 $_->hide;
… …
754 $_->draw for @{$self->{children}}; 781 $_->draw for @{$self->{children}};
755} 782}
756 783
757############################################################################# 784#############################################################################
758 785
759package CFClient::UI::Bin; 786package CFPlus::UI::Bin;
760 787
761our @ISA = CFClient::UI::Container::; 788our @ISA = CFPlus::UI::Container::;
762 789
763sub new { 790sub new {
764 my ($class, %arg) = @_; 791 my ($class, %arg) = @_;
765 792
766 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 793 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
767 794
768 $class->SUPER::new (children => [$child], %arg) 795 $class->SUPER::new (children => [$child], %arg)
769} 796}
770 797
771sub add { 798sub add {
… …
778sub remove { 805sub remove {
779 my ($self, $widget) = @_; 806 my ($self, $widget) = @_;
780 807
781 $self->SUPER::remove ($widget); 808 $self->SUPER::remove ($widget);
782 809
783 $self->{children} = [new CFClient::UI::Empty] 810 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 811 unless @{$self->{children}};
785} 812}
786 813
787sub child { $_[0]->{children}[0] } 814sub child { $_[0]->{children}[0] }
788 815
… …
800 827
801############################################################################# 828#############################################################################
802 829
803# back-buffered drawing area 830# back-buffered drawing area
804 831
805package CFClient::UI::Window; 832package CFPlus::UI::Window;
806 833
807our @ISA = CFClient::UI::Bin::; 834our @ISA = CFPlus::UI::Bin::;
808 835
809use CFClient::OpenGL; 836use CFPlus::OpenGL;
810 837
811sub new { 838sub new {
812 my ($class, %arg) = @_; 839 my ($class, %arg) = @_;
813 840
814 my $self = $class->SUPER::new (%arg); 841 my $self = $class->SUPER::new (%arg);
… …
836} 863}
837 864
838sub render_child { 865sub render_child {
839 my ($self) = @_; 866 my ($self) = @_;
840 867
841 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 868 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
842 glClearColor 0, 0, 0, 0; 869 glClearColor 0, 0, 0, 0;
843 glClear GL_COLOR_BUFFER_BIT; 870 glClear GL_COLOR_BUFFER_BIT;
844 871
845 { 872 {
846 package CFClient::UI::Base; 873 package CFPlus::UI::Base;
847 874
848 ($draw_x, $draw_y, $draw_w, $draw_h) = 875 local ($draw_x, $draw_y, $draw_w, $draw_h) =
849 (0, 0, $self->{w}, $self->{h}); 876 (0, 0, $self->{w}, $self->{h});
877
878 $self->_render;
850 } 879 }
851
852 $self->_render;
853 }; 880 };
854} 881}
855 882
856sub _draw { 883sub _draw {
857 my ($self) = @_; 884 my ($self) = @_;
858
859 my ($w, $h) = @$self{qw(w h)};
860 885
861 my $tex = $self->{texture} 886 my $tex = $self->{texture}
862 or return; 887 or return;
863 888
864 glEnable GL_TEXTURE_2D; 889 glEnable GL_TEXTURE_2D;
865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
866 glColor 0, 0, 0, 1; 891 glColor 0, 0, 0, 1;
867 892
868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 893 $tex->draw_quad_alpha_premultiplied (0, 0);
869 894
870 glDisable GL_TEXTURE_2D; 895 glDisable GL_TEXTURE_2D;
871} 896}
872 897
873############################################################################# 898#############################################################################
874 899
875package CFClient::UI::ViewPort; 900package CFPlus::UI::ViewPort;
876 901
902use List::Util qw(min max);
903
877our @ISA = CFClient::UI::Window::; 904our @ISA = CFPlus::UI::Window::;
878 905
879sub new { 906sub new {
880 my $class = shift; 907 my $class = shift;
881 908
882 $class->SUPER::new ( 909 $class->SUPER::new (
… …
889sub size_request { 916sub size_request {
890 my ($self) = @_; 917 my ($self) = @_;
891 918
892 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 919 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
893 920
894 $w = 10 if $self->{scroll_x}; 921 $w = 1 if $self->{scroll_x};
895 $h = 10 if $self->{scroll_y}; 922 $h = 1 if $self->{scroll_y};
896 923
897 ($w, $h) 924 ($w, $h)
898} 925}
899 926
900sub invoke_size_allocate { 927sub invoke_size_allocate {
… …
912} 939}
913 940
914sub set_offset { 941sub set_offset {
915 my ($self, $x, $y) = @_; 942 my ($self, $x, $y) = @_;
916 943
944 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
945 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
946
947 if ($x != $self->{view_x} or $y != $self->{view_y}) {
917 $self->{view_x} = int $x; 948 $self->{view_x} = $x;
918 $self->{view_y} = int $y; 949 $self->{view_y} = $y;
919 950
951 $self->emit (changed => $x, $y);
920 $self->update; 952 $self->update;
953 }
921} 954}
922 955
923# hmm, this does not work for topleft of $self... but we should not ask for that 956# hmm, this does not work for topleft of $self... but we should not ask for that
924sub coord2local { 957sub coord2local {
925 my ($self, $x, $y) = @_; 958 my ($self, $x, $y) = @_;
… …
940 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
941 974
942 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 975 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
943 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 976 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
944 ) { 977 ) {
945 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 978 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
946 } else { 979 } else {
947 $self->CFClient::UI::Base::find_widget ($x, $y) 980 $self->CFPlus::UI::Base::find_widget ($x, $y)
948 } 981 }
949} 982}
950 983
951sub _render { 984sub _render {
952 my ($self) = @_; 985 my ($self) = @_;
953 986
954 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 987 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}; 988 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
956 989
957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 990 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
958 991
959 $self->SUPER::_render; 992 $self->SUPER::_render;
960} 993}
961 994
962############################################################################# 995#############################################################################
963 996
964package CFClient::UI::ScrolledWindow; 997package CFPlus::UI::ScrolledWindow;
965 998
966our @ISA = CFClient::UI::HBox::; 999our @ISA = CFPlus::UI::Table::;
967 1000
968sub new { 1001sub new {
969 my ($class, %arg) = @_; 1002 my ($class, %arg) = @_;
970 1003
971 my $child = delete $arg{child}; 1004 my $child = delete $arg{child};
972 1005
973 my $self; 1006 my $self;
974 1007
975 my $slider = new CFClient::UI::Slider 1008 my $hslider = new CFPlus::UI::Slider
1009 col => 0,
1010 row => 1,
1011 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub {
1014 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 },
1017 ;
1018
1019 my $vslider = new CFPlus::UI::Slider
1020 col => 1,
1021 row => 0,
976 vertical => 1, 1022 vertical => 1,
977 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
978 on_changed => sub { 1024 on_changed => sub {
979 $self->{vp}->set_offset (0, $_[1]); 1025 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
980 }, 1027 },
981 ; 1028 ;
982 1029
983 $self = $class->SUPER::new ( 1030 $self = $class->SUPER::new (
984 vp => (new CFClient::UI::ViewPort expand => 1), 1031 scroll_x => 0,
1032 scroll_y => 1,
1033 can_events => 1,
985 slider => $slider, 1034 hslider => $hslider,
1035 vslider => $vslider,
1036 col_expand => [1, 0],
1037 row_expand => [1, 0],
986 %arg, 1038 %arg,
987 ); 1039 );
988 1040
1041 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0,
1043 row => 0,
1044 expand => 1,
1045 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y},
1047 on_changed => sub {
1048 my ($vp, $x, $y) = @_;
1049
1050 $vp->{parent}{hslider}->set_value ($x);
1051 $vp->{parent}{vslider}->set_value ($y);
1052
1053 0
1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1060 ;
1061
989 $self->SUPER::add ($self->{vp}, $self->{slider}); 1062 $self->SUPER::add ($self->{vp});
1063
990 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
991 1065
992 $self 1066 $self
993} 1067}
994
995#TODO# update range on size_allocate depending on child
996 1068
997sub add { 1069sub add {
998 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
999 1071
1000 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
1001} 1073}
1002 1074
1075sub update_slider {
1076 my ($self) = @_;
1077
1078 my $child = ($self->{vp} or return)->child;
1079
1080 if ($self->{scroll_x}) {
1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1083
1084 my $visible = $w1 > $w2;
1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1087 $visible ? $self->SUPER::add ($self->{hslider})
1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1090 }
1091
1092 if ($self->{scroll_y}) {
1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1095
1096 my $visible = $h1 > $h2;
1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1099 $visible ? $self->SUPER::add ($self->{vslider})
1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1120 };
1121}
1122
1123sub invoke_mouse_wheel {
1124 my ($self, $ev) = @_;
1125
1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1128
1129 1
1130}
1131
1132sub invoke_button_down {
1133 my ($self, $ev, $x, $y) = @_;
1134
1135 if ($ev->{button} == 2) {
1136 $self->start_dragging ($ev);
1137 return 1;
1138 }
1139
1140 0
1141}
1142
1003sub invoke_button_up { 1143sub invoke_button_up {
1004 my ($self, $ev) = @_; 1144 my ($self, $ev, $x, $y) = @_;
1005 1145
1006 warn "button up $ev->{button}\n";#d# 1146 if (delete $self->{motion}) {
1147 return 1;
1007 1148 }
1149
1008 0 1150 0
1009} 1151}
1010 1152
1011sub update_slider { 1153sub invoke_mouse_motion {
1012 my ($self) = @_; 1154 my ($self, $ev, $x, $y) = @_;
1013 1155
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1156 if ($self->{motion}) {
1015} 1157 $self->{motion}->($ev, $x, $y);
1158 return 1;
1159 }
1016 1160
1017sub update { 1161 0
1018 my ($self) = @_;
1019
1020 $self->SUPER::update;
1021
1022 $self->update_slider;
1023} 1162}
1024 1163
1025sub invoke_size_allocate { 1164sub invoke_size_allocate {
1026 my ($self, $w, $h) = @_; 1165 my ($self, $w, $h) = @_;
1027 1166
1028 $self->update_slider; 1167 $self->update_slider;
1029
1030 $self->SUPER::invoke_size_allocate ($w, $h) 1168 $self->SUPER::invoke_size_allocate ($w, $h)
1031} 1169}
1032 1170
1033############################################################################# 1171#############################################################################
1034 1172
1035package CFClient::UI::Frame; 1173package CFPlus::UI::Frame;
1036 1174
1037our @ISA = CFClient::UI::Bin::; 1175our @ISA = CFPlus::UI::Bin::;
1038 1176
1039use CFClient::OpenGL; 1177use CFPlus::OpenGL;
1040 1178
1041sub new { 1179sub new {
1042 my $class = shift; 1180 my $class = shift;
1043 1181
1044 $class->SUPER::new ( 1182 $class->SUPER::new (
… …
1070 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
1071} 1209}
1072 1210
1073############################################################################# 1211#############################################################################
1074 1212
1075package CFClient::UI::FancyFrame; 1213package CFPlus::UI::FancyFrame;
1076 1214
1077our @ISA = CFClient::UI::Bin::; 1215our @ISA = CFPlus::UI::Bin::;
1078 1216
1079use CFClient::OpenGL; 1217use CFPlus::OpenGL;
1218
1219sub new {
1220 my ($class, %arg) = @_;
1221
1222 if ((exists $arg{label}) && !ref $arg{label}) {
1223 $arg{label} = new CFPlus::UI::Label
1224 align => 1,
1225 valign => 0,
1226 text => $arg{label},
1227 fontsize => ($arg{border} || 0.8) * 0.75;
1228 }
1229
1230 my $self = $class->SUPER::new (
1231 # label => "",
1232 fg => [0.6, 0.3, 0.1],
1233 border => 0.8,
1234 style => 'single',
1235 %arg,
1236 );
1237
1238 $self
1239}
1240
1241sub add {
1242 my ($self, @widgets) = @_;
1243
1244 $self->SUPER::add (@widgets);
1245 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1246}
1247
1248sub border {
1249 int $_[0]{border} * $::FONTSIZE
1250}
1251
1252sub size_request {
1253 my ($self) = @_;
1254
1255 ($self->{label_w}, undef) = $self->{label}->size_request
1256 if $self->{label};
1257
1258 my ($w, $h) = $self->SUPER::size_request;
1259
1260 (
1261 $w + $self->border * 2,
1262 $h + $self->border * 2,
1263 )
1264}
1265
1266sub invoke_size_allocate {
1267 my ($self, $w, $h) = @_;
1268
1269 my $border = $self->border;
1270
1271 $w -= List::Util::max 0, $border * 2;
1272 $h -= List::Util::max 0, $border * 2;
1273
1274 if (my $label = $self->{label}) {
1275 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1276 $label->{h} = List::Util::min $h, $border;
1277 $label->invoke_size_allocate ($label->{w}, $label->{h});
1278 }
1279
1280 $self->child->configure ($border, $border, $w, $h);
1281
1282 1
1283}
1284
1285sub _draw {
1286 my ($self) = @_;
1287
1288 my $child = $self->{children}[0];
1289
1290 my $border = $self->border;
1291 my ($w, $h) = ($self->{w}, $self->{h});
1292
1293 $child->draw;
1294
1295 glColor @{$self->{fg}};
1296 glBegin GL_LINE_STRIP;
1297 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1301 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1302 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1303 glEnd;
1304
1305 if ($self->{label}) {
1306 glTranslate $border * 2, 0;
1307 $self->{label}->_draw;
1308 }
1309}
1310
1311#############################################################################
1312
1313package CFPlus::UI::Toplevel;
1314
1315our @ISA = CFPlus::UI::Bin::;
1316
1317use CFPlus::OpenGL;
1080 1318
1081my $bg = 1319my $bg =
1082 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1320 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1083 mipmap => 1, wrap => 1; 1321 mipmap => 1, wrap => 1;
1084 1322
1085my @border = 1323my @border =
1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1324 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); 1325 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326
1327my @icon =
1328 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1329 qw(x1_move.png x1_resize.png);
1088 1330
1089sub new { 1331sub new {
1090 my ($class, %arg) = @_; 1332 my ($class, %arg) = @_;
1091 1333
1092 my $self = $class->SUPER::new ( 1334 my $self = $class->SUPER::new (
… …
1097 min_w => 64, 1339 min_w => 64,
1098 min_h => 32, 1340 min_h => 32,
1099 %arg, 1341 %arg,
1100 ); 1342 );
1101 1343
1102 $self->{title_widget} = new CFClient::UI::Label 1344 $self->{title_widget} = new CFPlus::UI::Label
1103 align => 0, 1345 align => 0,
1104 valign => 1, 1346 valign => 1,
1105 text => $self->{title}, 1347 text => $self->{title},
1106 fontsize => $self->{border}, 1348 fontsize => $self->{border},
1107 if exists $self->{title}; 1349 if exists $self->{title};
1108 1350
1109 if ($self->{has_close_button}) { 1351 if ($self->{has_close_button}) {
1110 $self->{close_button} = 1352 $self->{close_button} =
1111 new CFClient::UI::ImageButton 1353 new CFPlus::UI::ImageButton
1112 path => 'x1_close.png', 1354 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") }; 1355 on_activate => sub { $self->emit ("delete") };
1114 1356
1115 $self->CFClient::UI::Container::add ($self->{close_button}); 1357 $self->CFPlus::UI::Container::add ($self->{close_button});
1116 } 1358 }
1117 1359
1118 $self 1360 $self
1119} 1361}
1120 1362
1121sub add { 1363sub add {
1122 my ($self, @widgets) = @_; 1364 my ($self, @widgets) = @_;
1123 1365
1124 $self->SUPER::add (@widgets); 1366 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1367 $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}; 1368 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1127} 1369}
1128 1370
1129sub border { 1371sub border {
1130 int $_[0]{border} * $::FONTSIZE 1372 int $_[0]{border} * $::FONTSIZE
1131} 1373}
… …
1239 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1481 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240 1482
1241 ! ! $self->{motion} 1483 ! ! $self->{motion}
1242} 1484}
1243 1485
1486sub invoke_visibility_change {
1487 my ($self, $visible) = @_;
1488
1489 delete $self->{motion} unless $visible;
1490
1491 0
1492}
1493
1244sub _draw { 1494sub _draw {
1245 my ($self) = @_; 1495 my ($self) = @_;
1246 1496
1247 my $child = $self->{children}[0]; 1497 my $child = $self->{children}[0];
1248 1498
… …
1253 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1254 1504
1255 my $border = $self->border; 1505 my $border = $self->border;
1256 1506
1257 glColor @{ $self->{border_bg} }; 1507 glColor @{ $self->{border_bg} };
1258 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1508 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1259 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1509 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1260 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1510 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1261 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1511 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512
1513 # move
1514 my $w2 = ($w - $border) * .5;
1515 my $h2 = ($h - $border) * .5;
1516 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519
1520 # resize
1521 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523 unless $self->{has_close_button};
1524 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1262 1526
1263 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1527 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1264 glColor @{ $self->{bg} }; 1528 glColor @{ $self->{bg} };
1265 1529
1266 # TODO: repeat texture not scale 1530 # TODO: repeat texture not scale
… …
1285 if $self->{close_button}; 1549 if $self->{close_button};
1286} 1550}
1287 1551
1288############################################################################# 1552#############################################################################
1289 1553
1290package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1291 1555
1292our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Container::;
1293 1557
1294use List::Util qw(max sum); 1558use List::Util qw(max sum);
1295 1559
1296use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1297 1561
1298sub new { 1562sub new {
1299 my $class = shift; 1563 my $class = shift;
1300 1564
1301 $class->SUPER::new ( 1565 $class->SUPER::new (
1302 col_expand => [], 1566 col_expand => [],
1567 row_expand => [],
1303 @_, 1568 @_,
1304 ) 1569 )
1305} 1570}
1306 1571
1307sub children {
1308 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1309}
1310
1311sub add { 1572sub add {
1312 my ($self, $x, $y, $child) = @_; 1573 my ($self, @widgets) = @_;
1313 1574
1314 $child->set_parent ($self); 1575 for my $child (@widgets) {
1315 $self->{children}[$y][$x] = $child; 1576 $child->{rowspan} ||= 1;
1577 $child->{colspan} ||= 1;
1578 }
1316 1579
1317 $self->realloc; 1580 $self->SUPER::add (@widgets);
1318} 1581}
1319 1582
1320sub remove { 1583sub add_at {
1584 my $self = shift;
1585
1586 my @widgets;
1587
1588 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, ();
1590
1591 $child->{row} = $row;
1592 $child->{col} = $col;
1593
1594 push @widgets, $child;
1595 }
1596
1597 $self->add (@widgets);
1598}
1599
1600sub get_wh {
1321 my ($self, $child) = @_; 1601 my ($self) = @_;
1322 1602
1323 # TODO: not yet implemented 1603 my (@w, @h);
1324}
1325
1326# TODO: move to container class maybe? send children a signal on removal?
1327sub clear {
1328 my ($self) = @_;
1329 1604
1330 my @children = $self->children; 1605 my @children = $self->children;
1331 delete $self->{children}; 1606
1607 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1610
1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1332 1616 }
1333 for (@children) {
1334 delete $_->{parent};
1335 $_->hide;
1336 }
1337 1617
1338 $self->realloc; 1618 # second pass, rows
1339} 1619 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)}; 1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1354 1621
1355 $w[$x] = max $w[$x], $w; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1356 $h[$y] = max $h[$y], $h; 1623
1624 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1357 } 1626 }
1358 } 1627 }
1359 1628
1360 (\@w, \@h) 1629 (\@w, \@h)
1361} 1630}
… …
1377 my ($ws, $hs) = $self->get_wh; 1646 my ($ws, $hs) = $self->get_wh;
1378 1647
1379 my $req_w = (sum @$ws) || 1; 1648 my $req_w = (sum @$ws) || 1;
1380 my $req_h = (sum @$hs) || 1; 1649 my $req_h = (sum @$hs) || 1;
1381 1650
1382 # TODO: nicer code && do row_expand 1651 # now linearly scale the rows/columns to the allocated size
1383 my @col_expand = @{$self->{col_expand}}; 1652 my @col_expand = @{$self->{col_expand}};
1384 @col_expand = (1) x @$ws unless @col_expand; 1653 @col_expand = (1) x @$ws unless @col_expand;
1385 my $col_expand = (sum @col_expand) || 1; 1654 my $col_expand = (sum @col_expand) || 1;
1386 1655
1387 # linearly scale sizes
1388 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1656 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1389 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1390 1657
1391 CFClient::UI::harmonize $ws; 1658 CFPlus::UI::harmonize $ws;
1659
1660 my @row_expand = @{$self->{row_expand}};
1661 @row_expand = (1) x @$ws unless @row_expand;
1662 my $row_expand = (sum @row_expand) || 1;
1663
1664 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665
1392 CFClient::UI::harmonize $hs; 1666 CFPlus::UI::harmonize $hs;
1393 1667
1394 my $y; 1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1395 1670
1396 for my $r (0 .. $#{$self->{children}}) { 1671 for my $widget ($self->children) {
1397 my $row = $self->{children}[$r] 1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1398 or next;
1399 1673
1400 my $x = 0; 1674 $widget->configure (
1401 my $row_h = $hs->[$r]; 1675 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1402 1677 );
1403 for my $c (0 .. $#$row) { 1678 }
1404 my $col_w = $ws->[$c];
1405 1679
1406 if (my $widget = $row->[$c]) { 1680 1
1407 $widget->configure ($x, $y, $col_w, $row_h); 1681}
1408 }
1409 1682
1410 $x += $col_w; 1683#############################################################################
1684
1685package CFPlus::UI::Fixed;
1686
1687use List::Util qw(min max);
1688
1689our @ISA = CFPlus::UI::Container::;
1690
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) {
1699 my ($mode, $val, $max) = @_;
1700
1701 $mode eq "abs" ? $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704}
1705
1706sub size_request {
1707 my ($self) = @_;
1708
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710
1711 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1714
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1411 } 1721 }
1722 }
1412 1723
1413 $y += $row_h; 1724 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1;
1726
1727 # now layout remaining widgets
1728 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1730
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1739 }
1740 }
1741
1742 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1;
1744
1745 ($W, $H)
1746}
1747
1748sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_;
1750
1751 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1753
1754 $x = _scale $pos, $x, $W;
1755 $y = _scale $pos, $x, $H;
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758
1759 $child->configure ($x, $y, $w, $h);
1414 } 1760 }
1415 1761
1416 1 1762 1
1417} 1763}
1418 1764
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############################################################################# 1765#############################################################################
1444 1766
1445package CFClient::UI::Box; 1767package CFPlus::UI::Box;
1446 1768
1447our @ISA = CFClient::UI::Container::; 1769our @ISA = CFPlus::UI::Container::;
1448 1770
1449sub size_request { 1771sub size_request {
1450 my ($self) = @_; 1772 my ($self) = @_;
1451 1773
1452 $self->{vertical} 1774 $self->{vertical}
… …
1485 $req[$_] += $space * $children[$_]{expand} 1807 $req[$_] += $space * $children[$_]{expand}
1486 for 0 .. $#children; 1808 for 0 .. $#children;
1487 } 1809 }
1488 } 1810 }
1489 1811
1490 CFClient::UI::harmonize \@req; 1812 CFPlus::UI::harmonize \@req;
1491 1813
1492 my $pos = 0; 1814 my $pos = 0;
1493 for (0 .. $#children) { 1815 for (0 .. $#children) {
1494 my $alloc = $req[$_]; 1816 my $alloc = $req[$_];
1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1817 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1500 1 1822 1
1501} 1823}
1502 1824
1503############################################################################# 1825#############################################################################
1504 1826
1505package CFClient::UI::HBox; 1827package CFPlus::UI::HBox;
1506 1828
1507our @ISA = CFClient::UI::Box::; 1829our @ISA = CFPlus::UI::Box::;
1508 1830
1509sub new { 1831sub new {
1510 my $class = shift; 1832 my $class = shift;
1511 1833
1512 $class->SUPER::new ( 1834 $class->SUPER::new (
… …
1515 ) 1837 )
1516} 1838}
1517 1839
1518############################################################################# 1840#############################################################################
1519 1841
1520package CFClient::UI::VBox; 1842package CFPlus::UI::VBox;
1521 1843
1522our @ISA = CFClient::UI::Box::; 1844our @ISA = CFPlus::UI::Box::;
1523 1845
1524sub new { 1846sub new {
1525 my $class = shift; 1847 my $class = shift;
1526 1848
1527 $class->SUPER::new ( 1849 $class->SUPER::new (
… …
1530 ) 1852 )
1531} 1853}
1532 1854
1533############################################################################# 1855#############################################################################
1534 1856
1535package CFClient::UI::Label; 1857package CFPlus::UI::Label;
1536 1858
1537our @ISA = CFClient::UI::DrawBG::; 1859our @ISA = CFPlus::UI::DrawBG::;
1538 1860
1539use CFClient::OpenGL; 1861use CFPlus::OpenGL;
1540 1862
1541sub new { 1863sub new {
1542 my ($class, %arg) = @_; 1864 my ($class, %arg) = @_;
1543 1865
1544 my $self = $class->SUPER::new ( 1866 my $self = $class->SUPER::new (
… …
1547 #active_bg => none 1869 #active_bg => none
1548 #font => default_font 1870 #font => default_font
1549 #text => initial text 1871 #text => initial text
1550 #markup => initial narkup 1872 #markup => initial narkup
1551 #max_w => maximum pixel width 1873 #max_w => maximum pixel width
1874 #style => 0, # render flags
1552 ellipsise => 3, # end 1875 ellipsise => 3, # end
1553 layout => (new CFClient::Layout), 1876 layout => (new CFPlus::Layout),
1554 fontsize => 1, 1877 fontsize => 1,
1555 align => -1, 1878 align => -1,
1556 valign => -1, 1879 valign => -1,
1557 padding_x => 2, 1880 padding_x => 2,
1558 padding_y => 2, 1881 padding_y => 2,
1559 can_events => 0, 1882 can_events => 0,
1560 %arg 1883 %arg
1561 ); 1884 );
1562 1885
1563 if (exists $self->{template}) { 1886 if (exists $self->{template}) {
1564 my $layout = new CFClient::Layout; 1887 my $layout = new CFPlus::Layout;
1565 $layout->set_text (delete $self->{template}); 1888 $layout->set_text (delete $self->{template});
1566 $self->{template} = $layout; 1889 $self->{template} = $layout;
1567 } 1890 }
1568 1891
1569 if (exists $self->{markup}) { 1892 if (exists $self->{markup}) {
… …
1571 } else { 1894 } else {
1572 $self->set_text (delete $self->{text}); 1895 $self->set_text (delete $self->{text});
1573 } 1896 }
1574 1897
1575 $self 1898 $self
1576}
1577
1578sub escape($) {
1579 local $_ = $_[0];
1580
1581 s/&/&amp;/g;
1582 s/>/&gt;/g;
1583 s/</&lt;/g;
1584
1585 $_
1586} 1899}
1587 1900
1588sub update { 1901sub update {
1589 my ($self) = @_; 1902 my ($self) = @_;
1590 1903
… …
1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1716 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
1717 }; 2030 };
1718 2031
1719 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2032# unless ($self->{list}) {
1720 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2033# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList;
2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
1721 2040
1722 $self->{layout}->render ($self->{ox}, $self->{oy}); 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1723} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
1724 2051
1725############################################################################# 2052#############################################################################
1726 2053
1727package CFClient::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
1728 2055
1729our @ISA = CFClient::UI::Label::; 2056our @ISA = CFPlus::UI::Label::;
1730 2057
1731use CFClient::OpenGL; 2058use CFPlus::OpenGL;
1732 2059
1733sub new { 2060sub new {
1734 my $class = shift; 2061 my $class = shift;
1735 2062
1736 $class->SUPER::new ( 2063 $class->SUPER::new (
… …
1740 active_fg => [0, 0, 0], 2067 active_fg => [0, 0, 0],
1741 can_hover => 1, 2068 can_hover => 1,
1742 can_focus => 1, 2069 can_focus => 1,
1743 valign => 0, 2070 valign => 0,
1744 can_events => 1, 2071 can_events => 1,
2072 ellipsise => 0,
1745 #text => ... 2073 #text => ...
1746 #hidden => "*", 2074 #hidden => "*",
1747 @_ 2075 @_
1748 ) 2076 )
1749} 2077}
… …
1794 my $sym = $ev->{sym}; 2122 my $sym = $ev->{sym};
1795 my $uni = $ev->{unicode}; 2123 my $uni = $ev->{unicode};
1796 2124
1797 my $text = $self->get_text; 2125 my $text = $self->get_text;
1798 2126
2127 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2128
1799 if ($uni == 8) { 2129 if ($uni == 8) {
1800 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2130 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1801 } elsif ($uni == 127) { 2131 } elsif ($uni == 127) {
1802 substr $text, $self->{cursor}, 1, ""; 2132 substr $text, $self->{cursor}, 1, "";
1803 } elsif ($sym == CFClient::SDLK_LEFT) { 2133 } elsif ($sym == CFPlus::SDLK_LEFT) {
1804 --$self->{cursor} if $self->{cursor}; 2134 --$self->{cursor} if $self->{cursor};
1805 } elsif ($sym == CFClient::SDLK_RIGHT) { 2135 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1806 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2136 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1807 } elsif ($sym == CFClient::SDLK_HOME) { 2137 } elsif ($sym == CFPlus::SDLK_HOME) {
2138 # what a hack
2139 $self->{cursor} =
2140 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141 ? length $1
2142 : 0;
2143 } elsif ($sym == CFPlus::SDLK_END) {
2144 # uh, again
2145 $self->{cursor} =
2146 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147 ? $self->{cursor} + length $1
2148 : length $self->{text};
2149 } elsif ($uni == 21) { # ctrl-u
2150 $text = "";
1808 $self->{cursor} = 0; 2151 $self->{cursor} = 0;
1809 } elsif ($sym == CFClient::SDLK_END) {
1810 $self->{cursor} = length $text;
1811 } elsif ($uni == 27) { 2152 } elsif ($uni == 27) {
1812 $self->emit ('escape'); 2153 $self->emit ('escape');
1813 } elsif ($uni) { 2154 } elsif ($uni == 0x0d) {
2155 substr $text, $self->{cursor}++, 0, "\012";
2156 } elsif ($uni >= 0x20) {
1814 substr $text, $self->{cursor}++, 0, chr $uni; 2157 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else { 2158 } else {
1816 return 0; 2159 return 0;
1817 } 2160 }
1818 2161
1819 $self->_set_text ($text); 2162 $self->_set_text ($text);
1820 2163
1821 $self->realloc; 2164 $self->realloc;
2165 $self->update;
1822 2166
1823 1 2167 1
1824} 2168}
1825 2169
1826sub invoke_focus_in { 2170sub invoke_focus_in {
… …
1888 utf8::encode $text; 2232 utf8::encode $text;
1889 2233
1890 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1891 } 2235 }
1892 2236
1893 glColor @{$self->{fg}};
1894 glBegin GL_LINES; 2237 glBegin GL_LINES;
1895 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 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}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1897 glEnd; 2240 glEnd;
1898 } 2241 }
1899} 2242}
1900 2243
2244#############################################################################
2245
1901package CFClient::UI::Entry; 2246package CFPlus::UI::Entry;
1902 2247
1903our @ISA = CFClient::UI::EntryBase::; 2248our @ISA = CFPlus::UI::EntryBase::;
1904 2249
1905use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1906 2251
1907sub invoke_key_down { 2252sub invoke_key_down {
1908 my ($self, $ev) = @_; 2253 my ($self, $ev) = @_;
1909 2254
1910 my $sym = $ev->{sym}; 2255 my $sym = $ev->{sym};
1911 2256
1912 if ($sym == 13) { 2257 if ($ev->{uni} == 0x0d || $sym == 13) {
1913 unshift @{$self->{history}}, 2258 unshift @{$self->{history}},
1914 my $txt = $self->get_text; 2259 my $txt = $self->get_text;
1915 2260
1916 $self->{history_pointer} = -1; 2261 $self->{history_pointer} = -1;
1917 $self->{history_saveback} = ''; 2262 $self->{history_saveback} = '';
1918 $self->emit (activate => $txt); 2263 $self->emit (activate => $txt);
1919 $self->update; 2264 $self->update;
1920 2265
1921 } elsif ($sym == CFClient::SDLK_UP) { 2266 } elsif ($sym == CFPlus::SDLK_UP) {
1922 if ($self->{history_pointer} < 0) { 2267 if ($self->{history_pointer} < 0) {
1923 $self->{history_saveback} = $self->get_text; 2268 $self->{history_saveback} = $self->get_text;
1924 } 2269 }
1925 if (@{$self->{history} || []} > 0) { 2270 if (@{$self->{history} || []} > 0) {
1926 $self->{history_pointer}++; 2271 $self->{history_pointer}++;
… …
1928 $self->{history_pointer} = @{$self->{history} || []} - 1; 2273 $self->{history_pointer} = @{$self->{history} || []} - 1;
1929 } 2274 }
1930 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2275 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1931 } 2276 }
1932 2277
1933 } elsif ($sym == CFClient::SDLK_DOWN) { 2278 } elsif ($sym == CFPlus::SDLK_DOWN) {
1934 $self->{history_pointer}--; 2279 $self->{history_pointer}--;
1935 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2280 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1936 2281
1937 if ($self->{history_pointer} >= 0) { 2282 if ($self->{history_pointer} >= 0) {
1938 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2283 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1947 1 2292 1
1948} 2293}
1949 2294
1950############################################################################# 2295#############################################################################
1951 2296
2297package CFPlus::UI::TextEdit;
2298
2299our @ISA = CFPlus::UI::EntryBase::;
2300
2301use CFPlus::OpenGL;
2302
2303sub move_cursor_ver {
2304 my ($self, $dy) = @_;
2305
2306 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307
2308 $y += $dy;
2309
2310 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2311 $self->{cursor} = $index;
2312 delete $self->{cur_h};
2313 $self->update;
2314 return;
2315 }
2316}
2317
2318sub invoke_key_down {
2319 my ($self, $ev) = @_;
2320
2321 my $sym = $ev->{sym};
2322
2323 if ($sym == CFPlus::SDLK_UP) {
2324 $self->move_cursor_ver (-1);
2325 } elsif ($sym == CFPlus::SDLK_DOWN) {
2326 $self->move_cursor_ver (+1);
2327 } else {
2328 return $self->SUPER::invoke_key_down ($ev)
2329 }
2330
2331 1
2332}
2333
2334#############################################################################
2335
1952package CFClient::UI::Button; 2336package CFPlus::UI::Button;
1953 2337
1954our @ISA = CFClient::UI::Label::; 2338our @ISA = CFPlus::UI::Label::;
1955 2339
1956use CFClient::OpenGL; 2340use CFPlus::OpenGL;
1957 2341
1958my @tex = 2342my @tex =
1959 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2343 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1960 qw(b1_button_active.png); 2344 qw(b1_button_inactive.png b1_button_active.png);
1961 2345
1962sub new { 2346sub new {
1963 my $class = shift; 2347 my $class = shift;
1964 2348
1965 $class->SUPER::new ( 2349 $class->SUPER::new (
1966 padding_x => 4, 2350 padding_x => 4,
1967 padding_y => 4, 2351 padding_y => 4,
1968 fg => [1, 1, 1], 2352 fg => [1.0, 1.0, 1.0],
1969 active_fg => [0, 0, 1], 2353 active_fg => [0.8, 0.8, 0.8],
1970 can_hover => 1, 2354 can_hover => 1,
1971 align => 0, 2355 align => 0,
1972 valign => 0, 2356 valign => 0,
1973 can_events => 1, 2357 can_events => 1,
1974 @_ 2358 @_
… …
1992 2376
1993 glEnable GL_TEXTURE_2D; 2377 glEnable GL_TEXTURE_2D;
1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1995 glColor 0, 0, 0, 1; 2379 glColor 0, 0, 0, 1;
1996 2380
2381 my $tex = $tex[$GRAB == $self];
1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2382 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1998 2383
1999 glDisable GL_TEXTURE_2D; 2384 glDisable GL_TEXTURE_2D;
2000 2385
2001 $self->SUPER::_draw; 2386 $self->SUPER::_draw;
2002} 2387}
2003 2388
2004############################################################################# 2389#############################################################################
2005 2390
2391package CFPlus::UI::CheckBox;
2392
2393our @ISA = CFPlus::UI::DrawBG::;
2394
2395my @tex =
2396 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2397 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2398
2399use CFPlus::OpenGL;
2400
2401sub new {
2402 my $class = shift;
2403
2404 $class->SUPER::new (
2405 padding_x => 2,
2406 padding_y => 2,
2407 fg => [1, 1, 1],
2408 active_fg => [1, 1, 0],
2409 bg => [0, 0, 0, 0.2],
2410 active_bg => [1, 1, 1, 0.5],
2411 state => 0,
2412 can_hover => 1,
2413 @_
2414 )
2415}
2416
2417sub size_request {
2418 my ($self) = @_;
2419
2420 (6) x 2
2421}
2422
2423sub toggle {
2424 my ($self) = @_;
2425
2426 $self->{state} = !$self->{state};
2427 $self->emit (changed => $self->{state});
2428 $self->update;
2429}
2430
2431sub invoke_button_down {
2432 my ($self, $ev, $x, $y) = @_;
2433
2434 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2435 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2436 $self->toggle;
2437 } else {
2438 return 0
2439 }
2440
2441 1
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 $self->SUPER::_draw;
2448
2449 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2450
2451 my ($w, $h) = @$self{qw(w h)};
2452
2453 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2454
2455 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2456
2457 my $tex = $self->{state} ? $tex[1] : $tex[0];
2458
2459 glEnable GL_TEXTURE_2D;
2460 $tex->draw_quad_alpha (0, 0, $s, $s);
2461 glDisable GL_TEXTURE_2D;
2462}
2463
2464#############################################################################
2465
2466package CFPlus::UI::Image;
2467
2468our @ISA = CFPlus::UI::Base::;
2469
2470use CFPlus::OpenGL;
2471
2472our %texture_cache;
2473
2474sub new {
2475 my $class = shift;
2476
2477 my $self = $class->SUPER::new (
2478 can_events => 0,
2479 @_,
2480 );
2481
2482 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required";
2484
2485 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2486 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2487
2488 CFPlus::weaken $texture_cache{$self->{path}};
2489
2490 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2491
2492 $self
2493}
2494
2495sub STORABLE_freeze {
2496 my ($self, $cloning) = @_;
2497
2498 $self->{path}
2499 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2500
2501 $self->{path}
2502}
2503
2504sub STORABLE_attach {
2505 my ($self, $cloning, $path) = @_;
2506
2507 $self->new (path => $path)
2508}
2509
2510sub size_request {
2511 my ($self) = @_;
2512
2513 ($self->{tex}{w}, $self->{tex}{h})
2514}
2515
2516sub _draw {
2517 my ($self) = @_;
2518
2519 my $tex = $self->{tex};
2520
2521 my ($w, $h) = ($self->{w}, $self->{h});
2522
2523 if ($self->{rot90}) {
2524 glRotate 90, 0, 0, 1;
2525 glTranslate 0, -$self->{w}, 0;
2526
2527 ($w, $h) = ($h, $w);
2528 }
2529
2530 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532
2533 $tex->draw_quad (0, 0, $w, $h);
2534
2535 glDisable GL_TEXTURE_2D;
2536}
2537
2538#############################################################################
2539
2006package CFClient::UI::ImageButton; 2540package CFPlus::UI::ImageButton;
2007 2541
2008our @ISA = CFClient::UI::Image::; 2542our @ISA = CFPlus::UI::Image::;
2009 2543
2010use CFClient::OpenGL; 2544use CFPlus::OpenGL;
2011 2545
2012my %textures; 2546my %textures;
2013 2547
2014sub new { 2548sub new {
2015 my $class = shift; 2549 my $class = shift;
… …
2037 1 2571 1
2038} 2572}
2039 2573
2040############################################################################# 2574#############################################################################
2041 2575
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; 2576package CFPlus::UI::VGauge;
2118 2577
2119our @ISA = CFClient::UI::Base::; 2578our @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 2579
2180use List::Util qw(min max); 2580use List::Util qw(min max);
2181 2581
2182use CFClient::OpenGL; 2582use CFPlus::OpenGL;
2183 2583
2184my %tex = ( 2584my %tex = (
2185 food => [ 2585 food => [
2186 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2586 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2187 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2587 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2188 ], 2588 ],
2189 grace => [ 2589 grace => [
2190 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2590 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/ 2591 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2192 ], 2592 ],
2193 hp => [ 2593 hp => [
2194 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2594 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2195 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2595 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2196 ], 2596 ],
2197 mana => [ 2597 mana => [
2198 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2598 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/ 2599 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2200 ], 2600 ],
2201); 2601);
2202 2602
2203# eg. VGauge->new (gauge => 'food'), default gauge: food 2603# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2306 glDisable GL_TEXTURE_2D; 2706 glDisable GL_TEXTURE_2D;
2307} 2707}
2308 2708
2309############################################################################# 2709#############################################################################
2310 2710
2311package CFClient::UI::Gauge; 2711package CFPlus::UI::Gauge;
2312 2712
2313our @ISA = CFClient::UI::VBox::; 2713our @ISA = CFPlus::UI::VBox::;
2314 2714
2315sub new { 2715sub new {
2316 my ($class, %arg) = @_; 2716 my ($class, %arg) = @_;
2317 2717
2318 my $self = $class->SUPER::new ( 2718 my $self = $class->SUPER::new (
… …
2320 can_hover => 1, 2720 can_hover => 1,
2321 can_events => 1, 2721 can_events => 1,
2322 %arg, 2722 %arg,
2323 ); 2723 );
2324 2724
2325 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2725 $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); 2726 $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"); 2727 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2328 2728
2329 $self 2729 $self
2330} 2730}
2331 2731
2332sub set_fontsize { 2732sub set_fontsize {
… …
2353 $self->{value}->set_text ($val); 2753 $self->{value}->set_text ($val);
2354} 2754}
2355 2755
2356############################################################################# 2756#############################################################################
2357 2757
2358package CFClient::UI::Slider; 2758package CFPlus::UI::Slider;
2359 2759
2360use strict; 2760use strict;
2361 2761
2362use CFClient::OpenGL; 2762use CFPlus::OpenGL;
2363 2763
2364our @ISA = CFClient::UI::DrawBG::; 2764our @ISA = CFPlus::UI::DrawBG::;
2365 2765
2366my @tex = 2766my @tex =
2367 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2767 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2368 qw(s1_slider.png s1_slider_bg.png); 2768 qw(s1_slider.png s1_slider_bg.png);
2369 2769
2370sub new { 2770sub new {
2371 my $class = shift; 2771 my $class = shift;
2372 2772
… …
2461 } 2861 }
2462 2862
2463 1 2863 1
2464} 2864}
2465 2865
2866sub invoke_mouse_wheel {
2867 my ($self, $ev) = @_;
2868
2869 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2870
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2872
2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874
2875 ! ! $delta
2876}
2877
2466sub update { 2878sub update {
2467 my ($self) = @_; 2879 my ($self) = @_;
2468 2880
2469 delete $self->{knob_w}; 2881 delete $self->{knob_w};
2470 $self->SUPER::update; 2882 $self->SUPER::update;
… …
2517 glDisable GL_TEXTURE_2D; 2929 glDisable GL_TEXTURE_2D;
2518} 2930}
2519 2931
2520############################################################################# 2932#############################################################################
2521 2933
2522package CFClient::UI::ValSlider; 2934package CFPlus::UI::ValSlider;
2523 2935
2524our @ISA = CFClient::UI::HBox::; 2936our @ISA = CFPlus::UI::HBox::;
2525 2937
2526sub new { 2938sub new {
2527 my ($class, %arg) = @_; 2939 my ($class, %arg) = @_;
2528 2940
2529 my $range = delete $arg{range}; 2941 my $range = delete $arg{range};
2530 2942
2531 my $self = $class->SUPER::new ( 2943 my $self = $class->SUPER::new (
2532 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2944 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2533 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2945 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2534 to_value => sub { shift }, 2946 to_value => sub { shift },
2535 from_value => sub { shift }, 2947 from_value => sub { shift },
2536 %arg, 2948 %arg,
2537 ); 2949 );
2538 2950
… …
2558sub set_range { shift->{slider}->set_range (@_) } 2970sub set_range { shift->{slider}->set_range (@_) }
2559sub set_value { shift->{slider}->set_value (@_) } 2971sub set_value { shift->{slider}->set_value (@_) }
2560 2972
2561############################################################################# 2973#############################################################################
2562 2974
2563package CFClient::UI::TextScroller; 2975package CFPlus::UI::TextScroller;
2564 2976
2565our @ISA = CFClient::UI::HBox::; 2977our @ISA = CFPlus::UI::HBox::;
2566 2978
2567use CFClient::OpenGL; 2979use CFPlus::OpenGL;
2568 2980
2569sub new { 2981sub new {
2570 my $class = shift; 2982 my $class = shift;
2571 2983
2572 my $self = $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2573 fontsize => 1, 2985 fontsize => 1,
2574 can_events => 0, 2986 can_events => 1,
2575 indent => 0, 2987 indent => 0,
2576 #font => default_font 2988 #font => default_font
2577 @_, 2989 @_,
2578 2990
2579 layout => (new CFClient::Layout), 2991 layout => (new CFPlus::Layout),
2580 par => [], 2992 par => [],
2993 max_par => 0,
2581 height => 0, 2994 height => 0,
2582 children => [ 2995 children => [
2583 (new CFClient::UI::Empty expand => 1), 2996 (new CFPlus::UI::Empty expand => 1),
2584 (new CFClient::UI::Slider vertical => 1), 2997 (new CFPlus::UI::Slider vertical => 1),
2585 ], 2998 ],
2586 ); 2999 );
2587 3000
2588 $self->{children}[1]->connect (changed => sub { $self->update }); 3001 $self->{children}[1]->connect (changed => sub { $self->update });
2589 3002
… …
2619 3032
2620 $self->reflow; 3033 $self->reflow;
2621 3034
2622 local $self->{children} = [$empty, $slider]; 3035 local $self->{children} = [$empty, $slider];
2623 $self->SUPER::invoke_size_allocate ($w, $h) 3036 $self->SUPER::invoke_size_allocate ($w, $h)
3037}
3038
3039sub invoke_mouse_wheel {
3040 my ($self, $ev) = @_;
3041
3042 return 0 unless $ev->{dy}; # only vertical movements
3043
3044 $self->{children}[1]->emit (mouse_wheel => $ev);
3045
3046 1
2624} 3047}
2625 3048
2626sub get_layout { 3049sub get_layout {
2627 my ($self, $para) = @_; 3050 my ($self, $para) = @_;
2628 3051
… …
2656 3079
2657 # todo: base offset on lines or so, not on pixels 3080 # todo: base offset on lines or so, not on pixels
2658 $self->{children}[1]->set_value ($offset); 3081 $self->{children}[1]->set_value ($offset);
2659} 3082}
2660 3083
3084sub current_paragraph {
3085 my ($self) = @_;
3086
3087 $self->{top_paragraph} - 1
3088}
3089
3090sub scroll_to {
3091 my ($self, $para) = @_;
3092
3093 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3094
3095 $self->{scroll_to} = $para;
3096 $self->update;
3097}
3098
2661sub clear { 3099sub clear {
2662 my ($self) = @_; 3100 my ($self) = @_;
2663 3101
2664 my (undef, undef, @other) = @{ $self->{children} }; 3102 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other; 3103 $self->remove ($_) for @other;
… …
2668 $self->{height} = 0; 3106 $self->{height} = 0;
2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3107 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2670} 3108}
2671 3109
2672sub add_paragraph { 3110sub add_paragraph {
2673 my ($self, $color, $para, $indent) = @_; 3111 my $self = shift;
2674 3112
2675 my ($text, @w) = ref $para ? @$para : $para; 3113 for my $para (@_) {
2676
2677 $para = { 3114 $para = {
3115 fg => [1, 1, 1, 1],
3116 indent => 0,
3117 markup => "",
3118 widget => [],
3119 ref $para ? %$para : (markup => $para),
2678 w => 1e10, 3120 w => 1e10,
2679 wrapped => 1, 3121 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2684 }; 3122 };
2685 3123
2686 $self->add (@w) if @w; 3124 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2687 push @{$self->{par}}, $para; 3125 push @{$self->{par}}, $para;
3126 }
3127
3128 if (my $max = $self->{max_par}) {
3129 shift @{$self->{par}} while @{$self->{par}} > $max;
3130 }
2688 3131
2689 $self->{need_reflow}++; 3132 $self->{need_reflow}++;
2690 $self->update; 3133 $self->update;
2691} 3134}
2692 3135
2693sub scroll_to_bottom { 3136sub scroll_to_bottom {
2694 my ($self) = @_; 3137 my ($self) = @_;
2695 3138
2696 $self->{scroll_to_bottom} = 1; 3139 $self->{scroll_to} = $#{$self->{par}};
2697 $self->update; 3140 $self->update;
2698} 3141}
2699 3142
3143sub force_uptodate {
3144 my ($self) = @_;
3145
3146 if (delete $self->{need_reflow}) {
3147 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3148
3149 my $height = 0;
3150
3151 for my $para (@{$self->{par}}) {
3152 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3153 my $layout = $self->get_layout ($para);
3154 my ($w, $h) = $layout->size;
3155
3156 $para->{w} = $w + $para->{indent};
3157 $para->{h} = $h;
3158 $para->{wrapped} = $layout->has_wrapped;
3159 }
3160
3161 $para->{y} = $height;
3162 $height += $para->{h};
3163 }
3164
3165 $self->{height} = $height;
3166 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3167
3168 delete $self->{texture};
3169 }
3170
3171 if (my $paridx = delete $self->{scroll_to}) {
3172 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3173 }
3174}
3175
2700sub update { 3176sub update {
2701 my ($self) = @_; 3177 my ($self) = @_;
2702 3178
2703 $self->SUPER::update; 3179 $self->SUPER::update;
2704 3180
2705 return unless $self->{h} > 0; 3181 return unless $self->{h} > 0;
2706 3182
2707 delete $self->{texture}; 3183 delete $self->{texture};
2708 3184
2709 $ROOT->on_post_alloc ($self => sub { 3185 $ROOT->on_post_alloc ($self => sub {
3186 $self->force_uptodate;
3187
2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3188 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2711 3189
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 { 3190 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2740 glClearColor 0, 0, 0, 0; 3191 glClearColor 0, 0, 0, 0;
2741 glClear GL_COLOR_BUFFER_BIT; 3192 glClear GL_COLOR_BUFFER_BIT;
2742 3193
3194 package CFPlus::UI::Base;
3195 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196 (0, 0, $self->{w}, $self->{h});
3197
3198 my $top = int $self->{children}[1]{range}[0];
3199
3200 my $paridx = 0;
3201 my $top_paragraph;
2743 my $top = int $self->{children}[1]{range}[0]; 3202 my $top = int $self->{children}[1]{range}[0];
2744 3203
2745 my $y0 = $top; 3204 my $y0 = $top;
2746 my $y1 = $top + $H; 3205 my $y1 = $top + $H;
2747 3206
2748 my $y = 0;
2749
2750 for my $para (@{$self->{par}}) { 3207 for my $para (@{$self->{par}}) {
2751 my $h = $para->{h}; 3208 my $h = $para->{h};
3209 my $y = $para->{y};
2752 3210
2753 if ($y0 < $y + $h && $y < $y1) { 3211 if ($y0 < $y + $h && $y < $y1) {
2754
2755 my $layout = $self->get_layout ($para); 3212 my $layout = $self->get_layout ($para);
2756 3213
2757 $layout->render ($para->{indent}, $y - $y0); 3214 $layout->render ($para->{indent}, $y - $y0);
2758 3215
2759 if (my @w = @{ $para->{widget} }) { 3216 if (my @w = @{ $para->{widget} }) {
… …
2768 $_->draw; 3225 $_->draw;
2769 } 3226 }
2770 } 3227 }
2771 } 3228 }
2772 3229
2773 $y += $h; 3230 $paridx++;
3231 $top_paragraph ||= $paridx if $y >= $top;
2774 } 3232 }
3233
3234 $self->{top_paragraph} = $top_paragraph;
2775 }; 3235 };
2776 }); 3236 });
2777} 3237}
2778 3238
2779sub reconfigure { 3239sub reconfigure {
… …
2797 $self->{children}[1]->draw; 3257 $self->{children}[1]->draw;
2798} 3258}
2799 3259
2800############################################################################# 3260#############################################################################
2801 3261
2802package CFClient::UI::Animator; 3262package CFPlus::UI::Animator;
2803 3263
2804use CFClient::OpenGL; 3264use CFPlus::OpenGL;
2805 3265
2806our @ISA = CFClient::UI::Bin::; 3266our @ISA = CFPlus::UI::Bin::;
2807 3267
2808sub moveto { 3268sub moveto {
2809 my ($self, $x, $y) = @_; 3269 my ($self, $x, $y) = @_;
2810 3270
2811 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3271 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2839 glPopMatrix; 3299 glPopMatrix;
2840} 3300}
2841 3301
2842############################################################################# 3302#############################################################################
2843 3303
2844package CFClient::UI::Flopper; 3304package CFPlus::UI::Flopper;
2845 3305
2846our @ISA = CFClient::UI::Button::; 3306our @ISA = CFPlus::UI::Button::;
2847 3307
2848sub new { 3308sub new {
2849 my $class = shift; 3309 my $class = shift;
2850 3310
2851 my $self = $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
… …
2863 $self->{other}->toggle_visibility; 3323 $self->{other}->toggle_visibility;
2864} 3324}
2865 3325
2866############################################################################# 3326#############################################################################
2867 3327
2868package CFClient::UI::Tooltip; 3328package CFPlus::UI::Tooltip;
2869 3329
2870our @ISA = CFClient::UI::Bin::; 3330our @ISA = CFPlus::UI::Bin::;
2871 3331
2872use CFClient::OpenGL; 3332use CFPlus::OpenGL;
2873 3333
2874sub new { 3334sub new {
2875 my $class = shift; 3335 my $class = shift;
2876 3336
2877 $class->SUPER::new ( 3337 $class->SUPER::new (
… …
2880 ) 3340 )
2881} 3341}
2882 3342
2883sub set_tooltip_from { 3343sub set_tooltip_from {
2884 my ($self, $widget) = @_; 3344 my ($self, $widget) = @_;
3345
3346 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347 if $widget->{tooltip} =~ /^#(.*)$/;
2885 3348
2886 my $tooltip = $widget->{tooltip}; 3349 my $tooltip = $widget->{tooltip};
2887 3350
2888 if ($ENV{CFPLUS_DEBUG} & 2) { 3351 if ($ENV{CFPLUS_DEBUG} & 2) {
2889 $tooltip .= "\n\n" . (ref $widget) . "\n" 3352 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2893 } 3356 }
2894 3357
2895 $tooltip =~ s/^\n+//; 3358 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//; 3359 $tooltip =~ s/\n+$//;
2897 3360
2898 $self->add (new CFClient::UI::Label 3361 $self->add (new CFPlus::UI::Label
2899 markup => $tooltip, 3362 markup => $tooltip,
2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3363 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2901 fontsize => 0.8, 3364 fontsize => 0.8,
2902 fg => [0, 0, 0, 1], 3365 style => 1, # FLAG_INVERSE
2903 ellipsise => 0, 3366 ellipsise => 0,
2904 font => ($widget->{tooltip_font} || $::FONT_PROP), 3367 font => ($widget->{tooltip_font} || $::FONT_PROP),
2905 ); 3368 );
2906} 3369}
2907 3370
… …
2926 3389
2927 $self->{root}->on_post_alloc ("move_$self" => sub { 3390 $self->{root}->on_post_alloc ("move_$self" => sub {
2928 my $widget = $self->{owner} 3391 my $widget = $self->{owner}
2929 or return; 3392 or return;
2930 3393
3394 if ($widget->{visible}) {
2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3395 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932 3396
2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3397 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934 if $x + $self->{w} > $self->{root}{w}; 3398 if $x + $self->{w} > $self->{root}{w};
2935 3399
2936 $self->move_abs ($x, $y); 3400 $self->move_abs ($x, $y);
3401 } else {
3402 $self->hide;
3403 }
2937 }); 3404 });
2938} 3405}
2939 3406
2940sub _draw { 3407sub _draw {
2941 my ($self) = @_; 3408 my ($self) = @_;
… …
2965 $self->SUPER::_draw; 3432 $self->SUPER::_draw;
2966} 3433}
2967 3434
2968############################################################################# 3435#############################################################################
2969 3436
2970package CFClient::UI::Face; 3437package CFPlus::UI::Face;
2971 3438
2972our @ISA = CFClient::UI::Base::; 3439our @ISA = CFPlus::UI::DrawBG::;
2973 3440
2974use CFClient::OpenGL; 3441use CFPlus::OpenGL;
2975 3442
2976sub new { 3443sub new {
2977 my $class = shift; 3444 my $class = shift;
2978 3445
2979 my $self = $class->SUPER::new ( 3446 my $self = $class->SUPER::new (
3447 size_w => 32,
3448 size_h => 8,
2980 aspect => 1, 3449 aspect => 1,
2981 can_events => 0, 3450 can_events => 0,
2982 @_, 3451 @_,
2983 ); 3452 );
2984 3453
2985 if ($self->{anim} && $self->{animspeed}) { 3454 if ($self->{anim} && $self->{animspeed}) {
2986 Scalar::Util::weaken (my $widget = $self); 3455 CFPlus::weaken (my $widget = $self);
2987 3456
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2988 $self->{timer} = Event->timer ( 3459 $self->{timer} = Event->timer (
2989 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2990 hard => 1, 3460 parked => 1,
2991 interval => $self->{animspeed},
2992 cb => sub { 3461 cb => sub {
3462 return unless $::CONN && $widget;
3463
2993 ++$widget->{frame}; 3464 ++$widget->{frame};
3465 $widget->update_face;
2994 $widget->update; 3466 $widget->update;
3467
3468 $widget->update_timer;
2995 }, 3469 },
2996 ); 3470 );
3471
3472 $self->update_face;
3473 $self->update_timer;
2997 } 3474 }
2998 3475
2999 $self 3476 $self
3000} 3477}
3001 3478
3479sub update_timer {
3480 my ($self) = @_;
3481
3482 return unless $self->{timer};
3483
3484 if ($self->{visible}) {
3485 $self->{timer}->at (
3486 $self->{anim_start}
3487 + $self->{animspeed}
3488 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489 );
3490 $self->{timer}->start;
3491 } else {
3492 $self->{timer}->stop;
3493 }
3494}
3495
3496sub update_face {
3497 my ($self) = @_;
3498
3499 return unless $::CONN;
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3506 }
3507 }
3508}
3509
3002sub size_request { 3510sub size_request {
3003 (32, 8) 3511 my ($self) = @_;
3512
3513 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex;
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518 } else {
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3520 $self->realloc;
3521 });
3522 }
3523 }
3524 }
3525
3526 ($self->{size_w} || 8, $self->{size_h} || 8)
3004} 3527}
3005 3528
3006sub update { 3529sub update {
3007 my ($self) = @_; 3530 my ($self) = @_;
3008 3531
3009 return unless $self->{visible}; 3532 return unless $self->{visible};
3010 3533
3011 $self->SUPER::update; 3534 $self->SUPER::update;
3012} 3535}
3013 3536
3537sub invoke_visibility_change {
3538 my ($self) = @_;
3539
3540 $self->update_timer;
3541
3542 0
3543}
3544
3014sub _draw { 3545sub _draw {
3015 my ($self) = @_; 3546 my ($self) = @_;
3016 3547
3017 return unless $::CONN; 3548 $self->SUPER::_draw;
3018 3549
3019 my $face; 3550 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; 3551 glEnable GL_TEXTURE_2D;
3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3033 glColor 0, 0, 0, 1; 3553 glColor 0, 0, 0, 1;
3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3554 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3035 glDisable GL_TEXTURE_2D; 3555 glDisable GL_TEXTURE_2D;
… …
3037} 3557}
3038 3558
3039sub destroy { 3559sub destroy {
3040 my ($self) = @_; 3560 my ($self) = @_;
3041 3561
3042 $self->{timer}->cancel 3562 (delete $self->{timer})->cancel
3043 if $self->{timer}; 3563 if $self->{timer};
3044 3564
3045 $self->SUPER::destroy; 3565 $self->SUPER::destroy;
3046} 3566}
3047 3567
3048############################################################################# 3568#############################################################################
3049 3569
3050package CFClient::UI::Buttonbar; 3570package CFPlus::UI::Buttonbar;
3051 3571
3052our @ISA = CFClient::UI::HBox::; 3572our @ISA = CFPlus::UI::HBox::;
3053 3573
3054# TODO: should actualyl wrap buttons and other goodies. 3574# TODO: should actually wrap buttons and other goodies.
3055 3575
3056############################################################################# 3576#############################################################################
3057 3577
3058package CFClient::UI::Menu; 3578package CFPlus::UI::Menu;
3059 3579
3060our @ISA = CFClient::UI::FancyFrame::; 3580our @ISA = CFPlus::UI::Toplevel::;
3061 3581
3062use CFClient::OpenGL; 3582use CFPlus::OpenGL;
3063 3583
3064sub new { 3584sub new {
3065 my $class = shift; 3585 my $class = shift;
3066 3586
3067 my $self = $class->SUPER::new ( 3587 my $self = $class->SUPER::new (
3068 items => [], 3588 items => [],
3069 z => 100, 3589 z => 100,
3070 @_, 3590 @_,
3071 ); 3591 );
3072 3592
3073 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3593 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3074 3594
3075 for my $item (@{ $self->{items} }) { 3595 for my $item (@{ $self->{items} }) {
3076 my ($widget, $cb, $tooltip) = @$item; 3596 my ($widget, $cb, $tooltip) = @$item;
3077 3597
3078 # handle various types of items, only text for now 3598 # handle various types of items, only text for now
3079 if (!ref $widget) { 3599 if (!ref $widget) {
3080 if ($widget =~ /\t/) { 3600 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2; 3601 my ($left, $right) = split /\t/, $widget, 2;
3082 3602
3083 $widget = new CFClient::UI::HBox 3603 $widget = new CFPlus::UI::HBox
3084 can_hover => 1, 3604 can_hover => 1,
3085 can_events => 1, 3605 can_events => 1,
3086 tooltip => $tooltip, 3606 tooltip => $tooltip,
3087 children => [ 3607 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1), 3608 (new CFPlus::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1), 3609 (new CFPlus::UI::Label markup => $right, align => +1),
3090 ], 3610 ],
3091 ; 3611 ;
3092 3612
3093 } else { 3613 } else {
3094 $widget = new CFClient::UI::Label 3614 $widget = new CFPlus::UI::Label
3095 can_hover => 1, 3615 can_hover => 1,
3096 can_events => 1, 3616 can_events => 1,
3097 markup => $widget, 3617 markup => $widget,
3098 tooltip => $tooltip; 3618 tooltip => $tooltip;
3099 } 3619 }
… …
3147 1 3667 1
3148} 3668}
3149 3669
3150############################################################################# 3670#############################################################################
3151 3671
3152package CFClient::UI::Multiplexer; 3672package CFPlus::UI::Multiplexer;
3153 3673
3154our @ISA = CFClient::UI::Container::; 3674our @ISA = CFPlus::UI::Container::;
3155 3675
3156sub new { 3676sub new {
3157 my $class = shift; 3677 my $class = shift;
3158 3678
3159 my $self = $class->SUPER::new ( 3679 my $self = $class->SUPER::new (
… …
3220 $self->{current}->draw; 3740 $self->{current}->draw;
3221} 3741}
3222 3742
3223############################################################################# 3743#############################################################################
3224 3744
3225package CFClient::UI::Notebook; 3745package CFPlus::UI::Notebook;
3226 3746
3227our @ISA = CFClient::UI::VBox::; 3747our @ISA = CFPlus::UI::VBox::;
3228 3748
3229sub new { 3749sub new {
3230 my $class = shift; 3750 my $class = shift;
3231 3751
3232 my $self = $class->SUPER::new ( 3752 my $self = $class->SUPER::new (
3233 buttonbar => (new CFClient::UI::Buttonbar), 3753 buttonbar => (new CFPlus::UI::Buttonbar),
3234 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3235 # filter => # will be put between multiplexer and $self 3755 # filter => # will be put between multiplexer and $self
3236 @_, 3756 @_,
3237 ); 3757 );
3238 3758
3239 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3243} 3763}
3244 3764
3245sub add { 3765sub add {
3246 my ($self, $title, $widget, $tooltip) = @_; 3766 my ($self, $title, $widget, $tooltip) = @_;
3247 3767
3248 Scalar::Util::weaken $self; 3768 CFPlus::weaken $self;
3249 3769
3250 $self->{buttonbar}->add (new CFClient::UI::Button 3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3251 markup => $title, 3772 markup => $title,
3252 tooltip => $tooltip, 3773 tooltip => $tooltip,
3774 );
3775 }
3776
3253 on_activate => sub { $self->set_current_page ($widget) }, 3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3254 ); 3778 $self->{buttonbar}->add ($title);
3255 3779
3256 $self->{multiplexer}->add ($widget); 3780 $self->{multiplexer}->add ($widget);
3257} 3781}
3258 3782
3259sub get_current_page { 3783sub get_current_page {
… …
3269 $self->emit (page_changed => $self->{multiplexer}{current}); 3793 $self->emit (page_changed => $self->{multiplexer}{current});
3270} 3794}
3271 3795
3272############################################################################# 3796#############################################################################
3273 3797
3274package CFClient::UI::Combobox; 3798package CFPlus::UI::Selector;
3275 3799
3276use utf8; 3800use utf8;
3277 3801
3278our @ISA = CFClient::UI::Button::; 3802our @ISA = CFPlus::UI::Button::;
3279 3803
3280sub new { 3804sub new {
3281 my $class = shift; 3805 my $class = shift;
3282 3806
3283 my $self = $class->SUPER::new ( 3807 my $self = $class->SUPER::new (
… …
3300 my ($value, $title, $tooltip) = @$_; 3824 my ($value, $title, $tooltip) = @$_;
3301 3825
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3826 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 } 3827 }
3304 3828
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3829 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306} 3830}
3307 3831
3308sub _set_value { 3832sub _set_value {
3309 my ($self, $value) = @_; 3833 my ($self, $value) = @_;
3310 3834
… …
3325 $self->emit (changed => $value); 3849 $self->emit (changed => $value);
3326} 3850}
3327 3851
3328############################################################################# 3852#############################################################################
3329 3853
3330package CFClient::UI::Statusbox; 3854package CFPlus::UI::Statusbox;
3331 3855
3332our @ISA = CFClient::UI::VBox::; 3856our @ISA = CFPlus::UI::VBox::;
3333 3857
3334sub new { 3858sub new {
3335 my $class = shift; 3859 my $class = shift;
3336 3860
3337 my $self = $class->SUPER::new ( 3861 my $self = $class->SUPER::new (
3338 fontsize => 0.8, 3862 fontsize => 0.8,
3339 @_, 3863 @_,
3340 ); 3864 );
3341 3865
3342 Scalar::Util::weaken (my $this = $self); 3866 CFPlus::weaken (my $this = $self);
3343 3867
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3868 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345 3869
3346 $self 3870 $self
3347} 3871}
… …
3349sub reorder { 3873sub reorder {
3350 my ($self) = @_; 3874 my ($self) = @_;
3351 my $NOW = Time::HiRes::time; 3875 my $NOW = Time::HiRes::time;
3352 3876
3353 # freeze display when hovering over any label 3877 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner} 3878 return if $CFPlus::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3879 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} }; 3880 values %{ $self->{item} };
3357 3881
3358 while (my ($k, $v) = each %{ $self->{item} }) { 3882 while (my ($k, $v) = each %{ $self->{item} }) {
3359 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3883 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3360 } 3884 }
… …
3381 for ($short) { 3905 for ($short) {
3382 s/^\s+//; 3906 s/^\s+//;
3383 s/\s+/ /g; 3907 s/\s+/ /g;
3384 } 3908 }
3385 3909
3386 new CFClient::UI::Label 3910 new CFPlus::UI::Label
3387 markup => $short, 3911 markup => $short,
3388 tooltip => $item->{tooltip}, 3912 tooltip => $item->{tooltip},
3389 tooltip_font => $::FONT_PROP, 3913 tooltip_font => $::FONT_PROP,
3390 tooltip_width => 0.67, 3914 tooltip_width => 0.67,
3391 fontsize => $item->{fontsize} || $self->{fontsize}, 3915 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3470 $self->SUPER::destroy; 3994 $self->SUPER::destroy;
3471} 3995}
3472 3996
3473############################################################################# 3997#############################################################################
3474 3998
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; 3999package CFPlus::UI::Root;
3640 4000
3641our @ISA = CFClient::UI::Container::; 4001our @ISA = CFPlus::UI::Container::;
3642 4002
3643use List::Util qw(min max); 4003use List::Util qw(min max);
3644 4004
3645use CFClient::OpenGL; 4005use CFPlus::OpenGL;
3646 4006
3647sub new { 4007sub new {
3648 my $class = shift; 4008 my $class = shift;
3649 4009
3650 my $self = $class->SUPER::new ( 4010 my $self = $class->SUPER::new (
3651 visible => 1, 4011 visible => 1,
3652 @_, 4012 @_,
3653 ); 4013 );
3654 4014
3655 Scalar::Util::weaken ($self->{root} = $self); 4015 CFPlus::weaken ($self->{root} = $self);
3656 4016
3657 $self 4017 $self
3658} 4018}
3659 4019
3660sub size_request { 4020sub size_request {
… …
3755 while ($self->{refresh_hook}) { 4115 while ($self->{refresh_hook}) {
3756 $_->() 4116 $_->()
3757 for values %{delete $self->{refresh_hook}}; 4117 for values %{delete $self->{refresh_hook}};
3758 } 4118 }
3759 4119
3760 if ($self->{realloc}) { 4120 while ($self->{realloc}) {
3761 my %queue; 4121 my %queue;
3762 my @queue; 4122 my @queue;
3763 my $widget; 4123 my $widget;
3764 4124
3765 outer: 4125 outer:
… …
3812 } 4172 }
3813 } 4173 }
3814 4174
3815 delete $self->{realloc}{$widget+0}; 4175 delete $self->{realloc}{$widget+0};
3816 } 4176 }
3817 }
3818 4177
3819 while (my $size_alloc = delete $self->{size_alloc}) { 4178 while (my $size_alloc = delete $self->{size_alloc}) {
3820 my @queue = sort { $b->{visible} <=> $a->{visible} } 4179 my @queue = sort { $a->{visible} <=> $b->{visible} }
3821 values %$size_alloc; 4180 values %$size_alloc;
3822 4181
3823 while () { 4182 while () {
3824 my $widget = pop @queue || last; 4183 my $widget = pop @queue || last;
3825 4184
3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3827 4186
3828 $w = 0 if $w < 0;
3829 $h = 0 if $h < 0;
3830
3831 $w = max $widget->{min_w}, $w; 4187 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h; 4188 $h = max $widget->{min_h}, $h;
3833 4189
4190# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4191# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4192
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4193 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4194 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836 4195
3837 $w = int $w + 0.5; 4196 $w = int $w + 0.5;
3838 $h = int $h + 0.5; 4197 $h = int $h + 0.5;
3839 4198
3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4199 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3841 $widget->{old_w} = $widget->{w}; 4200 $widget->{old_w} = $widget->{w};
3842 $widget->{old_h} = $widget->{h}; 4201 $widget->{old_h} = $widget->{h};
3843 4202
3844 $widget->{w} = $w; 4203 $widget->{w} = $w;
3845 $widget->{h} = $h; 4204 $widget->{h} = $h;
3846 4205
3847 $widget->emit (size_allocate => $w, $h); 4206 $widget->emit (size_allocate => $w, $h);
4207 }
3848 } 4208 }
3849 } 4209 }
3850 } 4210 }
3851 4211
3852 while ($self->{post_alloc_hook}) { 4212 while ($self->{post_alloc_hook}) {
3853 $_->() 4213 $_->()
3854 for values %{delete $self->{post_alloc_hook}}; 4214 for values %{delete $self->{post_alloc_hook}};
3855 } 4215 }
3856
3857 4216
3858 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4217 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3859 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4218 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3860 glClear GL_COLOR_BUFFER_BIT; 4219 glClear GL_COLOR_BUFFER_BIT;
3861 4220
… …
3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4223 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3865 glMatrixMode GL_MODELVIEW; 4224 glMatrixMode GL_MODELVIEW;
3866 glLoadIdentity; 4225 glLoadIdentity;
3867 4226
3868 { 4227 {
3869 package CFClient::UI::Base; 4228 package CFPlus::UI::Base;
3870 4229
3871 ($draw_x, $draw_y, $draw_w, $draw_h) = 4230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3872 (0, 0, $self->{w}, $self->{h}); 4231 (0, 0, $self->{w}, $self->{h});
3873 }
3874 4232
3875 $self->_draw; 4233 $self->_draw;
4234 }
3876} 4235}
3877 4236
3878############################################################################# 4237#############################################################################
3879 4238
3880package CFClient::UI; 4239package CFPlus::UI;
3881 4240
3882$ROOT = new CFClient::UI::Root; 4241$ROOT = new CFPlus::UI::Root;
3883$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4242$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3884 4243
38851 42441
3886 4245

Diff Legend

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