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.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 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 if ($tex->{format} == GL_ALPHA) { 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661 }
1662
1663 glDisable GL_TEXTURE_2D;
1664} 1895}
1665 1896
1666############################################################################# 1897#############################################################################
1667 1898
1668package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1669 1900
1670our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1671 1902
1672use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1673 1904
1674sub new { 1905sub new {
1675 my $class = shift; 1906 my $class = shift;
1676 1907
1677 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1681 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1682 can_hover => 1, 1913 can_hover => 1,
1683 can_focus => 1, 1914 can_focus => 1,
1684 valign => 0, 1915 valign => 0,
1685 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1686 #text => ... 1918 #text => ...
1919 #hidden => "*",
1687 @_ 1920 @_
1688 ) 1921 )
1689} 1922}
1690 1923
1691sub _set_text { 1924sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 1932 $self->{text} = $text;
1700 1933
1701 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 1936 delete $self->{size_req};
1704 1937
1705 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1706 1939
1707 $self->realloc; 1940 $self->realloc;
1708 $self->update; 1941 $self->update;
1709} 1942}
1710 1943
… …
1725 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1726 1959
1727 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1728} 1961}
1729 1962
1730sub key_down { 1963sub invoke_key_down {
1731 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1732 1965
1733 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1738 1971
1739 if ($uni == 8) { 1972 if ($uni == 8) {
1740 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1741 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1742 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1743 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1744 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1745 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1746 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1747 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1981 # what a hack
1982 $self->{cursor} =
1983 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1984 ? length $1
1985 : 0;
1986 } elsif ($sym == CFPlus::SDLK_END) {
1987 # uh, again
1988 $self->{cursor} =
1989 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1990 ? $self->{cursor} + length $1
1991 : length $self->{text};
1992 } elsif ($uni == 21) { # ctrl-u
1993 $text = "";
1748 $self->{cursor} = 0; 1994 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) {
1750 $self->{cursor} = length $text;
1751 } elsif ($uni == 27) { 1995 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 1996 $self->emit ('escape');
1753 } elsif ($uni) { 1997 } elsif ($uni == 0x0d) {
1998 substr $text, $self->{cursor}++, 0, "\012";
1999 } elsif ($uni >= 0x20) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 2000 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 2001 } else {
1756 return 0; 2002 return 0;
1757 } 2003 }
1758 2004
1759 $self->_set_text ($text); 2005 $self->_set_text ($text);
1760 2006
1761 $self->realloc; 2007 $self->realloc;
2008 $self->update;
1762 2009
1763 1 2010 1
1764} 2011}
1765 2012
1766sub focus_in { 2013sub invoke_focus_in {
1767 my ($self) = @_; 2014 my ($self) = @_;
1768 2015
1769 $self->{last_activity} = $::NOW; 2016 $self->{last_activity} = $::NOW;
1770 2017
1771 $self->SUPER::focus_in; 2018 $self->SUPER::invoke_focus_in
1772} 2019}
1773 2020
1774sub button_down { 2021sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 2022 my ($self, $ev, $x, $y) = @_;
1776 2023
1777 $self->SUPER::button_down ($ev, $x, $y); 2024 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 2025
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 2026 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 2027
1781 # byte-index to char-index 2028 # byte-index to char-index
1782 my $text = $self->{text}; 2029 my $text = $self->{text};
1783 utf8::encode $text; 2030 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784 $self->{cursor} = length substr $text, 0, $idx; 2031 $self->{cursor} = length $text;
1785 2032
1786 $self->_set_text ($self->{text}); 2033 $self->_set_text ($self->{text});
1787 $self->update; 2034 $self->update;
1788 2035
1789 1 2036 1
1790} 2037}
1791 2038
1792sub mouse_motion { 2039sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2041# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795 2042
1796 0 2043 1
1797} 2044}
1798 2045
1799sub _draw { 2046sub _draw {
1800 my ($self) = @_; 2047 my ($self) = @_;
1801 2048
… …
1828 utf8::encode $text; 2075 utf8::encode $text;
1829 2076
1830 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2077 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1831 } 2078 }
1832 2079
1833 glColor @{$self->{fg}};
1834 glBegin GL_LINES; 2080 glBegin GL_LINES;
1835 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2081 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2082 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1837 glEnd; 2083 glEnd;
1838 } 2084 }
1839} 2085}
1840 2086
2087#############################################################################
2088
1841package CFClient::UI::Entry; 2089package CFPlus::UI::Entry;
1842 2090
1843our @ISA = CFClient::UI::EntryBase::; 2091our @ISA = CFPlus::UI::EntryBase::;
1844 2092
1845use CFClient::OpenGL; 2093use CFPlus::OpenGL;
1846 2094
1847sub key_down { 2095sub invoke_key_down {
1848 my ($self, $ev) = @_; 2096 my ($self, $ev) = @_;
1849 2097
1850 my $sym = $ev->{sym}; 2098 my $sym = $ev->{sym};
1851 2099
1852 if ($sym == 13) { 2100 if ($ev->{uni} == 0x0d || $sym == 13) {
1853 unshift @{$self->{history}}, 2101 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 2102 my $txt = $self->get_text;
2103
1855 $self->{history_pointer} = -1; 2104 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 2105 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 2106 $self->emit (activate => $txt);
1858 $self->update; 2107 $self->update;
1859 2108
1860 } elsif ($sym == CFClient::SDLK_UP) { 2109 } elsif ($sym == CFPlus::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 2110 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 2111 $self->{history_saveback} = $self->get_text;
1863 } 2112 }
1864 if (@{$self->{history} || []} > 0) { 2113 if (@{$self->{history} || []} > 0) {
1865 $self->{history_pointer}++; 2114 $self->{history_pointer}++;
… …
1867 $self->{history_pointer} = @{$self->{history} || []} - 1; 2116 $self->{history_pointer} = @{$self->{history} || []} - 1;
1868 } 2117 }
1869 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2118 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1870 } 2119 }
1871 2120
1872 } elsif ($sym == CFClient::SDLK_DOWN) { 2121 } elsif ($sym == CFPlus::SDLK_DOWN) {
1873 $self->{history_pointer}--; 2122 $self->{history_pointer}--;
1874 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2123 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1875 2124
1876 if ($self->{history_pointer} >= 0) { 2125 if ($self->{history_pointer} >= 0) {
1877 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2126 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1878 } else { 2127 } else {
1879 $self->set_text ($self->{history_saveback}); 2128 $self->set_text ($self->{history_saveback});
1880 } 2129 }
1881 2130
1882 } else { 2131 } else {
1883 return $self->SUPER::key_down ($ev) 2132 return $self->SUPER::invoke_key_down ($ev)
1884 } 2133 }
1885 2134
1886 1 2135 1
1887} 2136}
1888 2137
1889############################################################################# 2138#############################################################################
1890 2139
2140package CFPlus::UI::TextEdit;
2141
2142our @ISA = CFPlus::UI::EntryBase::;
2143
2144use CFPlus::OpenGL;
2145
2146sub move_cursor_ver {
2147 my ($self, $dy) = @_;
2148
2149 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2150
2151 $y += $dy;
2152
2153 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2154 $self->{cursor} = $index;
2155 delete $self->{cur_h};
2156 $self->update;
2157 return;
2158 }
2159}
2160
2161sub invoke_key_down {
2162 my ($self, $ev) = @_;
2163
2164 my $sym = $ev->{sym};
2165
2166 if ($sym == CFPlus::SDLK_UP) {
2167 $self->move_cursor_ver (-1);
2168 } elsif ($sym == CFPlus::SDLK_DOWN) {
2169 $self->move_cursor_ver (+1);
2170 } else {
2171 return $self->SUPER::invoke_key_down ($ev)
2172 }
2173
2174 1
2175}
2176
2177#############################################################################
2178
1891package CFClient::UI::Button; 2179package CFPlus::UI::Button;
1892 2180
1893our @ISA = CFClient::UI::Label::; 2181our @ISA = CFPlus::UI::Label::;
1894 2182
1895use CFClient::OpenGL; 2183use CFPlus::OpenGL;
1896 2184
1897my @tex = 2185my @tex =
1898 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1899 qw(b1_button_active.png); 2187 qw(b1_button_active.png);
1900 2188
1901sub new { 2189sub new {
1902 my $class = shift; 2190 my $class = shift;
1903 2191
… …
1912 can_events => 1, 2200 can_events => 1,
1913 @_ 2201 @_
1914 ) 2202 )
1915} 2203}
1916 2204
1917sub activate { }
1918
1919sub button_up { 2205sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1921 2207
1922 $self->emit ("activate") 2208 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 2209 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 2210 && $y >= 0 && $y < $self->{h};
… …
1942 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1943} 2229}
1944 2230
1945############################################################################# 2231#############################################################################
1946 2232
1947package CFClient::UI::CheckBox; 2233package CFPlus::UI::CheckBox;
1948 2234
1949our @ISA = CFClient::UI::DrawBG::; 2235our @ISA = CFPlus::UI::DrawBG::;
1950 2236
1951my @tex = 2237my @tex =
1952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2238 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1953 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2239 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1954 2240
1955use CFClient::OpenGL; 2241use CFPlus::OpenGL;
1956 2242
1957sub new { 2243sub new {
1958 my $class = shift; 2244 my $class = shift;
1959 2245
1960 $class->SUPER::new ( 2246 $class->SUPER::new (
… …
1974 my ($self) = @_; 2260 my ($self) = @_;
1975 2261
1976 (6) x 2 2262 (6) x 2
1977} 2263}
1978 2264
2265sub toggle {
2266 my ($self) = @_;
2267
2268 $self->{state} = !$self->{state};
2269 $self->emit (changed => $self->{state});
2270 $self->update;
2271}
2272
1979sub button_down { 2273sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2274 my ($self, $ev, $x, $y) = @_;
1981 2275
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2276 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2277 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2278 $self->toggle;
1985 $self->_emit (changed => $self->{state});
1986 } else { 2279 } else {
1987 return 0 2280 return 0
1988 } 2281 }
1989 2282
1990 1 2283 1
… …
2010 glDisable GL_TEXTURE_2D; 2303 glDisable GL_TEXTURE_2D;
2011} 2304}
2012 2305
2013############################################################################# 2306#############################################################################
2014 2307
2015package CFClient::UI::Image; 2308package CFPlus::UI::Image;
2016 2309
2017our @ISA = CFClient::UI::Base::; 2310our @ISA = CFPlus::UI::Base::;
2018 2311
2019use CFClient::OpenGL; 2312use CFPlus::OpenGL;
2020use Carp qw/confess/;
2021 2313
2022our %loaded_images; 2314our %texture_cache;
2023 2315
2024sub new { 2316sub new {
2025 my $class = shift; 2317 my $class = shift;
2026 2318
2027 my $self = $class->SUPER::new (can_events => 0, @_); 2319 my $self = $class->SUPER::new (
2320 can_events => 0,
2321 @_,
2322 );
2028 2323
2029 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2324 $self->{path} || $self->{tex}
2325 or Carp::croak "'path' or 'tex' attributes required";
2030 2326
2031 $loaded_images{$self->{image}} ||= 2327 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2032 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2328 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2033 2329
2034 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2330 CFPlus::weaken $texture_cache{$self->{path}};
2035 2331
2036 Scalar::Util::weaken $loaded_images{$self->{image}}; 2332 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038 $self->{aspect} = $tex->{w} / $tex->{h};
2039 2333
2040 $self 2334 $self
2041} 2335}
2042 2336
2337sub STORABLE_freeze {
2338 my ($self, $cloning) = @_;
2339
2340 $self->{path}
2341 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2342
2343 $self->{path}
2344}
2345
2346sub STORABLE_attach {
2347 my ($self, $cloning, $path) = @_;
2348
2349 $self->new (path => $path)
2350}
2351
2043sub size_request { 2352sub size_request {
2044 my ($self) = @_; 2353 my ($self) = @_;
2045 2354
2046 ($self->{tex}->{w}, $self->{tex}->{h}) 2355 ($self->{tex}{w}, $self->{tex}{h})
2047} 2356}
2048 2357
2049sub _draw { 2358sub _draw {
2050 my ($self) = @_; 2359 my ($self) = @_;
2051 2360
… …
2061 } 2370 }
2062 2371
2063 glEnable GL_TEXTURE_2D; 2372 glEnable GL_TEXTURE_2D;
2064 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065 2374
2066 $tex->draw_quad_alpha (0, 0, $w, $h); 2375 $tex->draw_quad (0, 0, $w, $h);
2067 2376
2068 glDisable GL_TEXTURE_2D; 2377 glDisable GL_TEXTURE_2D;
2069} 2378}
2070 2379
2071############################################################################# 2380#############################################################################
2072 2381
2382package CFPlus::UI::ImageButton;
2383
2384our @ISA = CFPlus::UI::Image::;
2385
2386use CFPlus::OpenGL;
2387
2388my %textures;
2389
2390sub new {
2391 my $class = shift;
2392
2393 my $self = $class->SUPER::new (
2394 padding_x => 4,
2395 padding_y => 4,
2396 fg => [1, 1, 1],
2397 active_fg => [0, 0, 1],
2398 can_hover => 1,
2399 align => 0,
2400 valign => 0,
2401 can_events => 1,
2402 @_
2403 );
2404}
2405
2406sub invoke_button_up {
2407 my ($self, $ev, $x, $y) = @_;
2408
2409 $self->emit ("activate")
2410 if $x >= 0 && $x < $self->{w}
2411 && $y >= 0 && $y < $self->{h};
2412
2413 1
2414}
2415
2416#############################################################################
2417
2073package CFClient::UI::VGauge; 2418package CFPlus::UI::VGauge;
2074 2419
2075our @ISA = CFClient::UI::Base::; 2420our @ISA = CFPlus::UI::Base::;
2076 2421
2077use List::Util qw(min max); 2422use List::Util qw(min max);
2078 2423
2079use CFClient::OpenGL; 2424use CFPlus::OpenGL;
2080 2425
2081my %tex = ( 2426my %tex = (
2082 food => [ 2427 food => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2429 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2085 ], 2430 ],
2086 grace => [ 2431 grace => [
2087 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2432 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2088 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2433 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2089 ], 2434 ],
2090 hp => [ 2435 hp => [
2091 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2092 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2437 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2093 ], 2438 ],
2094 mana => [ 2439 mana => [
2095 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2440 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2096 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2441 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2097 ], 2442 ],
2098); 2443);
2099 2444
2100# eg. VGauge->new (gauge => 'food'), default gauge: food 2445# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2160 my $ycut1 = max 0, min 1, $ycut; 2505 my $ycut1 = max 0, min 1, $ycut;
2161 my $ycut2 = max 0, min 1, $ycut - 1; 2506 my $ycut2 = max 0, min 1, $ycut - 1;
2162 2507
2163 my $h1 = $self->{h} * (1 - $ycut1); 2508 my $h1 = $self->{h} * (1 - $ycut1);
2164 my $h2 = $self->{h} * (1 - $ycut2); 2509 my $h2 = $self->{h} * (1 - $ycut2);
2510 my $h3 = $self->{h};
2511
2512 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2165 2513
2166 glEnable GL_BLEND; 2514 glEnable GL_BLEND;
2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2515 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2516 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
… …
2188 2536
2189 if ($t3) { 2537 if ($t3) {
2190 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2538 glBindTexture GL_TEXTURE_2D, $t3->{name};
2191 glBegin GL_QUADS; 2539 glBegin GL_QUADS;
2192 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2540 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2541 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2542 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2543 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196 glEnd; 2544 glEnd;
2197 } 2545 }
2198 2546
2199 glDisable GL_BLEND; 2547 glDisable GL_BLEND;
2200 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2201} 2549}
2202 2550
2203############################################################################# 2551#############################################################################
2204 2552
2205package CFClient::UI::Gauge; 2553package CFPlus::UI::Gauge;
2206 2554
2207our @ISA = CFClient::UI::VBox::; 2555our @ISA = CFPlus::UI::VBox::;
2208 2556
2209sub new { 2557sub new {
2210 my ($class, %arg) = @_; 2558 my ($class, %arg) = @_;
2211 2559
2212 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
… …
2214 can_hover => 1, 2562 can_hover => 1,
2215 can_events => 1, 2563 can_events => 1,
2216 %arg, 2564 %arg,
2217 ); 2565 );
2218 2566
2219 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2567 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2220 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2568 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2221 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2569 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2222 2570
2223 $self 2571 $self
2224} 2572}
2225 2573
2226sub set_fontsize { 2574sub set_fontsize {
… …
2247 $self->{value}->set_text ($val); 2595 $self->{value}->set_text ($val);
2248} 2596}
2249 2597
2250############################################################################# 2598#############################################################################
2251 2599
2252package CFClient::UI::Slider; 2600package CFPlus::UI::Slider;
2253 2601
2254use strict; 2602use strict;
2255 2603
2256use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2257 2605
2258our @ISA = CFClient::UI::DrawBG::; 2606our @ISA = CFPlus::UI::DrawBG::;
2259 2607
2260my @tex = 2608my @tex =
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2262 qw(s1_slider.png s1_slider_bg.png); 2610 qw(s1_slider.png s1_slider_bg.png);
2263 2611
2264sub new { 2612sub new {
2265 my $class = shift; 2613 my $class = shift;
2266 2614
… …
2287 $self->update; 2635 $self->update;
2288 2636
2289 $self 2637 $self
2290} 2638}
2291 2639
2292sub changed { }
2293
2294sub set_range { 2640sub set_range {
2295 my ($self, $range) = @_; 2641 my ($self, $range) = @_;
2296 2642
2297 ($range, $self->{range}) = ($self->{range}, $range); 2643 ($range, $self->{range}) = ($self->{range}, $range);
2298 2644
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2645 if ("@$range" ne "@{$self->{range}}") {
2646 $self->update;
2647 $self->set_value ($self->{range}[0]);
2648 }
2301} 2649}
2302 2650
2303sub set_value { 2651sub set_value {
2304 my ($self, $value) = @_; 2652 my ($self, $value) = @_;
2305 2653
… …
2316 if $unit; 2664 if $unit;
2317 2665
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2666 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2667
2320 if ($value != $old_value) { 2668 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2669 $self->emit (changed => $value);
2322 $self->update; 2670 $self->update;
2323 } 2671 }
2324} 2672}
2325 2673
2326sub size_request { 2674sub size_request {
2327 my ($self) = @_; 2675 my ($self) = @_;
2328 2676
2329 ($self->{req_w}, $self->{req_h}) 2677 ($self->{req_w}, $self->{req_h})
2330} 2678}
2331 2679
2332sub button_down { 2680sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
2334 2682
2335 $self->SUPER::button_down ($ev, $x, $y); 2683 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2684
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2686
2339 $self->mouse_motion ($ev, $x, $y) 2687 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2688}
2341 2689
2342sub mouse_motion { 2690sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
2344 2692
2345 if ($GRAB == $self) { 2693 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2694 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2695
… …
2353 } else { 2701 } else {
2354 return 0; 2702 return 0;
2355 } 2703 }
2356 2704
2357 1 2705 1
2706}
2707
2708sub invoke_mouse_wheel {
2709 my ($self, $ev) = @_;
2710
2711 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712
2713 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2714
2715 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2716
2717 ! ! $delta
2358} 2718}
2359 2719
2360sub update { 2720sub update {
2361 my ($self) = @_; 2721 my ($self) = @_;
2362 2722
… …
2411 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2412} 2772}
2413 2773
2414############################################################################# 2774#############################################################################
2415 2775
2416package CFClient::UI::ValSlider; 2776package CFPlus::UI::ValSlider;
2417 2777
2418our @ISA = CFClient::UI::HBox::; 2778our @ISA = CFPlus::UI::HBox::;
2419 2779
2420sub new { 2780sub new {
2421 my ($class, %arg) = @_; 2781 my ($class, %arg) = @_;
2422 2782
2423 my $range = delete $arg{range}; 2783 my $range = delete $arg{range};
2424 2784
2425 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2426 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2786 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2427 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2787 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2428 to_value => sub { shift }, 2788 to_value => sub { shift },
2429 from_value => sub { shift }, 2789 from_value => sub { shift },
2430 %arg, 2790 %arg,
2431 ); 2791 );
2432 2792
… …
2452sub set_range { shift->{slider}->set_range (@_) } 2812sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 2813sub set_value { shift->{slider}->set_value (@_) }
2454 2814
2455############################################################################# 2815#############################################################################
2456 2816
2457package CFClient::UI::TextView; 2817package CFPlus::UI::TextScroller;
2458 2818
2459our @ISA = CFClient::UI::HBox::; 2819our @ISA = CFPlus::UI::HBox::;
2460 2820
2461use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2462 2822
2463sub new { 2823sub new {
2464 my $class = shift; 2824 my $class = shift;
2465 2825
2466 my $self = $class->SUPER::new ( 2826 my $self = $class->SUPER::new (
2467 fontsize => 1, 2827 fontsize => 1,
2468 can_events => 0, 2828 can_events => 1,
2829 indent => 0,
2469 #font => default_font 2830 #font => default_font
2470 @_, 2831 @_,
2471 2832
2472 layout => (new CFClient::Layout 1), 2833 layout => (new CFPlus::Layout),
2473 par => [], 2834 par => [],
2835 max_par => 0,
2474 height => 0, 2836 height => 0,
2475 children => [ 2837 children => [
2476 (new CFClient::UI::Empty expand => 1), 2838 (new CFPlus::UI::Empty expand => 1),
2477 (new CFClient::UI::Slider vertical => 1), 2839 (new CFPlus::UI::Slider vertical => 1),
2478 ], 2840 ],
2479 ); 2841 );
2480 2842
2481 $self->{children}[1]->connect (changed => sub { $self->update }); 2843 $self->{children}[1]->connect (changed => sub { $self->update });
2482 2844
… …
2488 2850
2489 $self->{fontsize} = $fontsize; 2851 $self->{fontsize} = $fontsize;
2490 $self->reflow; 2852 $self->reflow;
2491} 2853}
2492 2854
2855sub size_request {
2856 my ($self) = @_;
2857
2858 my ($empty, $slider) = @{ $self->{children} };
2859
2860 local $self->{children} = [$empty, $slider];
2861 $self->SUPER::size_request
2862}
2863
2493sub size_allocate { 2864sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 2865 my ($self, $w, $h) = @_;
2495 2866
2496 $self->SUPER::size_allocate ($w, $h); 2867 my ($empty, $slider, @other) = @{ $self->{children} };
2868 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497 2869
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2870 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2871 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $self->{layout}->set_width ($self->{children}[0]{w}); 2872 $self->{layout}->set_width ($empty->{w});
2873 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 2874
2502 $self->reflow; 2875 $self->reflow;
2503}
2504 2876
2505sub text_size { 2877 local $self->{children} = [$empty, $slider];
2878 $self->SUPER::invoke_size_allocate ($w, $h)
2879}
2880
2881sub invoke_mouse_wheel {
2506 my ($self, $text, $indent) = @_; 2882 my ($self, $ev) = @_;
2883
2884 return 0 unless $ev->{dy}; # only vertical movements
2885
2886 $self->{children}[1]->emit (mouse_wheel => $ev);
2887
2888 1
2889}
2890
2891sub get_layout {
2892 my ($self, $para) = @_;
2507 2893
2508 my $layout = $self->{layout}; 2894 my $layout = $self->{layout};
2509 2895
2896 $layout->set_font ($self->{font}) if $self->{font};
2897 $layout->set_foreground (@{$para->{fg}});
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2898 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $layout->set_width ($self->{children}[0]{w} - $indent); 2899 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2900 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 $layout->set_markup ($text); 2901 $layout->set_markup ($para->{markup});
2902
2903 $layout->set_shapes (
2904 map
2905 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2906 @{$para->{widget}}
2513 2907 );
2908
2514 $layout->size 2909 $layout
2515} 2910}
2516 2911
2517sub reflow { 2912sub reflow {
2518 my ($self) = @_; 2913 my ($self) = @_;
2519 2914
… …
2526 2921
2527 # todo: base offset on lines or so, not on pixels 2922 # todo: base offset on lines or so, not on pixels
2528 $self->{children}[1]->set_value ($offset); 2923 $self->{children}[1]->set_value ($offset);
2529} 2924}
2530 2925
2926sub current_paragraph {
2927 my ($self) = @_;
2928
2929 $self->{top_paragraph} - 1
2930}
2931
2932sub scroll_to {
2933 my ($self, $para) = @_;
2934
2935 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2936
2937 $self->{scroll_to} = $para;
2938 $self->update;
2939}
2940
2531sub clear { 2941sub clear {
2532 my ($self) = @_; 2942 my ($self) = @_;
2943
2944 my (undef, undef, @other) = @{ $self->{children} };
2945 $self->remove ($_) for @other;
2533 2946
2534 $self->{par} = []; 2947 $self->{par} = [];
2535 $self->{height} = 0; 2948 $self->{height} = 0;
2536 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2949 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537} 2950}
2538 2951
2539sub add_paragraph { 2952sub add_paragraph {
2540 my ($self, $color, $text, $indent) = @_; 2953 my $self = shift;
2541 2954
2542 for my $line (split /\n/, $text) { 2955 for my $para (@_) {
2543 my ($w, $h) = $self->text_size ($line); 2956 $para = {
2957 fg => [1, 1, 1, 1],
2958 indent => 0,
2959 markup => "",
2960 widget => [],
2961 ref $para ? %$para : (markup => $para),
2962 w => 1e10,
2963 wrapped => 1,
2964 };
2965
2966 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2967 push @{$self->{par}}, $para;
2968 }
2969
2970 if (my $max = $self->{max_par}) {
2971 shift @{$self->{par}} while @{$self->{par}} > $max;
2972 }
2973
2974 $self->{need_reflow}++;
2975 $self->update;
2976}
2977
2978sub scroll_to_bottom {
2979 my ($self) = @_;
2980
2981 $self->{scroll_to} = $#{$self->{par}};
2982 $self->update;
2983}
2984
2985sub force_uptodate {
2986 my ($self) = @_;
2987
2988 if (delete $self->{need_reflow}) {
2989 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2990
2991 my $height = 0;
2992
2993 for my $para (@{$self->{par}}) {
2994 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2995 my $layout = $self->get_layout ($para);
2996 my ($w, $h) = $layout->size;
2997
2998 $para->{w} = $w + $para->{indent};
2999 $para->{h} = $h;
3000 $para->{wrapped} = $layout->has_wrapped;
3001 }
3002
3003 $para->{y} = $height;
3004 $height += $para->{h};
3005 }
3006
2544 $self->{height} += $h; 3007 $self->{height} = $height;
2545 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3008 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2546 }
2547 3009
2548 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3010 delete $self->{texture};
3011 }
3012
3013 if (my $paridx = delete $self->{scroll_to}) {
3014 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3015 }
2549} 3016}
2550 3017
2551sub update { 3018sub update {
2552 my ($self) = @_; 3019 my ($self) = @_;
2553 3020
… …
2555 3022
2556 return unless $self->{h} > 0; 3023 return unless $self->{h} > 0;
2557 3024
2558 delete $self->{texture}; 3025 delete $self->{texture};
2559 3026
2560 $ROOT->on_post_alloc ($self, sub { 3027 $ROOT->on_post_alloc ($self => sub {
3028 $self->force_uptodate;
3029
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3030 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 3031
2563 if (delete $self->{need_reflow}) {
2564 my $height = 0;
2565
2566 my $layout = $self->{layout};
2567
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570 for (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2572 $layout->set_width ($W - $_->[3]);
2573 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3];
2576 $_->[1] = $h;
2577 }
2578
2579 $height += $_->[1];
2580 }
2581
2582 $self->{height} = $height;
2583
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2585
2586 delete $self->{texture};
2587 }
2588
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3032 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 3033 glClearColor 0, 0, 0, 0;
2591 glClear GL_COLOR_BUFFER_BIT; 3034 glClear GL_COLOR_BUFFER_BIT;
2592 3035
3036 package CFPlus::UI::Base;
3037 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3038 (0, 0, $self->{w}, $self->{h});
3039
3040 my $top = int $self->{children}[1]{range}[0];
3041
3042 my $paridx = 0;
3043 my $top_paragraph;
2593 my $top = int $self->{children}[1]{range}[0]; 3044 my $top = int $self->{children}[1]{range}[0];
2594 3045
2595 my $y0 = $top; 3046 my $y0 = $top;
2596 my $y1 = $top + $H; 3047 my $y1 = $top + $H;
2597 3048
2598 my $y = 0;
2599
2600 my $layout = $self->{layout};
2601
2602 $layout->set_font ($self->{font}) if $self->{font};
2603
2604 glEnable GL_BLEND;
2605 #TODO# not correct in windows where rgba is forced off
2606 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608 for my $par (@{$self->{par}}) { 3049 for my $para (@{$self->{par}}) {
2609 my $h = $par->[1]; 3050 my $h = $para->{h};
3051 my $y = $para->{y};
2610 3052
2611 if ($y0 < $y + $h && $y < $y1) { 3053 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] }); 3054 my $layout = $self->get_layout ($para);
2613 $layout->set_width ($W - $par->[3]);
2614 $layout->set_markup ($par->[4]);
2615 3055
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3056 $layout->render ($para->{indent}, $y - $y0);
2617 3057
2618 glRasterPos $par->[3], $y - $y0; 3058 if (my @w = @{ $para->{widget} }) {
2619 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3059 my @s = $layout->get_shapes;
3060
3061 for (@w) {
3062 my ($dx, $dy) = splice @s, 0, 2, ();
3063
3064 $_->{x} = $dx + $para->{indent};
3065 $_->{y} = $dy + $y - $y0;
3066
3067 $_->draw;
3068 }
3069 }
2620 } 3070 }
2621 3071
2622 $y += $h; 3072 $paridx++;
3073 $top_paragraph ||= $paridx if $y >= $top;
2623 } 3074 }
2624 3075
2625 glDisable GL_BLEND; 3076 $self->{top_paragraph} = $top_paragraph;
2626 }; 3077 };
2627 }); 3078 });
3079}
3080
3081sub reconfigure {
3082 my ($self) = @_;
3083
3084 $self->SUPER::reconfigure;
3085
3086 $_->{w} = 1e10 for @{ $self->{par} };
3087 $self->reflow;
2628} 3088}
2629 3089
2630sub _draw { 3090sub _draw {
2631 my ($self) = @_; 3091 my ($self) = @_;
2632 3092
… …
2635 glColor 0, 0, 0, 1; 3095 glColor 0, 0, 0, 1;
2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3096 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637 glDisable GL_TEXTURE_2D; 3097 glDisable GL_TEXTURE_2D;
2638 3098
2639 $self->{children}[1]->draw; 3099 $self->{children}[1]->draw;
2640
2641} 3100}
2642 3101
2643############################################################################# 3102#############################################################################
2644 3103
2645package CFClient::UI::Animator; 3104package CFPlus::UI::Animator;
2646 3105
2647use CFClient::OpenGL; 3106use CFPlus::OpenGL;
2648 3107
2649our @ISA = CFClient::UI::Bin::; 3108our @ISA = CFPlus::UI::Bin::;
2650 3109
2651sub moveto { 3110sub moveto {
2652 my ($self, $x, $y) = @_; 3111 my ($self, $x, $y) = @_;
2653 3112
2654 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3113 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2682 glPopMatrix; 3141 glPopMatrix;
2683} 3142}
2684 3143
2685############################################################################# 3144#############################################################################
2686 3145
2687package CFClient::UI::Flopper; 3146package CFPlus::UI::Flopper;
2688 3147
2689our @ISA = CFClient::UI::Button::; 3148our @ISA = CFPlus::UI::Button::;
2690 3149
2691sub new { 3150sub new {
2692 my $class = shift; 3151 my $class = shift;
2693 3152
2694 my $self = $class->SUPER::new ( 3153 my $self = $class->SUPER::new (
… …
2706 $self->{other}->toggle_visibility; 3165 $self->{other}->toggle_visibility;
2707} 3166}
2708 3167
2709############################################################################# 3168#############################################################################
2710 3169
2711package CFClient::UI::Tooltip; 3170package CFPlus::UI::Tooltip;
2712 3171
2713our @ISA = CFClient::UI::Bin::; 3172our @ISA = CFPlus::UI::Bin::;
2714 3173
2715use CFClient::OpenGL; 3174use CFPlus::OpenGL;
2716 3175
2717sub new { 3176sub new {
2718 my $class = shift; 3177 my $class = shift;
2719 3178
2720 $class->SUPER::new ( 3179 $class->SUPER::new (
… …
2723 ) 3182 )
2724} 3183}
2725 3184
2726sub set_tooltip_from { 3185sub set_tooltip_from {
2727 my ($self, $widget) = @_; 3186 my ($self, $widget) = @_;
3187
3188 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3189 if $widget->{tooltip} =~ /^#(.*)$/;
2728 3190
2729 my $tooltip = $widget->{tooltip}; 3191 my $tooltip = $widget->{tooltip};
2730 3192
2731 if ($ENV{CFPLUS_DEBUG} & 2) { 3193 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n" 3194 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3195 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 3196 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 3197 . "visible $widget->{visible}";
2736 } 3198 }
2737 3199
3200 $tooltip =~ s/^\n+//;
3201 $tooltip =~ s/\n+$//;
3202
2738 $self->add (new CFClient::UI::Label 3203 $self->add (new CFPlus::UI::Label
2739 markup => $tooltip, 3204 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3205 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 3206 fontsize => 0.8,
2742 fg => [0, 0, 0, 1], 3207 style => 1, # FLAG_INVERSE
2743 ellipsise => 0, 3208 ellipsise => 0,
2744 font => ($widget->{tooltip_font} || $::FONT_PROP), 3209 font => ($widget->{tooltip_font} || $::FONT_PROP),
2745 ); 3210 );
2746} 3211}
2747 3212
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3216 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 3217
2753 ($w + 4, $h + 4) 3218 ($w + 4, $h + 4)
2754} 3219}
2755 3220
2756sub size_allocate { 3221sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 3222 my ($self, $w, $h) = @_;
2758 3223
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 3224 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 3225}
2761 3226
2762sub visibility_change { 3227sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 3228 my ($self, $visible) = @_;
2764 3229
2765 return unless $visible; 3230 return unless $visible;
2766 3231
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 3232 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner} 3233 my $widget = $self->{owner}
2769 or return; 3234 or return;
2770 3235
3236 if ($widget->{visible}) {
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3237 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 3238
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3239 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 3240 if $x + $self->{w} > $self->{root}{w};
2775 3241
2776 $self->move_abs ($x, $y); 3242 $self->move_abs ($x, $y);
3243 } else {
3244 $self->hide;
3245 }
2777 }); 3246 });
2778} 3247}
2779 3248
2780sub _draw { 3249sub _draw {
2781 my ($self) = @_; 3250 my ($self) = @_;
… …
2805 $self->SUPER::_draw; 3274 $self->SUPER::_draw;
2806} 3275}
2807 3276
2808############################################################################# 3277#############################################################################
2809 3278
2810package CFClient::UI::Face; 3279package CFPlus::UI::Face;
2811 3280
2812our @ISA = CFClient::UI::Base::; 3281our @ISA = CFPlus::UI::DrawBG::;
2813 3282
2814use CFClient::OpenGL; 3283use CFPlus::OpenGL;
2815 3284
2816sub new { 3285sub new {
2817 my $class = shift; 3286 my $class = shift;
2818 3287
2819 my $self = $class->SUPER::new ( 3288 my $self = $class->SUPER::new (
… …
2821 can_events => 0, 3290 can_events => 0,
2822 @_, 3291 @_,
2823 ); 3292 );
2824 3293
2825 if ($self->{anim} && $self->{animspeed}) { 3294 if ($self->{anim} && $self->{animspeed}) {
2826 Scalar::Util::weaken (my $widget = $self); 3295 CFPlus::weaken (my $widget = $self);
2827 3296
2828 $self->{timer} = Event->timer ( 3297 $self->{timer} = Event->timer (
2829 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3298 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2830 hard => 1, 3299 hard => 1,
2831 interval => $self->{animspeed}, 3300 interval => $self->{animspeed},
… …
2854sub _draw { 3323sub _draw {
2855 my ($self) = @_; 3324 my ($self) = @_;
2856 3325
2857 return unless $::CONN; 3326 return unless $::CONN;
2858 3327
3328 $self->SUPER::_draw;
3329
2859 my $face; 3330 my $face;
2860 3331
2861 if ($self->{frame}) { 3332 if ($self->{frame}) {
2862 my $anim = $::CONN->{anim}[$self->{anim}]; 3333 my $anim = $::CONN->{anim}[$self->{anim}];
2863 3334
… …
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3345 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 3346 glDisable GL_TEXTURE_2D;
2876 } 3347 }
2877} 3348}
2878 3349
2879sub DESTROY { 3350sub destroy {
2880 my ($self) = @_; 3351 my ($self) = @_;
2881 3352
2882 $self->{timer}->cancel 3353 $self->{timer}->cancel
2883 if $self->{timer}; 3354 if $self->{timer};
2884 3355
2885 $self->SUPER::DESTROY; 3356 $self->SUPER::destroy;
2886} 3357}
2887 3358
2888############################################################################# 3359#############################################################################
2889 3360
2890package CFClient::UI::Buttonbar; 3361package CFPlus::UI::Buttonbar;
2891 3362
2892our @ISA = CFClient::UI::HBox::; 3363our @ISA = CFPlus::UI::HBox::;
2893 3364
2894# TODO: should actualyl wrap buttons and other goodies. 3365# TODO: should actually wrap buttons and other goodies.
2895 3366
2896############################################################################# 3367#############################################################################
2897 3368
2898package CFClient::UI::Menu; 3369package CFPlus::UI::Menu;
2899 3370
2900our @ISA = CFClient::UI::FancyFrame::; 3371our @ISA = CFPlus::UI::Toplevel::;
2901 3372
2902use CFClient::OpenGL; 3373use CFPlus::OpenGL;
2903 3374
2904sub new { 3375sub new {
2905 my $class = shift; 3376 my $class = shift;
2906 3377
2907 my $self = $class->SUPER::new ( 3378 my $self = $class->SUPER::new (
2908 items => [], 3379 items => [],
2909 z => 100, 3380 z => 100,
2910 @_, 3381 @_,
2911 ); 3382 );
2912 3383
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3384 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2914 3385
2915 for my $item (@{ $self->{items} }) { 3386 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3387 my ($widget, $cb, $tooltip) = @$item;
2917 3388
2918 # handle various types of items, only text for now 3389 # handle various types of items, only text for now
2919 if (!ref $widget) { 3390 if (!ref $widget) {
3391 if ($widget =~ /\t/) {
3392 my ($left, $right) = split /\t/, $widget, 2;
3393
2920 $widget = new CFClient::UI::Label 3394 $widget = new CFPlus::UI::HBox
2921 can_hover => 1, 3395 can_hover => 1,
2922 can_events => 1, 3396 can_events => 1,
3397 tooltip => $tooltip,
3398 children => [
3399 (new CFPlus::UI::Label markup => $left, expand => 1),
3400 (new CFPlus::UI::Label markup => $right, align => +1),
3401 ],
3402 ;
3403
3404 } else {
3405 $widget = new CFPlus::UI::Label
3406 can_hover => 1,
3407 can_events => 1,
2923 text => $widget; 3408 markup => $widget,
3409 tooltip => $tooltip;
3410 }
2924 } 3411 }
2925 3412
2926 $self->{item}{$widget} = $item; 3413 $self->{item}{$widget} = $item;
2927 3414
2928 $self->{vbox}->add ($widget); 3415 $self->{vbox}->add ($widget);
… …
2933 3420
2934# popup given the event (must be a mouse button down event currently) 3421# popup given the event (must be a mouse button down event currently)
2935sub popup { 3422sub popup {
2936 my ($self, $ev) = @_; 3423 my ($self, $ev) = @_;
2937 3424
2938 $self->_emit ("popdown"); 3425 $self->emit ("popdown");
2939 3426
2940 # maybe save $GRAB? must be careful about events... 3427 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3428 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3429 $self->{button} = $ev->{button};
2943 3430
2944 $self->show; 3431 $self->show;
2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3432 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946} 3433}
2947 3434
2948sub mouse_motion { 3435sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3436 my ($self, $ev, $x, $y) = @_;
2950 3437
2951 # TODO: should use vbox->find_widget or so 3438 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3439 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3440 $self->{hover} = $self->{item}{$HOVER};
2954 3441
2955 0 3442 0
2956} 3443}
2957 3444
2958sub button_up { 3445sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3446 my ($self, $ev, $x, $y) = @_;
2960 3447
2961 if ($ev->{button} == $self->{button}) { 3448 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3449 undef $GRAB;
2963 $self->hide; 3450 $self->hide;
2964 3451
2965 $self->_emit ("popdown"); 3452 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3453 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3454 } else {
2968 return 0 3455 return 0
2969 } 3456 }
2970 3457
2971 1 3458 1
2972} 3459}
2973 3460
2974############################################################################# 3461#############################################################################
2975 3462
2976package CFClient::UI::Multiplexer; 3463package CFPlus::UI::Multiplexer;
2977 3464
2978our @ISA = CFClient::UI::Container::; 3465our @ISA = CFPlus::UI::Container::;
2979 3466
2980sub new { 3467sub new {
2981 my $class = shift; 3468 my $class = shift;
2982 3469
2983 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
… …
2997 3484
2998 $self->{current} = $self->{children}[0] 3485 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} }; 3486 if @{ $self->{children} };
3000} 3487}
3001 3488
3489sub get_current_page {
3490 my ($self) = @_;
3491
3492 $self->{current}
3493}
3494
3002sub set_current_page { 3495sub set_current_page {
3003 my ($self, $page_or_widget) = @_; 3496 my ($self, $page_or_widget) = @_;
3004 3497
3005 my $widget = ref $page_or_widget 3498 my $widget = ref $page_or_widget
3006 ? $page_or_widget 3499 ? $page_or_widget
3007 : $self->{children}[$page_or_widget]; 3500 : $self->{children}[$page_or_widget];
3008 3501
3009 $self->{current} = $widget; 3502 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3503 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3504
3012 $self->_emit (page_changed => $self->{current}); 3505 $self->emit (page_changed => $self->{current});
3013 3506
3014 $self->realloc; 3507 $self->realloc;
3015} 3508}
3016 3509
3017sub visible_children { 3510sub visible_children {
… …
3022 my ($self) = @_; 3515 my ($self) = @_;
3023 3516
3024 $self->{current}->size_request 3517 $self->{current}->size_request
3025} 3518}
3026 3519
3027sub size_allocate { 3520sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3521 my ($self, $w, $h) = @_;
3029 3522
3030 $self->{current}->configure (0, 0, $w, $h); 3523 $self->{current}->configure (0, 0, $w, $h);
3524
3525 1
3031} 3526}
3032 3527
3033sub _draw { 3528sub _draw {
3034 my ($self) = @_; 3529 my ($self) = @_;
3035 3530
3036 $self->{current}->draw; 3531 $self->{current}->draw;
3037} 3532}
3038 3533
3039############################################################################# 3534#############################################################################
3040 3535
3041package CFClient::UI::Notebook; 3536package CFPlus::UI::Notebook;
3042 3537
3043our @ISA = CFClient::UI::VBox::; 3538our @ISA = CFPlus::UI::VBox::;
3044 3539
3045sub new { 3540sub new {
3046 my $class = shift; 3541 my $class = shift;
3047 3542
3048 my $self = $class->SUPER::new ( 3543 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar), 3544 buttonbar => (new CFPlus::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3545 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self 3546 # filter => # will be put between multiplexer and $self
3052 @_, 3547 @_,
3053 ); 3548 );
3054 3549
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3550 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3059} 3554}
3060 3555
3061sub add { 3556sub add {
3062 my ($self, $title, $widget, $tooltip) = @_; 3557 my ($self, $title, $widget, $tooltip) = @_;
3063 3558
3064 Scalar::Util::weaken $self; 3559 CFPlus::weaken $self;
3065 3560
3066 $self->{buttonbar}->add (new CFClient::UI::Button 3561 $self->{buttonbar}->add (new CFPlus::UI::Button
3067 markup => $title, 3562 markup => $title,
3068 tooltip => $tooltip, 3563 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) }, 3564 on_activate => sub { $self->set_current_page ($widget) },
3070 ); 3565 );
3071 3566
3072 $self->{multiplexer}->add ($widget); 3567 $self->{multiplexer}->add ($widget);
3073} 3568}
3074 3569
3570sub get_current_page {
3571 my ($self) = @_;
3572
3573 $self->{multiplexer}->get_current_page
3574}
3575
3075sub set_current_page { 3576sub set_current_page {
3076 my ($self, $page) = @_; 3577 my ($self, $page) = @_;
3077 3578
3078 $self->{multiplexer}->set_current_page ($page); 3579 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3580 $self->emit (page_changed => $self->{multiplexer}{current});
3080} 3581}
3081 3582
3082############################################################################# 3583#############################################################################
3083 3584
3585package CFPlus::UI::Selector;
3586
3587use utf8;
3588
3589our @ISA = CFPlus::UI::Button::;
3590
3591sub new {
3592 my $class = shift;
3593
3594 my $self = $class->SUPER::new (
3595 options => [], # [value, title, longdesc], ...
3596 value => undef,
3597 @_,
3598 );
3599
3600 $self->_set_value ($self->{value});
3601
3602 $self
3603}
3604
3605sub invoke_button_down {
3606 my ($self, $ev) = @_;
3607
3608 my @menu_items;
3609
3610 for (@{ $self->{options} }) {
3611 my ($value, $title, $tooltip) = @$_;
3612
3613 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3614 }
3615
3616 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3617}
3618
3619sub _set_value {
3620 my ($self, $value) = @_;
3621
3622 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3623 or return;
3624
3625 $self->{value} = $item->[0];
3626 $self->set_markup ("$item->[1] ⇓");
3627 $self->set_tooltip ($item->[2]);
3628}
3629
3630sub set_value {
3631 my ($self, $value) = @_;
3632
3633 return unless $self->{value} ne $value;
3634
3635 $self->_set_value ($value);
3636 $self->emit (changed => $value);
3637}
3638
3639#############################################################################
3640
3084package CFClient::UI::Statusbox; 3641package CFPlus::UI::Statusbox;
3085 3642
3086our @ISA = CFClient::UI::VBox::; 3643our @ISA = CFPlus::UI::VBox::;
3087 3644
3088sub new { 3645sub new {
3089 my $class = shift; 3646 my $class = shift;
3090 3647
3091 my $self = $class->SUPER::new ( 3648 my $self = $class->SUPER::new (
3092 fontsize => 0.8, 3649 fontsize => 0.8,
3093 @_, 3650 @_,
3094 ); 3651 );
3095 3652
3096 Scalar::Util::weaken (my $this = $self); 3653 CFPlus::weaken (my $this = $self);
3097 3654
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3655 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099 3656
3100 $self 3657 $self
3101} 3658}
… …
3103sub reorder { 3660sub reorder {
3104 my ($self) = @_; 3661 my ($self) = @_;
3105 my $NOW = Time::HiRes::time; 3662 my $NOW = Time::HiRes::time;
3106 3663
3107 # freeze display when hovering over any label 3664 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner} 3665 return if $CFPlus::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3666 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} }; 3667 values %{ $self->{item} };
3111 3668
3112 while (my ($k, $v) = each %{ $self->{item} }) { 3669 while (my ($k, $v) = each %{ $self->{item} }) {
3113 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3670 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3114 } 3671 }
… …
3135 for ($short) { 3692 for ($short) {
3136 s/^\s+//; 3693 s/^\s+//;
3137 s/\s+/ /g; 3694 s/\s+/ /g;
3138 } 3695 }
3139 3696
3140 new CFClient::UI::Label 3697 new CFPlus::UI::Label
3141 markup => $short, 3698 markup => $short,
3142 tooltip => $item->{tooltip}, 3699 tooltip => $item->{tooltip},
3143 tooltip_font => $::FONT_PROP, 3700 tooltip_font => $::FONT_PROP,
3144 tooltip_width => 0.67, 3701 tooltip_width => 0.67,
3145 fontsize => $item->{fontsize} || $self->{fontsize}, 3702 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3183 $item->{count}++; 3740 $item->{count}++;
3184 } else { 3741 } else {
3185 $item->{count} = 1; 3742 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 3743 $item->{text} = $item->{tooltip} = $text;
3187 } 3744 }
3188 $item->{id} = ++$self->{id}; 3745 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 3746 $item->{timeout} = $timeout;
3190 delete $item->{label}; 3747 delete $item->{label};
3191 } else { 3748 } else {
3192 $self->{item}{$group} = { 3749 $self->{item}{$group} = {
3193 id => ++$self->{id}, 3750 id => ++$self->{id},
… …
3199 count => 1, 3756 count => 1,
3200 %arg, 3757 %arg,
3201 }; 3758 };
3202 } 3759 }
3203 3760
3761 $ROOT->on_refresh (reorder => sub {
3204 $self->reorder; 3762 $self->reorder;
3763 });
3205} 3764}
3206 3765
3207sub reconfigure { 3766sub reconfigure {
3208 my ($self) = @_; 3767 my ($self) = @_;
3209 3768
… …
3212 3771
3213 $self->reorder; 3772 $self->reorder;
3214 $self->SUPER::reconfigure; 3773 $self->SUPER::reconfigure;
3215} 3774}
3216 3775
3217sub DESTROY { 3776sub destroy {
3218 my ($self) = @_; 3777 my ($self) = @_;
3219 3778
3220 $self->{timer}->cancel; 3779 $self->{timer}->cancel;
3221 3780
3222 $self->SUPER::DESTROY; 3781 $self->SUPER::destroy;
3223} 3782}
3224 3783
3225############################################################################# 3784#############################################################################
3226 3785
3227package CFClient::UI::Inventory;
3228
3229our @ISA = CFClient::UI::ScrolledWindow::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236 @_,
3237 );
3238
3239 $self
3240}
3241
3242sub set_items {
3243 my ($self, $items) = @_;
3244
3245 $self->{child}->clear;
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList;
3467
3468our @ISA = CFClient::UI::Table::;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 binding => [],
3475 commands => [],
3476 @_,
3477 )
3478}
3479
3480# XXX: Do sorting? Argl...
3481sub add_spell {
3482 my ($self, $spell) = @_;
3483 $self->{spells}->{$spell->{name}} = $spell;
3484
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512}
3513
3514sub remove_spell {
3515 my ($self, $spell) = @_;
3516 delete $self->{spells}->{$spell->{name}};
3517 $self->rebuild_spell_list;
3518}
3519
3520#############################################################################
3521
3522package CFClient::UI::Root; 3786package CFPlus::UI::Root;
3523 3787
3524our @ISA = CFClient::UI::Container::; 3788our @ISA = CFPlus::UI::Container::;
3525 3789
3526use List::Util qw(min max); 3790use List::Util qw(min max);
3527 3791
3528use CFClient::OpenGL; 3792use CFPlus::OpenGL;
3529 3793
3530sub new { 3794sub new {
3531 my $class = shift; 3795 my $class = shift;
3532 3796
3533 my $self = $class->SUPER::new ( 3797 my $self = $class->SUPER::new (
3534 visible => 1, 3798 visible => 1,
3535 @_, 3799 @_,
3536 ); 3800 );
3537 3801
3538 Scalar::Util::weaken ($self->{root} = $self); 3802 CFPlus::weaken ($self->{root} = $self);
3539 3803
3540 $self 3804 $self
3541} 3805}
3542 3806
3543sub size_request { 3807sub size_request {
… …
3558 $coord = $max - $size if $coord > $max - $size; 3822 $coord = $max - $size if $coord > $max - $size;
3559 3823
3560 int $coord + 0.5 3824 int $coord + 0.5
3561} 3825}
3562 3826
3563sub size_allocate { 3827sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 3828 my ($self, $w, $h) = @_;
3565 3829
3566 for my $child ($self->children) { 3830 for my $child ($self->children) {
3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3831 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568 3832
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 3836 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 3837 $Y = _to_pixel $Y, $H, $self->{h};
3574 3838
3575 $child->configure ($X, $Y, $W, $H); 3839 $child->configure ($X, $Y, $W, $H);
3576 } 3840 }
3841
3842 1
3577} 3843}
3578 3844
3579sub coord2local { 3845sub coord2local {
3580 my ($self, $x, $y) = @_; 3846 my ($self, $x, $y) = @_;
3581 3847
… …
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3973 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708 3974
3709 $w = 0 if $w < 0; 3975 $w = 0 if $w < 0;
3710 $h = 0 if $h < 0; 3976 $h = 0 if $h < 0;
3711 3977
3978 $w = max $widget->{min_w}, $w;
3979 $h = max $widget->{min_h}, $h;
3980
3981# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3982# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3983
3984 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3985 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3986
3712 $w = int $w + 0.5; 3987 $w = int $w + 0.5;
3713 $h = int $h + 0.5; 3988 $h = int $h + 0.5;
3714 3989
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3990 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w}; 3991 $widget->{old_w} = $widget->{w};
… …
3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4014 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3740 glMatrixMode GL_MODELVIEW; 4015 glMatrixMode GL_MODELVIEW;
3741 glLoadIdentity; 4016 glLoadIdentity;
3742 4017
3743 { 4018 {
3744 package CFClient::UI::Base; 4019 package CFPlus::UI::Base;
3745 4020
3746 ($draw_x, $draw_y, $draw_w, $draw_h) = 4021 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h}); 4022 (0, 0, $self->{w}, $self->{h});
3748 }
3749 4023
3750 $self->_draw; 4024 $self->_draw;
4025 }
3751} 4026}
3752 4027
3753############################################################################# 4028#############################################################################
3754 4029
3755package CFClient::UI; 4030package CFPlus::UI;
3756 4031
3757$ROOT = new CFClient::UI::Root; 4032$ROOT = new CFPlus::UI::Root;
3758$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4033$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3759 4034
37601 40351
3761 4036

Diff Legend

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