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.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.401 by root, Sat Jul 21 20:05:37 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 256 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 257 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
278 delete $self->{root}; 312 delete $self->{root};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->emit ("focus_out"); 320 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
288} 322}
… …
290sub set_visibility { 324sub set_visibility {
291 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
292 326
293 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
294 328
295 $visible ? $self->hide 329 $visible ? $self->show
296 : $self->show; 330 : $self->hide;
297} 331}
298 332
299sub toggle_visibility { 333sub toggle_visibility {
300 my ($self) = @_; 334 my ($self) = @_;
301 335
… …
345 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
346 380
347 if ($self->{aspect}) { 381 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
349 383
350 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 386
353 # use alignment to adjust x, y 387 # use alignment to adjust x, y
354 388
355 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
397 431
398 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
399 433
400 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
401 435
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 439 }
406} 440}
407 441
408# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
409sub coord2local { 443sub coord2local {
410 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
411 445
446 Carp::confess unless $self->{parent};#d#
447
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 449}
414 450
415# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
416sub coord2global { 452sub coord2global {
417 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
418 454
455 Carp::confess unless $self->{parent};#d#
456
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 458}
421 459
422sub invoke_focus_in { 460sub invoke_focus_in {
423 my ($self) = @_; 461 my ($self) = @_;
424 462
425 return if $FOCUS == $self; 463 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
427 465
428 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
429 467
430 $focus->update if $focus; 468 $self->update;
431 $FOCUS->update;
432 469
433 0 470 0
434} 471}
435 472
436sub invoke_focus_out { 473sub invoke_focus_out {
437 my ($self) = @_; 474 my ($self) = @_;
438 475
439 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
440 477
441 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
442 479
443 $focus->update if $focus; #? 480 $self->update;
444 481
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 483 unless $FOCUS;
447 484
448 0 485 0
449} 486}
450 487
451sub grab_focus { 488sub grab_focus {
452 my ($self) = @_; 489 my ($self) = @_;
453 490
491 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 492 $self->emit ("focus_in");
455} 493}
456 494
457sub invoke_mouse_motion { 1 } 495sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 496sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 497sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
461 500
462sub invoke_button_down { 501sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
464 503
465 $self->grab_focus; 504 $self->grab_focus;
466 505
467 1 506 0
468} 507}
469 508
470sub connect { 509sub connect {
471 my ($self, $signal, $cb) = @_; 510 my ($self, $signal, $cb) = @_;
472 511
473 push @{ $self->{signal_cb}{$signal} }, $cb; 512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
474} 518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
475 532
476sub emit { 533sub emit {
477 my ($self, $signal, @args) = @_; 534 my ($self, $signal, @args) = @_;
478 535
479 #d##TODO# stop propagating at first true, do not use sum 536 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 554}
484 555
485sub find_widget { 556#sub find_widget {
486 my ($self, $x, $y) = @_; 557# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 558
497sub set_parent { 559sub set_parent {
498 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
499 561
500 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
… …
539 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
540 602
541 # update screen rectangle 603 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 606
547 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 610
… …
573 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
576 glEnd; 636 glEnd;
577 glPopMatrix; 637 glPopMatrix;
578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
579 } 639 }
580 640
581 $self->_draw; 641 $self->_draw;
582 glPopMatrix; 642 glPopMatrix;
583} 643}
… …
589} 649}
590 650
591sub DESTROY { 651sub DESTROY {
592 my ($self) = @_; 652 my ($self) = @_;
593 653
594 delete $WIDGET{$self+0}; 654 return if CFPlus::in_destruct;
595 655
596 eval { $self->destroy }; 656 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658
659 delete $WIDGET{$self+0};
598} 660}
599 661
600############################################################################# 662#############################################################################
601 663
602package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
603 665
604our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
605 667
606use strict; 668use strict;
607use CFClient::OpenGL; 669use CFPlus::OpenGL;
608 670
609sub new { 671sub new {
610 my $class = shift; 672 my $class = shift;
611 673
612 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
643 } 705 }
644} 706}
645 707
646############################################################################# 708#############################################################################
647 709
648package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
649 711
650our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
651 713
652sub new { 714sub new {
653 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
655} 717}
… …
662 724
663sub draw { } 725sub draw { }
664 726
665############################################################################# 727#############################################################################
666 728
667package CFClient::UI::Container; 729package CFPlus::UI::Container;
668 730
669our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
670 732
671sub new { 733sub new {
672 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
673 735
674 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
678 can_events => 0, 740 can_events => 0,
679 %arg, 741 %arg,
680 ); 742 );
681 743
682 $self->add (@$children) 744 $self->add (@$children)
683 if $children; 745 if $children && @$children;
684 746
685 $self 747 $self
748}
749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
686} 756}
687 757
688sub add { 758sub add {
689 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
690 760
691 $_->set_parent ($self) 761 $_->set_parent ($self)
692 for @widgets; 762 for @widgets;
693 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
694 use sort 'stable'; 765 use sort 'stable';
695 766
696 $self->{children} = [ 767 $self->{children} = [
697 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
698 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
699 ]; 770 ];
700 771
701 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
702} 775}
703 776
704sub children { 777sub children {
705 @{ $_[0]{children} } 778 @{ $_[0]{children} }
706} 779}
… …
717} 790}
718 791
719sub clear { 792sub clear {
720 my ($self) = @_; 793 my ($self) = @_;
721 794
722 my $children = delete $self->{children}; 795 my $children = $self->{children};
723 $self->{children} = []; 796 $self->{children} = [];
724 797
725 for (@$children) { 798 for (@$children) {
726 delete $_->{parent}; 799 delete $_->{parent};
727 $_->hide; 800 $_->hide;
… …
752 $_->draw for @{$self->{children}}; 825 $_->draw for @{$self->{children}};
753} 826}
754 827
755############################################################################# 828#############################################################################
756 829
757package CFClient::UI::Bin; 830package CFPlus::UI::Bin;
758 831
759our @ISA = CFClient::UI::Container::; 832our @ISA = CFPlus::UI::Container::;
760 833
761sub new { 834sub new {
762 my ($class, %arg) = @_; 835 my ($class, %arg) = @_;
763 836
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 837 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 838
766 $class->SUPER::new (children => [$child], %arg) 839 $class->SUPER::new (children => [$child], %arg)
767} 840}
768 841
769sub add { 842sub add {
… …
776sub remove { 849sub remove {
777 my ($self, $widget) = @_; 850 my ($self, $widget) = @_;
778 851
779 $self->SUPER::remove ($widget); 852 $self->SUPER::remove ($widget);
780 853
781 $self->{children} = [new CFClient::UI::Empty] 854 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 855 unless @{$self->{children}};
783} 856}
784 857
785sub child { $_[0]->{children}[0] } 858sub child { $_[0]->{children}[0] }
786 859
… …
798 871
799############################################################################# 872#############################################################################
800 873
801# back-buffered drawing area 874# back-buffered drawing area
802 875
803package CFClient::UI::Window; 876package CFPlus::UI::Window;
804 877
805our @ISA = CFClient::UI::Bin::; 878our @ISA = CFPlus::UI::Bin::;
806 879
807use CFClient::OpenGL; 880use CFPlus::OpenGL;
808 881
809sub new { 882sub new {
810 my ($class, %arg) = @_; 883 my ($class, %arg) = @_;
811 884
812 my $self = $class->SUPER::new (%arg); 885 my $self = $class->SUPER::new (%arg);
… …
834} 907}
835 908
836sub render_child { 909sub render_child {
837 my ($self) = @_; 910 my ($self) = @_;
838 911
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 912 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 913 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 914 glClear GL_COLOR_BUFFER_BIT;
842 915
843 { 916 {
844 package CFClient::UI::Base; 917 package CFPlus::UI::Base;
845 918
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 919 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 920 (0, 0, $self->{w}, $self->{h});
921
922 $self->_render;
848 } 923 }
849
850 $self->_render;
851 }; 924 };
852} 925}
853 926
854sub _draw { 927sub _draw {
855 my ($self) = @_; 928 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 929
859 my $tex = $self->{texture} 930 my $tex = $self->{texture}
860 or return; 931 or return;
861 932
862 glEnable GL_TEXTURE_2D; 933 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 935 glColor 0, 0, 0, 1;
865 936
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 937 $tex->draw_quad_alpha_premultiplied (0, 0);
867 938
868 glDisable GL_TEXTURE_2D; 939 glDisable GL_TEXTURE_2D;
869} 940}
870 941
871############################################################################# 942#############################################################################
872 943
873package CFClient::UI::ViewPort; 944package CFPlus::UI::ViewPort;
874 945
946use List::Util qw(min max);
947
875our @ISA = CFClient::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
876 949
877sub new { 950sub new {
878 my $class = shift; 951 my $class = shift;
879 952
880 $class->SUPER::new ( 953 $class->SUPER::new (
… …
887sub size_request { 960sub size_request {
888 my ($self) = @_; 961 my ($self) = @_;
889 962
890 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
891 964
892 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
894 967
895 ($w, $h) 968 ($w, $h)
896} 969}
897 970
898sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
910} 983}
911 984
912sub set_offset { 985sub set_offset {
913 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
914 987
988 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
989 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
990
991 if ($x != $self->{view_x} or $y != $self->{view_y}) {
915 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
916 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
917 994
995 $self->emit (changed => $x, $y);
918 $self->update; 996 $self->update;
997 }
919} 998}
920 999
921# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
922sub coord2local { 1001sub coord2local {
923 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
938 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
939 1018
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 1021 ) {
943 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
944 } else { 1023 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 1025 }
947} 1026}
948 1027
949sub _render { 1028sub _render {
950 my ($self) = @_; 1029 my ($self) = @_;
951 1030
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1031 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1032 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
954 1033
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1035
957 $self->SUPER::_render; 1036 $self->SUPER::_render;
958} 1037}
959 1038
960############################################################################# 1039#############################################################################
961 1040
962package CFClient::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
963 1042
964our @ISA = CFClient::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
965 1044
966sub new { 1045sub new {
967 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
968 1047
969 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
970 1049
971 my $self; 1050 my $self;
972 1051
973 my $slider = new CFClient::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1055 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub {
1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 },
1061 ;
1062
1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
974 vertical => 1, 1066 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1068 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1071 },
979 ; 1072 ;
980 1073
981 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1077 can_events => 1,
983 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
984 %arg, 1082 %arg,
985 ); 1083 );
986 1084
1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1088 expand => 1,
1089 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1104 ;
1105
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1106 $self->SUPER::add ($self->{vp});
1107
988 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
989 1109
990 $self 1110 $self
991} 1111}
992 1112
… …
994 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
995 1115
996 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
997} 1117}
998 1118
999sub update { 1119sub update_slider {
1120 my ($self) = @_;
1121
1122 my $child = ($self->{vp} or return)->child;
1123
1124 if ($self->{scroll_x}) {
1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1127
1128 my $visible = $w1 > $w2;
1129 if ($visible != $self->{hslider_visible}) {
1130 $self->{hslider_visible} = $visible;
1131 $visible ? $self->SUPER::add ($self->{hslider})
1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1134 }
1135
1136 if ($self->{scroll_y}) {
1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1139
1140 my $visible = $h1 > $h2;
1141 if ($visible != $self->{vslider_visible}) {
1142 $self->{vslider_visible} = $visible;
1143 $visible ? $self->SUPER::add ($self->{vslider})
1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1146 }
1147}
1148
1149sub start_dragging {
1000 my ($self) = @_; 1150 my ($self, $ev) = @_;
1001 1151
1002 $self->SUPER::update; 1152 $self->grab_focus;
1003 1153
1004 # todo: overwrite size_allocate of child 1154 my $ox = $self->{vp}{view_x};
1005 my $child = $self->{vp}->child; 1155 my $oy = $self->{vp}{view_y};
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $ox -= $ev->{xrel};
1161 $oy -= $ev->{yrel};
1162
1163 $self->{vp}->set_offset ($ox, $oy);
1164 };
1165}
1166
1167sub invoke_mouse_wheel {
1168 my ($self, $ev) = @_;
1169
1170 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1171 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1172
1173 1
1174}
1175
1176sub invoke_button_down {
1177 my ($self, $ev, $x, $y) = @_;
1178
1179 if ($ev->{button} == 2) {
1180 $self->start_dragging ($ev);
1181 return 1;
1182 }
1183
1184 0
1185}
1186
1187sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_;
1189
1190 if (delete $self->{motion}) {
1191 return 1;
1192 }
1193
1194 0
1195}
1196
1197sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_;
1199
1200 if ($self->{motion}) {
1201 $self->{motion}->($ev, $x, $y);
1202 return 1;
1203 }
1204
1205 0
1007} 1206}
1008 1207
1009sub invoke_size_allocate { 1208sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1011 1210
1012 my $child = $self->{vp}->child; 1211 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1212 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1213}
1017 1214
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020
1021############################################################################# 1215#############################################################################
1022 1216
1023package CFClient::UI::Frame; 1217package CFPlus::UI::Frame;
1024 1218
1025our @ISA = CFClient::UI::Bin::; 1219our @ISA = CFPlus::UI::Bin::;
1026 1220
1027use CFClient::OpenGL; 1221use CFPlus::OpenGL;
1028 1222
1029sub new { 1223sub new {
1030 my $class = shift; 1224 my $class = shift;
1031 1225
1032 $class->SUPER::new ( 1226 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1252 $self->SUPER::_draw;
1059} 1253}
1060 1254
1061############################################################################# 1255#############################################################################
1062 1256
1063package CFClient::UI::FancyFrame; 1257package CFPlus::UI::FancyFrame;
1064 1258
1065our @ISA = CFClient::UI::Bin::; 1259our @ISA = CFPlus::UI::Bin::;
1066 1260
1067use CFClient::OpenGL; 1261use CFPlus::OpenGL;
1262
1263sub new {
1264 my ($class, %arg) = @_;
1265
1266 if ((exists $arg{label}) && !ref $arg{label}) {
1267 $arg{label} = new CFPlus::UI::Label
1268 align => 1,
1269 valign => 0,
1270 text => $arg{label},
1271 fontsize => ($arg{border} || 0.8) * 0.75;
1272 }
1273
1274 my $self = $class->SUPER::new (
1275 # label => "",
1276 fg => [0.6, 0.3, 0.1],
1277 border => 0.8,
1278 style => 'single',
1279 %arg,
1280 );
1281
1282 $self
1283}
1284
1285sub add {
1286 my ($self, @widgets) = @_;
1287
1288 $self->SUPER::add (@widgets);
1289 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1290}
1291
1292sub border {
1293 int $_[0]{border} * $::FONTSIZE
1294}
1295
1296sub size_request {
1297 my ($self) = @_;
1298
1299 ($self->{label_w}, undef) = $self->{label}->size_request
1300 if $self->{label};
1301
1302 my ($w, $h) = $self->SUPER::size_request;
1303
1304 (
1305 $w + $self->border * 2,
1306 $h + $self->border * 2,
1307 )
1308}
1309
1310sub invoke_size_allocate {
1311 my ($self, $w, $h) = @_;
1312
1313 my $border = $self->border;
1314
1315 $w -= List::Util::max 0, $border * 2;
1316 $h -= List::Util::max 0, $border * 2;
1317
1318 if (my $label = $self->{label}) {
1319 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1320 $label->{h} = List::Util::min $h, $border;
1321 $label->invoke_size_allocate ($label->{w}, $label->{h});
1322 }
1323
1324 $self->child->configure ($border, $border, $w, $h);
1325
1326 1
1327}
1328
1329sub _draw {
1330 my ($self) = @_;
1331
1332 my $child = $self->{children}[0];
1333
1334 my $border = $self->border;
1335 my ($w, $h) = ($self->{w}, $self->{h});
1336
1337 $child->draw;
1338
1339 glColor @{$self->{fg}};
1340 glBegin GL_LINE_STRIP;
1341 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1342 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1343 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1344 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1345 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1346 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1347 glEnd;
1348
1349 if ($self->{label}) {
1350 glTranslate $border * 2, 0;
1351 $self->{label}->_draw;
1352 }
1353}
1354
1355#############################################################################
1356
1357package CFPlus::UI::Toplevel;
1358
1359our @ISA = CFPlus::UI::Bin::;
1360
1361use CFPlus::OpenGL;
1068 1362
1069my $bg = 1363my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1364 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1365 mipmap => 1, wrap => 1;
1072 1366
1073my @border = 1367my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1369 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1370
1371my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png);
1076 1374
1077sub new { 1375sub new {
1078 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1079 1377
1080 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1379 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1380 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1381 border => 0.6,
1084 can_events => 1, 1382 can_events => 1,
1085 min_w => 16, 1383 min_w => 64,
1086 min_h => 16, 1384 min_h => 32,
1087 %arg, 1385 %arg,
1088 ); 1386 );
1089 1387
1090 $self->{title_widget} = new CFClient::UI::Label 1388 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1389 align => 0,
1092 valign => 1, 1390 valign => 1,
1093 text => $self->{title}, 1391 text => $self->{title},
1094 fontsize => $self->{border}, 1392 fontsize => $self->{border},
1095 if exists $self->{title}; 1393 if exists $self->{title};
1096 1394
1097 if ($self->{has_close_button}) { 1395 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1396 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1397 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1398 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1399 on_activate => sub { $self->emit ("delete") };
1102 1400
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1401 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1402 }
1105 1403
1106 $self 1404 $self
1107} 1405}
1108 1406
1109sub add { 1407sub add {
1110 my ($self, @widgets) = @_; 1408 my ($self, @widgets) = @_;
1111 1409
1112 $self->SUPER::add (@widgets); 1410 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1411 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1412 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1413}
1116 1414
1117sub border { 1415sub border {
1118 int $_[0]{border} * $::FONTSIZE 1416 int $_[0]{border} * $::FONTSIZE
1119} 1417}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1450 $self->child->configure ($border, $border, $w, $h);
1153 1451
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1452 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1453 if $self->{close_button};
1156 1454
1455 1
1456}
1457
1458sub invoke_delete {
1459 my ($self) = @_;
1460
1461 $self->hide;
1462
1157 1 1463 1
1158} 1464}
1159 1465
1160sub invoke_button_down { 1466sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1467 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1525 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1526
1221 ! ! $self->{motion} 1527 ! ! $self->{motion}
1222} 1528}
1223 1529
1530sub invoke_visibility_change {
1531 my ($self, $visible) = @_;
1532
1533 delete $self->{motion} unless $visible;
1534
1535 0
1536}
1537
1224sub _draw { 1538sub _draw {
1225 my ($self) = @_; 1539 my ($self) = @_;
1226 1540
1227 my $child = $self->{children}[0]; 1541 my $child = $self->{children}[0];
1228 1542
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1548
1235 my $border = $self->border; 1549 my $border = $self->border;
1236 1550
1237 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1570
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1245 1573
1246 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1593 if $self->{close_button};
1266} 1594}
1267 1595
1268############################################################################# 1596#############################################################################
1269 1597
1270package CFClient::UI::Table; 1598package CFPlus::UI::Table;
1271 1599
1272our @ISA = CFClient::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1273 1601
1274use List::Util qw(max sum); 1602use List::Util qw(max sum);
1275 1603
1276use CFClient::OpenGL; 1604use CFPlus::OpenGL;
1277 1605
1278sub new { 1606sub new {
1279 my $class = shift; 1607 my $class = shift;
1280 1608
1281 $class->SUPER::new ( 1609 $class->SUPER::new (
1282 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1283 @_, 1612 @_,
1284 ) 1613 )
1285} 1614}
1286 1615
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1616sub add {
1292 my ($self, $x, $y, $child) = @_; 1617 my ($self, @widgets) = @_;
1293 1618
1294 $child->set_parent ($self); 1619 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1620 $child->{rowspan} ||= 1;
1621 $child->{colspan} ||= 1;
1622 }
1296 1623
1297 $self->realloc; 1624 $self->SUPER::add (@widgets);
1298} 1625}
1299 1626
1300sub remove { 1627sub add_at {
1628 my $self = shift;
1629
1630 my @widgets;
1631
1632 while (@_) {
1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1634
1635 $child->{row} = $row;
1636 $child->{col} = $col;
1637
1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1301 my ($self, $child) = @_; 1645 my ($self) = @_;
1302 1646
1303 # TODO: not yet implemented 1647 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1648
1310 my @children = $self->children; 1649 my @children = $self->children;
1311 delete $self->{children}; 1650
1651 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1654
1655 my $sw = sum @w[$c .. $c + $cs - 1];
1656
1657 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 }
1312 1660 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1661
1318 $self->realloc; 1662 # second pass, rows
1319} 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1320
1321sub get_wh {
1322 my ($self) = @_;
1323
1324 my (@w, @h);
1325
1326 for my $y (0 .. $#{$self->{children}}) {
1327 my $row = $self->{children}[$y]
1328 or next;
1329
1330 for my $x (0 .. $#$row) {
1331 my $widget = $row->[$x]
1332 or next;
1333 my ($w, $h) = @$widget{qw(req_w req_h)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334 1665
1335 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1670 }
1338 } 1671 }
1339 1672
1340 (\@w, \@h) 1673 (\@w, \@h)
1341} 1674}
… …
1357 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1358 1691
1359 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1361 1694
1362 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1366 1699
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1701
1371 CFClient::UI::harmonize $ws; 1702 CFPlus::UI::harmonize $ws;
1703
1704 my @row_expand = @{$self->{row_expand}};
1705 @row_expand = (1) x @$ws unless @row_expand;
1706 my $row_expand = (sum @row_expand) || 1;
1707
1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709
1372 CFClient::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1373 1711
1374 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1714
1376 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1377 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378 or next;
1379 1717
1380 my $x = 0; 1718 $widget->configure (
1381 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1721 );
1383 for my $c (0 .. $#$row) { 1722 }
1384 my $col_w = $ws->[$c];
1385 1723
1386 if (my $widget = $row->[$c]) { 1724 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1388 }
1389 1726
1390 $x += $col_w; 1727#############################################################################
1728
1729package CFPlus::UI::Fixed;
1730
1731use List::Util qw(min max);
1732
1733our @ISA = CFPlus::UI::Container::;
1734
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741
1742sub _scale($$$) {
1743 my ($mode, $val, $max) = @_;
1744
1745 $mode eq "abs" ? $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748}
1749
1750sub size_request {
1751 my ($self) = @_;
1752
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754
1755 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1758
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1391 } 1765 }
1766 }
1392 1767
1393 $y += $row_h; 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1770
1771 # now layout remaining widgets
1772 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1774
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1783 }
1784 }
1785
1786 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1;
1788
1789 ($W, $H)
1790}
1791
1792sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_;
1794
1795 for my $child ($self->visible_children) {
1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1797
1798 $x = _scale $pos, $x, $W;
1799 $y = _scale $pos, $x, $H;
1800 $w = _scale $size, $w, $child->{req_w};
1801 $h = _scale $size, $h, $child->{req_h};
1802
1803 $child->configure ($x, $y, $w, $h);
1394 } 1804 }
1395 1805
1396 1 1806 1
1397} 1807}
1398 1808
1399sub find_widget {
1400 my ($self, $x, $y) = @_;
1401
1402 $x -= $self->{x};
1403 $y -= $self->{y};
1404
1405 my $res;
1406
1407 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408 $res = $_->find_widget ($x, $y)
1409 and return $res;
1410 }
1411
1412 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413}
1414
1415sub _draw {
1416 my ($self) = @_;
1417
1418 for (grep $_, @{$self->{children}}) {
1419 $_->draw for grep $_, @$_;
1420 }
1421}
1422
1423############################################################################# 1809#############################################################################
1424 1810
1425package CFClient::UI::Box; 1811package CFPlus::UI::Box;
1426 1812
1427our @ISA = CFClient::UI::Container::; 1813our @ISA = CFPlus::UI::Container::;
1428 1814
1429sub size_request { 1815sub size_request {
1430 my ($self) = @_; 1816 my ($self) = @_;
1431 1817
1432 $self->{vertical} 1818 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1851 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1852 for 0 .. $#children;
1467 } 1853 }
1468 } 1854 }
1469 1855
1470 CFClient::UI::harmonize \@req; 1856 CFPlus::UI::harmonize \@req;
1471 1857
1472 my $pos = 0; 1858 my $pos = 0;
1473 for (0 .. $#children) { 1859 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1860 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1861 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1866 1
1481} 1867}
1482 1868
1483############################################################################# 1869#############################################################################
1484 1870
1485package CFClient::UI::HBox; 1871package CFPlus::UI::HBox;
1486 1872
1487our @ISA = CFClient::UI::Box::; 1873our @ISA = CFPlus::UI::Box::;
1488 1874
1489sub new { 1875sub new {
1490 my $class = shift; 1876 my $class = shift;
1491 1877
1492 $class->SUPER::new ( 1878 $class->SUPER::new (
… …
1495 ) 1881 )
1496} 1882}
1497 1883
1498############################################################################# 1884#############################################################################
1499 1885
1500package CFClient::UI::VBox; 1886package CFPlus::UI::VBox;
1501 1887
1502our @ISA = CFClient::UI::Box::; 1888our @ISA = CFPlus::UI::Box::;
1503 1889
1504sub new { 1890sub new {
1505 my $class = shift; 1891 my $class = shift;
1506 1892
1507 $class->SUPER::new ( 1893 $class->SUPER::new (
… …
1510 ) 1896 )
1511} 1897}
1512 1898
1513############################################################################# 1899#############################################################################
1514 1900
1515package CFClient::UI::Label; 1901package CFPlus::UI::Label;
1516 1902
1517our @ISA = CFClient::UI::DrawBG::; 1903our @ISA = CFPlus::UI::DrawBG::;
1518 1904
1519use CFClient::OpenGL; 1905use CFPlus::OpenGL;
1520 1906
1521sub new { 1907sub new {
1522 my ($class, %arg) = @_; 1908 my ($class, %arg) = @_;
1523 1909
1524 my $self = $class->SUPER::new ( 1910 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1913 #active_bg => none
1528 #font => default_font 1914 #font => default_font
1529 #text => initial text 1915 #text => initial text
1530 #markup => initial narkup 1916 #markup => initial narkup
1531 #max_w => maximum pixel width 1917 #max_w => maximum pixel width
1918 #style => 0, # render flags
1532 ellipsise => 3, # end 1919 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1920 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1921 fontsize => 1,
1535 align => -1, 1922 align => -1,
1536 valign => -1, 1923 valign => -1,
1537 padding_x => 2, 1924 padding_x => 2,
1538 padding_y => 2, 1925 padding_y => 2,
1539 can_events => 0, 1926 can_events => 0,
1540 %arg 1927 %arg
1541 ); 1928 );
1542 1929
1543 if (exists $self->{template}) { 1930 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1931 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1932 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1933 $self->{template} = $layout;
1547 } 1934 }
1548 1935
1549 if (exists $self->{markup}) { 1936 if (exists $self->{markup}) {
… …
1553 } 1940 }
1554 1941
1555 $self 1942 $self
1556} 1943}
1557 1944
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1945sub update {
1569 my ($self) = @_; 1946 my ($self) = @_;
1570 1947
1571 delete $self->{texture}; 1948 delete $self->{texture};
1572 $self->SUPER::update; 1949 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1584 1961
1585 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
1587 1964
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1965 $self->{layout}->set_text ($text);
1590 1966
1591 delete $self->{size_req}; 1967 delete $self->{size_req};
1592 $self->realloc; 1968 $self->realloc;
1593 $self->update; 1969 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1975 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1976 $self->{text} = "M$markup";
1601 1977
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1978 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1979
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1980 $self->{layout}->set_markup ($markup);
1606 1981
1607 delete $self->{size_req}; 1982 delete $self->{size_req};
1608 $self->realloc; 1983 $self->realloc;
1609 $self->update; 1984 $self->update;
… …
1621 1996
1622 my ($w, $h) = $self->{layout}->size; 1997 my ($w, $h) = $self->{layout}->size;
1623 1998
1624 if (exists $self->{template}) { 1999 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 2000 $self->{template}->set_font ($self->{font}) if $self->{font};
2001 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2002 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 2003
1628 my ($w2, $h2) = $self->{template}->size; 2004 my ($w2, $h2) = $self->{template}->size;
1629 2005
1630 $w = List::Util::max $w, $w2; 2006 $w = List::Util::max $w, $w2;
… …
1654 2030
1655sub set_fontsize { 2031sub set_fontsize {
1656 my ($self, $fontsize) = @_; 2032 my ($self, $fontsize) = @_;
1657 2033
1658 $self->{fontsize} = $fontsize; 2034 $self->{fontsize} = $fontsize;
2035 delete $self->{size_req};
1659 delete $self->{texture}; 2036 delete $self->{texture};
1660 2037
1661 $self->realloc; 2038 $self->realloc;
1662} 2039}
1663 2040
1664sub reconfigure { 2041sub reconfigure {
1665 my ($self) = @_; 2042 my ($self) = @_;
1666 2043
1667 delete $self->{size_req}; 2044 delete $self->{size_req};
2045 delete $self->{texture};
1668 2046
1669 $self->SUPER::reconfigure; 2047 $self->SUPER::reconfigure;
1670} 2048}
1671 2049
1672sub _draw { 2050sub _draw {
1673 my ($self) = @_; 2051 my ($self) = @_;
1674 2052
1675 $self->SUPER::_draw; # draw background, if applicable 2053 $self->SUPER::_draw; # draw background, if applicable
1676 2054
1677 my $tex = $self->{texture} ||= do { 2055 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2056 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2057 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2058 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2059 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2060 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2061 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2062
1685 new_from_layout CFClient::Texture $self->{layout} 2063 [$self->{layout}->size]
1686 }; 2064 };
1687 2065
1688 unless (exists $self->{ox}) { 2066 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2067 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2068 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2069 : ($self->{w} - $size->[0]) * 0.5);
1692 2070
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2073 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2074 };
1697 2075
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2076 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2077 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 2078
1703 if ($tex->{format} == GL_ALPHA) { 2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 2080}
1714 2081
1715############################################################################# 2082#############################################################################
1716 2083
1717package CFClient::UI::EntryBase; 2084package CFPlus::UI::EntryBase;
1718 2085
1719our @ISA = CFClient::UI::Label::; 2086our @ISA = CFPlus::UI::Label::;
1720 2087
1721use CFClient::OpenGL; 2088use CFPlus::OpenGL;
1722 2089
1723sub new { 2090sub new {
1724 my $class = shift; 2091 my $class = shift;
1725 2092
1726 $class->SUPER::new ( 2093 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2097 active_fg => [0, 0, 0],
1731 can_hover => 1, 2098 can_hover => 1,
1732 can_focus => 1, 2099 can_focus => 1,
1733 valign => 0, 2100 valign => 0,
1734 can_events => 1, 2101 can_events => 1,
2102 ellipsise => 0,
1735 #text => ... 2103 #text => ...
1736 #hidden => "*", 2104 #hidden => "*",
1737 @_ 2105 @_
1738 ) 2106 )
1739} 2107}
… …
1784 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1786 2154
1787 my $text = $self->get_text; 2155 my $text = $self->get_text;
1788 2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2158
1789 if ($uni == 8) { 2159 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2167 } elsif ($sym == CFPlus::SDLK_HOME) {
2168 # what a hack
2169 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1
2172 : 0;
2173 } elsif ($sym == CFPlus::SDLK_END) {
2174 # uh, again
2175 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177 ? $self->{cursor} + length $1
2178 : length $self->{text};
2179 } elsif ($uni == 21) { # ctrl-u
2180 $text = "";
1798 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2183 $self->emit ('escape');
1803 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2188 } else {
1806 return 0; 2189 return 0;
1807 } 2190 }
1808 2191
1809 $self->_set_text ($text); 2192 $self->_set_text ($text);
1810 2193
1811 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1812 2196
1813 1 2197 1
1814} 2198}
1815 2199
1816sub invoke_focus_in { 2200sub invoke_focus_in {
… …
1828 2212
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2213 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2214
1831 # byte-index to char-index 2215 # byte-index to char-index
1832 my $text = $self->{text}; 2216 my $text = $self->{text};
1833 utf8::encode $text; 2217 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2218 $self->{cursor} = length $text;
1835 2219
1836 $self->_set_text ($self->{text}); 2220 $self->_set_text ($self->{text});
1837 $self->update; 2221 $self->update;
1838 2222
1839 1 2223 1
… …
1878 utf8::encode $text; 2262 utf8::encode $text;
1879 2263
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2264 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2265 }
1882 2266
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2267 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2268 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2270 glEnd;
1888 } 2271 }
1889} 2272}
1890 2273
2274#############################################################################
2275
1891package CFClient::UI::Entry; 2276package CFPlus::UI::Entry;
1892 2277
1893our @ISA = CFClient::UI::EntryBase::; 2278our @ISA = CFPlus::UI::EntryBase::;
1894 2279
1895use CFClient::OpenGL; 2280use CFPlus::OpenGL;
1896 2281
1897sub invoke_key_down { 2282sub invoke_key_down {
1898 my ($self, $ev) = @_; 2283 my ($self, $ev) = @_;
1899 2284
1900 my $sym = $ev->{sym}; 2285 my $sym = $ev->{sym};
1901 2286
1902 if ($sym == 13) { 2287 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2288 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2289 my $txt = $self->get_text;
1905 2290
1906 $self->{history_pointer} = -1; 2291 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2292 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2293 $self->emit (activate => $txt);
1909 $self->update; 2294 $self->update;
1910 2295
1911 } elsif ($sym == CFClient::SDLK_UP) { 2296 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2297 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2298 $self->{history_saveback} = $self->get_text;
1914 } 2299 }
1915 if (@{$self->{history} || []} > 0) { 2300 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2301 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2303 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2304 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2305 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2306 }
1922 2307
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2309 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2310 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2311
1927 if ($self->{history_pointer} >= 0) { 2312 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2322 1
1938} 2323}
1939 2324
1940############################################################################# 2325#############################################################################
1941 2326
2327package CFPlus::UI::TextEdit;
2328
2329our @ISA = CFPlus::UI::EntryBase::;
2330
2331use CFPlus::OpenGL;
2332
2333sub move_cursor_ver {
2334 my ($self, $dy) = @_;
2335
2336 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2337
2338 $y += $dy;
2339
2340 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2341 $self->{cursor} = $index;
2342 delete $self->{cur_h};
2343 $self->update;
2344 return;
2345 }
2346}
2347
2348sub invoke_key_down {
2349 my ($self, $ev) = @_;
2350
2351 my $sym = $ev->{sym};
2352
2353 if ($sym == CFPlus::SDLK_UP) {
2354 $self->move_cursor_ver (-1);
2355 } elsif ($sym == CFPlus::SDLK_DOWN) {
2356 $self->move_cursor_ver (+1);
2357 } else {
2358 return $self->SUPER::invoke_key_down ($ev)
2359 }
2360
2361 1
2362}
2363
2364#############################################################################
2365
1942package CFClient::UI::Button; 2366package CFPlus::UI::Button;
1943 2367
1944our @ISA = CFClient::UI::Label::; 2368our @ISA = CFPlus::UI::Label::;
1945 2369
1946use CFClient::OpenGL; 2370use CFPlus::OpenGL;
1947 2371
1948my @tex = 2372my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
1951 2375
1952sub new { 2376sub new {
1953 my $class = shift; 2377 my $class = shift;
1954 2378
1955 $class->SUPER::new ( 2379 $class->SUPER::new (
1956 padding_x => 4, 2380 padding_x => 4,
1957 padding_y => 4, 2381 padding_y => 4,
1958 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2384 can_hover => 1,
1961 align => 0, 2385 align => 0,
1962 valign => 0, 2386 valign => 0,
1963 can_events => 1, 2387 can_events => 1,
1964 @_ 2388 @_
… …
1982 2406
1983 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
1986 2410
2411 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2413
1989 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
1990 2415
1991 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
1992} 2417}
1993 2418
1994############################################################################# 2419#############################################################################
1995 2420
2421package CFPlus::UI::CheckBox;
2422
2423our @ISA = CFPlus::UI::DrawBG::;
2424
2425my @tex =
2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2427 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2428
2429use CFPlus::OpenGL;
2430
2431sub new {
2432 my $class = shift;
2433
2434 $class->SUPER::new (
2435 padding_x => 2,
2436 padding_y => 2,
2437 fg => [1, 1, 1],
2438 active_fg => [1, 1, 0],
2439 bg => [0, 0, 0, 0.2],
2440 active_bg => [1, 1, 1, 0.5],
2441 state => 0,
2442 can_hover => 1,
2443 @_
2444 )
2445}
2446
2447sub size_request {
2448 my ($self) = @_;
2449
2450 (6) x 2
2451}
2452
2453sub toggle {
2454 my ($self) = @_;
2455
2456 $self->{state} = !$self->{state};
2457 $self->emit (changed => $self->{state});
2458 $self->update;
2459}
2460
2461sub invoke_button_down {
2462 my ($self, $ev, $x, $y) = @_;
2463
2464 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2465 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2466 $self->toggle;
2467 } else {
2468 return 0
2469 }
2470
2471 1
2472}
2473
2474sub _draw {
2475 my ($self) = @_;
2476
2477 $self->SUPER::_draw;
2478
2479 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2480
2481 my ($w, $h) = @$self{qw(w h)};
2482
2483 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2484
2485 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2486
2487 my $tex = $self->{state} ? $tex[1] : $tex[0];
2488
2489 glEnable GL_TEXTURE_2D;
2490 $tex->draw_quad_alpha (0, 0, $s, $s);
2491 glDisable GL_TEXTURE_2D;
2492}
2493
2494#############################################################################
2495
2496package CFPlus::UI::Image;
2497
2498our @ISA = CFPlus::UI::Base::;
2499
2500use CFPlus::OpenGL;
2501
2502our %texture_cache;
2503
2504sub new {
2505 my $class = shift;
2506
2507 my $self = $class->SUPER::new (
2508 can_events => 0,
2509 @_,
2510 );
2511
2512 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required";
2514
2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2517
2518 CFPlus::weaken $texture_cache{$self->{path}};
2519
2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2521
2522 $self
2523}
2524
2525sub STORABLE_freeze {
2526 my ($self, $cloning) = @_;
2527
2528 $self->{path}
2529 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2530
2531 $self->{path}
2532}
2533
2534sub STORABLE_attach {
2535 my ($self, $cloning, $path) = @_;
2536
2537 $self->new (path => $path)
2538}
2539
2540sub size_request {
2541 my ($self) = @_;
2542
2543 ($self->{tex}{w}, $self->{tex}{h})
2544}
2545
2546sub _draw {
2547 my ($self) = @_;
2548
2549 my $tex = $self->{tex};
2550
2551 my ($w, $h) = ($self->{w}, $self->{h});
2552
2553 if ($self->{rot90}) {
2554 glRotate 90, 0, 0, 1;
2555 glTranslate 0, -$self->{w}, 0;
2556
2557 ($w, $h) = ($h, $w);
2558 }
2559
2560 glEnable GL_TEXTURE_2D;
2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2562
2563 $tex->draw_quad (0, 0, $w, $h);
2564
2565 glDisable GL_TEXTURE_2D;
2566}
2567
2568#############################################################################
2569
1996package CFClient::UI::ImageButton; 2570package CFPlus::UI::ImageButton;
1997 2571
1998our @ISA = CFClient::UI::Image::; 2572our @ISA = CFPlus::UI::Image::;
1999 2573
2000use CFClient::OpenGL; 2574use CFPlus::OpenGL;
2001 2575
2002my %textures; 2576my %textures;
2003 2577
2004sub new { 2578sub new {
2005 my $class = shift; 2579 my $class = shift;
… …
2027 1 2601 1
2028} 2602}
2029 2603
2030############################################################################# 2604#############################################################################
2031 2605
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2606package CFPlus::UI::VGauge;
2101 2607
2102our @ISA = CFClient::UI::Base::; 2608our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2609
2163use List::Util qw(min max); 2610use List::Util qw(min max);
2164 2611
2165use CFClient::OpenGL; 2612use CFPlus::OpenGL;
2166 2613
2167my %tex = ( 2614my %tex = (
2168 food => [ 2615 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2617 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2618 ],
2172 grace => [ 2619 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2621 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2622 ],
2176 hp => [ 2623 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2625 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2626 ],
2180 mana => [ 2627 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2629 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2630 ],
2184); 2631);
2185 2632
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2633# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2693 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2694 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2695
2249 my $h1 = $self->{h} * (1 - $ycut1); 2696 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2697 my $h2 = $self->{h} * (1 - $ycut2);
2698 my $h3 = $self->{h};
2699
2700 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2701
2252 glEnable GL_BLEND; 2702 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2703 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2704 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2705 glEnable GL_TEXTURE_2D;
… …
2274 2724
2275 if ($t3) { 2725 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2726 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2727 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2728 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2729 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2730 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2731 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2732 glEnd;
2283 } 2733 }
2284 2734
2285 glDisable GL_BLEND; 2735 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2736 glDisable GL_TEXTURE_2D;
2287} 2737}
2288 2738
2289############################################################################# 2739#############################################################################
2290 2740
2291package CFClient::UI::Gauge; 2741package CFPlus::UI::Gauge;
2292 2742
2293our @ISA = CFClient::UI::VBox::; 2743our @ISA = CFPlus::UI::VBox::;
2294 2744
2295sub new { 2745sub new {
2296 my ($class, %arg) = @_; 2746 my ($class, %arg) = @_;
2297 2747
2298 my $self = $class->SUPER::new ( 2748 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2750 can_hover => 1,
2301 can_events => 1, 2751 can_events => 1,
2302 %arg, 2752 %arg,
2303 ); 2753 );
2304 2754
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2755 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2306 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2756 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2307 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2757 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2758
2309 $self 2759 $self
2310} 2760}
2311 2761
2312sub set_fontsize { 2762sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2783 $self->{value}->set_text ($val);
2334} 2784}
2335 2785
2336############################################################################# 2786#############################################################################
2337 2787
2338package CFClient::UI::Slider; 2788package CFPlus::UI::Slider;
2339 2789
2340use strict; 2790use strict;
2341 2791
2342use CFClient::OpenGL; 2792use CFPlus::OpenGL;
2343 2793
2344our @ISA = CFClient::UI::DrawBG::; 2794our @ISA = CFPlus::UI::DrawBG::;
2345 2795
2346my @tex = 2796my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2797 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2798 qw(s1_slider.png s1_slider_bg.png);
2349 2799
2350sub new { 2800sub new {
2351 my $class = shift; 2801 my $class = shift;
2352 2802
… …
2441 } 2891 }
2442 2892
2443 1 2893 1
2444} 2894}
2445 2895
2896sub invoke_mouse_wheel {
2897 my ($self, $ev) = @_;
2898
2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2900
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904
2905 ! ! $delta
2906}
2907
2446sub update { 2908sub update {
2447 my ($self) = @_; 2909 my ($self) = @_;
2448 2910
2449 delete $self->{knob_w}; 2911 delete $self->{knob_w};
2450 $self->SUPER::update; 2912 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2498} 2960}
2499 2961
2500############################################################################# 2962#############################################################################
2501 2963
2502package CFClient::UI::ValSlider; 2964package CFPlus::UI::ValSlider;
2503 2965
2504our @ISA = CFClient::UI::HBox::; 2966our @ISA = CFPlus::UI::HBox::;
2505 2967
2506sub new { 2968sub new {
2507 my ($class, %arg) = @_; 2969 my ($class, %arg) = @_;
2508 2970
2509 my $range = delete $arg{range}; 2971 my $range = delete $arg{range};
2510 2972
2511 my $self = $class->SUPER::new ( 2973 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2974 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2975 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2976 to_value => sub { shift },
2515 from_value => sub { shift }, 2977 from_value => sub { shift },
2516 %arg, 2978 %arg,
2517 ); 2979 );
2518 2980
… …
2538sub set_range { shift->{slider}->set_range (@_) } 3000sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 3001sub set_value { shift->{slider}->set_value (@_) }
2540 3002
2541############################################################################# 3003#############################################################################
2542 3004
2543package CFClient::UI::TextScroller; 3005package CFPlus::UI::TextScroller;
2544 3006
2545our @ISA = CFClient::UI::HBox::; 3007our @ISA = CFPlus::UI::HBox::;
2546 3008
2547use CFClient::OpenGL; 3009use CFPlus::OpenGL;
2548 3010
2549sub new { 3011sub new {
2550 my $class = shift; 3012 my $class = shift;
2551 3013
2552 my $self = $class->SUPER::new ( 3014 my $self = $class->SUPER::new (
2553 fontsize => 1, 3015 fontsize => 1,
2554 can_events => 0, 3016 can_events => 1,
2555 indent => 0, 3017 indent => 0,
2556 #font => default_font 3018 #font => default_font
2557 @_, 3019 @_,
2558 3020
2559 layout => (new CFClient::Layout 1), 3021 layout => (new CFPlus::Layout),
2560 par => [], 3022 par => [],
3023 max_par => 0,
2561 height => 0, 3024 height => 0,
2562 children => [ 3025 children => [
2563 (new CFClient::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2565 ], 3028 ],
2566 ); 3029 );
2567 3030
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3031 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3032
… …
2575 3038
2576 $self->{fontsize} = $fontsize; 3039 $self->{fontsize} = $fontsize;
2577 $self->reflow; 3040 $self->reflow;
2578} 3041}
2579 3042
2580sub visible_children { 3043sub size_request {
2581 my ($self) = @_; 3044 my ($self) = @_;
2582 3045
2583 @{$self->{children}}[0,1] 3046 my ($empty, $slider) = @{ $self->{children} };
3047
3048 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request
2584} 3050}
2585 3051
2586sub invoke_size_allocate { 3052sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 3053 my ($self, $w, $h) = @_;
2588 3054
… …
2594 $self->{layout}->set_width ($empty->{w}); 3060 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3061 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 3062
2597 $self->reflow; 3063 $self->reflow;
2598 3064
3065 local $self->{children} = [$empty, $slider];
2599 $self->SUPER::invoke_size_allocate ($w, $h) 3066 $self->SUPER::invoke_size_allocate ($w, $h)
3067}
3068
3069sub invoke_mouse_wheel {
3070 my ($self, $ev) = @_;
3071
3072 return 0 unless $ev->{dy}; # only vertical movements
3073
3074 $self->{children}[1]->emit (mouse_wheel => $ev);
3075
3076 1
2600} 3077}
2601 3078
2602sub get_layout { 3079sub get_layout {
2603 my ($self, $para) = @_; 3080 my ($self, $para) = @_;
2604 3081
… …
2632 3109
2633 # todo: base offset on lines or so, not on pixels 3110 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset); 3111 $self->{children}[1]->set_value ($offset);
2635} 3112}
2636 3113
3114sub current_paragraph {
3115 my ($self) = @_;
3116
3117 $self->{top_paragraph} - 1
3118}
3119
3120sub scroll_to {
3121 my ($self, $para) = @_;
3122
3123 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3124
3125 $self->{scroll_to} = $para;
3126 $self->update;
3127}
3128
2637sub clear { 3129sub clear {
2638 my ($self) = @_; 3130 my ($self) = @_;
2639 3131
2640 my (undef, undef, @other) = @{ $self->{children} }; 3132 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other; 3133 $self->remove ($_) for @other;
… …
2644 $self->{height} = 0; 3136 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3137 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 3138}
2647 3139
2648sub add_paragraph { 3140sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 3141 my $self = shift;
2650 3142
2651 my ($text, @w) = ref $para ? @$para : $para; 3143 for my $para (@_) {
2652
2653 $para = { 3144 $para = {
3145 fg => [1, 1, 1, 1],
3146 indent => 0,
3147 markup => "",
3148 widget => [],
3149 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 3150 w => 1e10,
2655 wrapped => 1, 3151 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 3152 };
2661 3153
2662 $self->add (@w) if @w; 3154 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 push @{$self->{par}}, $para; 3155 push @{$self->{par}}, $para;
3156 }
3157
3158 if (my $max = $self->{max_par}) {
3159 shift @{$self->{par}} while @{$self->{par}} > $max;
3160 }
2664 3161
2665 $self->{need_reflow}++; 3162 $self->{need_reflow}++;
2666 $self->update; 3163 $self->update;
2667} 3164}
2668 3165
2669sub scroll_to_bottom { 3166sub scroll_to_bottom {
2670 my ($self) = @_; 3167 my ($self) = @_;
2671 3168
2672 $self->{scroll_to_bottom} = 1; 3169 $self->{scroll_to} = $#{$self->{par}};
2673 $self->update; 3170 $self->update;
2674} 3171}
2675 3172
3173sub force_uptodate {
3174 my ($self) = @_;
3175
3176 if (delete $self->{need_reflow}) {
3177 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3178
3179 my $height = 0;
3180
3181 for my $para (@{$self->{par}}) {
3182 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3183 my $layout = $self->get_layout ($para);
3184 my ($w, $h) = $layout->size;
3185
3186 $para->{w} = $w + $para->{indent};
3187 $para->{h} = $h;
3188 $para->{wrapped} = $layout->has_wrapped;
3189 }
3190
3191 $para->{y} = $height;
3192 $height += $para->{h};
3193 }
3194
3195 $self->{height} = $height;
3196 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3197
3198 delete $self->{texture};
3199 }
3200
3201 if (my $paridx = delete $self->{scroll_to}) {
3202 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3203 }
3204}
3205
2676sub update { 3206sub update {
2677 my ($self) = @_; 3207 my ($self) = @_;
2678 3208
2679 $self->SUPER::update; 3209 $self->SUPER::update;
2680 3210
2681 return unless $self->{h} > 0; 3211 return unless $self->{h} > 0;
2682 3212
2683 delete $self->{texture}; 3213 delete $self->{texture};
2684 3214
2685 $ROOT->on_post_alloc ($self => sub { 3215 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate;
3217
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687 3219
2688 if (delete $self->{need_reflow}) {
2689 my $height = 0;
2690
2691 for my $para (@{$self->{par}}) {
2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693 my $layout = $self->get_layout ($para);
2694 my ($w, $h) = $layout->size;
2695
2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2699 }
2700
2701 $height += $para->{h};
2702 }
2703
2704 $self->{height} = $height;
2705
2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708 delete $self->{texture};
2709 }
2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716 glClearColor 0, 0, 0, 0; 3221 glClearColor 0, 0, 0, 0;
2717 glClear GL_COLOR_BUFFER_BIT; 3222 glClear GL_COLOR_BUFFER_BIT;
2718 3223
3224 package CFPlus::UI::Base;
3225 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3226 (0, 0, $self->{w}, $self->{h});
3227
3228 my $top = int $self->{children}[1]{range}[0];
3229
3230 my $paridx = 0;
3231 my $top_paragraph;
2719 my $top = int $self->{children}[1]{range}[0]; 3232 my $top = int $self->{children}[1]{range}[0];
2720 3233
2721 my $y0 = $top; 3234 my $y0 = $top;
2722 my $y1 = $top + $H; 3235 my $y1 = $top + $H;
2723 3236
2724 my $y = 0;
2725
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 3237 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 3238 my $h = $para->{h};
3239 my $y = $para->{y};
2732 3240
2733 if ($y0 < $y + $h && $y < $y1) { 3241 if ($y0 < $y + $h && $y < $y1) {
2734
2735 my $layout = $self->get_layout ($para); 3242 my $layout = $self->get_layout ($para);
2736 3243
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 3244 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 3245
2742 if (my @w = @{ $para->{widget} }) { 3246 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 3247 my @s = $layout->get_shapes;
2744 3248
2745 for (@w) { 3249 for (@w) {
… …
2751 $_->draw; 3255 $_->draw;
2752 } 3256 }
2753 } 3257 }
2754 } 3258 }
2755 3259
2756 $y += $h; 3260 $paridx++;
3261 $top_paragraph ||= $paridx if $y >= $top;
2757 } 3262 }
2758 3263
2759 glDisable GL_BLEND; 3264 $self->{top_paragraph} = $top_paragraph;
2760 }; 3265 };
2761 }); 3266 });
2762} 3267}
2763 3268
2764sub reconfigure { 3269sub reconfigure {
… …
2782 $self->{children}[1]->draw; 3287 $self->{children}[1]->draw;
2783} 3288}
2784 3289
2785############################################################################# 3290#############################################################################
2786 3291
2787package CFClient::UI::Animator; 3292package CFPlus::UI::Animator;
2788 3293
2789use CFClient::OpenGL; 3294use CFPlus::OpenGL;
2790 3295
2791our @ISA = CFClient::UI::Bin::; 3296our @ISA = CFPlus::UI::Bin::;
2792 3297
2793sub moveto { 3298sub moveto {
2794 my ($self, $x, $y) = @_; 3299 my ($self, $x, $y) = @_;
2795 3300
2796 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3301 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2824 glPopMatrix; 3329 glPopMatrix;
2825} 3330}
2826 3331
2827############################################################################# 3332#############################################################################
2828 3333
2829package CFClient::UI::Flopper; 3334package CFPlus::UI::Flopper;
2830 3335
2831our @ISA = CFClient::UI::Button::; 3336our @ISA = CFPlus::UI::Button::;
2832 3337
2833sub new { 3338sub new {
2834 my $class = shift; 3339 my $class = shift;
2835 3340
2836 my $self = $class->SUPER::new ( 3341 my $self = $class->SUPER::new (
… …
2848 $self->{other}->toggle_visibility; 3353 $self->{other}->toggle_visibility;
2849} 3354}
2850 3355
2851############################################################################# 3356#############################################################################
2852 3357
2853package CFClient::UI::Tooltip; 3358package CFPlus::UI::Tooltip;
2854 3359
2855our @ISA = CFClient::UI::Bin::; 3360our @ISA = CFPlus::UI::Bin::;
2856 3361
2857use CFClient::OpenGL; 3362use CFPlus::OpenGL;
2858 3363
2859sub new { 3364sub new {
2860 my $class = shift; 3365 my $class = shift;
2861 3366
2862 $class->SUPER::new ( 3367 $class->SUPER::new (
… …
2865 ) 3370 )
2866} 3371}
2867 3372
2868sub set_tooltip_from { 3373sub set_tooltip_from {
2869 my ($self, $widget) = @_; 3374 my ($self, $widget) = @_;
3375
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
2870 3378
2871 my $tooltip = $widget->{tooltip}; 3379 my $tooltip = $widget->{tooltip};
2872 3380
2873 if ($ENV{CFPLUS_DEBUG} & 2) { 3381 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n" 3382 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2878 } 3386 }
2879 3387
2880 $tooltip =~ s/^\n+//; 3388 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//; 3389 $tooltip =~ s/\n+$//;
2882 3390
2883 $self->add (new CFClient::UI::Label 3391 $self->add (new CFPlus::UI::Label
2884 markup => $tooltip, 3392 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886 fontsize => 0.8, 3394 fontsize => 0.8,
2887 fg => [0, 0, 0, 1], 3395 style => 1, # FLAG_INVERSE
2888 ellipsise => 0, 3396 ellipsise => 0,
2889 font => ($widget->{tooltip_font} || $::FONT_PROP), 3397 font => ($widget->{tooltip_font} || $::FONT_PROP),
2890 ); 3398 );
2891} 3399}
2892 3400
… …
2911 3419
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3420 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3421 my $widget = $self->{owner}
2914 or return; 3422 or return;
2915 3423
3424 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3425 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3426
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3427 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3428 if $x + $self->{w} > $self->{root}{w};
2920 3429
2921 $self->move_abs ($x, $y); 3430 $self->move_abs ($x, $y);
3431 } else {
3432 $self->hide;
3433 }
2922 }); 3434 });
2923} 3435}
2924 3436
2925sub _draw { 3437sub _draw {
2926 my ($self) = @_; 3438 my ($self) = @_;
… …
2950 $self->SUPER::_draw; 3462 $self->SUPER::_draw;
2951} 3463}
2952 3464
2953############################################################################# 3465#############################################################################
2954 3466
2955package CFClient::UI::Face; 3467package CFPlus::UI::Face;
2956 3468
2957our @ISA = CFClient::UI::Base::; 3469our @ISA = CFPlus::UI::DrawBG::;
2958 3470
2959use CFClient::OpenGL; 3471use CFPlus::OpenGL;
2960 3472
2961sub new { 3473sub new {
2962 my $class = shift; 3474 my $class = shift;
2963 3475
2964 my $self = $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
2965 aspect => 1, 3479 aspect => 1,
2966 can_events => 0, 3480 can_events => 0,
2967 @_, 3481 @_,
2968 ); 3482 );
2969 3483
2970 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
2972 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2973 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1, 3490 parked => 1,
2976 interval => $self->{animspeed},
2977 cb => sub { 3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
2978 ++$widget->{frame}; 3494 ++$widget->{frame};
3495 $widget->update_face;
2979 $widget->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
2980 }, 3499 },
2981 ); 3500 );
3501
3502 $self->update_face;
3503 $self->update_timer;
2982 } 3504 }
2983 3505
2984 $self 3506 $self
2985} 3507}
2986 3508
3509sub update_timer {
3510 my ($self) = @_;
3511
3512 return unless $self->{timer};
3513
3514 if ($self->{visible}) {
3515 $self->{timer}->at (
3516 $self->{anim_start}
3517 + $self->{animspeed}
3518 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519 );
3520 $self->{timer}->start;
3521 } else {
3522 $self->{timer}->stop;
3523 }
3524}
3525
3526sub update_face {
3527 my ($self) = @_;
3528
3529 return unless $::CONN;
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 }
3536 }
3537}
3538
2987sub size_request { 3539sub size_request {
2988 (32, 8) 3540 my ($self) = @_;
3541
3542 if ($::CONN) {
3543 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3544 if (my $tex = $::CONN->{texture}[$faceid]) {
3545 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3546 } else {
3547 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3548 $self->realloc;
3549 });
3550 }
3551 }
3552 }
3553
3554 ($self->{size_w} || 8, $self->{size_h} || 8)
2989} 3555}
2990 3556
2991sub update { 3557sub update {
2992 my ($self) = @_; 3558 my ($self) = @_;
2993 3559
2994 return unless $self->{visible}; 3560 return unless $self->{visible};
2995 3561
2996 $self->SUPER::update; 3562 $self->SUPER::update;
2997} 3563}
2998 3564
3565sub invoke_visibility_change {
3566 my ($self) = @_;
3567
3568 $self->update_timer;
3569
3570 0
3571}
3572
2999sub _draw { 3573sub _draw {
3000 my ($self) = @_; 3574 my ($self) = @_;
3001 3575
3002 return unless $::CONN; 3576 return unless $::CONN;
3003 3577
3004 my $face; 3578 $self->SUPER::_draw;
3005 3579
3006 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}]; 3580 my $faceid = $::CONN->{faceid}[$self->{face}]
3008 3581 or return;
3009 $face = $anim->[ $self->{frame} % @$anim ]
3010 if $anim && @$anim;
3011 }
3012 3582
3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3583 my $tex = $::CONN->{texture}[$faceid];
3014 3584
3015 if ($tex) { 3585 if ($tex) {
3016 glEnable GL_TEXTURE_2D; 3586 glEnable GL_TEXTURE_2D;
3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3587 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018 glColor 0, 0, 0, 1; 3588 glColor 0, 0, 0, 1;
… …
3022} 3592}
3023 3593
3024sub destroy { 3594sub destroy {
3025 my ($self) = @_; 3595 my ($self) = @_;
3026 3596
3027 $self->{timer}->cancel 3597 (delete $self->{timer})->cancel
3028 if $self->{timer}; 3598 if $self->{timer};
3029 3599
3030 $self->SUPER::destroy; 3600 $self->SUPER::destroy;
3031} 3601}
3032 3602
3033############################################################################# 3603#############################################################################
3034 3604
3035package CFClient::UI::Buttonbar; 3605package CFPlus::UI::Buttonbar;
3036 3606
3037our @ISA = CFClient::UI::HBox::; 3607our @ISA = CFPlus::UI::HBox::;
3038 3608
3039# TODO: should actualyl wrap buttons and other goodies. 3609# TODO: should actually wrap buttons and other goodies.
3040 3610
3041############################################################################# 3611#############################################################################
3042 3612
3043package CFClient::UI::Menu; 3613package CFPlus::UI::Menu;
3044 3614
3045our @ISA = CFClient::UI::FancyFrame::; 3615our @ISA = CFPlus::UI::Toplevel::;
3046 3616
3047use CFClient::OpenGL; 3617use CFPlus::OpenGL;
3048 3618
3049sub new { 3619sub new {
3050 my $class = shift; 3620 my $class = shift;
3051 3621
3052 my $self = $class->SUPER::new ( 3622 my $self = $class->SUPER::new (
3053 items => [], 3623 items => [],
3054 z => 100, 3624 z => 100,
3055 @_, 3625 @_,
3056 ); 3626 );
3057 3627
3058 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3628 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059 3629
3060 for my $item (@{ $self->{items} }) { 3630 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3631 my ($widget, $cb, $tooltip) = @$item;
3062 3632
3063 # handle various types of items, only text for now 3633 # handle various types of items, only text for now
3064 if (!ref $widget) { 3634 if (!ref $widget) {
3635 if ($widget =~ /\t/) {
3636 my ($left, $right) = split /\t/, $widget, 2;
3637
3065 $widget = new CFClient::UI::Label 3638 $widget = new CFPlus::UI::HBox
3066 can_hover => 1, 3639 can_hover => 1,
3067 can_events => 1, 3640 can_events => 1,
3641 tooltip => $tooltip,
3642 children => [
3643 (new CFPlus::UI::Label markup => $left, expand => 1),
3644 (new CFPlus::UI::Label markup => $right, align => +1),
3645 ],
3646 ;
3647
3648 } else {
3649 $widget = new CFPlus::UI::Label
3650 can_hover => 1,
3651 can_events => 1,
3068 markup => $widget, 3652 markup => $widget,
3069 tooltip => $tooltip 3653 tooltip => $tooltip;
3654 }
3070 } 3655 }
3071 3656
3072 $self->{item}{$widget} = $item; 3657 $self->{item}{$widget} = $item;
3073 3658
3074 $self->{vbox}->add ($widget); 3659 $self->{vbox}->add ($widget);
… …
3117 1 3702 1
3118} 3703}
3119 3704
3120############################################################################# 3705#############################################################################
3121 3706
3122package CFClient::UI::Multiplexer; 3707package CFPlus::UI::Multiplexer;
3123 3708
3124our @ISA = CFClient::UI::Container::; 3709our @ISA = CFPlus::UI::Container::;
3125 3710
3126sub new { 3711sub new {
3127 my $class = shift; 3712 my $class = shift;
3128 3713
3129 my $self = $class->SUPER::new ( 3714 my $self = $class->SUPER::new (
… …
3143 3728
3144 $self->{current} = $self->{children}[0] 3729 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3730 if @{ $self->{children} };
3146} 3731}
3147 3732
3733sub get_current_page {
3734 my ($self) = @_;
3735
3736 $self->{current}
3737}
3738
3148sub set_current_page { 3739sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3740 my ($self, $page_or_widget) = @_;
3150 3741
3151 my $widget = ref $page_or_widget 3742 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3743 ? $page_or_widget
… …
3184 $self->{current}->draw; 3775 $self->{current}->draw;
3185} 3776}
3186 3777
3187############################################################################# 3778#############################################################################
3188 3779
3189package CFClient::UI::Notebook; 3780package CFPlus::UI::Notebook;
3190 3781
3191our @ISA = CFClient::UI::VBox::; 3782our @ISA = CFPlus::UI::VBox::;
3192 3783
3193sub new { 3784sub new {
3194 my $class = shift; 3785 my $class = shift;
3195 3786
3196 my $self = $class->SUPER::new ( 3787 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar), 3788 buttonbar => (new CFPlus::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3789 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self 3790 # filter => # will be put between multiplexer and $self
3200 @_, 3791 @_,
3201 ); 3792 );
3202 3793
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3794 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3207} 3798}
3208 3799
3209sub add { 3800sub add {
3210 my ($self, $title, $widget, $tooltip) = @_; 3801 my ($self, $title, $widget, $tooltip) = @_;
3211 3802
3212 Scalar::Util::weaken $self; 3803 CFPlus::weaken $self;
3213 3804
3214 $self->{buttonbar}->add (new CFClient::UI::Button 3805 $self->{buttonbar}->add (new CFPlus::UI::Button
3215 markup => $title, 3806 markup => $title,
3216 tooltip => $tooltip, 3807 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3808 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3809 );
3219 3810
3220 $self->{multiplexer}->add ($widget); 3811 $self->{multiplexer}->add ($widget);
3221} 3812}
3222 3813
3814sub get_current_page {
3815 my ($self) = @_;
3816
3817 $self->{multiplexer}->get_current_page
3818}
3819
3223sub set_current_page { 3820sub set_current_page {
3224 my ($self, $page) = @_; 3821 my ($self, $page) = @_;
3225 3822
3226 $self->{multiplexer}->set_current_page ($page); 3823 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 3824 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 3825}
3229 3826
3230############################################################################# 3827#############################################################################
3231 3828
3232package CFClient::UI::Combobox; 3829package CFPlus::UI::Selector;
3233 3830
3234use utf8; 3831use utf8;
3235 3832
3236our @ISA = CFClient::UI::Button::; 3833our @ISA = CFPlus::UI::Button::;
3237 3834
3238sub new { 3835sub new {
3239 my $class = shift; 3836 my $class = shift;
3240 3837
3241 my $self = $class->SUPER::new ( 3838 my $self = $class->SUPER::new (
… …
3258 my ($value, $title, $tooltip) = @$_; 3855 my ($value, $title, $tooltip) = @$_;
3259 3856
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3857 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 } 3858 }
3262 3859
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3860 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264} 3861}
3265 3862
3266sub _set_value { 3863sub _set_value {
3267 my ($self, $value) = @_; 3864 my ($self, $value) = @_;
3268 3865
… …
3283 $self->emit (changed => $value); 3880 $self->emit (changed => $value);
3284} 3881}
3285 3882
3286############################################################################# 3883#############################################################################
3287 3884
3288package CFClient::UI::Statusbox; 3885package CFPlus::UI::Statusbox;
3289 3886
3290our @ISA = CFClient::UI::VBox::; 3887our @ISA = CFPlus::UI::VBox::;
3291 3888
3292sub new { 3889sub new {
3293 my $class = shift; 3890 my $class = shift;
3294 3891
3295 my $self = $class->SUPER::new ( 3892 my $self = $class->SUPER::new (
3296 fontsize => 0.8, 3893 fontsize => 0.8,
3297 @_, 3894 @_,
3298 ); 3895 );
3299 3896
3300 Scalar::Util::weaken (my $this = $self); 3897 CFPlus::weaken (my $this = $self);
3301 3898
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3899 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303 3900
3304 $self 3901 $self
3305} 3902}
… …
3307sub reorder { 3904sub reorder {
3308 my ($self) = @_; 3905 my ($self) = @_;
3309 my $NOW = Time::HiRes::time; 3906 my $NOW = Time::HiRes::time;
3310 3907
3311 # freeze display when hovering over any label 3908 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner} 3909 return if $CFPlus::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3910 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} }; 3911 values %{ $self->{item} };
3315 3912
3316 while (my ($k, $v) = each %{ $self->{item} }) { 3913 while (my ($k, $v) = each %{ $self->{item} }) {
3317 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3914 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318 } 3915 }
… …
3339 for ($short) { 3936 for ($short) {
3340 s/^\s+//; 3937 s/^\s+//;
3341 s/\s+/ /g; 3938 s/\s+/ /g;
3342 } 3939 }
3343 3940
3344 new CFClient::UI::Label 3941 new CFPlus::UI::Label
3345 markup => $short, 3942 markup => $short,
3346 tooltip => $item->{tooltip}, 3943 tooltip => $item->{tooltip},
3347 tooltip_font => $::FONT_PROP, 3944 tooltip_font => $::FONT_PROP,
3348 tooltip_width => 0.67, 3945 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize}, 3946 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3403 count => 1, 4000 count => 1,
3404 %arg, 4001 %arg,
3405 }; 4002 };
3406 } 4003 }
3407 4004
4005 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 4006 $self->reorder;
4007 });
3409} 4008}
3410 4009
3411sub reconfigure { 4010sub reconfigure {
3412 my ($self) = @_; 4011 my ($self) = @_;
3413 4012
… …
3426 $self->SUPER::destroy; 4025 $self->SUPER::destroy;
3427} 4026}
3428 4027
3429############################################################################# 4028#############################################################################
3430 4029
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
3803package CFClient::UI::Root; 4030package CFPlus::UI::Root;
3804 4031
3805our @ISA = CFClient::UI::Container::; 4032our @ISA = CFPlus::UI::Container::;
3806 4033
3807use List::Util qw(min max); 4034use List::Util qw(min max);
3808 4035
3809use CFClient::OpenGL; 4036use CFPlus::OpenGL;
3810 4037
3811sub new { 4038sub new {
3812 my $class = shift; 4039 my $class = shift;
3813 4040
3814 my $self = $class->SUPER::new ( 4041 my $self = $class->SUPER::new (
3815 visible => 1, 4042 visible => 1,
3816 @_, 4043 @_,
3817 ); 4044 );
3818 4045
3819 Scalar::Util::weaken ($self->{root} = $self); 4046 CFPlus::weaken ($self->{root} = $self);
3820 4047
3821 $self 4048 $self
3822} 4049}
3823 4050
3824sub size_request { 4051sub size_request {
… …
3919 while ($self->{refresh_hook}) { 4146 while ($self->{refresh_hook}) {
3920 $_->() 4147 $_->()
3921 for values %{delete $self->{refresh_hook}}; 4148 for values %{delete $self->{refresh_hook}};
3922 } 4149 }
3923 4150
3924 if ($self->{realloc}) { 4151 while ($self->{realloc}) {
3925 my %queue; 4152 my %queue;
3926 my @queue; 4153 my @queue;
3927 my $widget; 4154 my $widget;
3928 4155
3929 outer: 4156 outer:
… …
3976 } 4203 }
3977 } 4204 }
3978 4205
3979 delete $self->{realloc}{$widget+0}; 4206 delete $self->{realloc}{$widget+0};
3980 } 4207 }
3981 }
3982 4208
3983 while (my $size_alloc = delete $self->{size_alloc}) { 4209 while (my $size_alloc = delete $self->{size_alloc}) {
3984 my @queue = sort { $b->{visible} <=> $a->{visible} } 4210 my @queue = sort { $a->{visible} <=> $b->{visible} }
3985 values %$size_alloc; 4211 values %$size_alloc;
3986 4212
3987 while () { 4213 while () {
3988 my $widget = pop @queue || last; 4214 my $widget = pop @queue || last;
3989 4215
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4216 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 4217
3992 $w = 0 if $w < 0; 4218 $w = max $widget->{min_w}, $w;
3993 $h = 0 if $h < 0; 4219 $h = max $widget->{min_h}, $h;
3994 4220
4221# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4222# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4223
4224 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4225 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4226
3995 $w = int $w + 0.5; 4227 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 4228 $h = int $h + 0.5;
3997 4229
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4230 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w}; 4231 $widget->{old_w} = $widget->{w};
4000 $widget->{old_h} = $widget->{h}; 4232 $widget->{old_h} = $widget->{h};
4001 4233
4002 $widget->{w} = $w; 4234 $widget->{w} = $w;
4003 $widget->{h} = $h; 4235 $widget->{h} = $h;
4004 4236
4005 $widget->emit (size_allocate => $w, $h); 4237 $widget->emit (size_allocate => $w, $h);
4238 }
4006 } 4239 }
4007 } 4240 }
4008 } 4241 }
4009 4242
4010 while ($self->{post_alloc_hook}) { 4243 while ($self->{post_alloc_hook}) {
4011 $_->() 4244 $_->()
4012 for values %{delete $self->{post_alloc_hook}}; 4245 for values %{delete $self->{post_alloc_hook}};
4013 } 4246 }
4014
4015 4247
4016 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4248 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4249 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4018 glClear GL_COLOR_BUFFER_BIT; 4250 glClear GL_COLOR_BUFFER_BIT;
4019 4251
… …
4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4254 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023 glMatrixMode GL_MODELVIEW; 4255 glMatrixMode GL_MODELVIEW;
4024 glLoadIdentity; 4256 glLoadIdentity;
4025 4257
4026 { 4258 {
4027 package CFClient::UI::Base; 4259 package CFPlus::UI::Base;
4028 4260
4029 ($draw_x, $draw_y, $draw_w, $draw_h) = 4261 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h}); 4262 (0, 0, $self->{w}, $self->{h});
4031 }
4032 4263
4033 $self->_draw; 4264 $self->_draw;
4265 }
4034} 4266}
4035 4267
4036############################################################################# 4268#############################################################################
4037 4269
4038package CFClient::UI; 4270package CFPlus::UI;
4039 4271
4040$ROOT = new CFClient::UI::Root; 4272$ROOT = new CFPlus::UI::Root;
4041$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4273$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042 4274
40431 42751
4044 4276

Diff Legend

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