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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.399 by root, Sat Jul 21 16:07:53 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) = @_;
… …
571 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
574 glEnd; 636 glEnd;
575 glPopMatrix; 637 glPopMatrix;
576 #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;
577 } 639 }
578 640
579 $self->_draw; 641 $self->_draw;
580 glPopMatrix; 642 glPopMatrix;
581} 643}
… …
584 my ($self) = @_; 646 my ($self) = @_;
585 647
586 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
587} 649}
588 650
651my $cntx;#d#
589sub DESTROY { 652sub DESTROY {
590 my ($self) = @_; 653 my ($self) = @_;
591 654
592 delete $WIDGET{$self+0}; 655 return if CFPlus::in_destruct;
593 656
594 eval { $self->destroy }; 657 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
660 delete $WIDGET{$self+0};
596} 661}
597 662
598############################################################################# 663#############################################################################
599 664
600package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
601 666
602our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
603 668
604use strict; 669use strict;
605use CFClient::OpenGL; 670use CFPlus::OpenGL;
606 671
607sub new { 672sub new {
608 my $class = shift; 673 my $class = shift;
609 674
610 # range [value, low, high, page] 675 # range [value, low, high, page]
… …
641 } 706 }
642} 707}
643 708
644############################################################################# 709#############################################################################
645 710
646package CFClient::UI::Empty; 711package CFPlus::UI::Empty;
647 712
648our @ISA = CFClient::UI::Base::; 713our @ISA = CFPlus::UI::Base::;
649 714
650sub new { 715sub new {
651 my ($class, %arg) = @_; 716 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 717 $class->SUPER::new (can_events => 0, %arg);
653} 718}
… …
660 725
661sub draw { } 726sub draw { }
662 727
663############################################################################# 728#############################################################################
664 729
665package CFClient::UI::Container; 730package CFPlus::UI::Container;
666 731
667our @ISA = CFClient::UI::Base::; 732our @ISA = CFPlus::UI::Base::;
668 733
669sub new { 734sub new {
670 my ($class, %arg) = @_; 735 my ($class, %arg) = @_;
671 736
672 my $children = delete $arg{children}; 737 my $children = delete $arg{children};
… …
676 can_events => 0, 741 can_events => 0,
677 %arg, 742 %arg,
678 ); 743 );
679 744
680 $self->add (@$children) 745 $self->add (@$children)
681 if $children; 746 if $children && @$children;
682 747
683 $self 748 $self
749}
750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
684} 757}
685 758
686sub add { 759sub add {
687 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
688 761
689 $_->set_parent ($self) 762 $_->set_parent ($self)
690 for @widgets; 763 for @widgets;
691 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 766 use sort 'stable';
693 767
694 $self->{children} = [ 768 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
697 ]; 771 ];
698 772
699 $self->realloc; 773 $self->realloc;
774
775 map $_+0, @widgets
700} 776}
701 777
702sub children { 778sub children {
703 @{ $_[0]{children} } 779 @{ $_[0]{children} }
704} 780}
… …
715} 791}
716 792
717sub clear { 793sub clear {
718 my ($self) = @_; 794 my ($self) = @_;
719 795
720 my $children = delete $self->{children}; 796 my $children = $self->{children};
721 $self->{children} = []; 797 $self->{children} = [];
722 798
723 for (@$children) { 799 for (@$children) {
724 delete $_->{parent}; 800 delete $_->{parent};
725 $_->hide; 801 $_->hide;
… …
750 $_->draw for @{$self->{children}}; 826 $_->draw for @{$self->{children}};
751} 827}
752 828
753############################################################################# 829#############################################################################
754 830
755package CFClient::UI::Bin; 831package CFPlus::UI::Bin;
756 832
757our @ISA = CFClient::UI::Container::; 833our @ISA = CFPlus::UI::Container::;
758 834
759sub new { 835sub new {
760 my ($class, %arg) = @_; 836 my ($class, %arg) = @_;
761 837
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 838 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 839
764 $class->SUPER::new (children => [$child], %arg) 840 $class->SUPER::new (children => [$child], %arg)
765} 841}
766 842
767sub add { 843sub add {
… …
774sub remove { 850sub remove {
775 my ($self, $widget) = @_; 851 my ($self, $widget) = @_;
776 852
777 $self->SUPER::remove ($widget); 853 $self->SUPER::remove ($widget);
778 854
779 $self->{children} = [new CFClient::UI::Empty] 855 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 856 unless @{$self->{children}};
781} 857}
782 858
783sub child { $_[0]->{children}[0] } 859sub child { $_[0]->{children}[0] }
784 860
… …
796 872
797############################################################################# 873#############################################################################
798 874
799# back-buffered drawing area 875# back-buffered drawing area
800 876
801package CFClient::UI::Window; 877package CFPlus::UI::Window;
802 878
803our @ISA = CFClient::UI::Bin::; 879our @ISA = CFPlus::UI::Bin::;
804 880
805use CFClient::OpenGL; 881use CFPlus::OpenGL;
806 882
807sub new { 883sub new {
808 my ($class, %arg) = @_; 884 my ($class, %arg) = @_;
809 885
810 my $self = $class->SUPER::new (%arg); 886 my $self = $class->SUPER::new (%arg);
… …
832} 908}
833 909
834sub render_child { 910sub render_child {
835 my ($self) = @_; 911 my ($self) = @_;
836 912
837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 913 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
838 glClearColor 0, 0, 0, 0; 914 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 915 glClear GL_COLOR_BUFFER_BIT;
840 916
841 { 917 {
842 package CFClient::UI::Base; 918 package CFPlus::UI::Base;
843 919
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 920 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 921 (0, 0, $self->{w}, $self->{h});
922
923 $self->_render;
846 } 924 }
847
848 $self->_render;
849 }; 925 };
850} 926}
851 927
852sub _draw { 928sub _draw {
853 my ($self) = @_; 929 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 930
857 my $tex = $self->{texture} 931 my $tex = $self->{texture}
858 or return; 932 or return;
859 933
860 glEnable GL_TEXTURE_2D; 934 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 936 glColor 0, 0, 0, 1;
863 937
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 938 $tex->draw_quad_alpha_premultiplied (0, 0);
865 939
866 glDisable GL_TEXTURE_2D; 940 glDisable GL_TEXTURE_2D;
867} 941}
868 942
869############################################################################# 943#############################################################################
870 944
871package CFClient::UI::ViewPort; 945package CFPlus::UI::ViewPort;
872 946
947use List::Util qw(min max);
948
873our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
874 950
875sub new { 951sub new {
876 my $class = shift; 952 my $class = shift;
877 953
878 $class->SUPER::new ( 954 $class->SUPER::new (
… …
885sub size_request { 961sub size_request {
886 my ($self) = @_; 962 my ($self) = @_;
887 963
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 964 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 965
890 $w = 10 if $self->{scroll_x}; 966 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 967 $h = 1 if $self->{scroll_y};
892 968
893 ($w, $h) 969 ($w, $h)
894} 970}
895 971
896sub invoke_size_allocate { 972sub invoke_size_allocate {
… …
908} 984}
909 985
910sub set_offset { 986sub set_offset {
911 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
912 988
989 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
990 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
991
992 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 993 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 994 $self->{view_y} = $y;
915 995
996 $self->emit (changed => $x, $y);
916 $self->update; 997 $self->update;
998 }
917} 999}
918 1000
919# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 1002sub coord2local {
921 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 1018 my ($self, $x, $y) = @_;
937 1019
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1022 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1024 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1025 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1026 }
945} 1027}
946 1028
947sub _render { 1029sub _render {
948 my ($self) = @_; 1030 my ($self) = @_;
949 1031
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1032 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1033 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1034
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1036
955 $self->SUPER::_render; 1037 $self->SUPER::_render;
956} 1038}
957 1039
958############################################################################# 1040#############################################################################
959 1041
960package CFClient::UI::ScrolledWindow; 1042package CFPlus::UI::ScrolledWindow;
961 1043
962our @ISA = CFClient::UI::HBox::; 1044our @ISA = CFPlus::UI::Table::;
963 1045
964sub new { 1046sub new {
965 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
966 1048
967 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
968 1050
969 my $self; 1051 my $self;
970 1052
971 my $slider = new CFClient::UI::Slider 1053 my $hslider = new CFPlus::UI::Slider
1054 col => 0,
1055 row => 1,
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1065 col => 1,
1066 row => 0,
972 vertical => 1, 1067 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1069 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1070 $self->{vpos} = $_[1];
1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1072 },
977 ; 1073 ;
978 1074
979 $self = $class->SUPER::new ( 1075 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1076 scroll_x => 0,
1077 scroll_y => 1,
1078 can_events => 1,
981 slider => $slider, 1079 hslider => $hslider,
1080 vslider => $vslider,
1081 col_expand => [1, 0],
1082 row_expand => [1, 0],
982 %arg, 1083 %arg,
983 ); 1084 );
984 1085
1086 $self->{vp} = new CFPlus::UI::ViewPort
1087 col => 0,
1088 row => 0,
1089 expand => 1,
1090 scroll_x => $self->{scroll_x},
1091 scroll_y => $self->{scroll_y},
1092 on_changed => sub {
1093 my ($vp, $x, $y) = @_;
1094
1095 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y);
1097
1098 0
1099 },
1100 ;
1101
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1102 $self->SUPER::add ($self->{vp});
1103
986 $self->add ($child) if $child; 1104 $self->add ($child) if $child;
987 1105
988 $self 1106 $self
989} 1107}
990
991#TODO# update range on size_allocate depending on child
992 1108
993sub add { 1109sub add {
994 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
995 1111
996 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
997} 1113}
998 1114
999sub update_slider { 1115sub update_slider {
1000 my ($self) = @_; 1116 my ($self) = @_;
1001 1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003}
1004 1122
1005sub update { 1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132
1133 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider});
1138 }
1139}
1140
1141sub start_dragging {
1006 my ($self) = @_; 1142 my ($self, $ev) = @_;
1007 1143
1008 $self->SUPER::update; 1144 $self->grab_focus;
1009 1145
1010 $self->update_slider; 1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1159sub invoke_mouse_wheel {
1160 my ($self, $ev) = @_;
1161
1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1164
1165 1
1166}
1167
1168sub invoke_button_down {
1169 my ($self, $ev, $x, $y) = @_;
1170
1171 if ($ev->{button} == 2) {
1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1175
1176 0
1177}
1178
1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1181
1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1011} 1198}
1012 1199
1013sub invoke_size_allocate { 1200sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1015 1202
1016 $self->update_slider; 1203 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1204 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1205}
1020 1206
1021############################################################################# 1207#############################################################################
1022 1208
1023package CFClient::UI::Frame; 1209package CFPlus::UI::Frame;
1024 1210
1025our @ISA = CFClient::UI::Bin::; 1211our @ISA = CFPlus::UI::Bin::;
1026 1212
1027use CFClient::OpenGL; 1213use CFPlus::OpenGL;
1028 1214
1029sub new { 1215sub new {
1030 my $class = shift; 1216 my $class = shift;
1031 1217
1032 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1244 $self->SUPER::_draw;
1059} 1245}
1060 1246
1061############################################################################# 1247#############################################################################
1062 1248
1063package CFClient::UI::FancyFrame; 1249package CFPlus::UI::FancyFrame;
1064 1250
1065our @ISA = CFClient::UI::Bin::; 1251our @ISA = CFPlus::UI::Bin::;
1066 1252
1067use CFClient::OpenGL; 1253use CFPlus::OpenGL;
1254
1255sub new {
1256 my ($class, %arg) = @_;
1257
1258 if ((exists $arg{label}) && !ref $arg{label}) {
1259 $arg{label} = new CFPlus::UI::Label
1260 align => 1,
1261 valign => 0,
1262 text => $arg{label},
1263 fontsize => ($arg{border} || 0.8) * 0.75;
1264 }
1265
1266 my $self = $class->SUPER::new (
1267 # label => "",
1268 fg => [0.6, 0.3, 0.1],
1269 border => 0.8,
1270 style => 'single',
1271 %arg,
1272 );
1273
1274 $self
1275}
1276
1277sub add {
1278 my ($self, @widgets) = @_;
1279
1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1282}
1283
1284sub border {
1285 int $_[0]{border} * $::FONTSIZE
1286}
1287
1288sub size_request {
1289 my ($self) = @_;
1290
1291 ($self->{label_w}, undef) = $self->{label}->size_request
1292 if $self->{label};
1293
1294 my ($w, $h) = $self->SUPER::size_request;
1295
1296 (
1297 $w + $self->border * 2,
1298 $h + $self->border * 2,
1299 )
1300}
1301
1302sub invoke_size_allocate {
1303 my ($self, $w, $h) = @_;
1304
1305 my $border = $self->border;
1306
1307 $w -= List::Util::max 0, $border * 2;
1308 $h -= List::Util::max 0, $border * 2;
1309
1310 if (my $label = $self->{label}) {
1311 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1312 $label->{h} = List::Util::min $h, $border;
1313 $label->invoke_size_allocate ($label->{w}, $label->{h});
1314 }
1315
1316 $self->child->configure ($border, $border, $w, $h);
1317
1318 1
1319}
1320
1321sub _draw {
1322 my ($self) = @_;
1323
1324 my $child = $self->{children}[0];
1325
1326 my $border = $self->border;
1327 my ($w, $h) = ($self->{w}, $self->{h});
1328
1329 $child->draw;
1330
1331 glColor @{$self->{fg}};
1332 glBegin GL_LINE_STRIP;
1333 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1334 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1336 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1337 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1338 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1339 glEnd;
1340
1341 if ($self->{label}) {
1342 glTranslate $border * 2, 0;
1343 $self->{label}->_draw;
1344 }
1345}
1346
1347#############################################################################
1348
1349package CFPlus::UI::Toplevel;
1350
1351our @ISA = CFPlus::UI::Bin::;
1352
1353use CFPlus::OpenGL;
1068 1354
1069my $bg = 1355my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1356 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1357 mipmap => 1, wrap => 1;
1072 1358
1073my @border = 1359my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1360 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); 1361 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1362
1363my @icon =
1364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1365 qw(x1_move.png x1_resize.png);
1076 1366
1077sub new { 1367sub new {
1078 my ($class, %arg) = @_; 1368 my ($class, %arg) = @_;
1079 1369
1080 my $self = $class->SUPER::new ( 1370 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1371 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1372 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1373 border => 0.6,
1084 can_events => 1, 1374 can_events => 1,
1085 min_w => 16, 1375 min_w => 64,
1086 min_h => 16, 1376 min_h => 32,
1087 %arg, 1377 %arg,
1088 ); 1378 );
1089 1379
1090 $self->{title_widget} = new CFClient::UI::Label 1380 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1381 align => 0,
1092 valign => 1, 1382 valign => 1,
1093 text => $self->{title}, 1383 text => $self->{title},
1094 fontsize => $self->{border}, 1384 fontsize => $self->{border},
1095 if exists $self->{title}; 1385 if exists $self->{title};
1096 1386
1097 if ($self->{has_close_button}) { 1387 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1388 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1389 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1390 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1391 on_activate => sub { $self->emit ("delete") };
1102 1392
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1393 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1394 }
1105 1395
1106 $self 1396 $self
1107} 1397}
1108 1398
1109sub add { 1399sub add {
1110 my ($self, @widgets) = @_; 1400 my ($self, @widgets) = @_;
1111 1401
1112 $self->SUPER::add (@widgets); 1402 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1403 $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}; 1404 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1405}
1116 1406
1117sub border { 1407sub border {
1118 int $_[0]{border} * $::FONTSIZE 1408 int $_[0]{border} * $::FONTSIZE
1119} 1409}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1442 $self->child->configure ($border, $border, $w, $h);
1153 1443
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1444 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1445 if $self->{close_button};
1156 1446
1447 1
1448}
1449
1450sub invoke_delete {
1451 my ($self) = @_;
1452
1453 $self->hide;
1454
1157 1 1455 1
1158} 1456}
1159 1457
1160sub invoke_button_down { 1458sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1459 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1517 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1518
1221 ! ! $self->{motion} 1519 ! ! $self->{motion}
1222} 1520}
1223 1521
1522sub invoke_visibility_change {
1523 my ($self, $visible) = @_;
1524
1525 delete $self->{motion} unless $visible;
1526
1527 0
1528}
1529
1224sub _draw { 1530sub _draw {
1225 my ($self) = @_; 1531 my ($self) = @_;
1226 1532
1227 my $child = $self->{children}[0]; 1533 my $child = $self->{children}[0];
1228 1534
… …
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1539 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1540
1235 my $border = $self->border; 1541 my $border = $self->border;
1236 1542
1237 glColor @{ $self->{border_bg} }; 1543 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1544 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1545 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1546 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1547 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1548
1549 # move
1550 my $w2 = ($w - $border) * .5;
1551 my $h2 = ($h - $border) * .5;
1552 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1555
1556 # resize
1557 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1559 unless $self->{has_close_button};
1560 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1242 1562
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1563 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1564 glColor @{ $self->{bg} };
1245 1565
1246 # TODO: repeat texture not scale 1566 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1585 if $self->{close_button};
1266} 1586}
1267 1587
1268############################################################################# 1588#############################################################################
1269 1589
1270package CFClient::UI::Table; 1590package CFPlus::UI::Table;
1271 1591
1272our @ISA = CFClient::UI::Base::; 1592our @ISA = CFPlus::UI::Container::;
1273 1593
1274use List::Util qw(max sum); 1594use List::Util qw(max sum);
1275 1595
1276use CFClient::OpenGL; 1596use CFPlus::OpenGL;
1277 1597
1278sub new { 1598sub new {
1279 my $class = shift; 1599 my $class = shift;
1280 1600
1281 $class->SUPER::new ( 1601 $class->SUPER::new (
1282 col_expand => [], 1602 col_expand => [],
1603 row_expand => [],
1283 @_, 1604 @_,
1284 ) 1605 )
1285} 1606}
1286 1607
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1608sub add {
1292 my ($self, $x, $y, $child) = @_; 1609 my ($self, @widgets) = @_;
1293 1610
1294 $child->set_parent ($self); 1611 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1612 $child->{rowspan} ||= 1;
1613 $child->{colspan} ||= 1;
1614 }
1296 1615
1297 $self->realloc; 1616 $self->SUPER::add (@widgets);
1298} 1617}
1299 1618
1300sub remove { 1619sub add_at {
1620 my $self = shift;
1621
1622 my @widgets;
1623
1624 while (@_) {
1625 my ($col, $row, $child) = splice @_, 0, 3, ();
1626
1627 $child->{row} = $row;
1628 $child->{col} = $col;
1629
1630 push @widgets, $child;
1631 }
1632
1633 $self->add (@widgets);
1634}
1635
1636sub get_wh {
1301 my ($self, $child) = @_; 1637 my ($self) = @_;
1302 1638
1303 # TODO: not yet implemented 1639 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1640
1310 my @children = $self->children; 1641 my @children = $self->children;
1311 delete $self->{children}; 1642
1643 # first pass, columns
1644 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1645 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1646
1647 my $sw = sum @w[$c .. $c + $cs - 1];
1648
1649 if ($w > $sw) {
1650 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1651 }
1312 1652 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1653
1318 $self->realloc; 1654 # second pass, rows
1319} 1655 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)}; 1656 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1334 1657
1335 $w[$x] = max $w[$x], $w; 1658 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1659
1660 if ($h > $sh) {
1661 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1662 }
1338 } 1663 }
1339 1664
1340 (\@w, \@h) 1665 (\@w, \@h)
1341} 1666}
… …
1357 my ($ws, $hs) = $self->get_wh; 1682 my ($ws, $hs) = $self->get_wh;
1358 1683
1359 my $req_w = (sum @$ws) || 1; 1684 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1685 my $req_h = (sum @$hs) || 1;
1361 1686
1362 # TODO: nicer code && do row_expand 1687 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1688 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1689 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1690 my $col_expand = (sum @col_expand) || 1;
1366 1691
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1692 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1693
1371 CFClient::UI::harmonize $ws; 1694 CFPlus::UI::harmonize $ws;
1695
1696 my @row_expand = @{$self->{row_expand}};
1697 @row_expand = (1) x @$ws unless @row_expand;
1698 my $row_expand = (sum @row_expand) || 1;
1699
1700 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1701
1372 CFClient::UI::harmonize $hs; 1702 CFPlus::UI::harmonize $hs;
1373 1703
1374 my $y; 1704 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1705 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1706
1376 for my $r (0 .. $#{$self->{children}}) { 1707 for my $widget ($self->children) {
1377 my $row = $self->{children}[$r] 1708 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1378 or next;
1379 1709
1380 my $x = 0; 1710 $widget->configure (
1381 my $row_h = $hs->[$r]; 1711 $x[$c], $y[$r],
1712 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1713 );
1383 for my $c (0 .. $#$row) { 1714 }
1384 my $col_w = $ws->[$c];
1385 1715
1386 if (my $widget = $row->[$c]) { 1716 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1717}
1388 }
1389 1718
1390 $x += $col_w; 1719#############################################################################
1720
1721package CFPlus::UI::Fixed;
1722
1723use List::Util qw(min max);
1724
1725our @ISA = CFPlus::UI::Container::;
1726
1727sub add {
1728 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1729
1730 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1731 $self->SUPER::add ($child);
1732}
1733
1734sub _scale($$$) {
1735 my ($mode, $val, $max) = @_;
1736
1737 $mode eq "abs" ? $val
1738 : $mode eq "rel" ? $val * $max
1739 : 0
1740}
1741
1742sub size_request {
1743 my ($self) = @_;
1744
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746
1747 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 if ($pos eq "abs") {
1752 $w = _scale $size, $w, $child->{req_w};
1753 $h = _scale $size, $h, $child->{req_h};
1754
1755 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1756 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1391 } 1757 }
1758 }
1392 1759
1393 $y += $row_h; 1760 my $W = $x2 - $x1;
1761 my $H = $y2 - $y1;
1762
1763 # now layout remaining widgets
1764 for my $child ($self->visible_children) {
1765 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1766
1767 if ($pos ne "abs") {
1768 $x = _scale $pos, $x, $W;
1769 $y = _scale $pos, $x, $H;
1770 $w = _scale $size, $w, $child->{req_w};
1771 $h = _scale $size, $h, $child->{req_h};
1772
1773 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1774 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1775 }
1776 }
1777
1778 my $W = $x2 - $x1;
1779 my $H = $y2 - $y1;
1780
1781 ($W, $H)
1782}
1783
1784sub invoke_size_allocate {
1785 my ($self, $W, $H) = @_;
1786
1787 for my $child ($self->visible_children) {
1788 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1789
1790 $x = _scale $pos, $x, $W;
1791 $y = _scale $pos, $x, $H;
1792 $w = _scale $size, $w, $child->{req_w};
1793 $h = _scale $size, $h, $child->{req_h};
1794
1795 $child->configure ($x, $y, $w, $h);
1394 } 1796 }
1395 1797
1396 1 1798 1
1397} 1799}
1398 1800
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############################################################################# 1801#############################################################################
1424 1802
1425package CFClient::UI::Box; 1803package CFPlus::UI::Box;
1426 1804
1427our @ISA = CFClient::UI::Container::; 1805our @ISA = CFPlus::UI::Container::;
1428 1806
1429sub size_request { 1807sub size_request {
1430 my ($self) = @_; 1808 my ($self) = @_;
1431 1809
1432 $self->{vertical} 1810 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1843 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1844 for 0 .. $#children;
1467 } 1845 }
1468 } 1846 }
1469 1847
1470 CFClient::UI::harmonize \@req; 1848 CFPlus::UI::harmonize \@req;
1471 1849
1472 my $pos = 0; 1850 my $pos = 0;
1473 for (0 .. $#children) { 1851 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1852 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1853 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1480 1 1858 1
1481} 1859}
1482 1860
1483############################################################################# 1861#############################################################################
1484 1862
1485package CFClient::UI::HBox; 1863package CFPlus::UI::HBox;
1486 1864
1487our @ISA = CFClient::UI::Box::; 1865our @ISA = CFPlus::UI::Box::;
1488 1866
1489sub new { 1867sub new {
1490 my $class = shift; 1868 my $class = shift;
1491 1869
1492 $class->SUPER::new ( 1870 $class->SUPER::new (
… …
1495 ) 1873 )
1496} 1874}
1497 1875
1498############################################################################# 1876#############################################################################
1499 1877
1500package CFClient::UI::VBox; 1878package CFPlus::UI::VBox;
1501 1879
1502our @ISA = CFClient::UI::Box::; 1880our @ISA = CFPlus::UI::Box::;
1503 1881
1504sub new { 1882sub new {
1505 my $class = shift; 1883 my $class = shift;
1506 1884
1507 $class->SUPER::new ( 1885 $class->SUPER::new (
… …
1510 ) 1888 )
1511} 1889}
1512 1890
1513############################################################################# 1891#############################################################################
1514 1892
1515package CFClient::UI::Label; 1893package CFPlus::UI::Label;
1516 1894
1517our @ISA = CFClient::UI::DrawBG::; 1895our @ISA = CFPlus::UI::DrawBG::;
1518 1896
1519use CFClient::OpenGL; 1897use CFPlus::OpenGL;
1520 1898
1521sub new { 1899sub new {
1522 my ($class, %arg) = @_; 1900 my ($class, %arg) = @_;
1523 1901
1524 my $self = $class->SUPER::new ( 1902 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1905 #active_bg => none
1528 #font => default_font 1906 #font => default_font
1529 #text => initial text 1907 #text => initial text
1530 #markup => initial narkup 1908 #markup => initial narkup
1531 #max_w => maximum pixel width 1909 #max_w => maximum pixel width
1910 #style => 0, # render flags
1532 ellipsise => 3, # end 1911 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1912 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1913 fontsize => 1,
1535 align => -1, 1914 align => -1,
1536 valign => -1, 1915 valign => -1,
1537 padding_x => 2, 1916 padding_x => 2,
1538 padding_y => 2, 1917 padding_y => 2,
1539 can_events => 0, 1918 can_events => 0,
1540 %arg 1919 %arg
1541 ); 1920 );
1542 1921
1543 if (exists $self->{template}) { 1922 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1923 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1924 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1925 $self->{template} = $layout;
1547 } 1926 }
1548 1927
1549 if (exists $self->{markup}) { 1928 if (exists $self->{markup}) {
… …
1553 } 1932 }
1554 1933
1555 $self 1934 $self
1556} 1935}
1557 1936
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1937sub update {
1569 my ($self) = @_; 1938 my ($self) = @_;
1570 1939
1571 delete $self->{texture}; 1940 delete $self->{texture};
1572 $self->SUPER::update; 1941 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1952 my ($self, $text) = @_;
1584 1953
1585 return if $self->{text} eq "T$text"; 1954 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1955 $self->{text} = "T$text";
1587 1956
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1957 $self->{layout}->set_text ($text);
1590 1958
1591 delete $self->{size_req}; 1959 delete $self->{size_req};
1592 $self->realloc; 1960 $self->realloc;
1593 $self->update; 1961 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1967 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1968 $self->{text} = "M$markup";
1601 1969
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1970 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1971
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1972 $self->{layout}->set_markup ($markup);
1606 1973
1607 delete $self->{size_req}; 1974 delete $self->{size_req};
1608 $self->realloc; 1975 $self->realloc;
1609 $self->update; 1976 $self->update;
… …
1621 1988
1622 my ($w, $h) = $self->{layout}->size; 1989 my ($w, $h) = $self->{layout}->size;
1623 1990
1624 if (exists $self->{template}) { 1991 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1992 $self->{template}->set_font ($self->{font}) if $self->{font};
1993 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1994 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1995
1628 my ($w2, $h2) = $self->{template}->size; 1996 my ($w2, $h2) = $self->{template}->size;
1629 1997
1630 $w = List::Util::max $w, $w2; 1998 $w = List::Util::max $w, $w2;
… …
1654 2022
1655sub set_fontsize { 2023sub set_fontsize {
1656 my ($self, $fontsize) = @_; 2024 my ($self, $fontsize) = @_;
1657 2025
1658 $self->{fontsize} = $fontsize; 2026 $self->{fontsize} = $fontsize;
2027 delete $self->{size_req};
1659 delete $self->{texture}; 2028 delete $self->{texture};
1660 2029
1661 $self->realloc; 2030 $self->realloc;
1662} 2031}
1663 2032
1664sub reconfigure { 2033sub reconfigure {
1665 my ($self) = @_; 2034 my ($self) = @_;
1666 2035
1667 delete $self->{size_req}; 2036 delete $self->{size_req};
2037 delete $self->{texture};
1668 2038
1669 $self->SUPER::reconfigure; 2039 $self->SUPER::reconfigure;
1670} 2040}
1671 2041
1672sub _draw { 2042sub _draw {
1673 my ($self) = @_; 2043 my ($self) = @_;
1674 2044
1675 $self->SUPER::_draw; # draw background, if applicable 2045 $self->SUPER::_draw; # draw background, if applicable
1676 2046
1677 my $tex = $self->{texture} ||= do { 2047 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2048 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2049 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2050 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2051 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2052 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2053 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2054
1685 new_from_layout CFClient::Texture $self->{layout} 2055 [$self->{layout}->size]
1686 }; 2056 };
1687 2057
1688 unless (exists $self->{ox}) { 2058 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2059 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2060 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2061 : ($self->{w} - $size->[0]) * 0.5);
1692 2062
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2063 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2064 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2065 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2066 };
1697 2067
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2068 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2069 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 2070
1703 if ($tex->{format} == GL_ALPHA) { 2071 $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} 2072}
1714 2073
1715############################################################################# 2074#############################################################################
1716 2075
1717package CFClient::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
1718 2077
1719our @ISA = CFClient::UI::Label::; 2078our @ISA = CFPlus::UI::Label::;
1720 2079
1721use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1722 2081
1723sub new { 2082sub new {
1724 my $class = shift; 2083 my $class = shift;
1725 2084
1726 $class->SUPER::new ( 2085 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2089 active_fg => [0, 0, 0],
1731 can_hover => 1, 2090 can_hover => 1,
1732 can_focus => 1, 2091 can_focus => 1,
1733 valign => 0, 2092 valign => 0,
1734 can_events => 1, 2093 can_events => 1,
2094 ellipsise => 0,
1735 #text => ... 2095 #text => ...
1736 #hidden => "*", 2096 #hidden => "*",
1737 @_ 2097 @_
1738 ) 2098 )
1739} 2099}
… …
1784 my $sym = $ev->{sym}; 2144 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2145 my $uni = $ev->{unicode};
1786 2146
1787 my $text = $self->get_text; 2147 my $text = $self->get_text;
1788 2148
2149 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2150
1789 if ($uni == 8) { 2151 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2152 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2153 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2154 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2155 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2156 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2157 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2158 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } elsif ($sym == CFClient::SDLK_HOME) { 2159 } elsif ($sym == CFPlus::SDLK_HOME) {
2160 # what a hack
2161 $self->{cursor} =
2162 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2163 ? length $1
2164 : 0;
2165 } elsif ($sym == CFPlus::SDLK_END) {
2166 # uh, again
2167 $self->{cursor} =
2168 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2169 ? $self->{cursor} + length $1
2170 : length $self->{text};
2171 } elsif ($uni == 21) { # ctrl-u
2172 $text = "";
1798 $self->{cursor} = 0; 2173 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2174 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2175 $self->emit ('escape');
1803 } elsif ($uni) { 2176 } elsif ($uni == 0x0d) {
2177 substr $text, $self->{cursor}++, 0, "\012";
2178 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2179 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2180 } else {
1806 return 0; 2181 return 0;
1807 } 2182 }
1808 2183
1809 $self->_set_text ($text); 2184 $self->_set_text ($text);
1810 2185
1811 $self->realloc; 2186 $self->realloc;
2187 $self->update;
1812 2188
1813 1 2189 1
1814} 2190}
1815 2191
1816sub invoke_focus_in { 2192sub invoke_focus_in {
… …
1828 2204
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2205 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2206
1831 # byte-index to char-index 2207 # byte-index to char-index
1832 my $text = $self->{text}; 2208 my $text = $self->{text};
1833 utf8::encode $text; 2209 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2210 $self->{cursor} = length $text;
1835 2211
1836 $self->_set_text ($self->{text}); 2212 $self->_set_text ($self->{text});
1837 $self->update; 2213 $self->update;
1838 2214
1839 1 2215 1
… …
1878 utf8::encode $text; 2254 utf8::encode $text;
1879 2255
1880 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1881 } 2257 }
1882 2258
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2259 glBegin GL_LINES;
1885 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2260 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}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1887 glEnd; 2262 glEnd;
1888 } 2263 }
1889} 2264}
1890 2265
2266#############################################################################
2267
1891package CFClient::UI::Entry; 2268package CFPlus::UI::Entry;
1892 2269
1893our @ISA = CFClient::UI::EntryBase::; 2270our @ISA = CFPlus::UI::EntryBase::;
1894 2271
1895use CFClient::OpenGL; 2272use CFPlus::OpenGL;
1896 2273
1897sub invoke_key_down { 2274sub invoke_key_down {
1898 my ($self, $ev) = @_; 2275 my ($self, $ev) = @_;
1899 2276
1900 my $sym = $ev->{sym}; 2277 my $sym = $ev->{sym};
1901 2278
1902 if ($sym == 13) { 2279 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2280 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2281 my $txt = $self->get_text;
1905 2282
1906 $self->{history_pointer} = -1; 2283 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2284 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2285 $self->emit (activate => $txt);
1909 $self->update; 2286 $self->update;
1910 2287
1911 } elsif ($sym == CFClient::SDLK_UP) { 2288 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2289 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2290 $self->{history_saveback} = $self->get_text;
1914 } 2291 }
1915 if (@{$self->{history} || []} > 0) { 2292 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2293 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2295 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2296 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2297 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2298 }
1922 2299
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2300 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2301 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2302 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2303
1927 if ($self->{history_pointer} >= 0) { 2304 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2305 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2314 1
1938} 2315}
1939 2316
1940############################################################################# 2317#############################################################################
1941 2318
2319package CFPlus::UI::TextEdit;
2320
2321our @ISA = CFPlus::UI::EntryBase::;
2322
2323use CFPlus::OpenGL;
2324
2325sub move_cursor_ver {
2326 my ($self, $dy) = @_;
2327
2328 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2329
2330 $y += $dy;
2331
2332 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2333 $self->{cursor} = $index;
2334 delete $self->{cur_h};
2335 $self->update;
2336 return;
2337 }
2338}
2339
2340sub invoke_key_down {
2341 my ($self, $ev) = @_;
2342
2343 my $sym = $ev->{sym};
2344
2345 if ($sym == CFPlus::SDLK_UP) {
2346 $self->move_cursor_ver (-1);
2347 } elsif ($sym == CFPlus::SDLK_DOWN) {
2348 $self->move_cursor_ver (+1);
2349 } else {
2350 return $self->SUPER::invoke_key_down ($ev)
2351 }
2352
2353 1
2354}
2355
2356#############################################################################
2357
1942package CFClient::UI::Button; 2358package CFPlus::UI::Button;
1943 2359
1944our @ISA = CFClient::UI::Label::; 2360our @ISA = CFPlus::UI::Label::;
1945 2361
1946use CFClient::OpenGL; 2362use CFPlus::OpenGL;
1947 2363
1948my @tex = 2364my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2366 qw(b1_button_inactive.png b1_button_active.png);
1951 2367
1952sub new { 2368sub new {
1953 my $class = shift; 2369 my $class = shift;
1954 2370
1955 $class->SUPER::new ( 2371 $class->SUPER::new (
1956 padding_x => 4, 2372 padding_x => 4,
1957 padding_y => 4, 2373 padding_y => 4,
1958 fg => [1, 1, 1], 2374 fg => [1.0, 1.0, 1.0],
1959 active_fg => [0, 0, 1], 2375 active_fg => [0.8, 0.8, 0.8],
1960 can_hover => 1, 2376 can_hover => 1,
1961 align => 0, 2377 align => 0,
1962 valign => 0, 2378 valign => 0,
1963 can_events => 1, 2379 can_events => 1,
1964 @_ 2380 @_
… …
1982 2398
1983 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1985 glColor 0, 0, 0, 1; 2401 glColor 0, 0, 0, 1;
1986 2402
2403 my $tex = $tex[$GRAB == $self];
1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1988 2405
1989 glDisable GL_TEXTURE_2D; 2406 glDisable GL_TEXTURE_2D;
1990 2407
1991 $self->SUPER::_draw; 2408 $self->SUPER::_draw;
1992} 2409}
1993 2410
1994############################################################################# 2411#############################################################################
1995 2412
2413package CFPlus::UI::CheckBox;
2414
2415our @ISA = CFPlus::UI::DrawBG::;
2416
2417my @tex =
2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2419 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2420
2421use CFPlus::OpenGL;
2422
2423sub new {
2424 my $class = shift;
2425
2426 $class->SUPER::new (
2427 padding_x => 2,
2428 padding_y => 2,
2429 fg => [1, 1, 1],
2430 active_fg => [1, 1, 0],
2431 bg => [0, 0, 0, 0.2],
2432 active_bg => [1, 1, 1, 0.5],
2433 state => 0,
2434 can_hover => 1,
2435 @_
2436 )
2437}
2438
2439sub size_request {
2440 my ($self) = @_;
2441
2442 (6) x 2
2443}
2444
2445sub toggle {
2446 my ($self) = @_;
2447
2448 $self->{state} = !$self->{state};
2449 $self->emit (changed => $self->{state});
2450 $self->update;
2451}
2452
2453sub invoke_button_down {
2454 my ($self, $ev, $x, $y) = @_;
2455
2456 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2457 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2458 $self->toggle;
2459 } else {
2460 return 0
2461 }
2462
2463 1
2464}
2465
2466sub _draw {
2467 my ($self) = @_;
2468
2469 $self->SUPER::_draw;
2470
2471 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2472
2473 my ($w, $h) = @$self{qw(w h)};
2474
2475 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2476
2477 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2478
2479 my $tex = $self->{state} ? $tex[1] : $tex[0];
2480
2481 glEnable GL_TEXTURE_2D;
2482 $tex->draw_quad_alpha (0, 0, $s, $s);
2483 glDisable GL_TEXTURE_2D;
2484}
2485
2486#############################################################################
2487
2488package CFPlus::UI::Image;
2489
2490our @ISA = CFPlus::UI::Base::;
2491
2492use CFPlus::OpenGL;
2493
2494our %texture_cache;
2495
2496sub new {
2497 my $class = shift;
2498
2499 my $self = $class->SUPER::new (
2500 can_events => 0,
2501 @_,
2502 );
2503
2504 $self->{path} || $self->{tex}
2505 or Carp::croak "'path' or 'tex' attributes required";
2506
2507 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2508 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2509
2510 CFPlus::weaken $texture_cache{$self->{path}};
2511
2512 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2513
2514 $self
2515}
2516
2517sub STORABLE_freeze {
2518 my ($self, $cloning) = @_;
2519
2520 $self->{path}
2521 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2522
2523 $self->{path}
2524}
2525
2526sub STORABLE_attach {
2527 my ($self, $cloning, $path) = @_;
2528
2529 $self->new (path => $path)
2530}
2531
2532sub size_request {
2533 my ($self) = @_;
2534
2535 ($self->{tex}{w}, $self->{tex}{h})
2536}
2537
2538sub _draw {
2539 my ($self) = @_;
2540
2541 my $tex = $self->{tex};
2542
2543 my ($w, $h) = ($self->{w}, $self->{h});
2544
2545 if ($self->{rot90}) {
2546 glRotate 90, 0, 0, 1;
2547 glTranslate 0, -$self->{w}, 0;
2548
2549 ($w, $h) = ($h, $w);
2550 }
2551
2552 glEnable GL_TEXTURE_2D;
2553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2554
2555 $tex->draw_quad (0, 0, $w, $h);
2556
2557 glDisable GL_TEXTURE_2D;
2558}
2559
2560#############################################################################
2561
1996package CFClient::UI::ImageButton; 2562package CFPlus::UI::ImageButton;
1997 2563
1998our @ISA = CFClient::UI::Image::; 2564our @ISA = CFPlus::UI::Image::;
1999 2565
2000use CFClient::OpenGL; 2566use CFPlus::OpenGL;
2001 2567
2002my %textures; 2568my %textures;
2003 2569
2004sub new { 2570sub new {
2005 my $class = shift; 2571 my $class = shift;
… …
2027 1 2593 1
2028} 2594}
2029 2595
2030############################################################################# 2596#############################################################################
2031 2597
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; 2598package CFPlus::UI::VGauge;
2101 2599
2102our @ISA = CFClient::UI::Base::; 2600our @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 2601
2163use List::Util qw(min max); 2602use List::Util qw(min max);
2164 2603
2165use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2166 2605
2167my %tex = ( 2606my %tex = (
2168 food => [ 2607 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2608 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2609 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2610 ],
2172 grace => [ 2611 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2612 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/ 2613 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2175 ], 2614 ],
2176 hp => [ 2615 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2617 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2618 ],
2180 mana => [ 2619 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 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/ 2621 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2183 ], 2622 ],
2184); 2623);
2185 2624
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2625# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2685 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2686 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2687
2249 my $h1 = $self->{h} * (1 - $ycut1); 2688 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2689 my $h2 = $self->{h} * (1 - $ycut2);
2690 my $h3 = $self->{h};
2691
2692 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2693
2252 glEnable GL_BLEND; 2694 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2695 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2696 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2697 glEnable GL_TEXTURE_2D;
… …
2274 2716
2275 if ($t3) { 2717 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2718 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2719 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2720 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2721 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2722 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2723 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2724 glEnd;
2283 } 2725 }
2284 2726
2285 glDisable GL_BLEND; 2727 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2728 glDisable GL_TEXTURE_2D;
2287} 2729}
2288 2730
2289############################################################################# 2731#############################################################################
2290 2732
2291package CFClient::UI::Gauge; 2733package CFPlus::UI::Gauge;
2292 2734
2293our @ISA = CFClient::UI::VBox::; 2735our @ISA = CFPlus::UI::VBox::;
2294 2736
2295sub new { 2737sub new {
2296 my ($class, %arg) = @_; 2738 my ($class, %arg) = @_;
2297 2739
2298 my $self = $class->SUPER::new ( 2740 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2742 can_hover => 1,
2301 can_events => 1, 2743 can_events => 1,
2302 %arg, 2744 %arg,
2303 ); 2745 );
2304 2746
2305 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2747 $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); 2748 $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"); 2749 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2308 2750
2309 $self 2751 $self
2310} 2752}
2311 2753
2312sub set_fontsize { 2754sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2775 $self->{value}->set_text ($val);
2334} 2776}
2335 2777
2336############################################################################# 2778#############################################################################
2337 2779
2338package CFClient::UI::Slider; 2780package CFPlus::UI::Slider;
2339 2781
2340use strict; 2782use strict;
2341 2783
2342use CFClient::OpenGL; 2784use CFPlus::OpenGL;
2343 2785
2344our @ISA = CFClient::UI::DrawBG::; 2786our @ISA = CFPlus::UI::DrawBG::;
2345 2787
2346my @tex = 2788my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2789 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2790 qw(s1_slider.png s1_slider_bg.png);
2349 2791
2350sub new { 2792sub new {
2351 my $class = shift; 2793 my $class = shift;
2352 2794
… …
2441 } 2883 }
2442 2884
2443 1 2885 1
2444} 2886}
2445 2887
2888sub invoke_mouse_wheel {
2889 my ($self, $ev) = @_;
2890
2891 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2892
2893 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2894
2895 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2896
2897 ! ! $delta
2898}
2899
2446sub update { 2900sub update {
2447 my ($self) = @_; 2901 my ($self) = @_;
2448 2902
2449 delete $self->{knob_w}; 2903 delete $self->{knob_w};
2450 $self->SUPER::update; 2904 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2951 glDisable GL_TEXTURE_2D;
2498} 2952}
2499 2953
2500############################################################################# 2954#############################################################################
2501 2955
2502package CFClient::UI::ValSlider; 2956package CFPlus::UI::ValSlider;
2503 2957
2504our @ISA = CFClient::UI::HBox::; 2958our @ISA = CFPlus::UI::HBox::;
2505 2959
2506sub new { 2960sub new {
2507 my ($class, %arg) = @_; 2961 my ($class, %arg) = @_;
2508 2962
2509 my $range = delete $arg{range}; 2963 my $range = delete $arg{range};
2510 2964
2511 my $self = $class->SUPER::new ( 2965 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2966 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2967 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2968 to_value => sub { shift },
2515 from_value => sub { shift }, 2969 from_value => sub { shift },
2516 %arg, 2970 %arg,
2517 ); 2971 );
2518 2972
… …
2538sub set_range { shift->{slider}->set_range (@_) } 2992sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 2993sub set_value { shift->{slider}->set_value (@_) }
2540 2994
2541############################################################################# 2995#############################################################################
2542 2996
2543package CFClient::UI::TextScroller; 2997package CFPlus::UI::TextScroller;
2544 2998
2545our @ISA = CFClient::UI::HBox::; 2999our @ISA = CFPlus::UI::HBox::;
2546 3000
2547use CFClient::OpenGL; 3001use CFPlus::OpenGL;
2548 3002
2549sub new { 3003sub new {
2550 my $class = shift; 3004 my $class = shift;
2551 3005
2552 my $self = $class->SUPER::new ( 3006 my $self = $class->SUPER::new (
2553 fontsize => 1, 3007 fontsize => 1,
2554 can_events => 0, 3008 can_events => 1,
2555 indent => 0, 3009 indent => 0,
2556 #font => default_font 3010 #font => default_font
2557 @_, 3011 @_,
2558 3012
2559 layout => (new CFClient::Layout 1), 3013 layout => (new CFPlus::Layout),
2560 par => [], 3014 par => [],
3015 max_par => 0,
2561 height => 0, 3016 height => 0,
2562 children => [ 3017 children => [
2563 (new CFClient::UI::Empty expand => 1), 3018 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 3019 (new CFPlus::UI::Slider vertical => 1),
2565 ], 3020 ],
2566 ); 3021 );
2567 3022
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3023 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3024
… …
2599 3054
2600 $self->reflow; 3055 $self->reflow;
2601 3056
2602 local $self->{children} = [$empty, $slider]; 3057 local $self->{children} = [$empty, $slider];
2603 $self->SUPER::invoke_size_allocate ($w, $h) 3058 $self->SUPER::invoke_size_allocate ($w, $h)
3059}
3060
3061sub invoke_mouse_wheel {
3062 my ($self, $ev) = @_;
3063
3064 return 0 unless $ev->{dy}; # only vertical movements
3065
3066 $self->{children}[1]->emit (mouse_wheel => $ev);
3067
3068 1
2604} 3069}
2605 3070
2606sub get_layout { 3071sub get_layout {
2607 my ($self, $para) = @_; 3072 my ($self, $para) = @_;
2608 3073
… …
2636 3101
2637 # todo: base offset on lines or so, not on pixels 3102 # todo: base offset on lines or so, not on pixels
2638 $self->{children}[1]->set_value ($offset); 3103 $self->{children}[1]->set_value ($offset);
2639} 3104}
2640 3105
3106sub current_paragraph {
3107 my ($self) = @_;
3108
3109 $self->{top_paragraph} - 1
3110}
3111
3112sub scroll_to {
3113 my ($self, $para) = @_;
3114
3115 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3116
3117 $self->{scroll_to} = $para;
3118 $self->update;
3119}
3120
2641sub clear { 3121sub clear {
2642 my ($self) = @_; 3122 my ($self) = @_;
2643 3123
2644 my (undef, undef, @other) = @{ $self->{children} }; 3124 my (undef, undef, @other) = @{ $self->{children} };
2645 $self->remove ($_) for @other; 3125 $self->remove ($_) for @other;
… …
2648 $self->{height} = 0; 3128 $self->{height} = 0;
2649 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3129 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2650} 3130}
2651 3131
2652sub add_paragraph { 3132sub add_paragraph {
2653 my ($self, $color, $para, $indent) = @_; 3133 my $self = shift;
2654 3134
2655 my ($text, @w) = ref $para ? @$para : $para; 3135 for my $para (@_) {
2656
2657 $para = { 3136 $para = {
3137 fg => [1, 1, 1, 1],
3138 indent => 0,
3139 markup => "",
3140 widget => [],
3141 ref $para ? %$para : (markup => $para),
2658 w => 1e10, 3142 w => 1e10,
2659 wrapped => 1, 3143 wrapped => 1,
2660 fg => $color,
2661 indent => $indent,
2662 markup => $text,
2663 widget => \@w,
2664 }; 3144 };
2665 3145
2666 $self->add (@w) if @w; 3146 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2667 push @{$self->{par}}, $para; 3147 push @{$self->{par}}, $para;
3148 }
3149
3150 if (my $max = $self->{max_par}) {
3151 shift @{$self->{par}} while @{$self->{par}} > $max;
3152 }
2668 3153
2669 $self->{need_reflow}++; 3154 $self->{need_reflow}++;
2670 $self->update; 3155 $self->update;
2671} 3156}
2672 3157
2673sub scroll_to_bottom { 3158sub scroll_to_bottom {
2674 my ($self) = @_; 3159 my ($self) = @_;
2675 3160
2676 $self->{scroll_to_bottom} = 1; 3161 $self->{scroll_to} = $#{$self->{par}};
2677 $self->update; 3162 $self->update;
2678} 3163}
2679 3164
3165sub force_uptodate {
3166 my ($self) = @_;
3167
3168 if (delete $self->{need_reflow}) {
3169 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3170
3171 my $height = 0;
3172
3173 for my $para (@{$self->{par}}) {
3174 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3175 my $layout = $self->get_layout ($para);
3176 my ($w, $h) = $layout->size;
3177
3178 $para->{w} = $w + $para->{indent};
3179 $para->{h} = $h;
3180 $para->{wrapped} = $layout->has_wrapped;
3181 }
3182
3183 $para->{y} = $height;
3184 $height += $para->{h};
3185 }
3186
3187 $self->{height} = $height;
3188 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3189
3190 delete $self->{texture};
3191 }
3192
3193 if (my $paridx = delete $self->{scroll_to}) {
3194 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3195 }
3196}
3197
2680sub update { 3198sub update {
2681 my ($self) = @_; 3199 my ($self) = @_;
2682 3200
2683 $self->SUPER::update; 3201 $self->SUPER::update;
2684 3202
2685 return unless $self->{h} > 0; 3203 return unless $self->{h} > 0;
2686 3204
2687 delete $self->{texture}; 3205 delete $self->{texture};
2688 3206
2689 $ROOT->on_post_alloc ($self => sub { 3207 $ROOT->on_post_alloc ($self => sub {
3208 $self->force_uptodate;
3209
2690 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3210 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2691 3211
2692 if (delete $self->{need_reflow}) {
2693 my $height = 0;
2694
2695 for my $para (@{$self->{par}}) {
2696 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2697 my $layout = $self->get_layout ($para);
2698 my ($w, $h) = $layout->size;
2699
2700 $para->{w} = $w + $para->{indent};
2701 $para->{h} = $h;
2702 $para->{wrapped} = $layout->has_wrapped;
2703 }
2704
2705 $height += $para->{h};
2706 }
2707
2708 $self->{height} = $height;
2709
2710 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2711
2712 delete $self->{texture};
2713 }
2714
2715 if (delete $self->{scroll_to_bottom}) {
2716 $self->{children}[1]->set_value (1e10);
2717 }
2718
2719 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3212 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2720 glClearColor 0, 0, 0, 0; 3213 glClearColor 0, 0, 0, 0;
2721 glClear GL_COLOR_BUFFER_BIT; 3214 glClear GL_COLOR_BUFFER_BIT;
2722 3215
3216 package CFPlus::UI::Base;
3217 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3218 (0, 0, $self->{w}, $self->{h});
3219
3220 my $top = int $self->{children}[1]{range}[0];
3221
3222 my $paridx = 0;
3223 my $top_paragraph;
2723 my $top = int $self->{children}[1]{range}[0]; 3224 my $top = int $self->{children}[1]{range}[0];
2724 3225
2725 my $y0 = $top; 3226 my $y0 = $top;
2726 my $y1 = $top + $H; 3227 my $y1 = $top + $H;
2727 3228
2728 my $y = 0;
2729
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 3229 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 3230 my $h = $para->{h};
3231 my $y = $para->{y};
2736 3232
2737 if ($y0 < $y + $h && $y < $y1) { 3233 if ($y0 < $y + $h && $y < $y1) {
2738
2739 my $layout = $self->get_layout ($para); 3234 my $layout = $self->get_layout ($para);
2740 3235
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 3236 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 3237
2746 if (my @w = @{ $para->{widget} }) { 3238 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 3239 my @s = $layout->get_shapes;
2748 3240
2749 glDisable GL_BLEND;
2750 for (@w) { 3241 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 3242 my ($dx, $dy) = splice @s, 0, 2, ();
2752 3243
2753 $_->{x} = $dx + $para->{indent}; 3244 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 3245 $_->{y} = $dy + $y - $y0;
2755 3246
2756 $_->draw; 3247 $_->draw;
2757 } 3248 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 3249 }
2761 } 3250 }
2762 3251
2763 $y += $h; 3252 $paridx++;
3253 $top_paragraph ||= $paridx if $y >= $top;
2764 } 3254 }
2765 3255
2766 glDisable GL_BLEND; 3256 $self->{top_paragraph} = $top_paragraph;
2767 }; 3257 };
2768 }); 3258 });
2769} 3259}
2770 3260
2771sub reconfigure { 3261sub reconfigure {
… …
2789 $self->{children}[1]->draw; 3279 $self->{children}[1]->draw;
2790} 3280}
2791 3281
2792############################################################################# 3282#############################################################################
2793 3283
2794package CFClient::UI::Animator; 3284package CFPlus::UI::Animator;
2795 3285
2796use CFClient::OpenGL; 3286use CFPlus::OpenGL;
2797 3287
2798our @ISA = CFClient::UI::Bin::; 3288our @ISA = CFPlus::UI::Bin::;
2799 3289
2800sub moveto { 3290sub moveto {
2801 my ($self, $x, $y) = @_; 3291 my ($self, $x, $y) = @_;
2802 3292
2803 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3293 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2831 glPopMatrix; 3321 glPopMatrix;
2832} 3322}
2833 3323
2834############################################################################# 3324#############################################################################
2835 3325
2836package CFClient::UI::Flopper; 3326package CFPlus::UI::Flopper;
2837 3327
2838our @ISA = CFClient::UI::Button::; 3328our @ISA = CFPlus::UI::Button::;
2839 3329
2840sub new { 3330sub new {
2841 my $class = shift; 3331 my $class = shift;
2842 3332
2843 my $self = $class->SUPER::new ( 3333 my $self = $class->SUPER::new (
… …
2855 $self->{other}->toggle_visibility; 3345 $self->{other}->toggle_visibility;
2856} 3346}
2857 3347
2858############################################################################# 3348#############################################################################
2859 3349
2860package CFClient::UI::Tooltip; 3350package CFPlus::UI::Tooltip;
2861 3351
2862our @ISA = CFClient::UI::Bin::; 3352our @ISA = CFPlus::UI::Bin::;
2863 3353
2864use CFClient::OpenGL; 3354use CFPlus::OpenGL;
2865 3355
2866sub new { 3356sub new {
2867 my $class = shift; 3357 my $class = shift;
2868 3358
2869 $class->SUPER::new ( 3359 $class->SUPER::new (
… …
2872 ) 3362 )
2873} 3363}
2874 3364
2875sub set_tooltip_from { 3365sub set_tooltip_from {
2876 my ($self, $widget) = @_; 3366 my ($self, $widget) = @_;
3367
3368 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3369 if $widget->{tooltip} =~ /^#(.*)$/;
2877 3370
2878 my $tooltip = $widget->{tooltip}; 3371 my $tooltip = $widget->{tooltip};
2879 3372
2880 if ($ENV{CFPLUS_DEBUG} & 2) { 3373 if ($ENV{CFPLUS_DEBUG} & 2) {
2881 $tooltip .= "\n\n" . (ref $widget) . "\n" 3374 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2885 } 3378 }
2886 3379
2887 $tooltip =~ s/^\n+//; 3380 $tooltip =~ s/^\n+//;
2888 $tooltip =~ s/\n+$//; 3381 $tooltip =~ s/\n+$//;
2889 3382
2890 $self->add (new CFClient::UI::Label 3383 $self->add (new CFPlus::UI::Label
2891 markup => $tooltip, 3384 markup => $tooltip,
2892 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3385 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2893 fontsize => 0.8, 3386 fontsize => 0.8,
2894 fg => [0, 0, 0, 1], 3387 style => 1, # FLAG_INVERSE
2895 ellipsise => 0, 3388 ellipsise => 0,
2896 font => ($widget->{tooltip_font} || $::FONT_PROP), 3389 font => ($widget->{tooltip_font} || $::FONT_PROP),
2897 ); 3390 );
2898} 3391}
2899 3392
… …
2918 3411
2919 $self->{root}->on_post_alloc ("move_$self" => sub { 3412 $self->{root}->on_post_alloc ("move_$self" => sub {
2920 my $widget = $self->{owner} 3413 my $widget = $self->{owner}
2921 or return; 3414 or return;
2922 3415
3416 if ($widget->{visible}) {
2923 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3417 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2924 3418
2925 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3419 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2926 if $x + $self->{w} > $self->{root}{w}; 3420 if $x + $self->{w} > $self->{root}{w};
2927 3421
2928 $self->move_abs ($x, $y); 3422 $self->move_abs ($x, $y);
3423 } else {
3424 $self->hide;
3425 }
2929 }); 3426 });
2930} 3427}
2931 3428
2932sub _draw { 3429sub _draw {
2933 my ($self) = @_; 3430 my ($self) = @_;
… …
2957 $self->SUPER::_draw; 3454 $self->SUPER::_draw;
2958} 3455}
2959 3456
2960############################################################################# 3457#############################################################################
2961 3458
2962package CFClient::UI::Face; 3459package CFPlus::UI::Face;
2963 3460
2964our @ISA = CFClient::UI::Base::; 3461our @ISA = CFPlus::UI::DrawBG::;
2965 3462
2966use CFClient::OpenGL; 3463use CFPlus::OpenGL;
2967 3464
2968sub new { 3465sub new {
2969 my $class = shift; 3466 my $class = shift;
2970 3467
2971 my $self = $class->SUPER::new ( 3468 my $self = $class->SUPER::new (
3469 size_w => 32,
3470 size_h => 8,
2972 aspect => 1, 3471 aspect => 1,
2973 can_events => 0, 3472 can_events => 0,
2974 @_, 3473 @_,
2975 ); 3474 );
2976 3475
2977 if ($self->{anim} && $self->{animspeed}) { 3476 if ($self->{anim} && $self->{animspeed}) {
2978 Scalar::Util::weaken (my $widget = $self); 3477 CFPlus::weaken (my $widget = $self);
2979 3478
3479 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3480 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2980 $self->{timer} = Event->timer ( 3481 $self->{timer} = Event->timer (
2981 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2982 hard => 1, 3482 parked => 1,
2983 interval => $self->{animspeed},
2984 cb => sub { 3483 cb => sub {
3484 return unless $::CONN && $widget;
3485
2985 ++$widget->{frame}; 3486 ++$widget->{frame};
3487 $widget->update_face;
2986 $widget->update; 3488 $widget->update;
3489
3490 $widget->update_timer;
2987 }, 3491 },
2988 ); 3492 );
3493
3494 $self->update_face;
3495 $self->update_timer;
2989 } 3496 }
2990 3497
2991 $self 3498 $self
2992} 3499}
2993 3500
3501sub update_timer {
3502 my ($self) = @_;
3503
3504 return unless $self->{timer};
3505
3506 if ($self->{visible}) {
3507 $self->{timer}->at (
3508 $self->{anim_start}
3509 + $self->{animspeed}
3510 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3511 );
3512 $self->{timer}->start;
3513 } else {
3514 $self->{timer}->stop;
3515 }
3516}
3517
3518sub update_face {
3519 my ($self) = @_;
3520
3521 return unless $::CONN;
3522
3523 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3524 if ($anim && @$anim) {
3525 delete $self->{wait_face};
3526 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3527 }
3528 }
3529}
3530
2994sub size_request { 3531sub size_request {
2995 (32, 8) 3532 my ($self) = @_;
3533
3534 if ($::CONN) {
3535 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3536 if (my $tex = $::CONN->{texture}[$faceid]) {
3537 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3538 } else {
3539 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3540 $self->realloc;
3541 });
3542 }
3543 }
3544 }
3545
3546 ($self->{size_w} || 8, $self->{size_h} || 8)
2996} 3547}
2997 3548
2998sub update { 3549sub update {
2999 my ($self) = @_; 3550 my ($self) = @_;
3000 3551
3001 return unless $self->{visible}; 3552 return unless $self->{visible};
3002 3553
3003 $self->SUPER::update; 3554 $self->SUPER::update;
3004} 3555}
3005 3556
3557sub invoke_visibility_change {
3558 my ($self) = @_;
3559
3560 $self->update_timer;
3561
3562 0
3563}
3564
3006sub _draw { 3565sub _draw {
3007 my ($self) = @_; 3566 my ($self) = @_;
3008 3567
3009 return unless $::CONN; 3568 return unless $::CONN;
3010 3569
3011 my $face; 3570 $self->SUPER::_draw;
3012 3571
3013 if ($self->{frame}) {
3014 my $anim = $::CONN->{anim}[$self->{anim}]; 3572 my $faceid = $::CONN->{faceid}[$self->{face}]
3015 3573 or return;
3016 $face = $anim->[ $self->{frame} % @$anim ]
3017 if $anim && @$anim;
3018 }
3019 3574
3020 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3575 my $tex = $::CONN->{texture}[$faceid];
3021 3576
3022 if ($tex) { 3577 if ($tex) {
3023 glEnable GL_TEXTURE_2D; 3578 glEnable GL_TEXTURE_2D;
3024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3025 glColor 0, 0, 0, 1; 3580 glColor 0, 0, 0, 1;
… …
3029} 3584}
3030 3585
3031sub destroy { 3586sub destroy {
3032 my ($self) = @_; 3587 my ($self) = @_;
3033 3588
3034 $self->{timer}->cancel 3589 (delete $self->{timer})->cancel
3035 if $self->{timer}; 3590 if $self->{timer};
3036 3591
3037 $self->SUPER::destroy; 3592 $self->SUPER::destroy;
3038} 3593}
3039 3594
3040############################################################################# 3595#############################################################################
3041 3596
3042package CFClient::UI::Buttonbar; 3597package CFPlus::UI::Buttonbar;
3043 3598
3044our @ISA = CFClient::UI::HBox::; 3599our @ISA = CFPlus::UI::HBox::;
3045 3600
3046# TODO: should actualyl wrap buttons and other goodies. 3601# TODO: should actually wrap buttons and other goodies.
3047 3602
3048############################################################################# 3603#############################################################################
3049 3604
3050package CFClient::UI::Menu; 3605package CFPlus::UI::Menu;
3051 3606
3052our @ISA = CFClient::UI::FancyFrame::; 3607our @ISA = CFPlus::UI::Toplevel::;
3053 3608
3054use CFClient::OpenGL; 3609use CFPlus::OpenGL;
3055 3610
3056sub new { 3611sub new {
3057 my $class = shift; 3612 my $class = shift;
3058 3613
3059 my $self = $class->SUPER::new ( 3614 my $self = $class->SUPER::new (
3060 items => [], 3615 items => [],
3061 z => 100, 3616 z => 100,
3062 @_, 3617 @_,
3063 ); 3618 );
3064 3619
3065 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3620 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3066 3621
3067 for my $item (@{ $self->{items} }) { 3622 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3623 my ($widget, $cb, $tooltip) = @$item;
3069 3624
3070 # handle various types of items, only text for now 3625 # handle various types of items, only text for now
3071 if (!ref $widget) { 3626 if (!ref $widget) {
3627 if ($widget =~ /\t/) {
3628 my ($left, $right) = split /\t/, $widget, 2;
3629
3072 $widget = new CFClient::UI::Label 3630 $widget = new CFPlus::UI::HBox
3073 can_hover => 1, 3631 can_hover => 1,
3074 can_events => 1, 3632 can_events => 1,
3633 tooltip => $tooltip,
3634 children => [
3635 (new CFPlus::UI::Label markup => $left, expand => 1),
3636 (new CFPlus::UI::Label markup => $right, align => +1),
3637 ],
3638 ;
3639
3640 } else {
3641 $widget = new CFPlus::UI::Label
3642 can_hover => 1,
3643 can_events => 1,
3075 markup => $widget, 3644 markup => $widget,
3076 tooltip => $tooltip 3645 tooltip => $tooltip;
3646 }
3077 } 3647 }
3078 3648
3079 $self->{item}{$widget} = $item; 3649 $self->{item}{$widget} = $item;
3080 3650
3081 $self->{vbox}->add ($widget); 3651 $self->{vbox}->add ($widget);
… …
3124 1 3694 1
3125} 3695}
3126 3696
3127############################################################################# 3697#############################################################################
3128 3698
3129package CFClient::UI::Multiplexer; 3699package CFPlus::UI::Multiplexer;
3130 3700
3131our @ISA = CFClient::UI::Container::; 3701our @ISA = CFPlus::UI::Container::;
3132 3702
3133sub new { 3703sub new {
3134 my $class = shift; 3704 my $class = shift;
3135 3705
3136 my $self = $class->SUPER::new ( 3706 my $self = $class->SUPER::new (
… …
3150 3720
3151 $self->{current} = $self->{children}[0] 3721 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3722 if @{ $self->{children} };
3153} 3723}
3154 3724
3725sub get_current_page {
3726 my ($self) = @_;
3727
3728 $self->{current}
3729}
3730
3155sub set_current_page { 3731sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3732 my ($self, $page_or_widget) = @_;
3157 3733
3158 my $widget = ref $page_or_widget 3734 my $widget = ref $page_or_widget
3159 ? $page_or_widget 3735 ? $page_or_widget
… …
3191 $self->{current}->draw; 3767 $self->{current}->draw;
3192} 3768}
3193 3769
3194############################################################################# 3770#############################################################################
3195 3771
3196package CFClient::UI::Notebook; 3772package CFPlus::UI::Notebook;
3197 3773
3198our @ISA = CFClient::UI::VBox::; 3774our @ISA = CFPlus::UI::VBox::;
3199 3775
3200sub new { 3776sub new {
3201 my $class = shift; 3777 my $class = shift;
3202 3778
3203 my $self = $class->SUPER::new ( 3779 my $self = $class->SUPER::new (
3204 buttonbar => (new CFClient::UI::Buttonbar), 3780 buttonbar => (new CFPlus::UI::Buttonbar),
3205 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3781 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3206 # filter => # will be put between multiplexer and $self 3782 # filter => # will be put between multiplexer and $self
3207 @_, 3783 @_,
3208 ); 3784 );
3209 3785
3210 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3786 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3214} 3790}
3215 3791
3216sub add { 3792sub add {
3217 my ($self, $title, $widget, $tooltip) = @_; 3793 my ($self, $title, $widget, $tooltip) = @_;
3218 3794
3219 Scalar::Util::weaken $self; 3795 CFPlus::weaken $self;
3220 3796
3221 $self->{buttonbar}->add (new CFClient::UI::Button 3797 $self->{buttonbar}->add (new CFPlus::UI::Button
3222 markup => $title, 3798 markup => $title,
3223 tooltip => $tooltip, 3799 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3800 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3801 );
3226 3802
3227 $self->{multiplexer}->add ($widget); 3803 $self->{multiplexer}->add ($widget);
3228} 3804}
3229 3805
3806sub get_current_page {
3807 my ($self) = @_;
3808
3809 $self->{multiplexer}->get_current_page
3810}
3811
3230sub set_current_page { 3812sub set_current_page {
3231 my ($self, $page) = @_; 3813 my ($self, $page) = @_;
3232 3814
3233 $self->{multiplexer}->set_current_page ($page); 3815 $self->{multiplexer}->set_current_page ($page);
3234 $self->emit (page_changed => $self->{multiplexer}{current}); 3816 $self->emit (page_changed => $self->{multiplexer}{current});
3235} 3817}
3236 3818
3237############################################################################# 3819#############################################################################
3238 3820
3239package CFClient::UI::Combobox; 3821package CFPlus::UI::Selector;
3240 3822
3241use utf8; 3823use utf8;
3242 3824
3243our @ISA = CFClient::UI::Button::; 3825our @ISA = CFPlus::UI::Button::;
3244 3826
3245sub new { 3827sub new {
3246 my $class = shift; 3828 my $class = shift;
3247 3829
3248 my $self = $class->SUPER::new ( 3830 my $self = $class->SUPER::new (
… …
3265 my ($value, $title, $tooltip) = @$_; 3847 my ($value, $title, $tooltip) = @$_;
3266 3848
3267 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3849 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3268 } 3850 }
3269 3851
3270 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3852 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3271} 3853}
3272 3854
3273sub _set_value { 3855sub _set_value {
3274 my ($self, $value) = @_; 3856 my ($self, $value) = @_;
3275 3857
… …
3290 $self->emit (changed => $value); 3872 $self->emit (changed => $value);
3291} 3873}
3292 3874
3293############################################################################# 3875#############################################################################
3294 3876
3295package CFClient::UI::Statusbox; 3877package CFPlus::UI::Statusbox;
3296 3878
3297our @ISA = CFClient::UI::VBox::; 3879our @ISA = CFPlus::UI::VBox::;
3298 3880
3299sub new { 3881sub new {
3300 my $class = shift; 3882 my $class = shift;
3301 3883
3302 my $self = $class->SUPER::new ( 3884 my $self = $class->SUPER::new (
3303 fontsize => 0.8, 3885 fontsize => 0.8,
3304 @_, 3886 @_,
3305 ); 3887 );
3306 3888
3307 Scalar::Util::weaken (my $this = $self); 3889 CFPlus::weaken (my $this = $self);
3308 3890
3309 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3891 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3310 3892
3311 $self 3893 $self
3312} 3894}
… …
3314sub reorder { 3896sub reorder {
3315 my ($self) = @_; 3897 my ($self) = @_;
3316 my $NOW = Time::HiRes::time; 3898 my $NOW = Time::HiRes::time;
3317 3899
3318 # freeze display when hovering over any label 3900 # freeze display when hovering over any label
3319 return if $CFClient::UI::TOOLTIP->{owner} 3901 return if $CFPlus::UI::TOOLTIP->{owner}
3320 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3902 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3321 values %{ $self->{item} }; 3903 values %{ $self->{item} };
3322 3904
3323 while (my ($k, $v) = each %{ $self->{item} }) { 3905 while (my ($k, $v) = each %{ $self->{item} }) {
3324 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3906 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3325 } 3907 }
… …
3346 for ($short) { 3928 for ($short) {
3347 s/^\s+//; 3929 s/^\s+//;
3348 s/\s+/ /g; 3930 s/\s+/ /g;
3349 } 3931 }
3350 3932
3351 new CFClient::UI::Label 3933 new CFPlus::UI::Label
3352 markup => $short, 3934 markup => $short,
3353 tooltip => $item->{tooltip}, 3935 tooltip => $item->{tooltip},
3354 tooltip_font => $::FONT_PROP, 3936 tooltip_font => $::FONT_PROP,
3355 tooltip_width => 0.67, 3937 tooltip_width => 0.67,
3356 fontsize => $item->{fontsize} || $self->{fontsize}, 3938 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3410 count => 1, 3992 count => 1,
3411 %arg, 3993 %arg,
3412 }; 3994 };
3413 } 3995 }
3414 3996
3997 $ROOT->on_refresh (reorder => sub {
3415 $self->reorder; 3998 $self->reorder;
3999 });
3416} 4000}
3417 4001
3418sub reconfigure { 4002sub reconfigure {
3419 my ($self) = @_; 4003 my ($self) = @_;
3420 4004
… …
3433 $self->SUPER::destroy; 4017 $self->SUPER::destroy;
3434} 4018}
3435 4019
3436############################################################################# 4020#############################################################################
3437 4021
3438package CFClient::UI::Inventory;
3439
3440our @ISA = CFClient::UI::ScrolledWindow::;
3441
3442sub new {
3443 my $class = shift;
3444
3445 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3447 @_,
3448 );
3449
3450 $self
3451}
3452
3453sub set_items {
3454 my ($self, $items) = @_;
3455
3456 $self->{child}->clear;
3457 return unless $items;
3458
3459 my @items = sort {
3460 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name})
3462 } @$items;
3463
3464 $self->{real_items} = \@items;
3465
3466 my $row = 0;
3467 for my $item (@items) {
3468 CFClient::Item::update_widgets $item;
3469
3470 $self->{child}->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget});
3473
3474 $row++;
3475 }
3476}
3477
3478#############################################################################
3479
3480package CFClient::UI::SpellList;
3481
3482our @ISA = CFClient::UI::Table::;
3483
3484sub new {
3485 my $class = shift;
3486
3487 my $self = $class->SUPER::new (
3488 binding => [],
3489 commands => [],
3490 @_,
3491 )
3492}
3493
3494my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3495
3496my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3497 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3498my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3499 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3500my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3501 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3502my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3503 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3504my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3505 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3506
3507sub rebuild_spell_list {
3508 my ($self) = @_;
3509
3510 $CFClient::UI::ROOT->on_refresh ($self => sub {
3511 $self->clear;
3512
3513 return unless $::CONN;
3514
3515 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3516 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3517 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3518 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3519 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3520
3521 my $row = 0;
3522
3523 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3524 my $spell = $self->{spell}{$_};
3525
3526 $row++;
3527
3528 my $spell_cb = sub {
3529 my ($widget, $ev) = @_;
3530
3531 if ($ev->{button} == 1) {
3532 $::CONN->user_send ("cast $spell->{name}");
3533 } elsif ($ev->{button} == 2) {
3534 $::CONN->user_send ("invoke $spell->{name}");
3535 } elsif ($ev->{button} == 3) {
3536 (new CFClient::UI::Menu
3537 items => [
3538 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3539 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3540 ],
3541 )->popup ($ev);
3542 } else {
3543 return 0;
3544 }
3545
3546 1
3547 };
3548
3549 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3550
3551 #TODO: add path info to tooltip
3552 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3553
3554 $self->add (0, $row, new CFClient::UI::Face
3555 face => $spell->{face},
3556 can_hover => 1,
3557 can_events => 1,
3558 tooltip => $tooltip,
3559 on_button_down => $spell_cb,
3560 );
3561
3562 $self->add (1, $row, new CFClient::UI::Label
3563 expand => 1,
3564 text => $spell->{name},
3565 can_hover => 1,
3566 can_events => 1,
3567 tooltip => $tooltip,
3568 on_button_down => $spell_cb,
3569 );
3570
3571 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3572 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3573 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3574 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3575 }
3576 });
3577}
3578
3579sub add_spell {
3580 my ($self, $spell) = @_;
3581
3582 $self->{spell}->{$spell->{name}} = $spell;
3583 $self->rebuild_spell_list;
3584}
3585
3586sub remove_spell {
3587 my ($self, $spell) = @_;
3588
3589 delete $self->{spell}->{$spell->{name}};
3590 $self->rebuild_spell_list;
3591}
3592
3593sub clear_spells {
3594 my ($self) = @_;
3595
3596 $self->{spell} = {};
3597 $self->rebuild_spell_list;
3598}
3599
3600#############################################################################
3601
3602package CFClient::UI::Root; 4022package CFPlus::UI::Root;
3603 4023
3604our @ISA = CFClient::UI::Container::; 4024our @ISA = CFPlus::UI::Container::;
3605 4025
3606use List::Util qw(min max); 4026use List::Util qw(min max);
3607 4027
3608use CFClient::OpenGL; 4028use CFPlus::OpenGL;
3609 4029
3610sub new { 4030sub new {
3611 my $class = shift; 4031 my $class = shift;
3612 4032
3613 my $self = $class->SUPER::new ( 4033 my $self = $class->SUPER::new (
3614 visible => 1, 4034 visible => 1,
3615 @_, 4035 @_,
3616 ); 4036 );
3617 4037
3618 Scalar::Util::weaken ($self->{root} = $self); 4038 CFPlus::weaken ($self->{root} = $self);
3619 4039
3620 $self 4040 $self
3621} 4041}
3622 4042
3623sub size_request { 4043sub size_request {
… …
3789 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4209 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790 4210
3791 $w = 0 if $w < 0; 4211 $w = 0 if $w < 0;
3792 $h = 0 if $h < 0; 4212 $h = 0 if $h < 0;
3793 4213
4214 $w = max $widget->{min_w}, $w;
4215 $h = max $widget->{min_h}, $h;
4216
4217# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4218# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4219
4220 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4221 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4222
3794 $w = int $w + 0.5; 4223 $w = int $w + 0.5;
3795 $h = int $h + 0.5; 4224 $h = int $h + 0.5;
3796 4225
3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4226 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w}; 4227 $widget->{old_w} = $widget->{w};
… …
3808 4237
3809 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
3810 $_->() 4239 $_->()
3811 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
3812 } 4241 }
3813
3814 4242
3815 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3816 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3817 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
3818 4246
… …
3821 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4249 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3822 glMatrixMode GL_MODELVIEW; 4250 glMatrixMode GL_MODELVIEW;
3823 glLoadIdentity; 4251 glLoadIdentity;
3824 4252
3825 { 4253 {
3826 package CFClient::UI::Base; 4254 package CFPlus::UI::Base;
3827 4255
3828 ($draw_x, $draw_y, $draw_w, $draw_h) = 4256 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3829 (0, 0, $self->{w}, $self->{h}); 4257 (0, 0, $self->{w}, $self->{h});
3830 }
3831 4258
3832 $self->_draw; 4259 $self->_draw;
4260 }
3833} 4261}
3834 4262
3835############################################################################# 4263#############################################################################
3836 4264
3837package CFClient::UI; 4265package CFPlus::UI;
3838 4266
3839$ROOT = new CFClient::UI::Root; 4267$ROOT = new CFPlus::UI::Root;
3840$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4268$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3841 4269
38421 42701
3843 4271

Diff Legend

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