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

Diff Legend

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