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.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.342 by root, Sun Aug 13 14:38:35 2006 UTC

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

Diff Legend

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