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.294 by root, Tue Jun 6 03:19:26 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;
1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1780 my $w = List::Util::min $self->{w} + 4, $size->[0];
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1781 my $h = List::Util::min $self->{h} + 2, $size->[1];
1665 1782
1666 if ($tex->{format} == GL_ALPHA) { 1783 $self->{layout}->render ($self->{ox}, $self->{oy});
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668 glColor @{$self->{fg}};
1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673 }
1674
1675 glDisable GL_TEXTURE_2D;
1676} 1784}
1677 1785
1678############################################################################# 1786#############################################################################
1679 1787
1680package CFClient::UI::EntryBase; 1788package CFPlus::UI::EntryBase;
1681 1789
1682our @ISA = CFClient::UI::Label::; 1790our @ISA = CFPlus::UI::Label::;
1683 1791
1684use CFClient::OpenGL; 1792use CFPlus::OpenGL;
1685 1793
1686sub new { 1794sub new {
1687 my $class = shift; 1795 my $class = shift;
1688 1796
1689 $class->SUPER::new ( 1797 $class->SUPER::new (
… …
1713 1821
1714 $text =~ s/./*/g if $self->{hidden}; 1822 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 1823 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 1824 delete $self->{size_req};
1717 1825
1718 $self->_emit (changed => $self->{text}); 1826 $self->emit (changed => $self->{text});
1719 1827
1720 $self->realloc; 1828 $self->realloc;
1721 $self->update; 1829 $self->update;
1722} 1830}
1723 1831
… …
1738 my ($w, $h) = $self->SUPER::size_request; 1846 my ($w, $h) = $self->SUPER::size_request;
1739 1847
1740 ($w + 1, $h) # add 1 for cursor 1848 ($w + 1, $h) # add 1 for cursor
1741} 1849}
1742 1850
1743sub key_down { 1851sub invoke_key_down {
1744 my ($self, $ev) = @_; 1852 my ($self, $ev) = @_;
1745 1853
1746 my $mod = $ev->{mod}; 1854 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 1855 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 1856 my $uni = $ev->{unicode};
… …
1751 1859
1752 if ($uni == 8) { 1860 if ($uni == 8) {
1753 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1861 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1754 } elsif ($uni == 127) { 1862 } elsif ($uni == 127) {
1755 substr $text, $self->{cursor}, 1, ""; 1863 substr $text, $self->{cursor}, 1, "";
1756 } elsif ($sym == CFClient::SDLK_LEFT) { 1864 } elsif ($sym == CFPlus::SDLK_LEFT) {
1757 --$self->{cursor} if $self->{cursor}; 1865 --$self->{cursor} if $self->{cursor};
1758 } elsif ($sym == CFClient::SDLK_RIGHT) { 1866 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1759 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1867 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1760 } elsif ($sym == CFClient::SDLK_HOME) { 1868 } elsif ($sym == CFPlus::SDLK_HOME) {
1761 $self->{cursor} = 0; 1869 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) { 1870 } elsif ($sym == CFPlus::SDLK_END) {
1763 $self->{cursor} = length $text; 1871 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 1872 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 1873 $self->emit ('escape');
1766 } elsif ($uni) { 1874 } elsif ($uni) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 1875 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 1876 } else {
1769 return 0; 1877 return 0;
1770 } 1878 }
… …
1774 $self->realloc; 1882 $self->realloc;
1775 1883
1776 1 1884 1
1777} 1885}
1778 1886
1779sub focus_in { 1887sub invoke_focus_in {
1780 my ($self) = @_; 1888 my ($self) = @_;
1781 1889
1782 $self->{last_activity} = $::NOW; 1890 $self->{last_activity} = $::NOW;
1783 1891
1784 $self->SUPER::focus_in; 1892 $self->SUPER::invoke_focus_in
1785} 1893}
1786 1894
1787sub button_down { 1895sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 1896 my ($self, $ev, $x, $y) = @_;
1789 1897
1790 $self->SUPER::button_down ($ev, $x, $y); 1898 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 1899
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 1900 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 1901
1794 # byte-index to char-index 1902 # byte-index to char-index
1795 my $text = $self->{text}; 1903 my $text = $self->{text};
1796 utf8::encode $text; 1904 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1797 $self->{cursor} = length substr $text, 0, $idx; 1905 $self->{cursor} = length $text;
1798 1906
1799 $self->_set_text ($self->{text}); 1907 $self->_set_text ($self->{text});
1800 $self->update; 1908 $self->update;
1801 1909
1802 1 1910 1
1803} 1911}
1804 1912
1805sub mouse_motion { 1913sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 1914 my ($self, $ev, $x, $y) = @_;
1807# 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#
1808 1916
1809 0 1917 1
1810} 1918}
1811 1919
1812sub _draw { 1920sub _draw {
1813 my ($self) = @_; 1921 my ($self) = @_;
1814 1922
… …
1849 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};
1850 glEnd; 1958 glEnd;
1851 } 1959 }
1852} 1960}
1853 1961
1854package CFClient::UI::Entry; 1962package CFPlus::UI::Entry;
1855 1963
1856our @ISA = CFClient::UI::EntryBase::; 1964our @ISA = CFPlus::UI::EntryBase::;
1857 1965
1858use CFClient::OpenGL; 1966use CFPlus::OpenGL;
1859 1967
1860sub key_down { 1968sub invoke_key_down {
1861 my ($self, $ev) = @_; 1969 my ($self, $ev) = @_;
1862 1970
1863 my $sym = $ev->{sym}; 1971 my $sym = $ev->{sym};
1864 1972
1865 if ($sym == 13) { 1973 if ($sym == 13) {
1866 unshift @{$self->{history}}, 1974 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 1975 my $txt = $self->get_text;
1976
1868 $self->{history_pointer} = -1; 1977 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 1978 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 1979 $self->emit (activate => $txt);
1871 $self->update; 1980 $self->update;
1872 1981
1873 } elsif ($sym == CFClient::SDLK_UP) { 1982 } elsif ($sym == CFPlus::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 1983 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 1984 $self->{history_saveback} = $self->get_text;
1876 } 1985 }
1877 if (@{$self->{history} || []} > 0) { 1986 if (@{$self->{history} || []} > 0) {
1878 $self->{history_pointer}++; 1987 $self->{history_pointer}++;
… …
1880 $self->{history_pointer} = @{$self->{history} || []} - 1; 1989 $self->{history_pointer} = @{$self->{history} || []} - 1;
1881 } 1990 }
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1991 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } 1992 }
1884 1993
1885 } elsif ($sym == CFClient::SDLK_DOWN) { 1994 } elsif ($sym == CFPlus::SDLK_DOWN) {
1886 $self->{history_pointer}--; 1995 $self->{history_pointer}--;
1887 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1996 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1888 1997
1889 if ($self->{history_pointer} >= 0) { 1998 if ($self->{history_pointer} >= 0) {
1890 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1999 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1891 } else { 2000 } else {
1892 $self->set_text ($self->{history_saveback}); 2001 $self->set_text ($self->{history_saveback});
1893 } 2002 }
1894 2003
1895 } else { 2004 } else {
1896 return $self->SUPER::key_down ($ev) 2005 return $self->SUPER::invoke_key_down ($ev)
1897 } 2006 }
1898 2007
1899 1 2008 1
1900} 2009}
1901 2010
1902############################################################################# 2011#############################################################################
1903 2012
1904package CFClient::UI::Button; 2013package CFPlus::UI::Button;
1905 2014
1906our @ISA = CFClient::UI::Label::; 2015our @ISA = CFPlus::UI::Label::;
1907 2016
1908use CFClient::OpenGL; 2017use CFPlus::OpenGL;
1909 2018
1910my @tex = 2019my @tex =
1911 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2020 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1912 qw(b1_button_active.png); 2021 qw(b1_button_active.png);
1913 2022
1914sub new { 2023sub new {
1915 my $class = shift; 2024 my $class = shift;
1916 2025
… …
1925 can_events => 1, 2034 can_events => 1,
1926 @_ 2035 @_
1927 ) 2036 )
1928} 2037}
1929 2038
1930sub activate { }
1931
1932sub button_up { 2039sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1934 2041
1935 $self->emit ("activate") 2042 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 2043 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 2044 && $y >= 0 && $y < $self->{h};
… …
1955 $self->SUPER::_draw; 2062 $self->SUPER::_draw;
1956} 2063}
1957 2064
1958############################################################################# 2065#############################################################################
1959 2066
1960package CFClient::UI::CheckBox; 2067package CFPlus::UI::CheckBox;
1961 2068
1962our @ISA = CFClient::UI::DrawBG::; 2069our @ISA = CFPlus::UI::DrawBG::;
1963 2070
1964my @tex = 2071my @tex =
1965 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2072 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1966 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2073 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1967 2074
1968use CFClient::OpenGL; 2075use CFPlus::OpenGL;
1969 2076
1970sub new { 2077sub new {
1971 my $class = shift; 2078 my $class = shift;
1972 2079
1973 $class->SUPER::new ( 2080 $class->SUPER::new (
… …
1987 my ($self) = @_; 2094 my ($self) = @_;
1988 2095
1989 (6) x 2 2096 (6) x 2
1990} 2097}
1991 2098
2099sub toggle {
2100 my ($self) = @_;
2101
2102 $self->{state} = !$self->{state};
2103 $self->emit (changed => $self->{state});
2104 $self->update;
2105}
2106
1992sub button_down { 2107sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2108 my ($self, $ev, $x, $y) = @_;
1994 2109
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2110 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2111 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2112 $self->toggle;
1998 $self->_emit (changed => $self->{state});
1999 } else { 2113 } else {
2000 return 0 2114 return 0
2001 } 2115 }
2002 2116
2003 1 2117 1
… …
2023 glDisable GL_TEXTURE_2D; 2137 glDisable GL_TEXTURE_2D;
2024} 2138}
2025 2139
2026############################################################################# 2140#############################################################################
2027 2141
2028package CFClient::UI::Image; 2142package CFPlus::UI::Image;
2029 2143
2030our @ISA = CFClient::UI::Base::; 2144our @ISA = CFPlus::UI::Base::;
2031 2145
2032use CFClient::OpenGL; 2146use CFPlus::OpenGL;
2033use Carp qw/confess/;
2034 2147
2035our %loaded_images; 2148our %texture_cache;
2036 2149
2037sub new { 2150sub new {
2038 my $class = shift; 2151 my $class = shift;
2039 2152
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2153 my $self = $class->SUPER::new (
2154 can_events => 0,
2155 @_,
2156 );
2041 2157
2042 $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";
2043 2160
2044 $loaded_images{$self->{image}} ||= 2161 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2045 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;
2046 2163
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2164 Scalar::Util::weaken $texture_cache{$self->{path}};
2048 2165
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2166 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2167
2053 $self 2168 $self
2054} 2169}
2055 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
2056sub size_request { 2186sub size_request {
2057 my ($self) = @_; 2187 my ($self) = @_;
2058 2188
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
2060} 2190}
2061 2191
2062sub _draw { 2192sub _draw {
2063 my ($self) = @_; 2193 my ($self) = @_;
2064 2194
… …
2074 } 2204 }
2075 2205
2076 glEnable GL_TEXTURE_2D; 2206 glEnable GL_TEXTURE_2D;
2077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2207 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2078 2208
2079 $tex->draw_quad_alpha (0, 0, $w, $h); 2209 $tex->draw_quad (0, 0, $w, $h);
2080 2210
2081 glDisable GL_TEXTURE_2D; 2211 glDisable GL_TEXTURE_2D;
2082} 2212}
2083 2213
2084############################################################################# 2214#############################################################################
2085 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
2086package CFClient::UI::VGauge; 2252package CFPlus::UI::VGauge;
2087 2253
2088our @ISA = CFClient::UI::Base::; 2254our @ISA = CFPlus::UI::Base::;
2089 2255
2090use List::Util qw(min max); 2256use List::Util qw(min max);
2091 2257
2092use CFClient::OpenGL; 2258use CFPlus::OpenGL;
2093 2259
2094my %tex = ( 2260my %tex = (
2095 food => [ 2261 food => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2262 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2263 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2098 ], 2264 ],
2099 grace => [ 2265 grace => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2266 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101 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/
2102 ], 2268 ],
2103 hp => [ 2269 hp => [
2104 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2270 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2105 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2271 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2106 ], 2272 ],
2107 mana => [ 2273 mana => [
2108 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2274 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2109 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/
2110 ], 2276 ],
2111); 2277);
2112 2278
2113# eg. VGauge->new (gauge => 'food'), default gauge: food 2279# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2173 my $ycut1 = max 0, min 1, $ycut; 2339 my $ycut1 = max 0, min 1, $ycut;
2174 my $ycut2 = max 0, min 1, $ycut - 1; 2340 my $ycut2 = max 0, min 1, $ycut - 1;
2175 2341
2176 my $h1 = $self->{h} * (1 - $ycut1); 2342 my $h1 = $self->{h} * (1 - $ycut1);
2177 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);
2178 2347
2179 glEnable GL_BLEND; 2348 glEnable GL_BLEND;
2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2349 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2350 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182 glEnable GL_TEXTURE_2D; 2351 glEnable GL_TEXTURE_2D;
… …
2201 2370
2202 if ($t3) { 2371 if ($t3) {
2203 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2372 glBindTexture GL_TEXTURE_2D, $t3->{name};
2204 glBegin GL_QUADS; 2373 glBegin GL_QUADS;
2205 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2374 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2375 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2376 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2377 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209 glEnd; 2378 glEnd;
2210 } 2379 }
2211 2380
2212 glDisable GL_BLEND; 2381 glDisable GL_BLEND;
2213 glDisable GL_TEXTURE_2D; 2382 glDisable GL_TEXTURE_2D;
2214} 2383}
2215 2384
2216############################################################################# 2385#############################################################################
2217 2386
2218package CFClient::UI::Gauge; 2387package CFPlus::UI::Gauge;
2219 2388
2220our @ISA = CFClient::UI::VBox::; 2389our @ISA = CFPlus::UI::VBox::;
2221 2390
2222sub new { 2391sub new {
2223 my ($class, %arg) = @_; 2392 my ($class, %arg) = @_;
2224 2393
2225 my $self = $class->SUPER::new ( 2394 my $self = $class->SUPER::new (
… …
2227 can_hover => 1, 2396 can_hover => 1,
2228 can_events => 1, 2397 can_events => 1,
2229 %arg, 2398 %arg,
2230 ); 2399 );
2231 2400
2232 $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");
2233 $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);
2234 $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");
2235 2404
2236 $self 2405 $self
2237} 2406}
2238 2407
2239sub set_fontsize { 2408sub set_fontsize {
… …
2260 $self->{value}->set_text ($val); 2429 $self->{value}->set_text ($val);
2261} 2430}
2262 2431
2263############################################################################# 2432#############################################################################
2264 2433
2265package CFClient::UI::Slider; 2434package CFPlus::UI::Slider;
2266 2435
2267use strict; 2436use strict;
2268 2437
2269use CFClient::OpenGL; 2438use CFPlus::OpenGL;
2270 2439
2271our @ISA = CFClient::UI::DrawBG::; 2440our @ISA = CFPlus::UI::DrawBG::;
2272 2441
2273my @tex = 2442my @tex =
2274 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2443 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2275 qw(s1_slider.png s1_slider_bg.png); 2444 qw(s1_slider.png s1_slider_bg.png);
2276 2445
2277sub new { 2446sub new {
2278 my $class = shift; 2447 my $class = shift;
2279 2448
… …
2300 $self->update; 2469 $self->update;
2301 2470
2302 $self 2471 $self
2303} 2472}
2304 2473
2305sub changed { }
2306
2307sub set_range { 2474sub set_range {
2308 my ($self, $range) = @_; 2475 my ($self, $range) = @_;
2309 2476
2310 ($range, $self->{range}) = ($self->{range}, $range); 2477 ($range, $self->{range}) = ($self->{range}, $range);
2311 2478
2312 $self->update
2313 if "@$range" ne "@{$self->{range}}"; 2479 if ("@$range" ne "@{$self->{range}}") {
2480 $self->update;
2481 $self->set_value ($self->{range}[0]);
2482 }
2314} 2483}
2315 2484
2316sub set_value { 2485sub set_value {
2317 my ($self, $value) = @_; 2486 my ($self, $value) = @_;
2318 2487
… …
2329 if $unit; 2498 if $unit;
2330 2499
2331 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2500 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2332 2501
2333 if ($value != $old_value) { 2502 if ($value != $old_value) {
2334 $self->_emit (changed => $value); 2503 $self->emit (changed => $value);
2335 $self->update; 2504 $self->update;
2336 } 2505 }
2337} 2506}
2338 2507
2339sub size_request { 2508sub size_request {
2340 my ($self) = @_; 2509 my ($self) = @_;
2341 2510
2342 ($self->{req_w}, $self->{req_h}) 2511 ($self->{req_w}, $self->{req_h})
2343} 2512}
2344 2513
2345sub button_down { 2514sub invoke_button_down {
2346 my ($self, $ev, $x, $y) = @_; 2515 my ($self, $ev, $x, $y) = @_;
2347 2516
2348 $self->SUPER::button_down ($ev, $x, $y); 2517 $self->SUPER::invoke_button_down ($ev, $x, $y);
2349 2518
2350 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2519 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2351 2520
2352 $self->mouse_motion ($ev, $x, $y) 2521 $self->invoke_mouse_motion ($ev, $x, $y)
2353} 2522}
2354 2523
2355sub mouse_motion { 2524sub invoke_mouse_motion {
2356 my ($self, $ev, $x, $y) = @_; 2525 my ($self, $ev, $x, $y) = @_;
2357 2526
2358 if ($GRAB == $self) { 2527 if ($GRAB == $self) {
2359 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2528 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2360 2529
… …
2366 } else { 2535 } else {
2367 return 0; 2536 return 0;
2368 } 2537 }
2369 2538
2370 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
2371} 2550}
2372 2551
2373sub update { 2552sub update {
2374 my ($self) = @_; 2553 my ($self) = @_;
2375 2554
… …
2424 glDisable GL_TEXTURE_2D; 2603 glDisable GL_TEXTURE_2D;
2425} 2604}
2426 2605
2427############################################################################# 2606#############################################################################
2428 2607
2429package CFClient::UI::ValSlider; 2608package CFPlus::UI::ValSlider;
2430 2609
2431our @ISA = CFClient::UI::HBox::; 2610our @ISA = CFPlus::UI::HBox::;
2432 2611
2433sub new { 2612sub new {
2434 my ($class, %arg) = @_; 2613 my ($class, %arg) = @_;
2435 2614
2436 my $range = delete $arg{range}; 2615 my $range = delete $arg{range};
2437 2616
2438 my $self = $class->SUPER::new ( 2617 my $self = $class->SUPER::new (
2439 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2618 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2440 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2619 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2441 to_value => sub { shift }, 2620 to_value => sub { shift },
2442 from_value => sub { shift }, 2621 from_value => sub { shift },
2443 %arg, 2622 %arg,
2444 ); 2623 );
2445 2624
… …
2465sub set_range { shift->{slider}->set_range (@_) } 2644sub set_range { shift->{slider}->set_range (@_) }
2466sub set_value { shift->{slider}->set_value (@_) } 2645sub set_value { shift->{slider}->set_value (@_) }
2467 2646
2468############################################################################# 2647#############################################################################
2469 2648
2470package CFClient::UI::TextView; 2649package CFPlus::UI::TextScroller;
2471 2650
2472our @ISA = CFClient::UI::HBox::; 2651our @ISA = CFPlus::UI::HBox::;
2473 2652
2474use CFClient::OpenGL; 2653use CFPlus::OpenGL;
2475 2654
2476sub new { 2655sub new {
2477 my $class = shift; 2656 my $class = shift;
2478 2657
2479 my $self = $class->SUPER::new ( 2658 my $self = $class->SUPER::new (
2480 fontsize => 1, 2659 fontsize => 1,
2481 can_events => 0, 2660 can_events => 1,
2482 indent => 0, 2661 indent => 0,
2483 #font => default_font 2662 #font => default_font
2484 @_, 2663 @_,
2485 2664
2486 layout => (new CFClient::Layout 1), 2665 layout => (new CFPlus::Layout),
2487 par => [], 2666 par => [],
2488 height => 0, 2667 height => 0,
2489 children => [ 2668 children => [
2490 (new CFClient::UI::Empty expand => 1), 2669 (new CFPlus::UI::Empty expand => 1),
2491 (new CFClient::UI::Slider vertical => 1), 2670 (new CFPlus::UI::Slider vertical => 1),
2492 ], 2671 ],
2493 ); 2672 );
2494 2673
2495 $self->{children}[1]->connect (changed => sub { $self->update }); 2674 $self->{children}[1]->connect (changed => sub { $self->update });
2496 2675
… …
2502 2681
2503 $self->{fontsize} = $fontsize; 2682 $self->{fontsize} = $fontsize;
2504 $self->reflow; 2683 $self->reflow;
2505} 2684}
2506 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
2507sub size_allocate { 2695sub invoke_size_allocate {
2508 my ($self, $w, $h) = @_; 2696 my ($self, $w, $h) = @_;
2509 2697
2510 $self->SUPER::size_allocate ($w, $h); 2698 my ($empty, $slider, @other) = @{ $self->{children} };
2699 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2511 2700
2512 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2701 $self->{layout}->set_font ($self->{font}) if $self->{font};
2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2702 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2514 $self->{layout}->set_width ($self->{children}[0]{w}); 2703 $self->{layout}->set_width ($empty->{w});
2515 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2704 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2516 2705
2517 $self->reflow; 2706 $self->reflow;
2518}
2519 2707
2520sub text_size { 2708 local $self->{children} = [$empty, $slider];
2709 $self->SUPER::invoke_size_allocate ($w, $h)
2710}
2711
2712sub invoke_mouse_wheel {
2521 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) = @_;
2522 2724
2523 my $layout = $self->{layout}; 2725 my $layout = $self->{layout};
2524 2726
2727 $layout->set_font ($self->{font}) if $self->{font};
2728 $layout->set_foreground (@{$para->{fg}});
2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2729 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2526 $layout->set_width ($self->{children}[0]{w} - $indent); 2730 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2527 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2731 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2528 $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}}
2529 2738 );
2739
2530 $layout->size 2740 $layout
2531} 2741}
2532 2742
2533sub reflow { 2743sub reflow {
2534 my ($self) = @_; 2744 my ($self) = @_;
2535 2745
… …
2544 $self->{children}[1]->set_value ($offset); 2754 $self->{children}[1]->set_value ($offset);
2545} 2755}
2546 2756
2547sub clear { 2757sub clear {
2548 my ($self) = @_; 2758 my ($self) = @_;
2759
2760 my (undef, undef, @other) = @{ $self->{children} };
2761 $self->remove ($_) for @other;
2549 2762
2550 $self->{par} = []; 2763 $self->{par} = [];
2551 $self->{height} = 0; 2764 $self->{height} = 0;
2552 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2765 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2553} 2766}
2554 2767
2555sub add_paragraph { 2768sub add_paragraph {
2556 my ($self, $color, $text, $indent) = @_; 2769 my $self = shift;
2557 2770
2558 for my $line (split /\n/, $text) { 2771 for my $para (@_) {
2559 my ($w, $h) = $self->text_size ($line); 2772 $para = {
2560 $self->{height} += $h; 2773 fg => [1, 1, 1, 1],
2561 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2774 indent => 0,
2562 } 2775 markup => "",
2776 widget => [],
2777 ref $para ? %$para : (markup => $para),
2778 w => 1e10,
2779 wrapped => 1,
2780 };
2563 2781
2564 $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;
2565} 2795}
2566 2796
2567sub update { 2797sub update {
2568 my ($self) = @_; 2798 my ($self) = @_;
2569 2799
… …
2571 2801
2572 return unless $self->{h} > 0; 2802 return unless $self->{h} > 0;
2573 2803
2574 delete $self->{texture}; 2804 delete $self->{texture};
2575 2805
2576 $ROOT->on_post_alloc ($self, sub { 2806 $ROOT->on_post_alloc ($self => sub {
2577 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2807 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2578 2808
2579 if (delete $self->{need_reflow}) { 2809 if (delete $self->{need_reflow}) {
2580 my $height = 0; 2810 my $height = 0;
2581 2811
2582 my $layout = $self->{layout};
2583
2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2585
2586 for (@{$self->{par}}) { 2812 for my $para (@{$self->{par}}) {
2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2813 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2588 $layout->set_width ($W - $_->[3]); 2814 my $layout = $self->get_layout ($para);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($_->[4]);
2591 my ($w, $h) = $layout->size; 2815 my ($w, $h) = $layout->size;
2592 $_->[0] = $w + $_->[3]; 2816
2593 $_->[1] = $h; 2817 $para->{w} = $w + $para->{indent};
2818 $para->{h} = $h;
2819 $para->{wrapped} = $layout->has_wrapped;
2594 } 2820 }
2595 2821
2596 $height += $_->[1]; 2822 $height += $para->{h};
2597 } 2823 }
2598 2824
2599 $self->{height} = $height; 2825 $self->{height} = $height;
2600 2826
2601 $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]);
2602 2828
2603 delete $self->{texture}; 2829 delete $self->{texture};
2604 } 2830 }
2605 2831
2832 if (delete $self->{scroll_to_bottom}) {
2833 $self->{children}[1]->set_value (1e10);
2834 }
2835
2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2836 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2607 glClearColor 0, 0, 0, 0; 2837 glClearColor 0, 0, 0, 0;
2608 glClear GL_COLOR_BUFFER_BIT; 2838 glClear GL_COLOR_BUFFER_BIT;
2609 2839
2610 my $top = int $self->{children}[1]{range}[0]; 2840 my $top = int $self->{children}[1]{range}[0];
2611 2841
2612 my $y0 = $top; 2842 my $y0 = $top;
2613 my $y1 = $top + $H; 2843 my $y1 = $top + $H;
2614 2844
2615 my $y = 0; 2845 my $y = 0;
2616 2846
2617 my $layout = $self->{layout};
2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620
2621 glEnable GL_BLEND;
2622 #TODO# not correct in windows where rgba is forced off
2623 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2624
2625 for my $par (@{$self->{par}}) { 2847 for my $para (@{$self->{par}}) {
2626 my $h = $par->[1]; 2848 my $h = $para->{h};
2627 2849
2628 if ($y0 < $y + $h && $y < $y1) { 2850 if ($y0 < $y + $h && $y < $y1) {
2629 $layout->set_foreground (@{ $par->[2] });
2630 $layout->set_width ($W - $par->[3]);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2632 $layout->set_markup ($par->[4]);
2633 2851
2634 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2852 my $layout = $self->get_layout ($para);
2635 2853
2636 glRasterPos $par->[3], $y - $y0; 2854 $layout->render ($para->{indent}, $y - $y0);
2637 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 }
2638 } 2868 }
2639 2869
2640 $y += $h; 2870 $y += $h;
2641 } 2871 }
2642
2643 glDisable GL_BLEND;
2644 }; 2872 };
2645 }); 2873 });
2874}
2875
2876sub reconfigure {
2877 my ($self) = @_;
2878
2879 $self->SUPER::reconfigure;
2880
2881 $_->{w} = 1e10 for @{ $self->{par} };
2882 $self->reflow;
2646} 2883}
2647 2884
2648sub _draw { 2885sub _draw {
2649 my ($self) = @_; 2886 my ($self) = @_;
2650 2887
… …
2653 glColor 0, 0, 0, 1; 2890 glColor 0, 0, 0, 1;
2654 $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});
2655 glDisable GL_TEXTURE_2D; 2892 glDisable GL_TEXTURE_2D;
2656 2893
2657 $self->{children}[1]->draw; 2894 $self->{children}[1]->draw;
2658
2659} 2895}
2660 2896
2661############################################################################# 2897#############################################################################
2662 2898
2663package CFClient::UI::Animator; 2899package CFPlus::UI::Animator;
2664 2900
2665use CFClient::OpenGL; 2901use CFPlus::OpenGL;
2666 2902
2667our @ISA = CFClient::UI::Bin::; 2903our @ISA = CFPlus::UI::Bin::;
2668 2904
2669sub moveto { 2905sub moveto {
2670 my ($self, $x, $y) = @_; 2906 my ($self, $x, $y) = @_;
2671 2907
2672 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2700 glPopMatrix; 2936 glPopMatrix;
2701} 2937}
2702 2938
2703############################################################################# 2939#############################################################################
2704 2940
2705package CFClient::UI::Flopper; 2941package CFPlus::UI::Flopper;
2706 2942
2707our @ISA = CFClient::UI::Button::; 2943our @ISA = CFPlus::UI::Button::;
2708 2944
2709sub new { 2945sub new {
2710 my $class = shift; 2946 my $class = shift;
2711 2947
2712 my $self = $class->SUPER::new ( 2948 my $self = $class->SUPER::new (
… …
2724 $self->{other}->toggle_visibility; 2960 $self->{other}->toggle_visibility;
2725} 2961}
2726 2962
2727############################################################################# 2963#############################################################################
2728 2964
2729package CFClient::UI::Tooltip; 2965package CFPlus::UI::Tooltip;
2730 2966
2731our @ISA = CFClient::UI::Bin::; 2967our @ISA = CFPlus::UI::Bin::;
2732 2968
2733use CFClient::OpenGL; 2969use CFPlus::OpenGL;
2734 2970
2735sub new { 2971sub new {
2736 my $class = shift; 2972 my $class = shift;
2737 2973
2738 $class->SUPER::new ( 2974 $class->SUPER::new (
… …
2741 ) 2977 )
2742} 2978}
2743 2979
2744sub set_tooltip_from { 2980sub set_tooltip_from {
2745 my ($self, $widget) = @_; 2981 my ($self, $widget) = @_;
2982
2983 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2984 if $widget->{tooltip} =~ /^#(.*)$/;
2746 2985
2747 my $tooltip = $widget->{tooltip}; 2986 my $tooltip = $widget->{tooltip};
2748 2987
2749 if ($ENV{CFPLUS_DEBUG} & 2) { 2988 if ($ENV{CFPLUS_DEBUG} & 2) {
2750 $tooltip .= "\n\n" . (ref $widget) . "\n" 2989 $tooltip .= "\n\n" . (ref $widget) . "\n"
2751 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2990 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2752 . "req $widget->{req_w} $widget->{req_h}\n" 2991 . "req $widget->{req_w} $widget->{req_h}\n"
2753 . "visible $widget->{visible}"; 2992 . "visible $widget->{visible}";
2754 } 2993 }
2755 2994
2995 $tooltip =~ s/^\n+//;
2996 $tooltip =~ s/\n+$//;
2997
2756 $self->add (new CFClient::UI::Label 2998 $self->add (new CFPlus::UI::Label
2757 markup => $tooltip, 2999 markup => $tooltip,
2758 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3000 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2759 fontsize => 0.8, 3001 fontsize => 0.8,
2760 fg => [0, 0, 0, 1], 3002 fg => [0, 0, 0, 1],
2761 ellipsise => 0, 3003 ellipsise => 0,
… …
2769 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3011 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2770 3012
2771 ($w + 4, $h + 4) 3013 ($w + 4, $h + 4)
2772} 3014}
2773 3015
2774sub size_allocate { 3016sub invoke_size_allocate {
2775 my ($self, $w, $h) = @_; 3017 my ($self, $w, $h) = @_;
2776 3018
2777 $self->SUPER::size_allocate ($w - 4, $h - 4); 3019 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2778} 3020}
2779 3021
2780sub visibility_change { 3022sub invoke_visibility_change {
2781 my ($self, $visible) = @_; 3023 my ($self, $visible) = @_;
2782 3024
2783 return unless $visible; 3025 return unless $visible;
2784 3026
2785 $self->{root}->on_post_alloc ("move_$self" => sub { 3027 $self->{root}->on_post_alloc ("move_$self" => sub {
2786 my $widget = $self->{owner} 3028 my $widget = $self->{owner}
2787 or return; 3029 or return;
2788 3030
3031 if ($widget->{visible}) {
2789 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3032 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2790 3033
2791 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3034 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2792 if $x + $self->{w} > $::WIDTH; 3035 if $x + $self->{w} > $self->{root}{w};
2793 3036
2794 $self->move_abs ($x, $y); 3037 $self->move_abs ($x, $y);
3038 } else {
3039 $self->hide;
3040 }
2795 }); 3041 });
2796} 3042}
2797 3043
2798sub _draw { 3044sub _draw {
2799 my ($self) = @_; 3045 my ($self) = @_;
… …
2823 $self->SUPER::_draw; 3069 $self->SUPER::_draw;
2824} 3070}
2825 3071
2826############################################################################# 3072#############################################################################
2827 3073
2828package CFClient::UI::Face; 3074package CFPlus::UI::Face;
2829 3075
2830our @ISA = CFClient::UI::Base::; 3076our @ISA = CFPlus::UI::DrawBG::;
2831 3077
2832use CFClient::OpenGL; 3078use CFPlus::OpenGL;
2833 3079
2834sub new { 3080sub new {
2835 my $class = shift; 3081 my $class = shift;
2836 3082
2837 my $self = $class->SUPER::new ( 3083 my $self = $class->SUPER::new (
… …
2872sub _draw { 3118sub _draw {
2873 my ($self) = @_; 3119 my ($self) = @_;
2874 3120
2875 return unless $::CONN; 3121 return unless $::CONN;
2876 3122
3123 $self->SUPER::_draw;
3124
2877 my $face; 3125 my $face;
2878 3126
2879 if ($self->{frame}) { 3127 if ($self->{frame}) {
2880 my $anim = $::CONN->{anim}[$self->{anim}]; 3128 my $anim = $::CONN->{anim}[$self->{anim}];
2881 3129
… …
2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3140 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2893 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2894 } 3142 }
2895} 3143}
2896 3144
2897sub DESTROY { 3145sub destroy {
2898 my ($self) = @_; 3146 my ($self) = @_;
2899 3147
2900 $self->{timer}->cancel 3148 $self->{timer}->cancel
2901 if $self->{timer}; 3149 if $self->{timer};
2902 3150
2903 $self->SUPER::DESTROY; 3151 $self->SUPER::destroy;
2904} 3152}
2905 3153
2906############################################################################# 3154#############################################################################
2907 3155
2908package CFClient::UI::Buttonbar; 3156package CFPlus::UI::Buttonbar;
2909 3157
2910our @ISA = CFClient::UI::HBox::; 3158our @ISA = CFPlus::UI::HBox::;
2911 3159
2912# TODO: should actualyl wrap buttons and other goodies. 3160# TODO: should actualyl wrap buttons and other goodies.
2913 3161
2914############################################################################# 3162#############################################################################
2915 3163
2916package CFClient::UI::Menu; 3164package CFPlus::UI::Menu;
2917 3165
2918our @ISA = CFClient::UI::FancyFrame::; 3166our @ISA = CFPlus::UI::FancyFrame::;
2919 3167
2920use CFClient::OpenGL; 3168use CFPlus::OpenGL;
2921 3169
2922sub new { 3170sub new {
2923 my $class = shift; 3171 my $class = shift;
2924 3172
2925 my $self = $class->SUPER::new ( 3173 my $self = $class->SUPER::new (
2926 items => [], 3174 items => [],
2927 z => 100, 3175 z => 100,
2928 @_, 3176 @_,
2929 ); 3177 );
2930 3178
2931 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3179 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2932 3180
2933 for my $item (@{ $self->{items} }) { 3181 for my $item (@{ $self->{items} }) {
2934 my ($widget, $cb, $tooltip) = @$item; 3182 my ($widget, $cb, $tooltip) = @$item;
2935 3183
2936 # handle various types of items, only text for now 3184 # handle various types of items, only text for now
2937 if (!ref $widget) { 3185 if (!ref $widget) {
3186 if ($widget =~ /\t/) {
3187 my ($left, $right) = split /\t/, $widget, 2;
3188
2938 $widget = new CFClient::UI::Label 3189 $widget = new CFPlus::UI::HBox
2939 can_hover => 1, 3190 can_hover => 1,
2940 can_events => 1, 3191 can_events => 1,
2941 text => $widget,
2942 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 }
2943 } 3206 }
2944 3207
2945 $self->{item}{$widget} = $item; 3208 $self->{item}{$widget} = $item;
2946 3209
2947 $self->{vbox}->add ($widget); 3210 $self->{vbox}->add ($widget);
… …
2952 3215
2953# 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)
2954sub popup { 3217sub popup {
2955 my ($self, $ev) = @_; 3218 my ($self, $ev) = @_;
2956 3219
2957 $self->_emit ("popdown"); 3220 $self->emit ("popdown");
2958 3221
2959 # maybe save $GRAB? must be careful about events... 3222 # maybe save $GRAB? must be careful about events...
2960 $GRAB = $self; 3223 $GRAB = $self;
2961 $self->{button} = $ev->{button}; 3224 $self->{button} = $ev->{button};
2962 3225
2963 $self->show; 3226 $self->show;
2964 $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);
2965} 3228}
2966 3229
2967sub mouse_motion { 3230sub invoke_mouse_motion {
2968 my ($self, $ev, $x, $y) = @_; 3231 my ($self, $ev, $x, $y) = @_;
2969 3232
2970 # TODO: should use vbox->find_widget or so 3233 # TODO: should use vbox->find_widget or so
2971 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3234 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2972 $self->{hover} = $self->{item}{$HOVER}; 3235 $self->{hover} = $self->{item}{$HOVER};
2973 3236
2974 0 3237 0
2975} 3238}
2976 3239
2977sub button_up { 3240sub invoke_button_up {
2978 my ($self, $ev, $x, $y) = @_; 3241 my ($self, $ev, $x, $y) = @_;
2979 3242
2980 if ($ev->{button} == $self->{button}) { 3243 if ($ev->{button} == $self->{button}) {
2981 undef $GRAB; 3244 undef $GRAB;
2982 $self->hide; 3245 $self->hide;
2983 3246
2984 $self->_emit ("popdown"); 3247 $self->emit ("popdown");
2985 $self->{hover}[1]->() if $self->{hover}; 3248 $self->{hover}[1]->() if $self->{hover};
2986 } else { 3249 } else {
2987 return 0 3250 return 0
2988 } 3251 }
2989 3252
2990 1 3253 1
2991} 3254}
2992 3255
2993############################################################################# 3256#############################################################################
2994 3257
2995package CFClient::UI::Multiplexer; 3258package CFPlus::UI::Multiplexer;
2996 3259
2997our @ISA = CFClient::UI::Container::; 3260our @ISA = CFPlus::UI::Container::;
2998 3261
2999sub new { 3262sub new {
3000 my $class = shift; 3263 my $class = shift;
3001 3264
3002 my $self = $class->SUPER::new ( 3265 my $self = $class->SUPER::new (
… …
3016 3279
3017 $self->{current} = $self->{children}[0] 3280 $self->{current} = $self->{children}[0]
3018 if @{ $self->{children} }; 3281 if @{ $self->{children} };
3019} 3282}
3020 3283
3284sub get_current_page {
3285 my ($self) = @_;
3286
3287 $self->{current}
3288}
3289
3021sub set_current_page { 3290sub set_current_page {
3022 my ($self, $page_or_widget) = @_; 3291 my ($self, $page_or_widget) = @_;
3023 3292
3024 my $widget = ref $page_or_widget 3293 my $widget = ref $page_or_widget
3025 ? $page_or_widget 3294 ? $page_or_widget
3026 : $self->{children}[$page_or_widget]; 3295 : $self->{children}[$page_or_widget];
3027 3296
3028 $self->{current} = $widget; 3297 $self->{current} = $widget;
3029 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3298 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3030 3299
3031 $self->_emit (page_changed => $self->{current}); 3300 $self->emit (page_changed => $self->{current});
3032 3301
3033 $self->realloc; 3302 $self->realloc;
3034} 3303}
3035 3304
3036sub visible_children { 3305sub visible_children {
… …
3041 my ($self) = @_; 3310 my ($self) = @_;
3042 3311
3043 $self->{current}->size_request 3312 $self->{current}->size_request
3044} 3313}
3045 3314
3046sub size_allocate { 3315sub invoke_size_allocate {
3047 my ($self, $w, $h) = @_; 3316 my ($self, $w, $h) = @_;
3048 3317
3049 $self->{current}->configure (0, 0, $w, $h); 3318 $self->{current}->configure (0, 0, $w, $h);
3319
3320 1
3050} 3321}
3051 3322
3052sub _draw { 3323sub _draw {
3053 my ($self) = @_; 3324 my ($self) = @_;
3054 3325
3055 $self->{current}->draw; 3326 $self->{current}->draw;
3056} 3327}
3057 3328
3058############################################################################# 3329#############################################################################
3059 3330
3060package CFClient::UI::Notebook; 3331package CFPlus::UI::Notebook;
3061 3332
3062our @ISA = CFClient::UI::VBox::; 3333our @ISA = CFPlus::UI::VBox::;
3063 3334
3064sub new { 3335sub new {
3065 my $class = shift; 3336 my $class = shift;
3066 3337
3067 my $self = $class->SUPER::new ( 3338 my $self = $class->SUPER::new (
3068 buttonbar => (new CFClient::UI::Buttonbar), 3339 buttonbar => (new CFPlus::UI::Buttonbar),
3069 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3340 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3070 # filter => # will be put between multiplexer and $self 3341 # filter => # will be put between multiplexer and $self
3071 @_, 3342 @_,
3072 ); 3343 );
3073 3344
3074 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3345 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3080sub add { 3351sub add {
3081 my ($self, $title, $widget, $tooltip) = @_; 3352 my ($self, $title, $widget, $tooltip) = @_;
3082 3353
3083 Scalar::Util::weaken $self; 3354 Scalar::Util::weaken $self;
3084 3355
3085 $self->{buttonbar}->add (new CFClient::UI::Button 3356 $self->{buttonbar}->add (new CFPlus::UI::Button
3086 markup => $title, 3357 markup => $title,
3087 tooltip => $tooltip, 3358 tooltip => $tooltip,
3088 on_activate => sub { $self->set_current_page ($widget) }, 3359 on_activate => sub { $self->set_current_page ($widget) },
3089 ); 3360 );
3090 3361
3091 $self->{multiplexer}->add ($widget); 3362 $self->{multiplexer}->add ($widget);
3092} 3363}
3093 3364
3365sub get_current_page {
3366 my ($self) = @_;
3367
3368 $self->{multiplexer}->get_current_page
3369}
3370
3094sub set_current_page { 3371sub set_current_page {
3095 my ($self, $page) = @_; 3372 my ($self, $page) = @_;
3096 3373
3097 $self->{multiplexer}->set_current_page ($page); 3374 $self->{multiplexer}->set_current_page ($page);
3098 $self->_emit (page_changed => $self->{multiplexer}{current}); 3375 $self->emit (page_changed => $self->{multiplexer}{current});
3099} 3376}
3100 3377
3101############################################################################# 3378#############################################################################
3102 3379
3103package CFClient::UI::Combobox; 3380package CFPlus::UI::Selector;
3104 3381
3105use utf8; 3382use utf8;
3106 3383
3107our @ISA = CFClient::UI::Button::; 3384our @ISA = CFPlus::UI::Button::;
3108 3385
3109sub new { 3386sub new {
3110 my $class = shift; 3387 my $class = shift;
3111 3388
3112 my $self = $class->SUPER::new ( 3389 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ... 3390 options => [], # [value, title, longdesc], ...
3114 value => undef, 3391 value => undef,
3115 @_, 3392 @_,
3116 ); 3393 );
3117 3394
3118 $self->_set_value ($self->{value}); 3395 $self->_set_value ($self->{value});
3119 3396
3120 $self 3397 $self
3121} 3398}
3122 3399
3123sub button_down { 3400sub invoke_button_down {
3124 my ($self, $ev) = @_; 3401 my ($self, $ev) = @_;
3125 3402
3126 my @menu_items; 3403 my @menu_items;
3127 3404
3128 for (@{ $self->{options} }) { 3405 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_; 3406 my ($value, $title, $tooltip) = @$_;
3130 3407
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3408 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3132 } 3409 }
3133 3410
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3411 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135} 3412}
3136 3413
3137sub _set_value { 3414sub _set_value {
3138 my ($self, $value) = @_; 3415 my ($self, $value) = @_;
3139 3416
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3417 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3141 or return; 3418 or return;
3142 3419
3143 $self->{value} = $item->[1]; 3420 $self->{value} = $item->[0];
3144 $self->set_markup ("$item->[0] ⇓"); 3421 $self->set_markup ("$item->[1] ⇓");
3145 $self->set_tooltip ($item->[2]); 3422 $self->set_tooltip ($item->[2]);
3146} 3423}
3147 3424
3148sub set_value { 3425sub set_value {
3149 my ($self, $value) = @_; 3426 my ($self, $value) = @_;
3150 3427
3151 return unless $self->{value} ne $value; 3428 return unless $self->{value} ne $value;
3152 3429
3153 $self->_set_value ($value); 3430 $self->_set_value ($value);
3154 $self->_emit (changed => $value); 3431 $self->emit (changed => $value);
3155} 3432}
3156 3433
3157############################################################################# 3434#############################################################################
3158 3435
3159package CFClient::UI::Statusbox; 3436package CFPlus::UI::Statusbox;
3160 3437
3161our @ISA = CFClient::UI::VBox::; 3438our @ISA = CFPlus::UI::VBox::;
3162 3439
3163sub new { 3440sub new {
3164 my $class = shift; 3441 my $class = shift;
3165 3442
3166 my $self = $class->SUPER::new ( 3443 my $self = $class->SUPER::new (
… …
3178sub reorder { 3455sub reorder {
3179 my ($self) = @_; 3456 my ($self) = @_;
3180 my $NOW = Time::HiRes::time; 3457 my $NOW = Time::HiRes::time;
3181 3458
3182 # freeze display when hovering over any label 3459 # freeze display when hovering over any label
3183 return if $CFClient::UI::TOOLTIP->{owner} 3460 return if $CFPlus::UI::TOOLTIP->{owner}
3184 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3461 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3185 values %{ $self->{item} }; 3462 values %{ $self->{item} };
3186 3463
3187 while (my ($k, $v) = each %{ $self->{item} }) { 3464 while (my ($k, $v) = each %{ $self->{item} }) {
3188 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3465 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3189 } 3466 }
… …
3210 for ($short) { 3487 for ($short) {
3211 s/^\s+//; 3488 s/^\s+//;
3212 s/\s+/ /g; 3489 s/\s+/ /g;
3213 } 3490 }
3214 3491
3215 new CFClient::UI::Label 3492 new CFPlus::UI::Label
3216 markup => $short, 3493 markup => $short,
3217 tooltip => $item->{tooltip}, 3494 tooltip => $item->{tooltip},
3218 tooltip_font => $::FONT_PROP, 3495 tooltip_font => $::FONT_PROP,
3219 tooltip_width => 0.67, 3496 tooltip_width => 0.67,
3220 fontsize => $item->{fontsize} || $self->{fontsize}, 3497 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3258 $item->{count}++; 3535 $item->{count}++;
3259 } else { 3536 } else {
3260 $item->{count} = 1; 3537 $item->{count} = 1;
3261 $item->{text} = $item->{tooltip} = $text; 3538 $item->{text} = $item->{tooltip} = $text;
3262 } 3539 }
3263 $item->{id} = ++$self->{id}; 3540 $item->{id} += 0.2;#d#
3264 $item->{timeout} = $timeout; 3541 $item->{timeout} = $timeout;
3265 delete $item->{label}; 3542 delete $item->{label};
3266 } else { 3543 } else {
3267 $self->{item}{$group} = { 3544 $self->{item}{$group} = {
3268 id => ++$self->{id}, 3545 id => ++$self->{id},
… …
3274 count => 1, 3551 count => 1,
3275 %arg, 3552 %arg,
3276 }; 3553 };
3277 } 3554 }
3278 3555
3556 $ROOT->on_refresh (reorder => sub {
3279 $self->reorder; 3557 $self->reorder;
3558 });
3280} 3559}
3281 3560
3282sub reconfigure { 3561sub reconfigure {
3283 my ($self) = @_; 3562 my ($self) = @_;
3284 3563
… …
3287 3566
3288 $self->reorder; 3567 $self->reorder;
3289 $self->SUPER::reconfigure; 3568 $self->SUPER::reconfigure;
3290} 3569}
3291 3570
3292sub DESTROY { 3571sub destroy {
3293 my ($self) = @_; 3572 my ($self) = @_;
3294 3573
3295 $self->{timer}->cancel; 3574 $self->{timer}->cancel;
3296 3575
3297 $self->SUPER::DESTROY; 3576 $self->SUPER::destroy;
3298} 3577}
3299 3578
3300############################################################################# 3579#############################################################################
3301 3580
3302package CFClient::UI::Inventory; 3581package CFPlus::UI::Inventory;
3303 3582
3304our @ISA = CFClient::UI::ScrolledWindow::; 3583our @ISA = CFPlus::UI::Table::;
3305 3584
3306sub new { 3585sub new {
3307 my $class = shift; 3586 my $class = shift;
3308 3587
3309 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3310 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3589 col_expand => [0, 1, 0],
3590 items => [],
3311 @_, 3591 @_,
3312 ); 3592 );
3313 3593
3594 $self->set_sort_order (undef);
3595
3314 $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;
3315} 3632}
3316 3633
3317sub set_items { 3634sub set_items {
3318 my ($self, $items) = @_; 3635 my ($self, $items) = @_;
3319 3636
3320 $self->{child}->clear; 3637 $self->{items} = [$items ? values %$items : ()];
3321 return unless $items; 3638 $self->update_items;
3322
3323 my @items = sort {
3324 ($a->{type} <=> $b->{type})
3325 or ($a->{name} cmp $b->{name})
3326 } @$items;
3327
3328 $self->{real_items} = \@items;
3329
3330 my $row = 0;
3331 for my $item (@items) {
3332 CFClient::Item::update_widgets $item;
3333
3334 $self->{child}->add (0, $row, $item->{face_widget});
3335 $self->{child}->add (1, $row, $item->{desc_widget});
3336 $self->{child}->add (2, $row, $item->{weight_widget});
3337
3338 $row++;
3339 }
3340} 3639}
3341 3640
3342############################################################################# 3641#############################################################################
3343 3642
3344package CFClient::UI::BindEditor;
3345
3346our @ISA = CFClient::UI::FancyFrame::;
3347
3348sub new {
3349 my $class = shift;
3350
3351 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3352
3353 $self->add (my $vb = new CFClient::UI::VBox);
3354
3355
3356 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3357 text => "start recording",
3358 tooltip => "Start/Stops recording of actions."
3359 ."All subsequent actions after the recording started will be captured."
3360 ."The actions are displayed after the record was stopped."
3361 ."To bind the action you have to click on the 'Bind' button",
3362 on_activate => sub {
3363 unless ($self->{recording}) {
3364 $self->start;
3365 } else {
3366 $self->stop;
3367 }
3368 });
3369
3370 $vb->add (new CFClient::UI::Label text => "Actions:");
3371 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3372
3373 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3374 $vb->add (my $hb = new CFClient::UI::HBox);
3375 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3376 $hb->add (new CFClient::UI::Button
3377 text => "bind",
3378 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3379 on_activate => sub {
3380 $self->ask_for_bind;
3381 });
3382
3383 $vb->add (my $hb = new CFClient::UI::HBox);
3384 $hb->add (new CFClient::UI::Button
3385 text => "ok",
3386 expand => 1,
3387 tooltip => "This closes the binding editor and saves the binding",
3388 on_activate => sub {
3389 $self->hide;
3390 $self->commit;
3391 });
3392
3393 $hb->add (new CFClient::UI::Button
3394 text => "cancel",
3395 expand => 1,
3396 tooltip => "This closes the binding editor without saving",
3397 on_activate => sub {
3398 $self->hide;
3399 $self->{binding_cancel}->()
3400 if $self->{binding_cancel};
3401 });
3402
3403 $self->update_binding_widgets;
3404
3405 $self
3406}
3407
3408sub commit {
3409 my ($self) = @_;
3410 my ($mod, $sym, $cmds) = $self->get_binding;
3411 if ($sym != 0 && @$cmds > 0) {
3412 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3413 ."'. Don't forget 'Save Config'!");
3414 $self->{binding_change}->($mod, $sym, $cmds)
3415 if $self->{binding_change};
3416 } else {
3417 $::STATUSBOX->add ("No action bound, no key or action specified!");
3418 $self->{binding_cancel}->()
3419 if $self->{binding_cancel};
3420 }
3421}
3422
3423sub start {
3424 my ($self) = @_;
3425
3426 $self->{rec_btn}->set_text ("stop recording");
3427 $self->{recording} = 1;
3428 $self->clear_command_list;
3429 $::CONN->start_record if $::CONN;
3430}
3431
3432sub stop {
3433 my ($self) = @_;
3434
3435 $self->{rec_btn}->set_text ("start recording");
3436 $self->{recording} = 0;
3437
3438 my $rec;
3439 $rec = $::CONN->stop_record if $::CONN;
3440 return unless ref $rec eq 'ARRAY';
3441 $self->set_command_list ($rec);
3442}
3443
3444
3445sub ask_for_bind_and_commit {
3446 my ($self) = @_;
3447 $self->ask_for_bind (1);
3448}
3449
3450sub ask_for_bind {
3451 my ($self, $commit) = @_;
3452
3453 CFClient::Binder::open_binding_dialog (sub {
3454 my ($mod, $sym) = @_;
3455 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3456 $self->update_binding_widgets;
3457 $self->commit if $commit;
3458 });
3459}
3460
3461# $mod and $sym are the modifiers and key symbol
3462# $cmds is a array ref of strings (the commands)
3463# $cb is the callback that is executed on OK
3464# $ccb is the callback that is executed on CANCEL and
3465# when the binding was unsuccessful on OK
3466sub set_binding {
3467 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3468
3469 $self->clear_command_list;
3470 $self->{recording} = 0;
3471 $self->{rec_btn}->set_text ("start recording");
3472
3473 $self->{binding} = [$mod, $sym];
3474 $self->{commands} = $cmds;
3475
3476 $self->{binding_change} = $cb;
3477 $self->{binding_cancel} = $ccb;
3478
3479 $self->update_binding_widgets;
3480}
3481
3482# this is a shortcut method that asks for a binding
3483# and then just binds it.
3484sub do_quick_binding {
3485 my ($self, $cmds) = @_;
3486 $self->set_binding (undef, undef, $cmds, sub {
3487 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3488 });
3489 $self->ask_for_bind (1);
3490}
3491
3492sub update_binding_widgets {
3493 my ($self) = @_;
3494 my ($mod, $sym, $cmds) = $self->get_binding;
3495 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3496 $self->set_command_list ($cmds);
3497}
3498
3499sub get_binding {
3500 my ($self) = @_;
3501 return (
3502 $self->{binding}->[0],
3503 $self->{binding}->[1],
3504 [ grep { defined $_ } @{$self->{commands}} ]
3505 );
3506}
3507
3508sub clear_command_list {
3509 my ($self) = @_;
3510 $self->{cmdbox}->clear ();
3511}
3512
3513sub set_command_list {
3514 my ($self, $cmds) = @_;
3515
3516 $self->{cmdbox}->clear ();
3517 $self->{commands} = $cmds;
3518
3519 my $idx = 0;
3520
3521 for (@$cmds) {
3522 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3523
3524 my $i = $idx;
3525 $hb->add (new CFClient::UI::Label text => $_);
3526 $hb->add (new CFClient::UI::Button
3527 text => "delete",
3528 tooltip => "Deletes the action from the record",
3529 on_activate => sub {
3530 $self->{cmdbox}->remove ($hb);
3531 $cmds->[$i] = undef;
3532 });
3533
3534
3535 $idx++
3536 }
3537}
3538
3539#############################################################################
3540
3541package CFClient::UI::SpellList; 3643package CFPlus::UI::SpellList;
3542 3644
3543our @ISA = CFClient::UI::Table::; 3645our @ISA = CFPlus::UI::Table::;
3544 3646
3545sub new { 3647sub new {
3546 my $class = shift; 3648 my $class = shift;
3547 3649
3548 my $self = $class->SUPER::new ( 3650 my $self = $class->SUPER::new (
… …
3550 commands => [], 3652 commands => [],
3551 @_, 3653 @_,
3552 ) 3654 )
3553} 3655}
3554 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");
3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3663my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<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");
3557my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3665my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<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");
3559my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3667my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<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");
3561 3669
3562sub rebuild_spell_list { 3670sub rebuild_spell_list {
3563 my ($self) = @_; 3671 my ($self) = @_;
3564 3672
3565 $CFClient::UI::ROOT->on_refresh ($self => sub { 3673 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3566 $self->clear; 3674 $self->clear;
3567 3675
3676 return unless $::CONN;
3677
3568 $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);
3569 $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);
3570 $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);
3571 $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);
3572 3683
3573 my $row = 0; 3684 my $row = 0;
3574 3685
3575 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3686 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576 my $spell = $self->{spell}{$_}; 3687 my $spell = $self->{spell}{$_};
3577 3688
3578 $row++; 3689 $row++;
3579 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
3580 $self->add (0, $row, new CFClient::UI::Face 3717 $self->add (0, $row, new CFPlus::UI::Face
3581 face => $spell->{face}, 3718 face => $spell->{face},
3582 can_hover => 1, 3719 can_hover => 1,
3583 can_events => 1, 3720 can_events => 1,
3584 tooltip => $spell->{message}, 3721 tooltip => $tooltip,
3722 on_button_down => $spell_cb,
3585 ); 3723 );
3586 3724
3587 $self->add (1, $row, new CFClient::UI::Label 3725 $self->add (1, $row, new CFPlus::UI::Label
3588 expand => 1, 3726 expand => 1,
3589 text => $spell->{name}, 3727 text => $spell->{name},
3590 can_hover => 1, 3728 can_hover => 1,
3591 can_events => 1, 3729 can_events => 1,
3592 tooltip => $spell->{message}, 3730 tooltip => $tooltip,
3731 on_button_down => $spell_cb,
3593 ); 3732 );
3594 3733
3734 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3595 $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);
3596 $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);
3597 $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);
3598
3599 # TODO: should be done via popup
3600 $self->add (5, $row, new CFClient::UI::Button
3601 text => "bind",
3602 tooltip => "bind spell readying (cast command) to key",
3603 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604 );
3605 } 3738 }
3606 }); 3739 });
3607} 3740}
3608 3741
3609sub add_spell { 3742sub add_spell {
… …
3618 3751
3619 delete $self->{spell}->{$spell->{name}}; 3752 delete $self->{spell}->{$spell->{name}};
3620 $self->rebuild_spell_list; 3753 $self->rebuild_spell_list;
3621} 3754}
3622 3755
3756sub clear_spells {
3757 my ($self) = @_;
3758
3759 $self->{spell} = {};
3760 $self->rebuild_spell_list;
3761}
3762
3623############################################################################# 3763#############################################################################
3624 3764
3625package CFClient::UI::Root; 3765package CFPlus::UI::Root;
3626 3766
3627our @ISA = CFClient::UI::Container::; 3767our @ISA = CFPlus::UI::Container::;
3628 3768
3629use List::Util qw(min max); 3769use List::Util qw(min max);
3630 3770
3631use CFClient::OpenGL; 3771use CFPlus::OpenGL;
3632 3772
3633sub new { 3773sub new {
3634 my $class = shift; 3774 my $class = shift;
3635 3775
3636 my $self = $class->SUPER::new ( 3776 my $self = $class->SUPER::new (
… …
3661 $coord = $max - $size if $coord > $max - $size; 3801 $coord = $max - $size if $coord > $max - $size;
3662 3802
3663 int $coord + 0.5 3803 int $coord + 0.5
3664} 3804}
3665 3805
3666sub size_allocate { 3806sub invoke_size_allocate {
3667 my ($self, $w, $h) = @_; 3807 my ($self, $w, $h) = @_;
3668 3808
3669 for my $child ($self->children) { 3809 for my $child ($self->children) {
3670 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)};
3671 3811
… …
3675 $X = _to_pixel $X, $W, $self->{w}; 3815 $X = _to_pixel $X, $W, $self->{w};
3676 $Y = _to_pixel $Y, $H, $self->{h}; 3816 $Y = _to_pixel $Y, $H, $self->{h};
3677 3817
3678 $child->configure ($X, $Y, $W, $H); 3818 $child->configure ($X, $Y, $W, $H);
3679 } 3819 }
3820
3821 1
3680} 3822}
3681 3823
3682sub coord2local { 3824sub coord2local {
3683 my ($self, $x, $y) = @_; 3825 my ($self, $x, $y) = @_;
3684 3826
… …
3810 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3952 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3811 3953
3812 $w = 0 if $w < 0; 3954 $w = 0 if $w < 0;
3813 $h = 0 if $h < 0; 3955 $h = 0 if $h < 0;
3814 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
3815 $w = int $w + 0.5; 3966 $w = int $w + 0.5;
3816 $h = int $h + 0.5; 3967 $h = int $h + 0.5;
3817 3968
3818 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}) {
3819 $widget->{old_w} = $widget->{w}; 3970 $widget->{old_w} = $widget->{w};
… …
3842 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3993 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3843 glMatrixMode GL_MODELVIEW; 3994 glMatrixMode GL_MODELVIEW;
3844 glLoadIdentity; 3995 glLoadIdentity;
3845 3996
3846 { 3997 {
3847 package CFClient::UI::Base; 3998 package CFPlus::UI::Base;
3848 3999
3849 ($draw_x, $draw_y, $draw_w, $draw_h) = 4000 ($draw_x, $draw_y, $draw_w, $draw_h) =
3850 (0, 0, $self->{w}, $self->{h}); 4001 (0, 0, $self->{w}, $self->{h});
3851 } 4002 }
3852 4003
3853 $self->_draw; 4004 $self->_draw;
3854} 4005}
3855 4006
3856############################################################################# 4007#############################################################################
3857 4008
3858package CFClient::UI; 4009package CFPlus::UI;
3859 4010
3860$ROOT = new CFClient::UI::Root; 4011$ROOT = new CFPlus::UI::Root;
3861$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4012$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3862 4013
38631 40141
3864 4015

Diff Legend

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