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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 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;
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
90 105
91 $GRAB = $widget; 106 $GRAB = $widget;
92 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
93 108
94 $TOOLTIP_WATCHER->cb->(); 109 $TOOLTIP_WATCHER->cb->();
95 } 110 }
96 111
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 112 if ($GRAB) {
98 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 114 # mousewheel
100 if $GRAB; 115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $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; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
193 reconfigure_widgets; 207 reconfigure_widgets;
194} 208}
195 209
196############################################################################# 210#############################################################################
197 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
198package CFClient::UI::Base; 220package CFPlus::UI::Base;
199 221
200use strict; 222use strict;
201 223
202use CFClient::OpenGL; 224use CFPlus::OpenGL;
203 225
204sub new { 226sub new {
205 my $class = shift; 227 my $class = shift;
206 228
207 my $self = bless { 229 my $self = bless {
… …
212 h => undef, 234 h => undef,
213 can_events => 1, 235 can_events => 1,
214 @_ 236 @_
215 }, $class; 237 }, $class;
216 238
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 239 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 240
219 for (keys %$self) { 241 for (keys %$self) {
220 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
222 } 244 }
223 } 245 }
224 246
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 248 $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}; 249 $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}; 250 $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}; 251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 252
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 255
234 $self->show if $layout->{show}; 256 $self->show if $layout->{show};
… …
239 261
240sub destroy { 262sub destroy {
241 my ($self) = @_; 263 my ($self) = @_;
242 264
243 $self->hide; 265 $self->hide;
266 $self->emit ("destroy");
244 %$self = (); 267 %$self = ();
245} 268}
246 269
247sub show { 270sub show {
248 my ($self) = @_; 271 my ($self) = @_;
249 272
250 return if $self->{parent}; 273 return if $self->{parent};
251 274
252 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
253} 276}
254 277
255sub set_visible { 278sub set_visible {
256 my ($self) = @_; 279 my ($self) = @_;
257 280
… …
278 delete $self->{root}; 301 delete $self->{root};
279 302
280 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
282 305
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
285 308
286 $self->focus_out; 309 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
289} 311}
290 312
291sub set_visibility { 313sub set_visibility {
292 my ($self, $visible) = @_; 314 my ($self, $visible) = @_;
… …
336sub size_request { 358sub size_request {
337 require Carp; 359 require Carp;
338 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
339} 361}
340 362
363sub baseline_shift {
364 0
365}
366
341sub configure { 367sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
343 369
344 if ($self->{aspect}) { 370 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
346 372
347 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 375
350 # use alignment to adjust x, y 376 # use alignment to adjust x, y
351 377
352 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
367 393
368 $self->{root}{size_alloc}{$self+0} = $self; 394 $self->{root}{size_alloc}{$self+0} = $self;
369 } 395 }
370} 396}
371 397
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 398sub children {
377 # nop 399 # nop
378} 400}
379 401
380sub visible_children { 402sub visible_children {
… …
398 420
399 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
400 422
401 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
402 424
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 428 }
407} 429}
408 430
409# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
410sub coord2local { 432sub coord2local {
411 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
412 434
435 Carp::confess unless $self->{parent};#d#
436
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 438}
415 439
416# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
417sub coord2global { 441sub coord2global {
418 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
419 443
444 Carp::confess unless $self->{parent};#d#
445
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 447}
422 448
423sub focus_in { 449sub invoke_focus_in {
424 my ($self) = @_; 450 my ($self) = @_;
425 451
426 return if $FOCUS == $self; 452 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
428 454
429 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
430 456
431 $self->_emit (focus_in => $focus); 457 $self->update;
432 458
433 $focus->update if $focus; 459 0
434 $FOCUS->update;
435} 460}
436 461
437sub focus_out { 462sub invoke_focus_out {
438 my ($self) = @_; 463 my ($self) = @_;
439 464
440 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
441 466
442 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
443 468
444 $self->_emit (focus_out => $focus); 469 $self->update;
445 470
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 472 unless $FOCUS;
450}
451 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
452sub mouse_motion { 0 } 484sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 485sub invoke_button_up { 0 }
454sub key_down { 0 } 486sub invoke_key_down { 0 }
455sub key_up { 0 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
456 489
457sub button_down { 490sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
459 492
460 $self->focus_in; 493 $self->grab_focus;
461 494
462 0 495 0
496}
497
498sub connect {
499 my ($self, $signal, $cb) = @_;
500
501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
507}
508
509sub disconnect_all {
510 my ($self, $signal) = @_;
511
512 delete $self->{signal_cb}{$signal};
513}
514
515my %has_coords = (
516 button_down => 1,
517 button_up => 1,
518 mouse_motion => 1,
519 mouse_wheel => 1,
520);
521
522sub emit {
523 my ($self, $signal, @args) = @_;
524
525 # I do not really like this solution, but I do not like duplication
526 # and needlessly verbose code, either.
527 my @append
528 = $has_coords{$signal}
529 ? $args[0]->xy ($self)
530 : ();
531
532 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
533
534 for my $cb (
535 @{$self->{signal_cb}{$signal} || []}, # before
536 ($self->can ("invoke_$signal") || sub { 1 }), # closure
537 ) {
538 return $cb->($self, @args, @append) || next;
539 }
540
541 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args)
463} 543}
464 544
465sub find_widget { 545sub find_widget {
466 my ($self, $x, $y) = @_; 546 my ($self, $x, $y) = @_;
467 547
… …
475} 555}
476 556
477sub set_parent { 557sub set_parent {
478 my ($self, $parent) = @_; 558 my ($self, $parent) = @_;
479 559
480 Scalar::Util::weaken ($self->{parent} = $parent); 560 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 561 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 562}
506 563
507sub realloc { 564sub realloc {
508 my ($self) = @_; 565 my ($self) = @_;
509 566
… …
542 return unless $self->{h} && $self->{w}; 599 return unless $self->{h} && $self->{w};
543 600
544 # update screen rectangle 601 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 602 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 603 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 604
550 # skip widgets that are entirely outside the drawing area 605 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 606 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 607 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 608
… …
576 glVertex $self->{w} - 1, 0; 631 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 632 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 633 glVertex 0 , $self->{h} - 1;
579 glEnd; 634 glEnd;
580 glPopMatrix; 635 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 636 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 637 }
583 638
584 $self->_draw; 639 $self->_draw;
585 glPopMatrix; 640 glPopMatrix;
586} 641}
… …
589 my ($self) = @_; 644 my ($self) = @_;
590 645
591 warn "no draw defined for $self\n"; 646 warn "no draw defined for $self\n";
592} 647}
593 648
649my $cntx;#d#
594sub DESTROY { 650sub DESTROY {
595 my ($self) = @_; 651 my ($self) = @_;
596 652
597 delete $WIDGET{$self+0}; 653 return if CFPlus::in_destruct;
598 654
599 eval { $self->destroy }; 655 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657
658 delete $WIDGET{$self+0};
601} 659}
602 660
603############################################################################# 661#############################################################################
604 662
605package CFClient::UI::DrawBG; 663package CFPlus::UI::DrawBG;
606 664
607our @ISA = CFClient::UI::Base::; 665our @ISA = CFPlus::UI::Base::;
608 666
609use strict; 667use strict;
610use CFClient::OpenGL; 668use CFPlus::OpenGL;
611 669
612sub new { 670sub new {
613 my $class = shift; 671 my $class = shift;
614 672
615 # range [value, low, high, page] 673 # range [value, low, high, page]
… …
646 } 704 }
647} 705}
648 706
649############################################################################# 707#############################################################################
650 708
651package CFClient::UI::Empty; 709package CFPlus::UI::Empty;
652 710
653our @ISA = CFClient::UI::Base::; 711our @ISA = CFPlus::UI::Base::;
654 712
655sub new { 713sub new {
656 my ($class, %arg) = @_; 714 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 715 $class->SUPER::new (can_events => 0, %arg);
658} 716}
… …
665 723
666sub draw { } 724sub draw { }
667 725
668############################################################################# 726#############################################################################
669 727
670package CFClient::UI::Container; 728package CFPlus::UI::Container;
671 729
672our @ISA = CFClient::UI::Base::; 730our @ISA = CFPlus::UI::Base::;
673 731
674sub new { 732sub new {
675 my ($class, %arg) = @_; 733 my ($class, %arg) = @_;
676 734
677 my $children = delete $arg{children}; 735 my $children = delete $arg{children};
… …
686 if $children; 744 if $children;
687 745
688 $self 746 $self
689} 747}
690 748
749sub realloc {
750 my ($self) = @_;
751
752 $self->{force_realloc} = 1;
753 $self->{force_size_alloc} = 1;
754 $self->SUPER::realloc;
755}
756
691sub add { 757sub add {
692 my ($self, @widgets) = @_; 758 my ($self, @widgets) = @_;
693 759
694 $_->set_parent ($self) 760 $_->set_parent ($self)
695 for @widgets; 761 for @widgets;
… …
755 $_->draw for @{$self->{children}}; 821 $_->draw for @{$self->{children}};
756} 822}
757 823
758############################################################################# 824#############################################################################
759 825
760package CFClient::UI::Bin; 826package CFPlus::UI::Bin;
761 827
762our @ISA = CFClient::UI::Container::; 828our @ISA = CFPlus::UI::Container::;
763 829
764sub new { 830sub new {
765 my ($class, %arg) = @_; 831 my ($class, %arg) = @_;
766 832
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 833 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 834
769 $class->SUPER::new (children => [$child], %arg) 835 $class->SUPER::new (children => [$child], %arg)
770} 836}
771 837
772sub add { 838sub add {
… …
779sub remove { 845sub remove {
780 my ($self, $widget) = @_; 846 my ($self, $widget) = @_;
781 847
782 $self->SUPER::remove ($widget); 848 $self->SUPER::remove ($widget);
783 849
784 $self->{children} = [new CFClient::UI::Empty] 850 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 851 unless @{$self->{children}};
786} 852}
787 853
788sub child { $_[0]->{children}[0] } 854sub child { $_[0]->{children}[0] }
789 855
790sub size_request { 856sub size_request {
791 $_[0]{children}[0]->size_request 857 $_[0]{children}[0]->size_request
792} 858}
793 859
794sub size_allocate { 860sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 861 my ($self, $w, $h) = @_;
796 862
797 $self->{children}[0]->configure (0, 0, $w, $h); 863 $self->{children}[0]->configure (0, 0, $w, $h);
864
865 1
798} 866}
799 867
800############################################################################# 868#############################################################################
801 869
802# back-buffered drawing area 870# back-buffered drawing area
803 871
804package CFClient::UI::Window; 872package CFPlus::UI::Window;
805 873
806our @ISA = CFClient::UI::Bin::; 874our @ISA = CFPlus::UI::Bin::;
807 875
808use CFClient::OpenGL; 876use CFPlus::OpenGL;
809 877
810sub new { 878sub new {
811 my ($class, %arg) = @_; 879 my ($class, %arg) = @_;
812 880
813 my $self = $class->SUPER::new (%arg); 881 my $self = $class->SUPER::new (%arg);
… …
818 886
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 887 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 888 $self->SUPER::update;
821} 889}
822 890
823sub size_allocate { 891sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 892 my ($self, $w, $h) = @_;
825 893
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 894 $self->update;
895
896 $self->SUPER::invoke_size_allocate ($w, $h)
828} 897}
829 898
830sub _render { 899sub _render {
831 my ($self) = @_; 900 my ($self) = @_;
832 901
… …
834} 903}
835 904
836sub render_child { 905sub render_child {
837 my ($self) = @_; 906 my ($self) = @_;
838 907
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 908 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 909 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 910 glClear GL_COLOR_BUFFER_BIT;
842 911
843 { 912 {
844 package CFClient::UI::Base; 913 package CFPlus::UI::Base;
845 914
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 916 (0, 0, $self->{w}, $self->{h});
917
918 $self->_render;
848 } 919 }
849
850 $self->_render;
851 }; 920 };
852} 921}
853 922
854sub _draw { 923sub _draw {
855 my ($self) = @_; 924 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 925
859 my $tex = $self->{texture} 926 my $tex = $self->{texture}
860 or return; 927 or return;
861 928
862 glEnable GL_TEXTURE_2D; 929 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 931 glColor 0, 0, 0, 1;
865 932
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 933 $tex->draw_quad_alpha_premultiplied (0, 0);
867 934
868 glDisable GL_TEXTURE_2D; 935 glDisable GL_TEXTURE_2D;
869} 936}
870 937
871############################################################################# 938#############################################################################
872 939
873package CFClient::UI::ViewPort; 940package CFPlus::UI::ViewPort;
874 941
875our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
876 943
877sub new { 944sub new {
878 my $class = shift; 945 my $class = shift;
879 946
880 $class->SUPER::new ( 947 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 960 $h = 10 if $self->{scroll_y};
894 961
895 ($w, $h) 962 ($w, $h)
896} 963}
897 964
898sub size_allocate { 965sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
900 967
901 my $child = $self->child; 968 my $child = $self->child;
902 969
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 970 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 971 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 972
906 $self->child->configure (0, 0, $w, $h); 973 $self->child->configure (0, 0, $w, $h);
907 $self->update; 974 $self->update;
975
976 1
908} 977}
909 978
910sub set_offset { 979sub set_offset {
911 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
912 981
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1009 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1011 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1013 }
945} 1014}
946 1015
947sub _render { 1016sub _render {
948 my ($self) = @_; 1017 my ($self) = @_;
949 1018
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1019 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}; 1020 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1021
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1023
955 $self->SUPER::_render; 1024 $self->SUPER::_render;
956} 1025}
957 1026
958############################################################################# 1027#############################################################################
959 1028
960package CFClient::UI::ScrolledWindow; 1029package CFPlus::UI::ScrolledWindow;
961 1030
962our @ISA = CFClient::UI::HBox::; 1031our @ISA = CFPlus::UI::HBox::;
963 1032
964sub new { 1033sub new {
965 my ($class, %arg) = @_; 1034 my ($class, %arg) = @_;
966 1035
967 my $child = delete $arg{child}; 1036 my $child = delete $arg{child};
968 1037
969 my $self; 1038 my $self;
970 1039
971 my $slider = new CFClient::UI::Slider 1040 my $slider = new CFPlus::UI::Slider
972 vertical => 1, 1041 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1042 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1043 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1044 $self->{vp}->set_offset (0, $_[1]);
976 }, 1045 },
977 ; 1046 ;
978 1047
979 $self = $class->SUPER::new ( 1048 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1049 vp => (new CFPlus::UI::ViewPort expand => 1),
1050 can_events => 1,
981 slider => $slider, 1051 slider => $slider,
982 %arg, 1052 %arg,
983 ); 1053 );
984 1054
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1055 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1056 $self->add ($child) if $child;
987 1057
988 $self 1058 $self
989} 1059}
990 1060
1061#TODO# update range on size_allocate depending on child
1062
991sub add { 1063sub add {
992 my ($self, $widget) = @_; 1064 my ($self, $widget) = @_;
993 1065
994 $self->{vp}->add ($self->{child} = $widget); 1066 $self->{vp}->add ($self->{child} = $widget);
995} 1067}
996 1068
1069sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_;
1071
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev);
1075
1076 1
1077}
1078
1079sub update_slider {
1080 my ($self) = @_;
1081
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1083}
1084
997sub update { 1085sub update {
998 my ($self) = @_; 1086 my ($self) = @_;
999 1087
1000 $self->SUPER::update; 1088 $self->SUPER::update;
1001 1089
1002 # todo: overwrite size_allocate of child 1090 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1091}
1006 1092
1007sub size_allocate { 1093sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1094 my ($self, $w, $h) = @_;
1009 1095
1096 $self->update_slider;
1097
1010 $self->SUPER::size_allocate ($w, $h); 1098 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1099}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1100
1019############################################################################# 1101#############################################################################
1020 1102
1021package CFClient::UI::Frame; 1103package CFPlus::UI::Frame;
1022 1104
1023our @ISA = CFClient::UI::Bin::; 1105our @ISA = CFPlus::UI::Bin::;
1024 1106
1025use CFClient::OpenGL; 1107use CFPlus::OpenGL;
1026 1108
1027sub new { 1109sub new {
1028 my $class = shift; 1110 my $class = shift;
1029 1111
1030 $class->SUPER::new ( 1112 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1138 $self->SUPER::_draw;
1057} 1139}
1058 1140
1059############################################################################# 1141#############################################################################
1060 1142
1061package CFClient::UI::FancyFrame; 1143package CFPlus::UI::FancyFrame;
1062 1144
1063our @ISA = CFClient::UI::Bin::; 1145our @ISA = CFPlus::UI::Bin::;
1064 1146
1065use CFClient::OpenGL; 1147use CFPlus::OpenGL;
1148
1149sub new {
1150 my ($class, %arg) = @_;
1151
1152 if ((exists $arg{label}) && !ref $arg{label}) {
1153 $arg{label} = new CFPlus::UI::Label
1154 align => 1,
1155 valign => 0,
1156 text => $arg{label},
1157 fontsize => ($arg{border} || 0.8) * 0.75;
1158 }
1159
1160 my $self = $class->SUPER::new (
1161 # label => "",
1162 fg => [0.6, 0.3, 0.1],
1163 border => 0.8,
1164 style => 'single',
1165 %arg,
1166 );
1167
1168 $self
1169}
1170
1171sub add {
1172 my ($self, @widgets) = @_;
1173
1174 $self->SUPER::add (@widgets);
1175 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1176}
1177
1178sub border {
1179 int $_[0]{border} * $::FONTSIZE
1180}
1181
1182sub size_request {
1183 my ($self) = @_;
1184
1185 ($self->{label_w}, undef) = $self->{label}->size_request
1186 if $self->{label};
1187
1188 my ($w, $h) = $self->SUPER::size_request;
1189
1190 (
1191 $w + $self->border * 2,
1192 $h + $self->border * 2,
1193 )
1194}
1195
1196sub invoke_size_allocate {
1197 my ($self, $w, $h) = @_;
1198
1199 my $border = $self->border;
1200
1201 $w -= List::Util::max 0, $border * 2;
1202 $h -= List::Util::max 0, $border * 2;
1203
1204 if (my $label = $self->{label}) {
1205 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1206 $label->{h} = List::Util::min $h, $border;
1207 $label->invoke_size_allocate ($label->{w}, $label->{h});
1208 }
1209
1210 $self->child->configure ($border, $border, $w, $h);
1211
1212 1
1213}
1214
1215sub _draw {
1216 my ($self) = @_;
1217
1218 my $child = $self->{children}[0];
1219
1220 my $border = $self->border;
1221 my ($w, $h) = ($self->{w}, $self->{h});
1222
1223 $child->draw;
1224
1225 glColor @{$self->{fg}};
1226 glBegin GL_LINE_STRIP;
1227 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1228 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1230 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1233 glEnd;
1234
1235 if ($self->{label}) {
1236 glTranslate $border * 2, 0;
1237 $self->{label}->_draw;
1238 }
1239}
1240
1241#############################################################################
1242
1243package CFPlus::UI::Toplevel;
1244
1245our @ISA = CFPlus::UI::Bin::;
1246
1247use CFPlus::OpenGL;
1066 1248
1067my $bg = 1249my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1250 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1251 mipmap => 1, wrap => 1;
1070 1252
1071my @border = 1253my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1256
1075sub new { 1257sub new {
1076 my ($class, %arg) = @_; 1258 my ($class, %arg) = @_;
1077 1259
1078 my $self = $class->SUPER::new ( 1260 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1261 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1262 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1263 border => 0.6,
1082 can_events => 1, 1264 can_events => 1,
1083 min_w => 16, 1265 min_w => 64,
1084 min_h => 16, 1266 min_h => 32,
1085 %arg, 1267 %arg,
1086 ); 1268 );
1087 1269
1088 $self->{title_widget} = new CFClient::UI::Label 1270 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1271 align => 0,
1090 valign => 1, 1272 valign => 1,
1091 text => $self->{title}, 1273 text => $self->{title},
1092 fontsize => $self->{border}, 1274 fontsize => $self->{border},
1093 if exists $self->{title}; 1275 if exists $self->{title};
1094 1276
1277 if ($self->{has_close_button}) {
1278 $self->{close_button} =
1279 new CFPlus::UI::ImageButton
1280 path => 'x1_close.png',
1281 on_activate => sub { $self->emit ("delete") };
1282
1283 $self->CFPlus::UI::Container::add ($self->{close_button});
1284 }
1285
1095 $self 1286 $self
1096} 1287}
1097 1288
1098sub add { 1289sub add {
1099 my ($self, @widgets) = @_; 1290 my ($self, @widgets) = @_;
1100 1291
1101 $self->SUPER::add (@widgets); 1292 $self->SUPER::add (@widgets);
1293 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1294 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1295}
1104 1296
1105sub border { 1297sub border {
1106 int $_[0]{border} * $::FONTSIZE 1298 int $_[0]{border} * $::FONTSIZE
1107} 1299}
… …
1109sub size_request { 1301sub size_request {
1110 my ($self) = @_; 1302 my ($self) = @_;
1111 1303
1112 $self->{title_widget}->size_request 1304 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1305 if $self->{title_widget};
1306
1307 $self->{close_button}->size_request
1308 if $self->{close_button};
1114 1309
1115 my ($w, $h) = $self->SUPER::size_request; 1310 my ($w, $h) = $self->SUPER::size_request;
1116 1311
1117 ( 1312 (
1118 $w + $self->border * 2, 1313 $w + $self->border * 2,
1119 $h + $self->border * 2, 1314 $h + $self->border * 2,
1120 ) 1315 )
1121} 1316}
1122 1317
1123sub size_allocate { 1318sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1125 1320
1126 if ($self->{title_widget}) { 1321 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1322 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1323 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1324 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1325 }
1131 1326
1132 my $border = $self->border; 1327 my $border = $self->border;
1133 1328
1134 $h -= List::Util::max 0, $border * 2; 1329 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1330 $w -= List::Util::max 0, $border * 2;
1331
1332 $self->child->configure ($border, $border, $w, $h);
1333
1334 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1335 if $self->{close_button};
1336
1337 1
1338}
1339
1340sub invoke_delete {
1341 my ($self) = @_;
1342
1343 $self->hide;
1136 1344
1137 $self->child->configure ($border, $border, $w, $h); 1345 1
1138} 1346}
1139 1347
1140sub button_down { 1348sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1349 my ($self, $ev, $x, $y) = @_;
1142 1350
1143 my ($w, $h) = @$self{qw(w h)}; 1351 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1352 my $border = $self->border;
1145 1353
… …
1176 1384
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1385 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1386
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1387 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1388 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1389 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1390 };
1183 } else { 1391 } else {
1184 return 0; 1392 return 0;
1185 } 1393 }
1186 1394
1187 1 1395 1
1188} 1396}
1189 1397
1190sub button_up { 1398sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1399 my ($self, $ev, $x, $y) = @_;
1192 1400
1193 !!delete $self->{motion} 1401 ! ! delete $self->{motion}
1194} 1402}
1195 1403
1196sub mouse_motion { 1404sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1405 my ($self, $ev, $x, $y) = @_;
1198 1406
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1407 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1408
1201 !!$self->{motion} 1409 ! ! $self->{motion}
1410}
1411
1412sub invoke_visibility_change {
1413 my ($self, $visible) = @_;
1414
1415 delete $self->{motion} unless $visible;
1416
1417 0
1202} 1418}
1203 1419
1204sub _draw { 1420sub _draw {
1205 my ($self) = @_; 1421 my ($self) = @_;
1206 1422
… …
1235 $child->draw; 1451 $child->draw;
1236 1452
1237 if ($self->{title_widget}) { 1453 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1454 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1455 $self->{title_widget}->_draw;
1456
1457 glTranslate 0, - ($border - $self->{h});
1240 } 1458 }
1459
1460 $self->{close_button}->draw
1461 if $self->{close_button};
1241} 1462}
1242 1463
1243############################################################################# 1464#############################################################################
1244 1465
1245package CFClient::UI::Table; 1466package CFPlus::UI::Table;
1246 1467
1247our @ISA = CFClient::UI::Base::; 1468our @ISA = CFPlus::UI::Base::;
1248 1469
1249use List::Util qw(max sum); 1470use List::Util qw(max sum);
1250 1471
1251use CFClient::OpenGL; 1472use CFPlus::OpenGL;
1252 1473
1253sub new { 1474sub new {
1254 my $class = shift; 1475 my $class = shift;
1255 1476
1256 $class->SUPER::new ( 1477 $class->SUPER::new (
… …
1262sub children { 1483sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1485}
1265 1486
1266sub add { 1487sub add {
1267 my ($self, $x, $y, $child) = @_; 1488 my ($self) = shift;
1268 1489
1490 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1492 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1493 $self->{children}[$y][$x] = $child;
1494 }
1271 1495
1496 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1498 $self->realloc;
1273} 1499}
1274 1500
1275sub remove { 1501sub remove {
1276 my ($self, $child) = @_; 1502 my ($self, $child) = @_;
… …
1324 (sum @$ws), 1550 (sum @$ws),
1325 (sum @$hs), 1551 (sum @$hs),
1326 ) 1552 )
1327} 1553}
1328 1554
1329sub size_allocate { 1555sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1556 my ($self, $w, $h) = @_;
1331 1557
1332 my ($ws, $hs) = $self->get_wh; 1558 my ($ws, $hs) = $self->get_wh;
1333 1559
1334 my $req_w = (sum @$ws) || 1; 1560 my $req_w = (sum @$ws) || 1;
… …
1341 1567
1342 # linearly scale sizes 1568 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1571
1346 CFClient::UI::harmonize $ws; 1572 CFPlus::UI::harmonize $ws;
1347 CFClient::UI::harmonize $hs; 1573 CFPlus::UI::harmonize $hs;
1348 1574
1349 my $y; 1575 my $y;
1350 1576
1351 for my $r (0 .. $#{$self->{children}}) { 1577 for my $r (0 .. $#{$self->{children}}) {
1352 my $row = $self->{children}[$r] 1578 my $row = $self->{children}[$r]
… …
1366 } 1592 }
1367 1593
1368 $y += $row_h; 1594 $y += $row_h;
1369 } 1595 }
1370 1596
1597 1
1371} 1598}
1372 1599
1373sub find_widget { 1600sub find_widget {
1374 my ($self, $x, $y) = @_; 1601 my ($self, $x, $y) = @_;
1375 1602
… …
1394 } 1621 }
1395} 1622}
1396 1623
1397############################################################################# 1624#############################################################################
1398 1625
1399package CFClient::UI::Box; 1626package CFPlus::UI::Box;
1400 1627
1401our @ISA = CFClient::UI::Container::; 1628our @ISA = CFPlus::UI::Container::;
1402 1629
1403sub size_request { 1630sub size_request {
1404 my ($self) = @_; 1631 my ($self) = @_;
1405 1632
1406 $self->{vertical} 1633 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1640 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1641 )
1415} 1642}
1416 1643
1417sub size_allocate { 1644sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1419 1646
1420 my $space = $self->{vertical} ? $h : $w; 1647 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1648 my @children = $self->visible_children;
1422 1649
1423 my @req; 1650 my @req;
1424 1651
1425 if ($self->{homogeneous}) { 1652 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1653 @req = ($space / (@children || 1)) x @children;
1427 } else { 1654 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1655 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1656 my $req = List::Util::sum @req;
1430 1657
1431 if ($req > $space) { 1658 if ($req > $space) {
1432 # ah well, not enough space 1659 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1660 $_ *= $space / $req for @req;
1434 } else { 1661 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1662 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1663
1437 $space = ($space - $req) / $expand; # remaining space to give away 1664 $space = ($space - $req) / $expand; # remaining space to give away
1438 1665
1439 $req[$_] += $space * $children->[$_]{expand} 1666 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1667 for 0 .. $#children;
1441 } 1668 }
1442 } 1669 }
1443 1670
1444 CFClient::UI::harmonize \@req; 1671 CFPlus::UI::harmonize \@req;
1445 1672
1446 my $pos = 0; 1673 my $pos = 0;
1447 for (0 .. $#$children) { 1674 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1675 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1676 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1677
1451 $pos += $alloc; 1678 $pos += $alloc;
1452 } 1679 }
1453 1680
1454 1 1681 1
1455} 1682}
1456 1683
1457############################################################################# 1684#############################################################################
1458 1685
1459package CFClient::UI::HBox; 1686package CFPlus::UI::HBox;
1460 1687
1461our @ISA = CFClient::UI::Box::; 1688our @ISA = CFPlus::UI::Box::;
1462 1689
1463sub new { 1690sub new {
1464 my $class = shift; 1691 my $class = shift;
1465 1692
1466 $class->SUPER::new ( 1693 $class->SUPER::new (
… …
1469 ) 1696 )
1470} 1697}
1471 1698
1472############################################################################# 1699#############################################################################
1473 1700
1474package CFClient::UI::VBox; 1701package CFPlus::UI::VBox;
1475 1702
1476our @ISA = CFClient::UI::Box::; 1703our @ISA = CFPlus::UI::Box::;
1477 1704
1478sub new { 1705sub new {
1479 my $class = shift; 1706 my $class = shift;
1480 1707
1481 $class->SUPER::new ( 1708 $class->SUPER::new (
… …
1484 ) 1711 )
1485} 1712}
1486 1713
1487############################################################################# 1714#############################################################################
1488 1715
1489package CFClient::UI::Label; 1716package CFPlus::UI::Label;
1490 1717
1491our @ISA = CFClient::UI::DrawBG::; 1718our @ISA = CFPlus::UI::DrawBG::;
1492 1719
1493use CFClient::OpenGL; 1720use CFPlus::OpenGL;
1494 1721
1495sub new { 1722sub new {
1496 my ($class, %arg) = @_; 1723 my ($class, %arg) = @_;
1497 1724
1498 my $self = $class->SUPER::new ( 1725 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1728 #active_bg => none
1502 #font => default_font 1729 #font => default_font
1503 #text => initial text 1730 #text => initial text
1504 #markup => initial narkup 1731 #markup => initial narkup
1505 #max_w => maximum pixel width 1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1506 ellipsise => 3, # end 1734 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1735 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1736 fontsize => 1,
1509 align => -1, 1737 align => -1,
1510 valign => -1, 1738 valign => -1,
1511 padding_x => 2, 1739 padding_x => 2,
1512 padding_y => 2, 1740 padding_y => 2,
1513 can_events => 0, 1741 can_events => 0,
1514 %arg 1742 %arg
1515 ); 1743 );
1516 1744
1517 if (exists $self->{template}) { 1745 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1746 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1747 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1748 $self->{template} = $layout;
1521 } 1749 }
1522 1750
1523 if (exists $self->{markup}) { 1751 if (exists $self->{markup}) {
… …
1527 } 1755 }
1528 1756
1529 $self 1757 $self
1530} 1758}
1531 1759
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1760sub update {
1543 my ($self) = @_; 1761 my ($self) = @_;
1544 1762
1545 delete $self->{texture}; 1763 delete $self->{texture};
1546 $self->SUPER::update; 1764 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1558 1776
1559 return if $self->{text} eq "T$text"; 1777 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1778 $self->{text} = "T$text";
1561 1779
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1564 1781
1565 delete $self->{size_req}; 1782 delete $self->{size_req};
1566 $self->realloc; 1783 $self->realloc;
1567 $self->update; 1784 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1790 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1791 $self->{text} = "M$markup";
1575 1792
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1793 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1794
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1795 $self->{layout}->set_markup ($markup);
1580 1796
1581 delete $self->{size_req}; 1797 delete $self->{size_req};
1582 $self->realloc; 1798 $self->realloc;
1583 $self->update; 1799 $self->update;
… …
1595 1811
1596 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1597 1813
1598 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1815 $self->{template}->set_font ($self->{font}) if $self->{font};
1816 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1818
1602 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1603 1820
1604 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
… …
1609 }; 1826 };
1610 1827
1611 @{ $self->{size_req} } 1828 @{ $self->{size_req} }
1612} 1829}
1613 1830
1831sub baseline_shift {
1832 $_[0]{layout}->descent
1833}
1834
1614sub size_allocate { 1835sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1616 1837
1617 delete $self->{ox}; 1838 delete $self->{ox};
1618 1839
1619 delete $self->{texture} 1840 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1841 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1842
1843 1
1621} 1844}
1622 1845
1623sub set_fontsize { 1846sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1625 1848
1626 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1850 delete $self->{size_req};
1627 delete $self->{texture}; 1851 delete $self->{texture};
1628 1852
1629 $self->realloc; 1853 $self->realloc;
1630} 1854}
1631 1855
1632sub reconfigure { 1856sub reconfigure {
1633 my ($self) = @_; 1857 my ($self) = @_;
1634 1858
1635 delete $self->{size_req}; 1859 delete $self->{size_req};
1860 delete $self->{texture};
1636 1861
1637 $self->SUPER::reconfigure; 1862 $self->SUPER::reconfigure;
1638} 1863}
1639 1864
1640sub _draw { 1865sub _draw {
1641 my ($self) = @_; 1866 my ($self) = @_;
1642 1867
1643 $self->SUPER::_draw; # draw background, if applicable 1868 $self->SUPER::_draw; # draw background, if applicable
1644 1869
1645 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1871 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1877
1653 new_from_layout CFClient::Texture $self->{layout} 1878 [$self->{layout}->size]
1654 }; 1879 };
1655 1880
1656 unless (exists $self->{ox}) { 1881 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1884 : ($self->{w} - $size->[0]) * 0.5);
1660 1885
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1888 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1889 };
1665 1890
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1893
1671 if ($tex->{format} == GL_ALPHA) { 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 1895}
1682 1896
1683############################################################################# 1897#############################################################################
1684 1898
1685package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1686 1900
1687our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1688 1902
1689use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1690 1904
1691sub new { 1905sub new {
1692 my $class = shift; 1906 my $class = shift;
1693 1907
1694 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1699 can_hover => 1, 1913 can_hover => 1,
1700 can_focus => 1, 1914 can_focus => 1,
1701 valign => 0, 1915 valign => 0,
1702 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1703 #text => ... 1918 #text => ...
1704 #hidden => "*", 1919 #hidden => "*",
1705 @_ 1920 @_
1706 ) 1921 )
1707} 1922}
… …
1718 1933
1719 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1936 delete $self->{size_req};
1722 1937
1723 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1724 1939
1725 $self->realloc; 1940 $self->realloc;
1726 $self->update; 1941 $self->update;
1727} 1942}
1728 1943
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1744 1959
1745 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1746} 1961}
1747 1962
1748sub key_down { 1963sub invoke_key_down {
1749 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1750 1965
1751 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1756 1971
1757 if ($uni == 8) { 1972 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1766 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1768 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1769 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1988 $self->emit ('escape');
1771 } elsif ($uni) { 1989 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1991 } else {
1774 return 0; 1992 return 0;
1775 } 1993 }
1776 1994
1777 $self->_set_text ($text); 1995 $self->_set_text ($text);
1778 1996
1779 $self->realloc; 1997 $self->realloc;
1998 $self->update;
1780 1999
1781 1 2000 1
1782} 2001}
1783 2002
1784sub focus_in { 2003sub invoke_focus_in {
1785 my ($self) = @_; 2004 my ($self) = @_;
1786 2005
1787 $self->{last_activity} = $::NOW; 2006 $self->{last_activity} = $::NOW;
1788 2007
1789 $self->SUPER::focus_in; 2008 $self->SUPER::invoke_focus_in
1790} 2009}
1791 2010
1792sub button_down { 2011sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2012 my ($self, $ev, $x, $y) = @_;
1794 2013
1795 $self->SUPER::button_down ($ev, $x, $y); 2014 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2015
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2016 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2017
1799 # byte-index to char-index 2018 # byte-index to char-index
1800 my $text = $self->{text}; 2019 my $text = $self->{text};
1801 utf8::encode $text; 2020 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2021 $self->{cursor} = length $text;
1803 2022
1804 $self->_set_text ($self->{text}); 2023 $self->_set_text ($self->{text});
1805 $self->update; 2024 $self->update;
1806 2025
1807 1 2026 1
1808} 2027}
1809 2028
1810sub mouse_motion { 2029sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2030 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2031# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 2032
1814 0 2033 1
1815} 2034}
1816 2035
1817sub _draw { 2036sub _draw {
1818 my ($self) = @_; 2037 my ($self) = @_;
1819 2038
… …
1846 utf8::encode $text; 2065 utf8::encode $text;
1847 2066
1848 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849 } 2068 }
1850 2069
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2070 glBegin GL_LINES;
1853 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2072 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 2073 glEnd;
1856 } 2074 }
1857} 2075}
1858 2076
2077#############################################################################
2078
1859package CFClient::UI::Entry; 2079package CFPlus::UI::Entry;
1860 2080
1861our @ISA = CFClient::UI::EntryBase::; 2081our @ISA = CFPlus::UI::EntryBase::;
1862 2082
1863use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1864 2084
1865sub key_down { 2085sub invoke_key_down {
1866 my ($self, $ev) = @_; 2086 my ($self, $ev) = @_;
1867 2087
1868 my $sym = $ev->{sym}; 2088 my $sym = $ev->{sym};
1869 2089
1870 if ($sym == 13) { 2090 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2091 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2092 my $txt = $self->get_text;
2093
1873 $self->{history_pointer} = -1; 2094 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2095 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2096 $self->emit (activate => $txt);
1876 $self->update; 2097 $self->update;
1877 2098
1878 } elsif ($sym == CFClient::SDLK_UP) { 2099 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2100 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2101 $self->{history_saveback} = $self->get_text;
1881 } 2102 }
1882 if (@{$self->{history} || []} > 0) { 2103 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2104 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2106 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2107 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2108 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2109 }
1889 2110
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2111 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2112 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2113 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2114
1894 if ($self->{history_pointer} >= 0) { 2115 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2116 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2117 } else {
1897 $self->set_text ($self->{history_saveback}); 2118 $self->set_text ($self->{history_saveback});
1898 } 2119 }
1899 2120
1900 } else { 2121 } else {
1901 return $self->SUPER::key_down ($ev) 2122 return $self->SUPER::invoke_key_down ($ev)
1902 } 2123 }
1903 2124
1904 1 2125 1
1905} 2126}
1906 2127
1907############################################################################# 2128#############################################################################
1908 2129
2130package CFPlus::UI::TextEdit;
2131
2132our @ISA = CFPlus::UI::EntryBase::;
2133
2134use CFPlus::OpenGL;
2135
2136sub move_cursor_ver {
2137 my ($self, $dy) = @_;
2138
2139 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2140
2141 $y += $dy;
2142
2143 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2144 $self->{cursor} = $index;
2145 delete $self->{cur_h};
2146 $self->update;
2147 return;
2148 }
2149}
2150
2151sub invoke_key_down {
2152 my ($self, $ev) = @_;
2153
2154 my $sym = $ev->{sym};
2155
2156 if ($sym == CFPlus::SDLK_UP) {
2157 $self->move_cursor_ver (-1);
2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
2159 $self->move_cursor_ver (+1);
2160 } else {
2161 return $self->SUPER::invoke_key_down ($ev)
2162 }
2163
2164 1
2165}
2166
2167#############################################################################
2168
1909package CFClient::UI::Button; 2169package CFPlus::UI::Button;
1910 2170
1911our @ISA = CFClient::UI::Label::; 2171our @ISA = CFPlus::UI::Label::;
1912 2172
1913use CFClient::OpenGL; 2173use CFPlus::OpenGL;
1914 2174
1915my @tex = 2175my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2176 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2177 qw(b1_button_active.png);
1918 2178
1919sub new { 2179sub new {
1920 my $class = shift; 2180 my $class = shift;
1921 2181
… …
1930 can_events => 1, 2190 can_events => 1,
1931 @_ 2191 @_
1932 ) 2192 )
1933} 2193}
1934 2194
1935sub activate { }
1936
1937sub button_up { 2195sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2196 my ($self, $ev, $x, $y) = @_;
1939 2197
1940 $self->emit ("activate") 2198 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2199 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2200 && $y >= 0 && $y < $self->{h};
… …
1960 $self->SUPER::_draw; 2218 $self->SUPER::_draw;
1961} 2219}
1962 2220
1963############################################################################# 2221#############################################################################
1964 2222
1965package CFClient::UI::CheckBox; 2223package CFPlus::UI::CheckBox;
1966 2224
1967our @ISA = CFClient::UI::DrawBG::; 2225our @ISA = CFPlus::UI::DrawBG::;
1968 2226
1969my @tex = 2227my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2228 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2229 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2230
1973use CFClient::OpenGL; 2231use CFPlus::OpenGL;
1974 2232
1975sub new { 2233sub new {
1976 my $class = shift; 2234 my $class = shift;
1977 2235
1978 $class->SUPER::new ( 2236 $class->SUPER::new (
… …
1992 my ($self) = @_; 2250 my ($self) = @_;
1993 2251
1994 (6) x 2 2252 (6) x 2
1995} 2253}
1996 2254
2255sub toggle {
2256 my ($self) = @_;
2257
2258 $self->{state} = !$self->{state};
2259 $self->emit (changed => $self->{state});
2260 $self->update;
2261}
2262
1997sub button_down { 2263sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2264 my ($self, $ev, $x, $y) = @_;
1999 2265
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2266 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2267 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2268 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2269 } else {
2005 return 0 2270 return 0
2006 } 2271 }
2007 2272
2008 1 2273 1
… …
2028 glDisable GL_TEXTURE_2D; 2293 glDisable GL_TEXTURE_2D;
2029} 2294}
2030 2295
2031############################################################################# 2296#############################################################################
2032 2297
2033package CFClient::UI::Image; 2298package CFPlus::UI::Image;
2034 2299
2035our @ISA = CFClient::UI::Base::; 2300our @ISA = CFPlus::UI::Base::;
2036 2301
2037use CFClient::OpenGL; 2302use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2303
2040our %loaded_images; 2304our %texture_cache;
2041 2305
2042sub new { 2306sub new {
2043 my $class = shift; 2307 my $class = shift;
2044 2308
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2309 my $self = $class->SUPER::new (
2310 can_events => 0,
2311 @_,
2312 );
2046 2313
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2314 $self->{path} || $self->{tex}
2315 or Carp::croak "'path' or 'tex' attributes required";
2048 2316
2049 $loaded_images{$self->{image}} ||= 2317 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2318 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2319
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2320 CFPlus::weaken $texture_cache{$self->{path}};
2053 2321
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2322 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2323
2058 $self 2324 $self
2059} 2325}
2060 2326
2327sub STORABLE_freeze {
2328 my ($self, $cloning) = @_;
2329
2330 $self->{path}
2331 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2332
2333 $self->{path}
2334}
2335
2336sub STORABLE_attach {
2337 my ($self, $cloning, $path) = @_;
2338
2339 $self->new (path => $path)
2340}
2341
2061sub size_request { 2342sub size_request {
2062 my ($self) = @_; 2343 my ($self) = @_;
2063 2344
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2345 ($self->{tex}{w}, $self->{tex}{h})
2065} 2346}
2066 2347
2067sub _draw { 2348sub _draw {
2068 my ($self) = @_; 2349 my ($self) = @_;
2069 2350
… …
2079 } 2360 }
2080 2361
2081 glEnable GL_TEXTURE_2D; 2362 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2364
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2365 $tex->draw_quad (0, 0, $w, $h);
2085 2366
2086 glDisable GL_TEXTURE_2D; 2367 glDisable GL_TEXTURE_2D;
2087} 2368}
2088 2369
2089############################################################################# 2370#############################################################################
2090 2371
2372package CFPlus::UI::ImageButton;
2373
2374our @ISA = CFPlus::UI::Image::;
2375
2376use CFPlus::OpenGL;
2377
2378my %textures;
2379
2380sub new {
2381 my $class = shift;
2382
2383 my $self = $class->SUPER::new (
2384 padding_x => 4,
2385 padding_y => 4,
2386 fg => [1, 1, 1],
2387 active_fg => [0, 0, 1],
2388 can_hover => 1,
2389 align => 0,
2390 valign => 0,
2391 can_events => 1,
2392 @_
2393 );
2394}
2395
2396sub invoke_button_up {
2397 my ($self, $ev, $x, $y) = @_;
2398
2399 $self->emit ("activate")
2400 if $x >= 0 && $x < $self->{w}
2401 && $y >= 0 && $y < $self->{h};
2402
2403 1
2404}
2405
2406#############################################################################
2407
2091package CFClient::UI::VGauge; 2408package CFPlus::UI::VGauge;
2092 2409
2093our @ISA = CFClient::UI::Base::; 2410our @ISA = CFPlus::UI::Base::;
2094 2411
2095use List::Util qw(min max); 2412use List::Util qw(min max);
2096 2413
2097use CFClient::OpenGL; 2414use CFPlus::OpenGL;
2098 2415
2099my %tex = ( 2416my %tex = (
2100 food => [ 2417 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2419 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2420 ],
2104 grace => [ 2421 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2422 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2423 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2424 ],
2108 hp => [ 2425 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2427 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2428 ],
2112 mana => [ 2429 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2430 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2431 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2432 ],
2116); 2433);
2117 2434
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2435# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2495 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2496 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2497
2181 my $h1 = $self->{h} * (1 - $ycut1); 2498 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2499 my $h2 = $self->{h} * (1 - $ycut2);
2500 my $h3 = $self->{h};
2501
2502 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2503
2184 glEnable GL_BLEND; 2504 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2505 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2506 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2507 glEnable GL_TEXTURE_2D;
… …
2206 2526
2207 if ($t3) { 2527 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2528 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2529 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2530 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2531 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2532 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2533 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2534 glEnd;
2215 } 2535 }
2216 2536
2217 glDisable GL_BLEND; 2537 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2538 glDisable GL_TEXTURE_2D;
2219} 2539}
2220 2540
2221############################################################################# 2541#############################################################################
2222 2542
2223package CFClient::UI::Gauge; 2543package CFPlus::UI::Gauge;
2224 2544
2225our @ISA = CFClient::UI::VBox::; 2545our @ISA = CFPlus::UI::VBox::;
2226 2546
2227sub new { 2547sub new {
2228 my ($class, %arg) = @_; 2548 my ($class, %arg) = @_;
2229 2549
2230 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2552 can_hover => 1,
2233 can_events => 1, 2553 can_events => 1,
2234 %arg, 2554 %arg,
2235 ); 2555 );
2236 2556
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2557 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2558 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2559 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2560
2241 $self 2561 $self
2242} 2562}
2243 2563
2244sub set_fontsize { 2564sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2585 $self->{value}->set_text ($val);
2266} 2586}
2267 2587
2268############################################################################# 2588#############################################################################
2269 2589
2270package CFClient::UI::Slider; 2590package CFPlus::UI::Slider;
2271 2591
2272use strict; 2592use strict;
2273 2593
2274use CFClient::OpenGL; 2594use CFPlus::OpenGL;
2275 2595
2276our @ISA = CFClient::UI::DrawBG::; 2596our @ISA = CFPlus::UI::DrawBG::;
2277 2597
2278my @tex = 2598my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2600 qw(s1_slider.png s1_slider_bg.png);
2281 2601
2282sub new { 2602sub new {
2283 my $class = shift; 2603 my $class = shift;
2284 2604
… …
2305 $self->update; 2625 $self->update;
2306 2626
2307 $self 2627 $self
2308} 2628}
2309 2629
2310sub changed { }
2311
2312sub set_range { 2630sub set_range {
2313 my ($self, $range) = @_; 2631 my ($self, $range) = @_;
2314 2632
2315 ($range, $self->{range}) = ($self->{range}, $range); 2633 ($range, $self->{range}) = ($self->{range}, $range);
2316 2634
… …
2336 if $unit; 2654 if $unit;
2337 2655
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2656 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2657
2340 if ($value != $old_value) { 2658 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2659 $self->emit (changed => $value);
2342 $self->update; 2660 $self->update;
2343 } 2661 }
2344} 2662}
2345 2663
2346sub size_request { 2664sub size_request {
2347 my ($self) = @_; 2665 my ($self) = @_;
2348 2666
2349 ($self->{req_w}, $self->{req_h}) 2667 ($self->{req_w}, $self->{req_h})
2350} 2668}
2351 2669
2352sub button_down { 2670sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2671 my ($self, $ev, $x, $y) = @_;
2354 2672
2355 $self->SUPER::button_down ($ev, $x, $y); 2673 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2674
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2675 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2676
2359 $self->mouse_motion ($ev, $x, $y) 2677 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2678}
2361 2679
2362sub mouse_motion { 2680sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
2364 2682
2365 if ($GRAB == $self) { 2683 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2684 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2685
… …
2373 } else { 2691 } else {
2374 return 0; 2692 return 0;
2375 } 2693 }
2376 2694
2377 1 2695 1
2696}
2697
2698sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_;
2700
2701 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702
2703 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2704
2705 ! ! $delta
2378} 2706}
2379 2707
2380sub update { 2708sub update {
2381 my ($self) = @_; 2709 my ($self) = @_;
2382 2710
… …
2431 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2432} 2760}
2433 2761
2434############################################################################# 2762#############################################################################
2435 2763
2436package CFClient::UI::ValSlider; 2764package CFPlus::UI::ValSlider;
2437 2765
2438our @ISA = CFClient::UI::HBox::; 2766our @ISA = CFPlus::UI::HBox::;
2439 2767
2440sub new { 2768sub new {
2441 my ($class, %arg) = @_; 2769 my ($class, %arg) = @_;
2442 2770
2443 my $range = delete $arg{range}; 2771 my $range = delete $arg{range};
2444 2772
2445 my $self = $class->SUPER::new ( 2773 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2774 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2775 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2776 to_value => sub { shift },
2449 from_value => sub { shift }, 2777 from_value => sub { shift },
2450 %arg, 2778 %arg,
2451 ); 2779 );
2452 2780
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2800sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2801sub set_value { shift->{slider}->set_value (@_) }
2474 2802
2475############################################################################# 2803#############################################################################
2476 2804
2477package CFClient::UI::TextScroller; 2805package CFPlus::UI::TextScroller;
2478 2806
2479our @ISA = CFClient::UI::HBox::; 2807our @ISA = CFPlus::UI::HBox::;
2480 2808
2481use CFClient::OpenGL; 2809use CFPlus::OpenGL;
2482 2810
2483sub new { 2811sub new {
2484 my $class = shift; 2812 my $class = shift;
2485 2813
2486 my $self = $class->SUPER::new ( 2814 my $self = $class->SUPER::new (
2487 fontsize => 1, 2815 fontsize => 1,
2488 can_events => 0, 2816 can_events => 1,
2489 indent => 0, 2817 indent => 0,
2490 #font => default_font 2818 #font => default_font
2491 @_, 2819 @_,
2492 2820
2493 layout => (new CFClient::Layout 1), 2821 layout => (new CFPlus::Layout),
2494 par => [], 2822 par => [],
2495 height => 0, 2823 height => 0,
2496 children => [ 2824 children => [
2497 (new CFClient::UI::Empty expand => 1), 2825 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2826 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2827 ],
2500 ); 2828 );
2501 2829
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 2830 $self->{children}[1]->connect (changed => sub { $self->update });
2503 2831
… …
2509 2837
2510 $self->{fontsize} = $fontsize; 2838 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2839 $self->reflow;
2512} 2840}
2513 2841
2842sub size_request {
2843 my ($self) = @_;
2844
2845 my ($empty, $slider) = @{ $self->{children} };
2846
2847 local $self->{children} = [$empty, $slider];
2848 $self->SUPER::size_request
2849}
2850
2514sub size_allocate { 2851sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2852 my ($self, $w, $h) = @_;
2516 2853
2517 $self->SUPER::size_allocate ($w, $h); 2854 my ($empty, $slider, @other) = @{ $self->{children} };
2855 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2856
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2857 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2858 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2859 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2860 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2861
2524 $self->reflow; 2862 $self->reflow;
2525}
2526 2863
2527sub text_size { 2864 local $self->{children} = [$empty, $slider];
2865 $self->SUPER::invoke_size_allocate ($w, $h)
2866}
2867
2868sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 2869 my ($self, $ev) = @_;
2870
2871 return 0 unless $ev->{dy}; # only vertical movements
2872
2873 $self->{children}[1]->emit (mouse_wheel => $ev);
2874
2875 1
2876}
2877
2878sub get_layout {
2879 my ($self, $para) = @_;
2529 2880
2530 my $layout = $self->{layout}; 2881 my $layout = $self->{layout};
2531 2882
2883 $layout->set_font ($self->{font}) if $self->{font};
2884 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2885 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2886 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2887 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2888 $layout->set_markup ($para->{markup});
2889
2890 $layout->set_shapes (
2891 map
2892 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2893 @{$para->{widget}}
2536 2894 );
2895
2537 $layout->size 2896 $layout
2538} 2897}
2539 2898
2540sub reflow { 2899sub reflow {
2541 my ($self) = @_; 2900 my ($self) = @_;
2542 2901
… …
2549 2908
2550 # todo: base offset on lines or so, not on pixels 2909 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 2910 $self->{children}[1]->set_value ($offset);
2552} 2911}
2553 2912
2913sub current_paragraph {
2914 my ($self) = @_;
2915
2916 $self->{top_paragraph} - 1
2917}
2918
2919sub scroll_to {
2920 my ($self, $para) = @_;
2921
2922 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2923
2924 $self->{scroll_to} = $para;
2925 $self->update;
2926}
2927
2554sub clear { 2928sub clear {
2555 my ($self) = @_; 2929 my ($self) = @_;
2930
2931 my (undef, undef, @other) = @{ $self->{children} };
2932 $self->remove ($_) for @other;
2556 2933
2557 $self->{par} = []; 2934 $self->{par} = [];
2558 $self->{height} = 0; 2935 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2936 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2937}
2561 2938
2562sub add_paragraph { 2939sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2940 my $self = shift;
2564 2941
2565 for my $line (split /\n/, $text) { 2942 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 2943 $para = {
2944 fg => [1, 1, 1, 1],
2945 indent => 0,
2946 markup => "",
2947 widget => [],
2948 ref $para ? %$para : (markup => $para),
2949 w => 1e10,
2950 wrapped => 1,
2951 };
2952
2953 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2954 push @{$self->{par}}, $para;
2955 }
2956
2957 $self->{need_reflow}++;
2958 $self->update;
2959}
2960
2961sub scroll_to_bottom {
2962 my ($self) = @_;
2963
2964 $self->{scroll_to} = $#{$self->{par}};
2965 $self->update;
2966}
2967
2968sub force_uptodate {
2969 my ($self) = @_;
2970
2971 if (delete $self->{need_reflow}) {
2972 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2973
2974 my $height = 0;
2975
2976 for my $para (@{$self->{par}}) {
2977 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2978 my $layout = $self->get_layout ($para);
2979 my ($w, $h) = $layout->size;
2980
2981 $para->{w} = $w + $para->{indent};
2982 $para->{h} = $h;
2983 $para->{wrapped} = $layout->has_wrapped;
2984 }
2985
2986 $para->{y} = $height;
2987 $height += $para->{h};
2988 }
2989
2567 $self->{height} += $h; 2990 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2991 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 2992
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2993 delete $self->{texture};
2994 }
2995
2996 if (my $paridx = delete $self->{scroll_to}) {
2997 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2998 }
2572} 2999}
2573 3000
2574sub update { 3001sub update {
2575 my ($self) = @_; 3002 my ($self) = @_;
2576 3003
… …
2579 return unless $self->{h} > 0; 3006 return unless $self->{h} > 0;
2580 3007
2581 delete $self->{texture}; 3008 delete $self->{texture};
2582 3009
2583 $ROOT->on_post_alloc ($self => sub { 3010 $ROOT->on_post_alloc ($self => sub {
3011 $self->force_uptodate;
3012
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3013 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3014
2586 if (delete $self->{need_reflow}) {
2587 my $height = 0;
2588
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2605
2606 $self->{height} = $height;
2607
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610 delete $self->{texture};
2611 }
2612
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3015 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3016 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3017 glClear GL_COLOR_BUFFER_BIT;
2616 3018
3019 package CFPlus::UI::Base;
3020 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3021 (0, 0, $self->{w}, $self->{h});
3022
3023 my $top = int $self->{children}[1]{range}[0];
3024
3025 my $paridx = 0;
3026 my $top_paragraph;
2617 my $top = int $self->{children}[1]{range}[0]; 3027 my $top = int $self->{children}[1]{range}[0];
2618 3028
2619 my $y0 = $top; 3029 my $y0 = $top;
2620 my $y1 = $top + $H; 3030 my $y1 = $top + $H;
2621 3031
2622 my $y = 0;
2623
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 3032 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3033 my $h = $para->{h};
3034 my $y = $para->{y};
2634 3035
2635 if ($y0 < $y + $h && $y < $y1) { 3036 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3037 my $layout = $self->get_layout ($para);
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 3038
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3039 $layout->render ($para->{indent}, $y - $y0);
2642 3040
2643 glRasterPos $par->[3], $y - $y0; 3041 if (my @w = @{ $para->{widget} }) {
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3042 my @s = $layout->get_shapes;
3043
3044 for (@w) {
3045 my ($dx, $dy) = splice @s, 0, 2, ();
3046
3047 $_->{x} = $dx + $para->{indent};
3048 $_->{y} = $dy + $y - $y0;
3049
3050 $_->draw;
3051 }
3052 }
2645 } 3053 }
2646 3054
2647 $y += $h; 3055 $paridx++;
3056 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3057 }
2649 3058
2650 glDisable GL_BLEND; 3059 $self->{top_paragraph} = $top_paragraph;
2651 }; 3060 };
2652 }); 3061 });
3062}
3063
3064sub reconfigure {
3065 my ($self) = @_;
3066
3067 $self->SUPER::reconfigure;
3068
3069 $_->{w} = 1e10 for @{ $self->{par} };
3070 $self->reflow;
2653} 3071}
2654 3072
2655sub _draw { 3073sub _draw {
2656 my ($self) = @_; 3074 my ($self) = @_;
2657 3075
… …
2660 glColor 0, 0, 0, 1; 3078 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3079 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 3080 glDisable GL_TEXTURE_2D;
2663 3081
2664 $self->{children}[1]->draw; 3082 $self->{children}[1]->draw;
2665
2666} 3083}
2667 3084
2668############################################################################# 3085#############################################################################
2669 3086
2670package CFClient::UI::Animator; 3087package CFPlus::UI::Animator;
2671 3088
2672use CFClient::OpenGL; 3089use CFPlus::OpenGL;
2673 3090
2674our @ISA = CFClient::UI::Bin::; 3091our @ISA = CFPlus::UI::Bin::;
2675 3092
2676sub moveto { 3093sub moveto {
2677 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2678 3095
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3096 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3124 glPopMatrix;
2708} 3125}
2709 3126
2710############################################################################# 3127#############################################################################
2711 3128
2712package CFClient::UI::Flopper; 3129package CFPlus::UI::Flopper;
2713 3130
2714our @ISA = CFClient::UI::Button::; 3131our @ISA = CFPlus::UI::Button::;
2715 3132
2716sub new { 3133sub new {
2717 my $class = shift; 3134 my $class = shift;
2718 3135
2719 my $self = $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3148 $self->{other}->toggle_visibility;
2732} 3149}
2733 3150
2734############################################################################# 3151#############################################################################
2735 3152
2736package CFClient::UI::Tooltip; 3153package CFPlus::UI::Tooltip;
2737 3154
2738our @ISA = CFClient::UI::Bin::; 3155our @ISA = CFPlus::UI::Bin::;
2739 3156
2740use CFClient::OpenGL; 3157use CFPlus::OpenGL;
2741 3158
2742sub new { 3159sub new {
2743 my $class = shift; 3160 my $class = shift;
2744 3161
2745 $class->SUPER::new ( 3162 $class->SUPER::new (
… …
2748 ) 3165 )
2749} 3166}
2750 3167
2751sub set_tooltip_from { 3168sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3169 my ($self, $widget) = @_;
3170
3171 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3172 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3173
2754 my $tooltip = $widget->{tooltip}; 3174 my $tooltip = $widget->{tooltip};
2755 3175
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3176 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3177 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3181 }
2762 3182
2763 $tooltip =~ s/^\n+//; 3183 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3184 $tooltip =~ s/\n+$//;
2765 3185
2766 $self->add (new CFClient::UI::Label 3186 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3187 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3188 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3189 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3190 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3191 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3192 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3193 );
2774} 3194}
2775 3195
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3199 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3200
2781 ($w + 4, $h + 4) 3201 ($w + 4, $h + 4)
2782} 3202}
2783 3203
2784sub size_allocate { 3204sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3205 my ($self, $w, $h) = @_;
2786 3206
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3207 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3208}
2789 3209
2790sub visibility_change { 3210sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3211 my ($self, $visible) = @_;
2792 3212
2793 return unless $visible; 3213 return unless $visible;
2794 3214
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3215 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3216 my $widget = $self->{owner}
2797 or return; 3217 or return;
2798 3218
3219 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3220 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3221
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3222 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3223 if $x + $self->{w} > $self->{root}{w};
2803 3224
2804 $self->move_abs ($x, $y); 3225 $self->move_abs ($x, $y);
3226 } else {
3227 $self->hide;
3228 }
2805 }); 3229 });
2806} 3230}
2807 3231
2808sub _draw { 3232sub _draw {
2809 my ($self) = @_; 3233 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3257 $self->SUPER::_draw;
2834} 3258}
2835 3259
2836############################################################################# 3260#############################################################################
2837 3261
2838package CFClient::UI::Face; 3262package CFPlus::UI::Face;
2839 3263
2840our @ISA = CFClient::UI::Base::; 3264our @ISA = CFPlus::UI::DrawBG::;
2841 3265
2842use CFClient::OpenGL; 3266use CFPlus::OpenGL;
2843 3267
2844sub new { 3268sub new {
2845 my $class = shift; 3269 my $class = shift;
2846 3270
2847 my $self = $class->SUPER::new ( 3271 my $self = $class->SUPER::new (
… …
2849 can_events => 0, 3273 can_events => 0,
2850 @_, 3274 @_,
2851 ); 3275 );
2852 3276
2853 if ($self->{anim} && $self->{animspeed}) { 3277 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3278 CFPlus::weaken (my $widget = $self);
2855 3279
2856 $self->{timer} = Event->timer ( 3280 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3282 hard => 1,
2859 interval => $self->{animspeed}, 3283 interval => $self->{animspeed},
… …
2882sub _draw { 3306sub _draw {
2883 my ($self) = @_; 3307 my ($self) = @_;
2884 3308
2885 return unless $::CONN; 3309 return unless $::CONN;
2886 3310
3311 $self->SUPER::_draw;
3312
2887 my $face; 3313 my $face;
2888 3314
2889 if ($self->{frame}) { 3315 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3316 my $anim = $::CONN->{anim}[$self->{anim}];
2891 3317
… …
2913 $self->SUPER::destroy; 3339 $self->SUPER::destroy;
2914} 3340}
2915 3341
2916############################################################################# 3342#############################################################################
2917 3343
2918package CFClient::UI::Buttonbar; 3344package CFPlus::UI::Buttonbar;
2919 3345
2920our @ISA = CFClient::UI::HBox::; 3346our @ISA = CFPlus::UI::HBox::;
2921 3347
2922# TODO: should actualyl wrap buttons and other goodies. 3348# TODO: should actually wrap buttons and other goodies.
2923 3349
2924############################################################################# 3350#############################################################################
2925 3351
2926package CFClient::UI::Menu; 3352package CFPlus::UI::Menu;
2927 3353
2928our @ISA = CFClient::UI::FancyFrame::; 3354our @ISA = CFPlus::UI::Toplevel::;
2929 3355
2930use CFClient::OpenGL; 3356use CFPlus::OpenGL;
2931 3357
2932sub new { 3358sub new {
2933 my $class = shift; 3359 my $class = shift;
2934 3360
2935 my $self = $class->SUPER::new ( 3361 my $self = $class->SUPER::new (
2936 items => [], 3362 items => [],
2937 z => 100, 3363 z => 100,
2938 @_, 3364 @_,
2939 ); 3365 );
2940 3366
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3367 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3368
2943 for my $item (@{ $self->{items} }) { 3369 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3370 my ($widget, $cb, $tooltip) = @$item;
2945 3371
2946 # handle various types of items, only text for now 3372 # handle various types of items, only text for now
2947 if (!ref $widget) { 3373 if (!ref $widget) {
3374 if ($widget =~ /\t/) {
3375 my ($left, $right) = split /\t/, $widget, 2;
3376
2948 $widget = new CFClient::UI::Label 3377 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3378 can_hover => 1,
2950 can_events => 1, 3379 can_events => 1,
3380 tooltip => $tooltip,
3381 children => [
3382 (new CFPlus::UI::Label markup => $left, expand => 1),
3383 (new CFPlus::UI::Label markup => $right, align => +1),
3384 ],
3385 ;
3386
3387 } else {
3388 $widget = new CFPlus::UI::Label
3389 can_hover => 1,
3390 can_events => 1,
2951 markup => $widget, 3391 markup => $widget,
2952 tooltip => $tooltip 3392 tooltip => $tooltip;
3393 }
2953 } 3394 }
2954 3395
2955 $self->{item}{$widget} = $item; 3396 $self->{item}{$widget} = $item;
2956 3397
2957 $self->{vbox}->add ($widget); 3398 $self->{vbox}->add ($widget);
… …
2962 3403
2963# popup given the event (must be a mouse button down event currently) 3404# popup given the event (must be a mouse button down event currently)
2964sub popup { 3405sub popup {
2965 my ($self, $ev) = @_; 3406 my ($self, $ev) = @_;
2966 3407
2967 $self->_emit ("popdown"); 3408 $self->emit ("popdown");
2968 3409
2969 # maybe save $GRAB? must be careful about events... 3410 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3411 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3412 $self->{button} = $ev->{button};
2972 3413
2973 $self->show; 3414 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3415 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3416}
2976 3417
2977sub mouse_motion { 3418sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3419 my ($self, $ev, $x, $y) = @_;
2979 3420
2980 # TODO: should use vbox->find_widget or so 3421 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3422 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3423 $self->{hover} = $self->{item}{$HOVER};
2983 3424
2984 0 3425 0
2985} 3426}
2986 3427
2987sub button_up { 3428sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3429 my ($self, $ev, $x, $y) = @_;
2989 3430
2990 if ($ev->{button} == $self->{button}) { 3431 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3432 undef $GRAB;
2992 $self->hide; 3433 $self->hide;
2993 3434
2994 $self->_emit ("popdown"); 3435 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3436 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3437 } else {
2997 return 0 3438 return 0
2998 } 3439 }
2999 3440
3000 1 3441 1
3001} 3442}
3002 3443
3003############################################################################# 3444#############################################################################
3004 3445
3005package CFClient::UI::Multiplexer; 3446package CFPlus::UI::Multiplexer;
3006 3447
3007our @ISA = CFClient::UI::Container::; 3448our @ISA = CFPlus::UI::Container::;
3008 3449
3009sub new { 3450sub new {
3010 my $class = shift; 3451 my $class = shift;
3011 3452
3012 my $self = $class->SUPER::new ( 3453 my $self = $class->SUPER::new (
… …
3026 3467
3027 $self->{current} = $self->{children}[0] 3468 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3469 if @{ $self->{children} };
3029} 3470}
3030 3471
3472sub get_current_page {
3473 my ($self) = @_;
3474
3475 $self->{current}
3476}
3477
3031sub set_current_page { 3478sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3479 my ($self, $page_or_widget) = @_;
3033 3480
3034 my $widget = ref $page_or_widget 3481 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3482 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3483 : $self->{children}[$page_or_widget];
3037 3484
3038 $self->{current} = $widget; 3485 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3486 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3487
3041 $self->_emit (page_changed => $self->{current}); 3488 $self->emit (page_changed => $self->{current});
3042 3489
3043 $self->realloc; 3490 $self->realloc;
3044} 3491}
3045 3492
3046sub visible_children { 3493sub visible_children {
… …
3051 my ($self) = @_; 3498 my ($self) = @_;
3052 3499
3053 $self->{current}->size_request 3500 $self->{current}->size_request
3054} 3501}
3055 3502
3056sub size_allocate { 3503sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
3058 3505
3059 $self->{current}->configure (0, 0, $w, $h); 3506 $self->{current}->configure (0, 0, $w, $h);
3507
3508 1
3060} 3509}
3061 3510
3062sub _draw { 3511sub _draw {
3063 my ($self) = @_; 3512 my ($self) = @_;
3064 3513
3065 $self->{current}->draw; 3514 $self->{current}->draw;
3066} 3515}
3067 3516
3068############################################################################# 3517#############################################################################
3069 3518
3070package CFClient::UI::Notebook; 3519package CFPlus::UI::Notebook;
3071 3520
3072our @ISA = CFClient::UI::VBox::; 3521our @ISA = CFPlus::UI::VBox::;
3073 3522
3074sub new { 3523sub new {
3075 my $class = shift; 3524 my $class = shift;
3076 3525
3077 my $self = $class->SUPER::new ( 3526 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3527 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3528 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3529 # filter => # will be put between multiplexer and $self
3081 @_, 3530 @_,
3082 ); 3531 );
3083 3532
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3533 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3537}
3089 3538
3090sub add { 3539sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3540 my ($self, $title, $widget, $tooltip) = @_;
3092 3541
3093 Scalar::Util::weaken $self; 3542 CFPlus::weaken $self;
3094 3543
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3544 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3545 markup => $title,
3097 tooltip => $tooltip, 3546 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3547 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3548 );
3100 3549
3101 $self->{multiplexer}->add ($widget); 3550 $self->{multiplexer}->add ($widget);
3102} 3551}
3103 3552
3553sub get_current_page {
3554 my ($self) = @_;
3555
3556 $self->{multiplexer}->get_current_page
3557}
3558
3104sub set_current_page { 3559sub set_current_page {
3105 my ($self, $page) = @_; 3560 my ($self, $page) = @_;
3106 3561
3107 $self->{multiplexer}->set_current_page ($page); 3562 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3563 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3564}
3110 3565
3111############################################################################# 3566#############################################################################
3112 3567
3113package CFClient::UI::Combobox; 3568package CFPlus::UI::Selector;
3114 3569
3115use utf8; 3570use utf8;
3116 3571
3117our @ISA = CFClient::UI::Button::; 3572our @ISA = CFPlus::UI::Button::;
3118 3573
3119sub new { 3574sub new {
3120 my $class = shift; 3575 my $class = shift;
3121 3576
3122 my $self = $class->SUPER::new ( 3577 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3583 $self->_set_value ($self->{value});
3129 3584
3130 $self 3585 $self
3131} 3586}
3132 3587
3133sub button_down { 3588sub invoke_button_down {
3134 my ($self, $ev) = @_; 3589 my ($self, $ev) = @_;
3135 3590
3136 my @menu_items; 3591 my @menu_items;
3137 3592
3138 for (@{ $self->{options} }) { 3593 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3594 my ($value, $title, $tooltip) = @$_;
3140 3595
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3596 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3597 }
3143 3598
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3599 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3600}
3146 3601
3147sub _set_value { 3602sub _set_value {
3148 my ($self, $value) = @_; 3603 my ($self, $value) = @_;
3149 3604
… …
3159 my ($self, $value) = @_; 3614 my ($self, $value) = @_;
3160 3615
3161 return unless $self->{value} ne $value; 3616 return unless $self->{value} ne $value;
3162 3617
3163 $self->_set_value ($value); 3618 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3619 $self->emit (changed => $value);
3165} 3620}
3166 3621
3167############################################################################# 3622#############################################################################
3168 3623
3169package CFClient::UI::Statusbox; 3624package CFPlus::UI::Statusbox;
3170 3625
3171our @ISA = CFClient::UI::VBox::; 3626our @ISA = CFPlus::UI::VBox::;
3172 3627
3173sub new { 3628sub new {
3174 my $class = shift; 3629 my $class = shift;
3175 3630
3176 my $self = $class->SUPER::new ( 3631 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3632 fontsize => 0.8,
3178 @_, 3633 @_,
3179 ); 3634 );
3180 3635
3181 Scalar::Util::weaken (my $this = $self); 3636 CFPlus::weaken (my $this = $self);
3182 3637
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3638 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3639
3185 $self 3640 $self
3186} 3641}
… …
3188sub reorder { 3643sub reorder {
3189 my ($self) = @_; 3644 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3645 my $NOW = Time::HiRes::time;
3191 3646
3192 # freeze display when hovering over any label 3647 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3648 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3649 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3650 values %{ $self->{item} };
3196 3651
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3652 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3653 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3654 }
… …
3220 for ($short) { 3675 for ($short) {
3221 s/^\s+//; 3676 s/^\s+//;
3222 s/\s+/ /g; 3677 s/\s+/ /g;
3223 } 3678 }
3224 3679
3225 new CFClient::UI::Label 3680 new CFPlus::UI::Label
3226 markup => $short, 3681 markup => $short,
3227 tooltip => $item->{tooltip}, 3682 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3683 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3684 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3685 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3739 count => 1,
3285 %arg, 3740 %arg,
3286 }; 3741 };
3287 } 3742 }
3288 3743
3744 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3745 $self->reorder;
3746 });
3290} 3747}
3291 3748
3292sub reconfigure { 3749sub reconfigure {
3293 my ($self) = @_; 3750 my ($self) = @_;
3294 3751
… …
3307 $self->SUPER::destroy; 3764 $self->SUPER::destroy;
3308} 3765}
3309 3766
3310############################################################################# 3767#############################################################################
3311 3768
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root; 3769package CFPlus::UI::Root;
3674 3770
3675our @ISA = CFClient::UI::Container::; 3771our @ISA = CFPlus::UI::Container::;
3676 3772
3677use List::Util qw(min max); 3773use List::Util qw(min max);
3678 3774
3679use CFClient::OpenGL; 3775use CFPlus::OpenGL;
3680 3776
3681sub new { 3777sub new {
3682 my $class = shift; 3778 my $class = shift;
3683 3779
3684 my $self = $class->SUPER::new ( 3780 my $self = $class->SUPER::new (
3685 visible => 1, 3781 visible => 1,
3686 @_, 3782 @_,
3687 ); 3783 );
3688 3784
3689 Scalar::Util::weaken ($self->{root} = $self); 3785 CFPlus::weaken ($self->{root} = $self);
3690 3786
3691 $self 3787 $self
3692} 3788}
3693 3789
3694sub size_request { 3790sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 3805 $coord = $max - $size if $coord > $max - $size;
3710 3806
3711 int $coord + 0.5 3807 int $coord + 0.5
3712} 3808}
3713 3809
3714sub size_allocate { 3810sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3811 my ($self, $w, $h) = @_;
3716 3812
3717 for my $child ($self->children) { 3813 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3814 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3815
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3819 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3820 $Y = _to_pixel $Y, $H, $self->{h};
3725 3821
3726 $child->configure ($X, $Y, $W, $H); 3822 $child->configure ($X, $Y, $W, $H);
3727 } 3823 }
3824
3825 1
3728} 3826}
3729 3827
3730sub coord2local { 3828sub coord2local {
3731 my ($self, $x, $y) = @_; 3829 my ($self, $x, $y) = @_;
3732 3830
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3956 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 3957
3860 $w = 0 if $w < 0; 3958 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 3959 $h = 0 if $h < 0;
3862 3960
3961 $w = max $widget->{min_w}, $w;
3962 $h = max $widget->{min_h}, $h;
3963
3964# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3965# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3966
3967 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3968 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3969
3863 $w = int $w + 0.5; 3970 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 3971 $h = int $h + 0.5;
3865 3972
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3973 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 3974 $widget->{old_w} = $widget->{w};
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3997 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 3998 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 3999 glLoadIdentity;
3893 4000
3894 { 4001 {
3895 package CFClient::UI::Base; 4002 package CFPlus::UI::Base;
3896 4003
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4004 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4005 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4006
3901 $self->_draw; 4007 $self->_draw;
4008 }
3902} 4009}
3903 4010
3904############################################################################# 4011#############################################################################
3905 4012
3906package CFClient::UI; 4013package CFPlus::UI;
3907 4014
3908$ROOT = new CFClient::UI::Root; 4015$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4016$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4017
39111 40181
3912 4019

Diff Legend

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