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.285 by root, Mon Jun 5 03:07:01 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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