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

Diff Legend

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