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

Diff Legend

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