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.293 by root, Tue Jun 6 03:05:16 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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