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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 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
1395 if ($self->{has_close_button}) {
1396 $self->{close_button} =
1397 new CFPlus::UI::ImageButton
1398 path => 'x1_close.png',
1399 on_activate => sub { $self->emit ("delete") };
1400
1401 $self->CFPlus::UI::Container::add ($self->{close_button});
1402 }
1403
1095 $self 1404 $self
1096} 1405}
1097 1406
1098sub add { 1407sub add {
1099 my ($self, @widgets) = @_; 1408 my ($self, @widgets) = @_;
1100 1409
1101 $self->SUPER::add (@widgets); 1410 $self->SUPER::add (@widgets);
1411 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $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};
1103} 1413}
1104 1414
1105sub border { 1415sub border {
1106 int $_[0]{border} * $::FONTSIZE 1416 int $_[0]{border} * $::FONTSIZE
1107} 1417}
… …
1109sub size_request { 1419sub size_request {
1110 my ($self) = @_; 1420 my ($self) = @_;
1111 1421
1112 $self->{title_widget}->size_request 1422 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1423 if $self->{title_widget};
1424
1425 $self->{close_button}->size_request
1426 if $self->{close_button};
1114 1427
1115 my ($w, $h) = $self->SUPER::size_request; 1428 my ($w, $h) = $self->SUPER::size_request;
1116 1429
1117 ( 1430 (
1118 $w + $self->border * 2, 1431 $w + $self->border * 2,
1119 $h + $self->border * 2, 1432 $h + $self->border * 2,
1120 ) 1433 )
1121} 1434}
1122 1435
1123sub size_allocate { 1436sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1125 1438
1126 if ($self->{title_widget}) { 1439 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1440 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1441 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1442 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1443 }
1131 1444
1132 my $border = $self->border; 1445 my $border = $self->border;
1133 1446
1134 $h -= List::Util::max 0, $border * 2; 1447 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1448 $w -= List::Util::max 0, $border * 2;
1449
1450 $self->child->configure ($border, $border, $w, $h);
1451
1452 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1453 if $self->{close_button};
1454
1455 1
1456}
1457
1458sub invoke_delete {
1459 my ($self) = @_;
1460
1461 $self->hide;
1136 1462
1137 $self->child->configure ($border, $border, $w, $h); 1463 1
1138} 1464}
1139 1465
1140sub button_down { 1466sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1467 my ($self, $ev, $x, $y) = @_;
1142 1468
1143 my ($w, $h) = @$self{qw(w h)}; 1469 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1470 my $border = $self->border;
1145 1471
… …
1176 1502
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1503 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1504
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1505 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1506 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1507 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1508 };
1183 } else { 1509 } else {
1184 return 0; 1510 return 0;
1185 } 1511 }
1186 1512
1187 1 1513 1
1188} 1514}
1189 1515
1190sub button_up { 1516sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1517 my ($self, $ev, $x, $y) = @_;
1192 1518
1193 !!delete $self->{motion} 1519 ! ! delete $self->{motion}
1194} 1520}
1195 1521
1196sub mouse_motion { 1522sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1523 my ($self, $ev, $x, $y) = @_;
1198 1524
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1525 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1526
1201 !!$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
1202} 1536}
1203 1537
1204sub _draw { 1538sub _draw {
1205 my ($self) = @_; 1539 my ($self) = @_;
1206 1540
… …
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214 1548
1215 my $border = $self->border; 1549 my $border = $self->border;
1216 1550
1217 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1218 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221 $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);
1222 1570
1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1225 1573
1226 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1235 $child->draw; 1583 $child->draw;
1236 1584
1237 if ($self->{title_widget}) { 1585 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1586 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1587 $self->{title_widget}->_draw;
1588
1589 glTranslate 0, - ($border - $self->{h});
1240 } 1590 }
1591
1592 $self->{close_button}->draw
1593 if $self->{close_button};
1241} 1594}
1242 1595
1243############################################################################# 1596#############################################################################
1244 1597
1245package CFClient::UI::Table; 1598package CFPlus::UI::Table;
1246 1599
1247our @ISA = CFClient::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1248 1601
1249use List::Util qw(max sum); 1602use List::Util qw(max sum);
1250 1603
1251use CFClient::OpenGL; 1604use CFPlus::OpenGL;
1252 1605
1253sub new { 1606sub new {
1254 my $class = shift; 1607 my $class = shift;
1255 1608
1256 $class->SUPER::new ( 1609 $class->SUPER::new (
1257 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1258 @_, 1612 @_,
1259 ) 1613 )
1260} 1614}
1261 1615
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264}
1265
1266sub add { 1616sub add {
1267 my ($self, $x, $y, $child) = @_; 1617 my ($self, @widgets) = @_;
1268 1618
1269 $child->set_parent ($self); 1619 for my $child (@widgets) {
1270 $self->{children}[$y][$x] = $child; 1620 $child->{rowspan} ||= 1;
1621 $child->{colspan} ||= 1;
1622 }
1271 1623
1272 $self->realloc; 1624 $self->SUPER::add (@widgets);
1273} 1625}
1274 1626
1275sub 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 {
1276 my ($self, $child) = @_; 1645 my ($self) = @_;
1277 1646
1278 # TODO: not yet implemented 1647 my (@w, @h);
1279}
1280
1281# TODO: move to container class maybe? send children a signal on removal?
1282sub clear {
1283 my ($self) = @_;
1284 1648
1285 my @children = $self->children; 1649 my @children = $self->children;
1286 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 }
1287 1660 }
1288 for (@children) {
1289 delete $_->{parent};
1290 $_->hide;
1291 }
1292 1661
1293 $self->realloc; 1662 # second pass, rows
1294} 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1295
1296sub get_wh {
1297 my ($self) = @_;
1298
1299 my (@w, @h);
1300
1301 for my $y (0 .. $#{$self->{children}}) {
1302 my $row = $self->{children}[$y]
1303 or next;
1304
1305 for my $x (0 .. $#$row) {
1306 my $widget = $row->[$x]
1307 or next;
1308 my ($w, $h) = @$widget{qw(req_w req_h)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1309 1665
1310 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1311 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1312 } 1670 }
1313 } 1671 }
1314 1672
1315 (\@w, \@h) 1673 (\@w, \@h)
1316} 1674}
… …
1324 (sum @$ws), 1682 (sum @$ws),
1325 (sum @$hs), 1683 (sum @$hs),
1326 ) 1684 )
1327} 1685}
1328 1686
1329sub size_allocate { 1687sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1688 my ($self, $w, $h) = @_;
1331 1689
1332 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1333 1691
1334 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1335 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1336 1694
1337 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1338 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1339 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1340 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1341 1699
1342 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1701
1346 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
1347 CFClient::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1348 1711
1349 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1350 1714
1351 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1352 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1353 or next;
1354 1717
1355 my $x = 0; 1718 $widget->configure (
1356 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1357 1721 );
1358 for my $c (0 .. $#$row) { 1722 }
1359 my $col_w = $ws->[$c];
1360 1723
1361 if (my $widget = $row->[$c]) { 1724 1
1362 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1363 }
1364 1726
1365 $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;
1366 } 1765 }
1367
1368 $y += $row_h;
1369 } 1766 }
1370 1767
1371} 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1372 1770
1373sub 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 {
1374 my ($self, $x, $y) = @_; 1793 my ($self, $W, $H) = @_;
1375 1794
1376 $x -= $self->{x}; 1795 for my $child ($self->visible_children) {
1377 $y -= $self->{y}; 1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1378 1797
1379 my $res; 1798 $x = _scale $pos, $x, $W;
1799 $y = _scale $pos, $x, $H;
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1380 1802
1381 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1803 $child->configure ($x, $y, $w, $h);
1382 $res = $_->find_widget ($x, $y) 1804 }
1383 and return $res; 1805
1384 } 1806 1
1385
1386 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1387}
1388
1389sub _draw {
1390 my ($self) = @_;
1391
1392 for (grep $_, @{$self->{children}}) {
1393 $_->draw for grep $_, @$_;
1394 }
1395} 1807}
1396 1808
1397############################################################################# 1809#############################################################################
1398 1810
1399package CFClient::UI::Box; 1811package CFPlus::UI::Box;
1400 1812
1401our @ISA = CFClient::UI::Container::; 1813our @ISA = CFPlus::UI::Container::;
1402 1814
1403sub size_request { 1815sub size_request {
1404 my ($self) = @_; 1816 my ($self) = @_;
1405 1817
1406 $self->{vertical} 1818 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1825 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1826 )
1415} 1827}
1416 1828
1417sub size_allocate { 1829sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1830 my ($self, $w, $h) = @_;
1419 1831
1420 my $space = $self->{vertical} ? $h : $w; 1832 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1833 my @children = $self->visible_children;
1422 1834
1423 my @req; 1835 my @req;
1424 1836
1425 if ($self->{homogeneous}) { 1837 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1838 @req = ($space / (@children || 1)) x @children;
1427 } else { 1839 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1840 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1841 my $req = List::Util::sum @req;
1430 1842
1431 if ($req > $space) { 1843 if ($req > $space) {
1432 # ah well, not enough space 1844 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1845 $_ *= $space / $req for @req;
1434 } else { 1846 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1847 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1848
1437 $space = ($space - $req) / $expand; # remaining space to give away 1849 $space = ($space - $req) / $expand; # remaining space to give away
1438 1850
1439 $req[$_] += $space * $children->[$_]{expand} 1851 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1852 for 0 .. $#children;
1441 } 1853 }
1442 } 1854 }
1443 1855
1444 CFClient::UI::harmonize \@req; 1856 CFPlus::UI::harmonize \@req;
1445 1857
1446 my $pos = 0; 1858 my $pos = 0;
1447 for (0 .. $#$children) { 1859 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1860 my $alloc = $req[$_];
1449 $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));
1450 1862
1451 $pos += $alloc; 1863 $pos += $alloc;
1452 } 1864 }
1453 1865
1454 1 1866 1
1455} 1867}
1456 1868
1457############################################################################# 1869#############################################################################
1458 1870
1459package CFClient::UI::HBox; 1871package CFPlus::UI::HBox;
1460 1872
1461our @ISA = CFClient::UI::Box::; 1873our @ISA = CFPlus::UI::Box::;
1462 1874
1463sub new { 1875sub new {
1464 my $class = shift; 1876 my $class = shift;
1465 1877
1466 $class->SUPER::new ( 1878 $class->SUPER::new (
… …
1469 ) 1881 )
1470} 1882}
1471 1883
1472############################################################################# 1884#############################################################################
1473 1885
1474package CFClient::UI::VBox; 1886package CFPlus::UI::VBox;
1475 1887
1476our @ISA = CFClient::UI::Box::; 1888our @ISA = CFPlus::UI::Box::;
1477 1889
1478sub new { 1890sub new {
1479 my $class = shift; 1891 my $class = shift;
1480 1892
1481 $class->SUPER::new ( 1893 $class->SUPER::new (
… …
1484 ) 1896 )
1485} 1897}
1486 1898
1487############################################################################# 1899#############################################################################
1488 1900
1489package CFClient::UI::Label; 1901package CFPlus::UI::Label;
1490 1902
1491our @ISA = CFClient::UI::DrawBG::; 1903our @ISA = CFPlus::UI::DrawBG::;
1492 1904
1493use CFClient::OpenGL; 1905use CFPlus::OpenGL;
1494 1906
1495sub new { 1907sub new {
1496 my ($class, %arg) = @_; 1908 my ($class, %arg) = @_;
1497 1909
1498 my $self = $class->SUPER::new ( 1910 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1913 #active_bg => none
1502 #font => default_font 1914 #font => default_font
1503 #text => initial text 1915 #text => initial text
1504 #markup => initial narkup 1916 #markup => initial narkup
1505 #max_w => maximum pixel width 1917 #max_w => maximum pixel width
1918 #style => 0, # render flags
1506 ellipsise => 3, # end 1919 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1920 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1921 fontsize => 1,
1509 align => -1, 1922 align => -1,
1510 valign => -1, 1923 valign => -1,
1511 padding_x => 2, 1924 padding_x => 2,
1512 padding_y => 2, 1925 padding_y => 2,
1513 can_events => 0, 1926 can_events => 0,
1514 %arg 1927 %arg
1515 ); 1928 );
1516 1929
1517 if (exists $self->{template}) { 1930 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1931 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1932 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1933 $self->{template} = $layout;
1521 } 1934 }
1522 1935
1523 if (exists $self->{markup}) { 1936 if (exists $self->{markup}) {
… …
1527 } 1940 }
1528 1941
1529 $self 1942 $self
1530} 1943}
1531 1944
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1945sub update {
1543 my ($self) = @_; 1946 my ($self) = @_;
1544 1947
1545 delete $self->{texture}; 1948 delete $self->{texture};
1546 $self->SUPER::update; 1949 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1558 1961
1559 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
1561 1964
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1965 $self->{layout}->set_text ($text);
1564 1966
1565 delete $self->{size_req}; 1967 delete $self->{size_req};
1566 $self->realloc; 1968 $self->realloc;
1567 $self->update; 1969 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1975 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1976 $self->{text} = "M$markup";
1575 1977
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1978 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1979
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1980 $self->{layout}->set_markup ($markup);
1580 1981
1581 delete $self->{size_req}; 1982 delete $self->{size_req};
1582 $self->realloc; 1983 $self->realloc;
1583 $self->update; 1984 $self->update;
… …
1595 1996
1596 my ($w, $h) = $self->{layout}->size; 1997 my ($w, $h) = $self->{layout}->size;
1597 1998
1598 if (exists $self->{template}) { 1999 if (exists $self->{template}) {
1599 $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);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2002 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 2003
1602 my ($w2, $h2) = $self->{template}->size; 2004 my ($w2, $h2) = $self->{template}->size;
1603 2005
1604 $w = List::Util::max $w, $w2; 2006 $w = List::Util::max $w, $w2;
… …
1609 }; 2011 };
1610 2012
1611 @{ $self->{size_req} } 2013 @{ $self->{size_req} }
1612} 2014}
1613 2015
2016sub baseline_shift {
2017 $_[0]{layout}->descent
2018}
2019
1614sub size_allocate { 2020sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 2021 my ($self, $w, $h) = @_;
1616 2022
1617 delete $self->{ox}; 2023 delete $self->{ox};
1618 2024
1619 delete $self->{texture} 2025 delete $self->{texture}
1620 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
1621} 2029}
1622 2030
1623sub set_fontsize { 2031sub set_fontsize {
1624 my ($self, $fontsize) = @_; 2032 my ($self, $fontsize) = @_;
1625 2033
1626 $self->{fontsize} = $fontsize; 2034 $self->{fontsize} = $fontsize;
2035 delete $self->{size_req};
1627 delete $self->{texture}; 2036 delete $self->{texture};
1628 2037
1629 $self->realloc; 2038 $self->realloc;
1630} 2039}
1631 2040
1632sub reconfigure { 2041sub reconfigure {
1633 my ($self) = @_; 2042 my ($self) = @_;
1634 2043
1635 delete $self->{size_req}; 2044 delete $self->{size_req};
2045 delete $self->{texture};
1636 2046
1637 $self->SUPER::reconfigure; 2047 $self->SUPER::reconfigure;
1638} 2048}
1639 2049
1640sub _draw { 2050sub _draw {
1641 my ($self) = @_; 2051 my ($self) = @_;
1642 2052
1643 $self->SUPER::_draw; # draw background, if applicable 2053 $self->SUPER::_draw; # draw background, if applicable
1644 2054
1645 my $tex = $self->{texture} ||= do { 2055 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 2056 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2057 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 2058 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2059 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2060 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2061 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 2062
1653 new_from_layout CFClient::Texture $self->{layout} 2063 [$self->{layout}->size]
1654 }; 2064 };
1655 2065
1656 unless (exists $self->{ox}) { 2066 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2067 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2068 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 2069 : ($self->{w} - $size->[0]) * 0.5);
1660 2070
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 2073 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 2074 };
1665 2075
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2076 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2077 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 2078
1671 if ($tex->{format} == GL_ALPHA) { 2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 2080}
1682 2081
1683############################################################################# 2082#############################################################################
1684 2083
1685package CFClient::UI::EntryBase; 2084package CFPlus::UI::EntryBase;
1686 2085
1687our @ISA = CFClient::UI::Label::; 2086our @ISA = CFPlus::UI::Label::;
1688 2087
1689use CFClient::OpenGL; 2088use CFPlus::OpenGL;
1690 2089
1691sub new { 2090sub new {
1692 my $class = shift; 2091 my $class = shift;
1693 2092
1694 $class->SUPER::new ( 2093 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 2097 active_fg => [0, 0, 0],
1699 can_hover => 1, 2098 can_hover => 1,
1700 can_focus => 1, 2099 can_focus => 1,
1701 valign => 0, 2100 valign => 0,
1702 can_events => 1, 2101 can_events => 1,
2102 ellipsise => 0,
1703 #text => ... 2103 #text => ...
1704 #hidden => "*", 2104 #hidden => "*",
1705 @_ 2105 @_
1706 ) 2106 )
1707} 2107}
… …
1718 2118
1719 $text =~ s/./*/g if $self->{hidden}; 2119 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 2120 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 2121 delete $self->{size_req};
1722 2122
1723 $self->_emit (changed => $self->{text}); 2123 $self->emit (changed => $self->{text});
1724 2124
1725 $self->realloc; 2125 $self->realloc;
1726 $self->update; 2126 $self->update;
1727} 2127}
1728 2128
… …
1743 my ($w, $h) = $self->SUPER::size_request; 2143 my ($w, $h) = $self->SUPER::size_request;
1744 2144
1745 ($w + 1, $h) # add 1 for cursor 2145 ($w + 1, $h) # add 1 for cursor
1746} 2146}
1747 2147
1748sub key_down { 2148sub invoke_key_down {
1749 my ($self, $ev) = @_; 2149 my ($self, $ev) = @_;
1750 2150
1751 my $mod = $ev->{mod}; 2151 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1754 2154
1755 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;
1756 2158
1757 if ($uni == 8) { 2159 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } 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 = "";
1766 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 2183 $self->emit ('escape');
1771 } elsif ($uni) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 2188 } else {
1774 return 0; 2189 return 0;
1775 } 2190 }
1776 2191
1777 $self->_set_text ($text); 2192 $self->_set_text ($text);
1778 2193
1779 $self->realloc; 2194 $self->realloc;
2195 $self->update;
1780 2196
1781 1 2197 1
1782} 2198}
1783 2199
1784sub focus_in { 2200sub invoke_focus_in {
1785 my ($self) = @_; 2201 my ($self) = @_;
1786 2202
1787 $self->{last_activity} = $::NOW; 2203 $self->{last_activity} = $::NOW;
1788 2204
1789 $self->SUPER::focus_in; 2205 $self->SUPER::invoke_focus_in
1790} 2206}
1791 2207
1792sub button_down { 2208sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2209 my ($self, $ev, $x, $y) = @_;
1794 2210
1795 $self->SUPER::button_down ($ev, $x, $y); 2211 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2212
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2213 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2214
1799 # byte-index to char-index 2215 # byte-index to char-index
1800 my $text = $self->{text}; 2216 my $text = $self->{text};
1801 utf8::encode $text; 2217 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2218 $self->{cursor} = length $text;
1803 2219
1804 $self->_set_text ($self->{text}); 2220 $self->_set_text ($self->{text});
1805 $self->update; 2221 $self->update;
1806 2222
1807 1 2223 1
1808} 2224}
1809 2225
1810sub mouse_motion { 2226sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1812# 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#
1813 2229
1814 0 2230 1
1815} 2231}
1816 2232
1817sub _draw { 2233sub _draw {
1818 my ($self) = @_; 2234 my ($self) = @_;
1819 2235
… …
1846 utf8::encode $text; 2262 utf8::encode $text;
1847 2263
1848 @$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)
1849 } 2265 }
1850 2266
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2267 glBegin GL_LINES;
1853 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};
1854 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};
1855 glEnd; 2270 glEnd;
1856 } 2271 }
1857} 2272}
1858 2273
2274#############################################################################
2275
1859package CFClient::UI::Entry; 2276package CFPlus::UI::Entry;
1860 2277
1861our @ISA = CFClient::UI::EntryBase::; 2278our @ISA = CFPlus::UI::EntryBase::;
1862 2279
1863use CFClient::OpenGL; 2280use CFPlus::OpenGL;
1864 2281
1865sub key_down { 2282sub invoke_key_down {
1866 my ($self, $ev) = @_; 2283 my ($self, $ev) = @_;
1867 2284
1868 my $sym = $ev->{sym}; 2285 my $sym = $ev->{sym};
1869 2286
1870 if ($sym == 13) { 2287 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2288 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2289 my $txt = $self->get_text;
2290
1873 $self->{history_pointer} = -1; 2291 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2292 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2293 $self->emit (activate => $txt);
1876 $self->update; 2294 $self->update;
1877 2295
1878 } elsif ($sym == CFClient::SDLK_UP) { 2296 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2297 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2298 $self->{history_saveback} = $self->get_text;
1881 } 2299 }
1882 if (@{$self->{history} || []} > 0) { 2300 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2301 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2303 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2304 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2305 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2306 }
1889 2307
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2309 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2310 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2311
1894 if ($self->{history_pointer} >= 0) { 2312 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2313 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2314 } else {
1897 $self->set_text ($self->{history_saveback}); 2315 $self->set_text ($self->{history_saveback});
1898 } 2316 }
1899 2317
1900 } else { 2318 } else {
1901 return $self->SUPER::key_down ($ev) 2319 return $self->SUPER::invoke_key_down ($ev)
1902 } 2320 }
1903 2321
1904 1 2322 1
1905} 2323}
1906 2324
1907############################################################################# 2325#############################################################################
1908 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
1909package CFClient::UI::Button; 2366package CFPlus::UI::Button;
1910 2367
1911our @ISA = CFClient::UI::Label::; 2368our @ISA = CFPlus::UI::Label::;
1912 2369
1913use CFClient::OpenGL; 2370use CFPlus::OpenGL;
1914 2371
1915my @tex = 2372my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
1918 2375
1919sub new { 2376sub new {
1920 my $class = shift; 2377 my $class = shift;
1921 2378
1922 $class->SUPER::new ( 2379 $class->SUPER::new (
1923 padding_x => 4, 2380 padding_x => 4,
1924 padding_y => 4, 2381 padding_y => 4,
1925 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
1926 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
1927 can_hover => 1, 2384 can_hover => 1,
1928 align => 0, 2385 align => 0,
1929 valign => 0, 2386 valign => 0,
1930 can_events => 1, 2387 can_events => 1,
1931 @_ 2388 @_
1932 ) 2389 )
1933} 2390}
1934 2391
1935sub activate { }
1936
1937sub button_up { 2392sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2393 my ($self, $ev, $x, $y) = @_;
1939 2394
1940 $self->emit ("activate") 2395 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2396 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2397 && $y >= 0 && $y < $self->{h};
… …
1951 2406
1952 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
1955 2410
2411 my $tex = $tex[$GRAB == $self];
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 2413
1958 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
1959 2415
1960 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
1961} 2417}
1962 2418
1963############################################################################# 2419#############################################################################
1964 2420
1965package CFClient::UI::CheckBox; 2421package CFPlus::UI::CheckBox;
1966 2422
1967our @ISA = CFClient::UI::DrawBG::; 2423our @ISA = CFPlus::UI::DrawBG::;
1968 2424
1969my @tex = 2425my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2427 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2428
1973use CFClient::OpenGL; 2429use CFPlus::OpenGL;
1974 2430
1975sub new { 2431sub new {
1976 my $class = shift; 2432 my $class = shift;
1977 2433
1978 $class->SUPER::new ( 2434 $class->SUPER::new (
… …
1992 my ($self) = @_; 2448 my ($self) = @_;
1993 2449
1994 (6) x 2 2450 (6) x 2
1995} 2451}
1996 2452
2453sub toggle {
2454 my ($self) = @_;
2455
2456 $self->{state} = !$self->{state};
2457 $self->emit (changed => $self->{state});
2458 $self->update;
2459}
2460
1997sub button_down { 2461sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2462 my ($self, $ev, $x, $y) = @_;
1999 2463
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2464 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2465 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2466 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2467 } else {
2005 return 0 2468 return 0
2006 } 2469 }
2007 2470
2008 1 2471 1
… …
2028 glDisable GL_TEXTURE_2D; 2491 glDisable GL_TEXTURE_2D;
2029} 2492}
2030 2493
2031############################################################################# 2494#############################################################################
2032 2495
2033package CFClient::UI::Image; 2496package CFPlus::UI::Image;
2034 2497
2035our @ISA = CFClient::UI::Base::; 2498our @ISA = CFPlus::UI::Base::;
2036 2499
2037use CFClient::OpenGL; 2500use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2501
2040our %loaded_images; 2502our %texture_cache;
2041 2503
2042sub new { 2504sub new {
2043 my $class = shift; 2505 my $class = shift;
2044 2506
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2507 my $self = $class->SUPER::new (
2508 can_events => 0,
2509 @_,
2510 );
2046 2511
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2512 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required";
2048 2514
2049 $loaded_images{$self->{image}} ||= 2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2517
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2518 CFPlus::weaken $texture_cache{$self->{path}};
2053 2519
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2521
2058 $self 2522 $self
2059} 2523}
2060 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
2061sub size_request { 2540sub size_request {
2062 my ($self) = @_; 2541 my ($self) = @_;
2063 2542
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2543 ($self->{tex}{w}, $self->{tex}{h})
2065} 2544}
2066 2545
2067sub _draw { 2546sub _draw {
2068 my ($self) = @_; 2547 my ($self) = @_;
2069 2548
… …
2079 } 2558 }
2080 2559
2081 glEnable GL_TEXTURE_2D; 2560 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2562
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2563 $tex->draw_quad (0, 0, $w, $h);
2085 2564
2086 glDisable GL_TEXTURE_2D; 2565 glDisable GL_TEXTURE_2D;
2087} 2566}
2088 2567
2089############################################################################# 2568#############################################################################
2090 2569
2570package CFPlus::UI::ImageButton;
2571
2572our @ISA = CFPlus::UI::Image::;
2573
2574use CFPlus::OpenGL;
2575
2576my %textures;
2577
2578sub new {
2579 my $class = shift;
2580
2581 my $self = $class->SUPER::new (
2582 padding_x => 4,
2583 padding_y => 4,
2584 fg => [1, 1, 1],
2585 active_fg => [0, 0, 1],
2586 can_hover => 1,
2587 align => 0,
2588 valign => 0,
2589 can_events => 1,
2590 @_
2591 );
2592}
2593
2594sub invoke_button_up {
2595 my ($self, $ev, $x, $y) = @_;
2596
2597 $self->emit ("activate")
2598 if $x >= 0 && $x < $self->{w}
2599 && $y >= 0 && $y < $self->{h};
2600
2601 1
2602}
2603
2604#############################################################################
2605
2091package CFClient::UI::VGauge; 2606package CFPlus::UI::VGauge;
2092 2607
2093our @ISA = CFClient::UI::Base::; 2608our @ISA = CFPlus::UI::Base::;
2094 2609
2095use List::Util qw(min max); 2610use List::Util qw(min max);
2096 2611
2097use CFClient::OpenGL; 2612use CFPlus::OpenGL;
2098 2613
2099my %tex = ( 2614my %tex = (
2100 food => [ 2615 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2617 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2618 ],
2104 grace => [ 2619 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 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/
2107 ], 2622 ],
2108 hp => [ 2623 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2625 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2626 ],
2112 mana => [ 2627 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2628 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 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/
2115 ], 2630 ],
2116); 2631);
2117 2632
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2633# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2693 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2694 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2695
2181 my $h1 = $self->{h} * (1 - $ycut1); 2696 my $h1 = $self->{h} * (1 - $ycut1);
2182 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);
2183 2701
2184 glEnable GL_BLEND; 2702 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2703 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2704 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2705 glEnable GL_TEXTURE_2D;
… …
2206 2724
2207 if ($t3) { 2725 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2726 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2727 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2728 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2729 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2730 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2731 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2732 glEnd;
2215 } 2733 }
2216 2734
2217 glDisable GL_BLEND; 2735 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2736 glDisable GL_TEXTURE_2D;
2219} 2737}
2220 2738
2221############################################################################# 2739#############################################################################
2222 2740
2223package CFClient::UI::Gauge; 2741package CFPlus::UI::Gauge;
2224 2742
2225our @ISA = CFClient::UI::VBox::; 2743our @ISA = CFPlus::UI::VBox::;
2226 2744
2227sub new { 2745sub new {
2228 my ($class, %arg) = @_; 2746 my ($class, %arg) = @_;
2229 2747
2230 my $self = $class->SUPER::new ( 2748 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2750 can_hover => 1,
2233 can_events => 1, 2751 can_events => 1,
2234 %arg, 2752 %arg,
2235 ); 2753 );
2236 2754
2237 $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");
2238 $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);
2239 $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");
2240 2758
2241 $self 2759 $self
2242} 2760}
2243 2761
2244sub set_fontsize { 2762sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2783 $self->{value}->set_text ($val);
2266} 2784}
2267 2785
2268############################################################################# 2786#############################################################################
2269 2787
2270package CFClient::UI::Slider; 2788package CFPlus::UI::Slider;
2271 2789
2272use strict; 2790use strict;
2273 2791
2274use CFClient::OpenGL; 2792use CFPlus::OpenGL;
2275 2793
2276our @ISA = CFClient::UI::DrawBG::; 2794our @ISA = CFPlus::UI::DrawBG::;
2277 2795
2278my @tex = 2796my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2797 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2798 qw(s1_slider.png s1_slider_bg.png);
2281 2799
2282sub new { 2800sub new {
2283 my $class = shift; 2801 my $class = shift;
2284 2802
… …
2305 $self->update; 2823 $self->update;
2306 2824
2307 $self 2825 $self
2308} 2826}
2309 2827
2310sub changed { }
2311
2312sub set_range { 2828sub set_range {
2313 my ($self, $range) = @_; 2829 my ($self, $range) = @_;
2314 2830
2315 ($range, $self->{range}) = ($self->{range}, $range); 2831 ($range, $self->{range}) = ($self->{range}, $range);
2316 2832
… …
2336 if $unit; 2852 if $unit;
2337 2853
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2854 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2855
2340 if ($value != $old_value) { 2856 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2857 $self->emit (changed => $value);
2342 $self->update; 2858 $self->update;
2343 } 2859 }
2344} 2860}
2345 2861
2346sub size_request { 2862sub size_request {
2347 my ($self) = @_; 2863 my ($self) = @_;
2348 2864
2349 ($self->{req_w}, $self->{req_h}) 2865 ($self->{req_w}, $self->{req_h})
2350} 2866}
2351 2867
2352sub button_down { 2868sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2869 my ($self, $ev, $x, $y) = @_;
2354 2870
2355 $self->SUPER::button_down ($ev, $x, $y); 2871 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2872
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2874
2359 $self->mouse_motion ($ev, $x, $y) 2875 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2876}
2361 2877
2362sub mouse_motion { 2878sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2879 my ($self, $ev, $x, $y) = @_;
2364 2880
2365 if ($GRAB == $self) { 2881 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2882 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2883
… …
2373 } else { 2889 } else {
2374 return 0; 2890 return 0;
2375 } 2891 }
2376 2892
2377 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
2378} 2906}
2379 2907
2380sub update { 2908sub update {
2381 my ($self) = @_; 2909 my ($self) = @_;
2382 2910
… …
2431 glDisable GL_TEXTURE_2D; 2959 glDisable GL_TEXTURE_2D;
2432} 2960}
2433 2961
2434############################################################################# 2962#############################################################################
2435 2963
2436package CFClient::UI::ValSlider; 2964package CFPlus::UI::ValSlider;
2437 2965
2438our @ISA = CFClient::UI::HBox::; 2966our @ISA = CFPlus::UI::HBox::;
2439 2967
2440sub new { 2968sub new {
2441 my ($class, %arg) = @_; 2969 my ($class, %arg) = @_;
2442 2970
2443 my $range = delete $arg{range}; 2971 my $range = delete $arg{range};
2444 2972
2445 my $self = $class->SUPER::new ( 2973 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2974 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2975 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2976 to_value => sub { shift },
2449 from_value => sub { shift }, 2977 from_value => sub { shift },
2450 %arg, 2978 %arg,
2451 ); 2979 );
2452 2980
… …
2472sub set_range { shift->{slider}->set_range (@_) } 3000sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 3001sub set_value { shift->{slider}->set_value (@_) }
2474 3002
2475############################################################################# 3003#############################################################################
2476 3004
2477package CFClient::UI::TextScroller; 3005package CFPlus::UI::TextScroller;
2478 3006
2479our @ISA = CFClient::UI::HBox::; 3007our @ISA = CFPlus::UI::HBox::;
2480 3008
2481use CFClient::OpenGL; 3009use CFPlus::OpenGL;
2482 3010
2483sub new { 3011sub new {
2484 my $class = shift; 3012 my $class = shift;
2485 3013
2486 my $self = $class->SUPER::new ( 3014 my $self = $class->SUPER::new (
2487 fontsize => 1, 3015 fontsize => 1,
2488 can_events => 0, 3016 can_events => 1,
2489 indent => 0, 3017 indent => 0,
2490 #font => default_font 3018 #font => default_font
2491 @_, 3019 @_,
2492 3020
2493 layout => (new CFClient::Layout 1), 3021 layout => (new CFPlus::Layout),
2494 par => [], 3022 par => [],
3023 max_par => 0,
2495 height => 0, 3024 height => 0,
2496 children => [ 3025 children => [
2497 (new CFClient::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2499 ], 3028 ],
2500 ); 3029 );
2501 3030
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 3031 $self->{children}[1]->connect (changed => sub { $self->update });
2503 3032
… …
2509 3038
2510 $self->{fontsize} = $fontsize; 3039 $self->{fontsize} = $fontsize;
2511 $self->reflow; 3040 $self->reflow;
2512} 3041}
2513 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
2514sub size_allocate { 3052sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 3053 my ($self, $w, $h) = @_;
2516 3054
2517 $self->SUPER::size_allocate ($w, $h); 3055 my ($empty, $slider, @other) = @{ $self->{children} };
3056 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 3057
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3058 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3059 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 3060 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3061 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 3062
2524 $self->reflow; 3063 $self->reflow;
2525}
2526 3064
2527sub text_size { 3065 local $self->{children} = [$empty, $slider];
3066 $self->SUPER::invoke_size_allocate ($w, $h)
3067}
3068
3069sub invoke_mouse_wheel {
2528 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) = @_;
2529 3081
2530 my $layout = $self->{layout}; 3082 my $layout = $self->{layout};
2531 3083
3084 $layout->set_font ($self->{font}) if $self->{font};
3085 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3086 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 3087 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3088 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $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}}
2536 3095 );
3096
2537 $layout->size 3097 $layout
2538} 3098}
2539 3099
2540sub reflow { 3100sub reflow {
2541 my ($self) = @_; 3101 my ($self) = @_;
2542 3102
… …
2549 3109
2550 # todo: base offset on lines or so, not on pixels 3110 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 3111 $self->{children}[1]->set_value ($offset);
2552} 3112}
2553 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
2554sub clear { 3129sub clear {
2555 my ($self) = @_; 3130 my ($self) = @_;
3131
3132 my (undef, undef, @other) = @{ $self->{children} };
3133 $self->remove ($_) for @other;
2556 3134
2557 $self->{par} = []; 3135 $self->{par} = [];
2558 $self->{height} = 0; 3136 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3137 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 3138}
2561 3139
2562sub add_paragraph { 3140sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 3141 my $self = shift;
2564 3142
2565 for my $line (split /\n/, $text) { 3143 for my $para (@_) {
2566 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
2567 $self->{height} += $h; 3195 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3196 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 3197
2571 $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 }
2572} 3204}
2573 3205
2574sub update { 3206sub update {
2575 my ($self) = @_; 3207 my ($self) = @_;
2576 3208
… …
2579 return unless $self->{h} > 0; 3211 return unless $self->{h} > 0;
2580 3212
2581 delete $self->{texture}; 3213 delete $self->{texture};
2582 3214
2583 $ROOT->on_post_alloc ($self => sub { 3215 $ROOT->on_post_alloc ($self => sub {
3216 $self->force_uptodate;
3217
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3218 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3219
2586 if (delete $self->{need_reflow}) {
2587 my $height = 0;
2588
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2605
2606 $self->{height} = $height;
2607
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610 delete $self->{texture};
2611 }
2612
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3220 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3221 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3222 glClear GL_COLOR_BUFFER_BIT;
2616 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;
2617 my $top = int $self->{children}[1]{range}[0]; 3232 my $top = int $self->{children}[1]{range}[0];
2618 3233
2619 my $y0 = $top; 3234 my $y0 = $top;
2620 my $y1 = $top + $H; 3235 my $y1 = $top + $H;
2621 3236
2622 my $y = 0;
2623
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 3237 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3238 my $h = $para->{h};
3239 my $y = $para->{y};
2634 3240
2635 if ($y0 < $y + $h && $y < $y1) { 3241 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3242 my $layout = $self->get_layout ($para);
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 3243
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3244 $layout->render ($para->{indent}, $y - $y0);
2642 3245
2643 glRasterPos $par->[3], $y - $y0; 3246 if (my @w = @{ $para->{widget} }) {
2644 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 }
2645 } 3258 }
2646 3259
2647 $y += $h; 3260 $paridx++;
3261 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3262 }
2649 3263
2650 glDisable GL_BLEND; 3264 $self->{top_paragraph} = $top_paragraph;
2651 }; 3265 };
2652 }); 3266 });
3267}
3268
3269sub reconfigure {
3270 my ($self) = @_;
3271
3272 $self->SUPER::reconfigure;
3273
3274 $_->{w} = 1e10 for @{ $self->{par} };
3275 $self->reflow;
2653} 3276}
2654 3277
2655sub _draw { 3278sub _draw {
2656 my ($self) = @_; 3279 my ($self) = @_;
2657 3280
… …
2660 glColor 0, 0, 0, 1; 3283 glColor 0, 0, 0, 1;
2661 $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});
2662 glDisable GL_TEXTURE_2D; 3285 glDisable GL_TEXTURE_2D;
2663 3286
2664 $self->{children}[1]->draw; 3287 $self->{children}[1]->draw;
2665
2666} 3288}
2667 3289
2668############################################################################# 3290#############################################################################
2669 3291
2670package CFClient::UI::Animator; 3292package CFPlus::UI::Animator;
2671 3293
2672use CFClient::OpenGL; 3294use CFPlus::OpenGL;
2673 3295
2674our @ISA = CFClient::UI::Bin::; 3296our @ISA = CFPlus::UI::Bin::;
2675 3297
2676sub moveto { 3298sub moveto {
2677 my ($self, $x, $y) = @_; 3299 my ($self, $x, $y) = @_;
2678 3300
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3301 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3329 glPopMatrix;
2708} 3330}
2709 3331
2710############################################################################# 3332#############################################################################
2711 3333
2712package CFClient::UI::Flopper; 3334package CFPlus::UI::Flopper;
2713 3335
2714our @ISA = CFClient::UI::Button::; 3336our @ISA = CFPlus::UI::Button::;
2715 3337
2716sub new { 3338sub new {
2717 my $class = shift; 3339 my $class = shift;
2718 3340
2719 my $self = $class->SUPER::new ( 3341 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3353 $self->{other}->toggle_visibility;
2732} 3354}
2733 3355
2734############################################################################# 3356#############################################################################
2735 3357
2736package CFClient::UI::Tooltip; 3358package CFPlus::UI::Tooltip;
2737 3359
2738our @ISA = CFClient::UI::Bin::; 3360our @ISA = CFPlus::UI::Bin::;
2739 3361
2740use CFClient::OpenGL; 3362use CFPlus::OpenGL;
2741 3363
2742sub new { 3364sub new {
2743 my $class = shift; 3365 my $class = shift;
2744 3366
2745 $class->SUPER::new ( 3367 $class->SUPER::new (
… …
2748 ) 3370 )
2749} 3371}
2750 3372
2751sub set_tooltip_from { 3373sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3374 my ($self, $widget) = @_;
3375
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3378
2754 my $tooltip = $widget->{tooltip}; 3379 my $tooltip = $widget->{tooltip};
2755 3380
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3381 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3382 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3386 }
2762 3387
2763 $tooltip =~ s/^\n+//; 3388 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3389 $tooltip =~ s/\n+$//;
2765 3390
2766 $self->add (new CFClient::UI::Label 3391 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3392 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3394 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3395 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3396 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3397 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3398 );
2774} 3399}
2775 3400
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3404 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3405
2781 ($w + 4, $h + 4) 3406 ($w + 4, $h + 4)
2782} 3407}
2783 3408
2784sub size_allocate { 3409sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3410 my ($self, $w, $h) = @_;
2786 3411
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3412 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3413}
2789 3414
2790sub visibility_change { 3415sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3416 my ($self, $visible) = @_;
2792 3417
2793 return unless $visible; 3418 return unless $visible;
2794 3419
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3420 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3421 my $widget = $self->{owner}
2797 or return; 3422 or return;
2798 3423
3424 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3425 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3426
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3427 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3428 if $x + $self->{w} > $self->{root}{w};
2803 3429
2804 $self->move_abs ($x, $y); 3430 $self->move_abs ($x, $y);
3431 } else {
3432 $self->hide;
3433 }
2805 }); 3434 });
2806} 3435}
2807 3436
2808sub _draw { 3437sub _draw {
2809 my ($self) = @_; 3438 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3462 $self->SUPER::_draw;
2834} 3463}
2835 3464
2836############################################################################# 3465#############################################################################
2837 3466
2838package CFClient::UI::Face; 3467package CFPlus::UI::Face;
2839 3468
2840our @ISA = CFClient::UI::Base::; 3469our @ISA = CFPlus::UI::DrawBG::;
2841 3470
2842use CFClient::OpenGL; 3471use CFPlus::OpenGL;
2843 3472
2844sub new { 3473sub new {
2845 my $class = shift; 3474 my $class = shift;
2846 3475
2847 my $self = $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
2848 aspect => 1, 3479 aspect => 1,
2849 can_events => 0, 3480 can_events => 0,
2850 @_, 3481 @_,
2851 ); 3482 );
2852 3483
2853 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
2855 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2856 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3490 parked => 1,
2859 interval => $self->{animspeed},
2860 cb => sub { 3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
2861 ++$widget->{frame}; 3494 ++$widget->{frame};
3495 $widget->update_face;
2862 $widget->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
2863 }, 3499 },
2864 ); 3500 );
3501
3502 $self->update_face;
3503 $self->update_timer;
2865 } 3504 }
2866 3505
2867 $self 3506 $self
2868} 3507}
2869 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 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3536 }
3537 }
3538}
3539
2870sub size_request { 3540sub size_request {
2871 (32, 8) 3541 my ($self) = @_;
3542
3543 if ($::CONN) {
3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3545 if (my $tex = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex;
3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3548 } else {
3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3550 $self->realloc;
3551 });
3552 }
3553 }
3554 }
3555
3556 ($self->{size_w} || 8, $self->{size_h} || 8)
2872} 3557}
2873 3558
2874sub update { 3559sub update {
2875 my ($self) = @_; 3560 my ($self) = @_;
2876 3561
2877 return unless $self->{visible}; 3562 return unless $self->{visible};
2878 3563
2879 $self->SUPER::update; 3564 $self->SUPER::update;
2880} 3565}
2881 3566
3567sub invoke_visibility_change {
3568 my ($self) = @_;
3569
3570 $self->update_timer;
3571
3572 0
3573}
3574
2882sub _draw { 3575sub _draw {
2883 my ($self) = @_; 3576 my ($self) = @_;
2884 3577
2885 return unless $::CONN; 3578 $self->SUPER::_draw;
2886 3579
2887 my $face; 3580 if (my $tex = $self->{tex}) {
2888
2889 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}];
2891
2892 $face = $anim->[ $self->{frame} % @$anim ]
2893 if $anim && @$anim;
2894 }
2895
2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2897
2898 if ($tex) {
2899 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2903 glDisable GL_TEXTURE_2D; 3585 glDisable GL_TEXTURE_2D;
… …
2905} 3587}
2906 3588
2907sub destroy { 3589sub destroy {
2908 my ($self) = @_; 3590 my ($self) = @_;
2909 3591
2910 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
2911 if $self->{timer}; 3593 if $self->{timer};
2912 3594
2913 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
2914} 3596}
2915 3597
2916############################################################################# 3598#############################################################################
2917 3599
2918package CFClient::UI::Buttonbar; 3600package CFPlus::UI::Buttonbar;
2919 3601
2920our @ISA = CFClient::UI::HBox::; 3602our @ISA = CFPlus::UI::HBox::;
2921 3603
2922# TODO: should actualyl wrap buttons and other goodies. 3604# TODO: should actually wrap buttons and other goodies.
2923 3605
2924############################################################################# 3606#############################################################################
2925 3607
2926package CFClient::UI::Menu; 3608package CFPlus::UI::Menu;
2927 3609
2928our @ISA = CFClient::UI::FancyFrame::; 3610our @ISA = CFPlus::UI::Toplevel::;
2929 3611
2930use CFClient::OpenGL; 3612use CFPlus::OpenGL;
2931 3613
2932sub new { 3614sub new {
2933 my $class = shift; 3615 my $class = shift;
2934 3616
2935 my $self = $class->SUPER::new ( 3617 my $self = $class->SUPER::new (
2936 items => [], 3618 items => [],
2937 z => 100, 3619 z => 100,
2938 @_, 3620 @_,
2939 ); 3621 );
2940 3622
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3623 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3624
2943 for my $item (@{ $self->{items} }) { 3625 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3626 my ($widget, $cb, $tooltip) = @$item;
2945 3627
2946 # handle various types of items, only text for now 3628 # handle various types of items, only text for now
2947 if (!ref $widget) { 3629 if (!ref $widget) {
3630 if ($widget =~ /\t/) {
3631 my ($left, $right) = split /\t/, $widget, 2;
3632
2948 $widget = new CFClient::UI::Label 3633 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3634 can_hover => 1,
2950 can_events => 1, 3635 can_events => 1,
3636 tooltip => $tooltip,
3637 children => [
3638 (new CFPlus::UI::Label markup => $left, expand => 1),
3639 (new CFPlus::UI::Label markup => $right, align => +1),
3640 ],
3641 ;
3642
3643 } else {
3644 $widget = new CFPlus::UI::Label
3645 can_hover => 1,
3646 can_events => 1,
2951 markup => $widget, 3647 markup => $widget,
2952 tooltip => $tooltip 3648 tooltip => $tooltip;
3649 }
2953 } 3650 }
2954 3651
2955 $self->{item}{$widget} = $item; 3652 $self->{item}{$widget} = $item;
2956 3653
2957 $self->{vbox}->add ($widget); 3654 $self->{vbox}->add ($widget);
… …
2962 3659
2963# popup given the event (must be a mouse button down event currently) 3660# popup given the event (must be a mouse button down event currently)
2964sub popup { 3661sub popup {
2965 my ($self, $ev) = @_; 3662 my ($self, $ev) = @_;
2966 3663
2967 $self->_emit ("popdown"); 3664 $self->emit ("popdown");
2968 3665
2969 # maybe save $GRAB? must be careful about events... 3666 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3667 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3668 $self->{button} = $ev->{button};
2972 3669
2973 $self->show; 3670 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3671 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3672}
2976 3673
2977sub mouse_motion { 3674sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3675 my ($self, $ev, $x, $y) = @_;
2979 3676
2980 # TODO: should use vbox->find_widget or so 3677 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3678 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3679 $self->{hover} = $self->{item}{$HOVER};
2983 3680
2984 0 3681 0
2985} 3682}
2986 3683
2987sub button_up { 3684sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3685 my ($self, $ev, $x, $y) = @_;
2989 3686
2990 if ($ev->{button} == $self->{button}) { 3687 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3688 undef $GRAB;
2992 $self->hide; 3689 $self->hide;
2993 3690
2994 $self->_emit ("popdown"); 3691 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3692 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3693 } else {
2997 return 0 3694 return 0
2998 } 3695 }
2999 3696
3000 1 3697 1
3001} 3698}
3002 3699
3003############################################################################# 3700#############################################################################
3004 3701
3005package CFClient::UI::Multiplexer; 3702package CFPlus::UI::Multiplexer;
3006 3703
3007our @ISA = CFClient::UI::Container::; 3704our @ISA = CFPlus::UI::Container::;
3008 3705
3009sub new { 3706sub new {
3010 my $class = shift; 3707 my $class = shift;
3011 3708
3012 my $self = $class->SUPER::new ( 3709 my $self = $class->SUPER::new (
… …
3026 3723
3027 $self->{current} = $self->{children}[0] 3724 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3725 if @{ $self->{children} };
3029} 3726}
3030 3727
3728sub get_current_page {
3729 my ($self) = @_;
3730
3731 $self->{current}
3732}
3733
3031sub set_current_page { 3734sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3735 my ($self, $page_or_widget) = @_;
3033 3736
3034 my $widget = ref $page_or_widget 3737 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3738 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3739 : $self->{children}[$page_or_widget];
3037 3740
3038 $self->{current} = $widget; 3741 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3742 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3743
3041 $self->_emit (page_changed => $self->{current}); 3744 $self->emit (page_changed => $self->{current});
3042 3745
3043 $self->realloc; 3746 $self->realloc;
3044} 3747}
3045 3748
3046sub visible_children { 3749sub visible_children {
… …
3051 my ($self) = @_; 3754 my ($self) = @_;
3052 3755
3053 $self->{current}->size_request 3756 $self->{current}->size_request
3054} 3757}
3055 3758
3056sub size_allocate { 3759sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3760 my ($self, $w, $h) = @_;
3058 3761
3059 $self->{current}->configure (0, 0, $w, $h); 3762 $self->{current}->configure (0, 0, $w, $h);
3763
3764 1
3060} 3765}
3061 3766
3062sub _draw { 3767sub _draw {
3063 my ($self) = @_; 3768 my ($self) = @_;
3064 3769
3065 $self->{current}->draw; 3770 $self->{current}->draw;
3066} 3771}
3067 3772
3068############################################################################# 3773#############################################################################
3069 3774
3070package CFClient::UI::Notebook; 3775package CFPlus::UI::Notebook;
3071 3776
3072our @ISA = CFClient::UI::VBox::; 3777our @ISA = CFPlus::UI::VBox::;
3073 3778
3074sub new { 3779sub new {
3075 my $class = shift; 3780 my $class = shift;
3076 3781
3077 my $self = $class->SUPER::new ( 3782 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3783 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3785 # filter => # will be put between multiplexer and $self
3081 @_, 3786 @_,
3082 ); 3787 );
3083 3788
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3793}
3089 3794
3090sub add { 3795sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3796 my ($self, $title, $widget, $tooltip) = @_;
3092 3797
3093 Scalar::Util::weaken $self; 3798 CFPlus::weaken $self;
3094 3799
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3801 markup => $title,
3097 tooltip => $tooltip, 3802 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3803 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3804 );
3100 3805
3101 $self->{multiplexer}->add ($widget); 3806 $self->{multiplexer}->add ($widget);
3102} 3807}
3103 3808
3809sub get_current_page {
3810 my ($self) = @_;
3811
3812 $self->{multiplexer}->get_current_page
3813}
3814
3104sub set_current_page { 3815sub set_current_page {
3105 my ($self, $page) = @_; 3816 my ($self, $page) = @_;
3106 3817
3107 $self->{multiplexer}->set_current_page ($page); 3818 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3819 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3820}
3110 3821
3111############################################################################# 3822#############################################################################
3112 3823
3113package CFClient::UI::Combobox; 3824package CFPlus::UI::Selector;
3114 3825
3115use utf8; 3826use utf8;
3116 3827
3117our @ISA = CFClient::UI::Button::; 3828our @ISA = CFPlus::UI::Button::;
3118 3829
3119sub new { 3830sub new {
3120 my $class = shift; 3831 my $class = shift;
3121 3832
3122 my $self = $class->SUPER::new ( 3833 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3839 $self->_set_value ($self->{value});
3129 3840
3130 $self 3841 $self
3131} 3842}
3132 3843
3133sub button_down { 3844sub invoke_button_down {
3134 my ($self, $ev) = @_; 3845 my ($self, $ev) = @_;
3135 3846
3136 my @menu_items; 3847 my @menu_items;
3137 3848
3138 for (@{ $self->{options} }) { 3849 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3850 my ($value, $title, $tooltip) = @$_;
3140 3851
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3852 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3853 }
3143 3854
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3855 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3856}
3146 3857
3147sub _set_value { 3858sub _set_value {
3148 my ($self, $value) = @_; 3859 my ($self, $value) = @_;
3149 3860
… …
3159 my ($self, $value) = @_; 3870 my ($self, $value) = @_;
3160 3871
3161 return unless $self->{value} ne $value; 3872 return unless $self->{value} ne $value;
3162 3873
3163 $self->_set_value ($value); 3874 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3875 $self->emit (changed => $value);
3165} 3876}
3166 3877
3167############################################################################# 3878#############################################################################
3168 3879
3169package CFClient::UI::Statusbox; 3880package CFPlus::UI::Statusbox;
3170 3881
3171our @ISA = CFClient::UI::VBox::; 3882our @ISA = CFPlus::UI::VBox::;
3172 3883
3173sub new { 3884sub new {
3174 my $class = shift; 3885 my $class = shift;
3175 3886
3176 my $self = $class->SUPER::new ( 3887 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3888 fontsize => 0.8,
3178 @_, 3889 @_,
3179 ); 3890 );
3180 3891
3181 Scalar::Util::weaken (my $this = $self); 3892 CFPlus::weaken (my $this = $self);
3182 3893
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3894 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3895
3185 $self 3896 $self
3186} 3897}
… …
3188sub reorder { 3899sub reorder {
3189 my ($self) = @_; 3900 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3901 my $NOW = Time::HiRes::time;
3191 3902
3192 # freeze display when hovering over any label 3903 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3904 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3905 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3906 values %{ $self->{item} };
3196 3907
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3908 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3909 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3910 }
… …
3220 for ($short) { 3931 for ($short) {
3221 s/^\s+//; 3932 s/^\s+//;
3222 s/\s+/ /g; 3933 s/\s+/ /g;
3223 } 3934 }
3224 3935
3225 new CFClient::UI::Label 3936 new CFPlus::UI::Label
3226 markup => $short, 3937 markup => $short,
3227 tooltip => $item->{tooltip}, 3938 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3939 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3940 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3941 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3995 count => 1,
3285 %arg, 3996 %arg,
3286 }; 3997 };
3287 } 3998 }
3288 3999
4000 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 4001 $self->reorder;
4002 });
3290} 4003}
3291 4004
3292sub reconfigure { 4005sub reconfigure {
3293 my ($self) = @_; 4006 my ($self) = @_;
3294 4007
… …
3307 $self->SUPER::destroy; 4020 $self->SUPER::destroy;
3308} 4021}
3309 4022
3310############################################################################# 4023#############################################################################
3311 4024
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root; 4025package CFPlus::UI::Root;
3674 4026
3675our @ISA = CFClient::UI::Container::; 4027our @ISA = CFPlus::UI::Container::;
3676 4028
3677use List::Util qw(min max); 4029use List::Util qw(min max);
3678 4030
3679use CFClient::OpenGL; 4031use CFPlus::OpenGL;
3680 4032
3681sub new { 4033sub new {
3682 my $class = shift; 4034 my $class = shift;
3683 4035
3684 my $self = $class->SUPER::new ( 4036 my $self = $class->SUPER::new (
3685 visible => 1, 4037 visible => 1,
3686 @_, 4038 @_,
3687 ); 4039 );
3688 4040
3689 Scalar::Util::weaken ($self->{root} = $self); 4041 CFPlus::weaken ($self->{root} = $self);
3690 4042
3691 $self 4043 $self
3692} 4044}
3693 4045
3694sub size_request { 4046sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 4061 $coord = $max - $size if $coord > $max - $size;
3710 4062
3711 int $coord + 0.5 4063 int $coord + 0.5
3712} 4064}
3713 4065
3714sub size_allocate { 4066sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 4067 my ($self, $w, $h) = @_;
3716 4068
3717 for my $child ($self->children) { 4069 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4070 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 4071
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 4075 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 4076 $Y = _to_pixel $Y, $H, $self->{h};
3725 4077
3726 $child->configure ($X, $Y, $W, $H); 4078 $child->configure ($X, $Y, $W, $H);
3727 } 4079 }
4080
4081 1
3728} 4082}
3729 4083
3730sub coord2local { 4084sub coord2local {
3731 my ($self, $x, $y) = @_; 4085 my ($self, $x, $y) = @_;
3732 4086
… …
3787 while ($self->{refresh_hook}) { 4141 while ($self->{refresh_hook}) {
3788 $_->() 4142 $_->()
3789 for values %{delete $self->{refresh_hook}}; 4143 for values %{delete $self->{refresh_hook}};
3790 } 4144 }
3791 4145
3792 if ($self->{realloc}) { 4146 while ($self->{realloc}) {
3793 my %queue; 4147 my %queue;
3794 my @queue; 4148 my @queue;
3795 my $widget; 4149 my $widget;
3796 4150
3797 outer: 4151 outer:
… …
3844 } 4198 }
3845 } 4199 }
3846 4200
3847 delete $self->{realloc}{$widget+0}; 4201 delete $self->{realloc}{$widget+0};
3848 } 4202 }
3849 }
3850 4203
3851 while (my $size_alloc = delete $self->{size_alloc}) { 4204 while (my $size_alloc = delete $self->{size_alloc}) {
3852 my @queue = sort { $b->{visible} <=> $a->{visible} } 4205 my @queue = sort { $a->{visible} <=> $b->{visible} }
3853 values %$size_alloc; 4206 values %$size_alloc;
3854 4207
3855 while () { 4208 while () {
3856 my $widget = pop @queue || last; 4209 my $widget = pop @queue || last;
3857 4210
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4211 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4212
3860 $w = 0 if $w < 0; 4213 $w = max $widget->{min_w}, $w;
3861 $h = 0 if $h < 0; 4214 $h = max $widget->{min_h}, $h;
3862 4215
4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4218
4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4221
3863 $w = int $w + 0.5; 4222 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 4223 $h = int $h + 0.5;
3865 4224
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 4226 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h}; 4227 $widget->{old_h} = $widget->{h};
3869 4228
3870 $widget->{w} = $w; 4229 $widget->{w} = $w;
3871 $widget->{h} = $h; 4230 $widget->{h} = $h;
3872 4231
3873 $widget->emit (size_allocate => $w, $h); 4232 $widget->emit (size_allocate => $w, $h);
4233 }
3874 } 4234 }
3875 } 4235 }
3876 } 4236 }
3877 4237
3878 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
3879 $_->() 4239 $_->()
3880 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
3881 } 4241 }
3882
3883 4242
3884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3886 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
3887 4246
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4249 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4250 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4251 glLoadIdentity;
3893 4252
3894 { 4253 {
3895 package CFClient::UI::Base; 4254 package CFPlus::UI::Base;
3896 4255
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4256 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4257 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4258
3901 $self->_draw; 4259 $self->_draw;
4260 }
3902} 4261}
3903 4262
3904############################################################################# 4263#############################################################################
3905 4264
3906package CFClient::UI; 4265package CFPlus::UI;
3907 4266
3908$ROOT = new CFClient::UI::Root; 4267$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4268$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4269
39111 42701
3912 4271

Diff Legend

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