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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines