ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 2007 UTC

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

Diff Legend

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