ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.364 by root, Sat Dec 23 10:18:27 2006 UTC

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

Diff Legend

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