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.400 by root, Sat Jul 21 16:15:03 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 ;
1100
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1101 $self->SUPER::add ($self->{vp});
1102
986 $self->add ($child) if $child; 1103 $self->add ($child) if $child;
987 1104
988 $self 1105 $self
989} 1106}
990 1107
… …
992 my ($self, $widget) = @_; 1109 my ($self, $widget) = @_;
993 1110
994 $self->{vp}->add ($self->{child} = $widget); 1111 $self->{vp}->add ($self->{child} = $widget);
995} 1112}
996 1113
997sub update { 1114sub update_slider {
1115 my ($self) = @_;
1116
1117 my $child = ($self->{vp} or return)->child;
1118
1119 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1120 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1121
1122 my $visible = $w1 > $w2;
1123 if ($visible != $self->{hslider_visible}) {
1124 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider});
1127 }
1128
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131
1132 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider});
1137 }
1138}
1139
1140sub start_dragging {
998 my ($self) = @_; 1141 my ($self, $ev) = @_;
999 1142
1000 $self->SUPER::update; 1143 $self->grab_focus;
1001 1144
1002 # todo: overwrite size_allocate of child 1145 my $ox = $self->{vp}{view_x};
1003 my $child = $self->{vp}->child; 1146 my $oy = $self->{vp}{view_y};
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1147
1005} 1148 $self->{motion} = sub {
1149 my ($ev, $x, $y) = @_;
1006 1150
1151 $ox -= $ev->{xrel};
1152 $oy -= $ev->{yrel};
1153
1154 $self->{vp}->set_offset ($ox, $oy);
1155 };
1156}
1157
1158sub invoke_mouse_wheel {
1159 my ($self, $ev) = @_;
1160
1161 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1162 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1163
1164 1
1165}
1166
1167sub invoke_button_down {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 if ($ev->{button} == 2) {
1171 $self->start_dragging ($ev);
1172 return 1;
1173 }
1174
1175 0
1176}
1177
1178sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_;
1180
1181 if (delete $self->{motion}) {
1182 return 1;
1183 }
1184
1185 0
1186}
1187
1188sub invoke_mouse_motion {
1189 my ($self, $ev, $x, $y) = @_;
1190
1191 if ($self->{motion}) {
1192 $self->{motion}->($ev, $x, $y);
1193 return 1;
1194 }
1195
1196 0
1197}
1198
1007sub size_allocate { 1199sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1200 my ($self, $w, $h) = @_;
1009 1201
1202 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1203 $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} 1204}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1205
1019############################################################################# 1206#############################################################################
1020 1207
1021package CFClient::UI::Frame; 1208package CFPlus::UI::Frame;
1022 1209
1023our @ISA = CFClient::UI::Bin::; 1210our @ISA = CFPlus::UI::Bin::;
1024 1211
1025use CFClient::OpenGL; 1212use CFPlus::OpenGL;
1026 1213
1027sub new { 1214sub new {
1028 my $class = shift; 1215 my $class = shift;
1029 1216
1030 $class->SUPER::new ( 1217 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1243 $self->SUPER::_draw;
1057} 1244}
1058 1245
1059############################################################################# 1246#############################################################################
1060 1247
1061package CFClient::UI::FancyFrame; 1248package CFPlus::UI::FancyFrame;
1062 1249
1063our @ISA = CFClient::UI::Bin::; 1250our @ISA = CFPlus::UI::Bin::;
1064 1251
1065use CFClient::OpenGL; 1252use CFPlus::OpenGL;
1253
1254sub new {
1255 my ($class, %arg) = @_;
1256
1257 if ((exists $arg{label}) && !ref $arg{label}) {
1258 $arg{label} = new CFPlus::UI::Label
1259 align => 1,
1260 valign => 0,
1261 text => $arg{label},
1262 fontsize => ($arg{border} || 0.8) * 0.75;
1263 }
1264
1265 my $self = $class->SUPER::new (
1266 # label => "",
1267 fg => [0.6, 0.3, 0.1],
1268 border => 0.8,
1269 style => 'single',
1270 %arg,
1271 );
1272
1273 $self
1274}
1275
1276sub add {
1277 my ($self, @widgets) = @_;
1278
1279 $self->SUPER::add (@widgets);
1280 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1281}
1282
1283sub border {
1284 int $_[0]{border} * $::FONTSIZE
1285}
1286
1287sub size_request {
1288 my ($self) = @_;
1289
1290 ($self->{label_w}, undef) = $self->{label}->size_request
1291 if $self->{label};
1292
1293 my ($w, $h) = $self->SUPER::size_request;
1294
1295 (
1296 $w + $self->border * 2,
1297 $h + $self->border * 2,
1298 )
1299}
1300
1301sub invoke_size_allocate {
1302 my ($self, $w, $h) = @_;
1303
1304 my $border = $self->border;
1305
1306 $w -= List::Util::max 0, $border * 2;
1307 $h -= List::Util::max 0, $border * 2;
1308
1309 if (my $label = $self->{label}) {
1310 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1311 $label->{h} = List::Util::min $h, $border;
1312 $label->invoke_size_allocate ($label->{w}, $label->{h});
1313 }
1314
1315 $self->child->configure ($border, $border, $w, $h);
1316
1317 1
1318}
1319
1320sub _draw {
1321 my ($self) = @_;
1322
1323 my $child = $self->{children}[0];
1324
1325 my $border = $self->border;
1326 my ($w, $h) = ($self->{w}, $self->{h});
1327
1328 $child->draw;
1329
1330 glColor @{$self->{fg}};
1331 glBegin GL_LINE_STRIP;
1332 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1333 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1334 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1335 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1336 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1337 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1338 glEnd;
1339
1340 if ($self->{label}) {
1341 glTranslate $border * 2, 0;
1342 $self->{label}->_draw;
1343 }
1344}
1345
1346#############################################################################
1347
1348package CFPlus::UI::Toplevel;
1349
1350our @ISA = CFPlus::UI::Bin::;
1351
1352use CFPlus::OpenGL;
1066 1353
1067my $bg = 1354my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1355 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1356 mipmap => 1, wrap => 1;
1070 1357
1071my @border = 1358my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1359 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); 1360 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1361
1362my @icon =
1363 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1364 qw(x1_move.png x1_resize.png);
1074 1365
1075sub new { 1366sub new {
1076 my ($class, %arg) = @_; 1367 my ($class, %arg) = @_;
1077 1368
1078 my $self = $class->SUPER::new ( 1369 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1370 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1371 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1372 border => 0.6,
1082 can_events => 1, 1373 can_events => 1,
1083 min_w => 16, 1374 min_w => 64,
1084 min_h => 16, 1375 min_h => 32,
1085 %arg, 1376 %arg,
1086 ); 1377 );
1087 1378
1088 $self->{title_widget} = new CFClient::UI::Label 1379 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1380 align => 0,
1090 valign => 1, 1381 valign => 1,
1091 text => $self->{title}, 1382 text => $self->{title},
1092 fontsize => $self->{border}, 1383 fontsize => $self->{border},
1093 if exists $self->{title}; 1384 if exists $self->{title};
1094 1385
1386 if ($self->{has_close_button}) {
1387 $self->{close_button} =
1388 new CFPlus::UI::ImageButton
1389 path => 'x1_close.png',
1390 on_activate => sub { $self->emit ("delete") };
1391
1392 $self->CFPlus::UI::Container::add ($self->{close_button});
1393 }
1394
1095 $self 1395 $self
1096} 1396}
1097 1397
1098sub add { 1398sub add {
1099 my ($self, @widgets) = @_; 1399 my ($self, @widgets) = @_;
1100 1400
1101 $self->SUPER::add (@widgets); 1401 $self->SUPER::add (@widgets);
1402 $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}; 1403 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1404}
1104 1405
1105sub border { 1406sub border {
1106 int $_[0]{border} * $::FONTSIZE 1407 int $_[0]{border} * $::FONTSIZE
1107} 1408}
… …
1109sub size_request { 1410sub size_request {
1110 my ($self) = @_; 1411 my ($self) = @_;
1111 1412
1112 $self->{title_widget}->size_request 1413 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1414 if $self->{title_widget};
1415
1416 $self->{close_button}->size_request
1417 if $self->{close_button};
1114 1418
1115 my ($w, $h) = $self->SUPER::size_request; 1419 my ($w, $h) = $self->SUPER::size_request;
1116 1420
1117 ( 1421 (
1118 $w + $self->border * 2, 1422 $w + $self->border * 2,
1119 $h + $self->border * 2, 1423 $h + $self->border * 2,
1120 ) 1424 )
1121} 1425}
1122 1426
1123sub size_allocate { 1427sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1428 my ($self, $w, $h) = @_;
1125 1429
1126 if ($self->{title_widget}) { 1430 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1431 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1432 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1433 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1434 }
1131 1435
1132 my $border = $self->border; 1436 my $border = $self->border;
1133 1437
1134 $h -= List::Util::max 0, $border * 2; 1438 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1439 $w -= List::Util::max 0, $border * 2;
1440
1441 $self->child->configure ($border, $border, $w, $h);
1442
1443 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1444 if $self->{close_button};
1445
1446 1
1447}
1448
1449sub invoke_delete {
1450 my ($self) = @_;
1451
1452 $self->hide;
1136 1453
1137 $self->child->configure ($border, $border, $w, $h); 1454 1
1138} 1455}
1139 1456
1140sub button_down { 1457sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1458 my ($self, $ev, $x, $y) = @_;
1142 1459
1143 my ($w, $h) = @$self{qw(w h)}; 1460 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1461 my $border = $self->border;
1145 1462
… …
1176 1493
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1494 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1495
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1496 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1497 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1498 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1499 };
1183 } else { 1500 } else {
1184 return 0; 1501 return 0;
1185 } 1502 }
1186 1503
1187 1 1504 1
1188} 1505}
1189 1506
1190sub button_up { 1507sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1508 my ($self, $ev, $x, $y) = @_;
1192 1509
1193 !!delete $self->{motion} 1510 ! ! delete $self->{motion}
1194} 1511}
1195 1512
1196sub mouse_motion { 1513sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1514 my ($self, $ev, $x, $y) = @_;
1198 1515
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1516 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1517
1201 !!$self->{motion} 1518 ! ! $self->{motion}
1519}
1520
1521sub invoke_visibility_change {
1522 my ($self, $visible) = @_;
1523
1524 delete $self->{motion} unless $visible;
1525
1526 0
1202} 1527}
1203 1528
1204sub _draw { 1529sub _draw {
1205 my ($self) = @_; 1530 my ($self) = @_;
1206 1531
… …
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214 1539
1215 my $border = $self->border; 1540 my $border = $self->border;
1216 1541
1217 glColor @{ $self->{border_bg} }; 1542 glColor @{ $self->{border_bg} };
1218 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1543 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1544 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1545 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1546 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1547
1548 # move
1549 my $w2 = ($w - $border) * .5;
1550 my $h2 = ($h - $border) * .5;
1551 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1552 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1554
1555 # resize
1556 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1557 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1558 unless $self->{has_close_button};
1559 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1222 1561
1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1562 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224 glColor @{ $self->{bg} }; 1563 glColor @{ $self->{bg} };
1225 1564
1226 # TODO: repeat texture not scale 1565 # TODO: repeat texture not scale
… …
1235 $child->draw; 1574 $child->draw;
1236 1575
1237 if ($self->{title_widget}) { 1576 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1577 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1578 $self->{title_widget}->_draw;
1579
1580 glTranslate 0, - ($border - $self->{h});
1240 } 1581 }
1582
1583 $self->{close_button}->draw
1584 if $self->{close_button};
1241} 1585}
1242 1586
1243############################################################################# 1587#############################################################################
1244 1588
1245package CFClient::UI::Table; 1589package CFPlus::UI::Table;
1246 1590
1247our @ISA = CFClient::UI::Base::; 1591our @ISA = CFPlus::UI::Container::;
1248 1592
1249use List::Util qw(max sum); 1593use List::Util qw(max sum);
1250 1594
1251use CFClient::OpenGL; 1595use CFPlus::OpenGL;
1252 1596
1253sub new { 1597sub new {
1254 my $class = shift; 1598 my $class = shift;
1255 1599
1256 $class->SUPER::new ( 1600 $class->SUPER::new (
1257 col_expand => [], 1601 col_expand => [],
1602 row_expand => [],
1258 @_, 1603 @_,
1259 ) 1604 )
1260} 1605}
1261 1606
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264}
1265
1266sub add { 1607sub add {
1267 my ($self, $x, $y, $child) = @_; 1608 my ($self, @widgets) = @_;
1268 1609
1269 $child->set_parent ($self); 1610 for my $child (@widgets) {
1270 $self->{children}[$y][$x] = $child; 1611 $child->{rowspan} ||= 1;
1612 $child->{colspan} ||= 1;
1613 }
1271 1614
1272 $self->realloc; 1615 $self->SUPER::add (@widgets);
1273} 1616}
1274 1617
1275sub remove { 1618sub add_at {
1619 my $self = shift;
1620
1621 my @widgets;
1622
1623 while (@_) {
1624 my ($col, $row, $child) = splice @_, 0, 3, ();
1625
1626 $child->{row} = $row;
1627 $child->{col} = $col;
1628
1629 push @widgets, $child;
1630 }
1631
1632 $self->add (@widgets);
1633}
1634
1635sub get_wh {
1276 my ($self, $child) = @_; 1636 my ($self) = @_;
1277 1637
1278 # TODO: not yet implemented 1638 my (@w, @h);
1279}
1280
1281# TODO: move to container class maybe? send children a signal on removal?
1282sub clear {
1283 my ($self) = @_;
1284 1639
1285 my @children = $self->children; 1640 my @children = $self->children;
1286 delete $self->{children}; 1641
1642 # first pass, columns
1643 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1644 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1645
1646 my $sw = sum @w[$c .. $c + $cs - 1];
1647
1648 if ($w > $sw) {
1649 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1650 }
1287 1651 }
1288 for (@children) {
1289 delete $_->{parent};
1290 $_->hide;
1291 }
1292 1652
1293 $self->realloc; 1653 # second pass, rows
1294} 1654 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)}; 1655 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1309 1656
1310 $w[$x] = max $w[$x], $w; 1657 my $sh = sum @h[$r .. $r + $rs - 1];
1311 $h[$y] = max $h[$y], $h; 1658
1659 if ($h > $sh) {
1660 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1312 } 1661 }
1313 } 1662 }
1314 1663
1315 (\@w, \@h) 1664 (\@w, \@h)
1316} 1665}
… …
1324 (sum @$ws), 1673 (sum @$ws),
1325 (sum @$hs), 1674 (sum @$hs),
1326 ) 1675 )
1327} 1676}
1328 1677
1329sub size_allocate { 1678sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1679 my ($self, $w, $h) = @_;
1331 1680
1332 my ($ws, $hs) = $self->get_wh; 1681 my ($ws, $hs) = $self->get_wh;
1333 1682
1334 my $req_w = (sum @$ws) || 1; 1683 my $req_w = (sum @$ws) || 1;
1335 my $req_h = (sum @$hs) || 1; 1684 my $req_h = (sum @$hs) || 1;
1336 1685
1337 # TODO: nicer code && do row_expand 1686 # now linearly scale the rows/columns to the allocated size
1338 my @col_expand = @{$self->{col_expand}}; 1687 my @col_expand = @{$self->{col_expand}};
1339 @col_expand = (1) x @$ws unless @col_expand; 1688 @col_expand = (1) x @$ws unless @col_expand;
1340 my $col_expand = (sum @col_expand) || 1; 1689 my $col_expand = (sum @col_expand) || 1;
1341 1690
1342 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1691 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1692
1346 CFClient::UI::harmonize $ws; 1693 CFPlus::UI::harmonize $ws;
1694
1695 my @row_expand = @{$self->{row_expand}};
1696 @row_expand = (1) x @$ws unless @row_expand;
1697 my $row_expand = (sum @row_expand) || 1;
1698
1699 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1700
1347 CFClient::UI::harmonize $hs; 1701 CFPlus::UI::harmonize $hs;
1348 1702
1349 my $y; 1703 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1704 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1350 1705
1351 for my $r (0 .. $#{$self->{children}}) { 1706 for my $widget ($self->children) {
1352 my $row = $self->{children}[$r] 1707 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1353 or next;
1354 1708
1355 my $x = 0; 1709 $widget->configure (
1356 my $row_h = $hs->[$r]; 1710 $x[$c], $y[$r],
1711 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1357 1712 );
1358 for my $c (0 .. $#$row) { 1713 }
1359 my $col_w = $ws->[$c];
1360 1714
1361 if (my $widget = $row->[$c]) { 1715 1
1362 $widget->configure ($x, $y, $col_w, $row_h); 1716}
1363 }
1364 1717
1365 $x += $col_w; 1718#############################################################################
1719
1720package CFPlus::UI::Fixed;
1721
1722use List::Util qw(min max);
1723
1724our @ISA = CFPlus::UI::Container::;
1725
1726sub add {
1727 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1728
1729 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1730 $self->SUPER::add ($child);
1731}
1732
1733sub _scale($$$) {
1734 my ($mode, $val, $max) = @_;
1735
1736 $mode eq "abs" ? $val
1737 : $mode eq "rel" ? $val * $max
1738 : 0
1739}
1740
1741sub size_request {
1742 my ($self) = @_;
1743
1744 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1745
1746 # determine overall size by querying abs widgets
1747 for my $child ($self->visible_children) {
1748 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1749
1750 if ($pos eq "abs") {
1751 $w = _scale $size, $w, $child->{req_w};
1752 $h = _scale $size, $h, $child->{req_h};
1753
1754 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1755 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1366 } 1756 }
1367
1368 $y += $row_h;
1369 } 1757 }
1370 1758
1371} 1759 my $W = $x2 - $x1;
1760 my $H = $y2 - $y1;
1372 1761
1373sub find_widget { 1762 # now layout remaining widgets
1763 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1765
1766 if ($pos ne "abs") {
1767 $x = _scale $pos, $x, $W;
1768 $y = _scale $pos, $x, $H;
1769 $w = _scale $size, $w, $child->{req_w};
1770 $h = _scale $size, $h, $child->{req_h};
1771
1772 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1773 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1774 }
1775 }
1776
1777 my $W = $x2 - $x1;
1778 my $H = $y2 - $y1;
1779
1780 ($W, $H)
1781}
1782
1783sub invoke_size_allocate {
1374 my ($self, $x, $y) = @_; 1784 my ($self, $W, $H) = @_;
1375 1785
1376 $x -= $self->{x}; 1786 for my $child ($self->visible_children) {
1377 $y -= $self->{y}; 1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1378 1788
1379 my $res; 1789 $x = _scale $pos, $x, $W;
1790 $y = _scale $pos, $x, $H;
1791 $w = _scale $size, $w, $child->{req_w};
1792 $h = _scale $size, $h, $child->{req_h};
1380 1793
1381 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1794 $child->configure ($x, $y, $w, $h);
1382 $res = $_->find_widget ($x, $y) 1795 }
1383 and return $res; 1796
1384 } 1797 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} 1798}
1396 1799
1397############################################################################# 1800#############################################################################
1398 1801
1399package CFClient::UI::Box; 1802package CFPlus::UI::Box;
1400 1803
1401our @ISA = CFClient::UI::Container::; 1804our @ISA = CFPlus::UI::Container::;
1402 1805
1403sub size_request { 1806sub size_request {
1404 my ($self) = @_; 1807 my ($self) = @_;
1405 1808
1406 $self->{vertical} 1809 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1816 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1817 )
1415} 1818}
1416 1819
1417sub size_allocate { 1820sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1821 my ($self, $w, $h) = @_;
1419 1822
1420 my $space = $self->{vertical} ? $h : $w; 1823 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1824 my @children = $self->visible_children;
1422 1825
1423 my @req; 1826 my @req;
1424 1827
1425 if ($self->{homogeneous}) { 1828 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1829 @req = ($space / (@children || 1)) x @children;
1427 } else { 1830 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1831 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1832 my $req = List::Util::sum @req;
1430 1833
1431 if ($req > $space) { 1834 if ($req > $space) {
1432 # ah well, not enough space 1835 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1836 $_ *= $space / $req for @req;
1434 } else { 1837 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1838 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1839
1437 $space = ($space - $req) / $expand; # remaining space to give away 1840 $space = ($space - $req) / $expand; # remaining space to give away
1438 1841
1439 $req[$_] += $space * $children->[$_]{expand} 1842 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1843 for 0 .. $#children;
1441 } 1844 }
1442 } 1845 }
1443 1846
1444 CFClient::UI::harmonize \@req; 1847 CFPlus::UI::harmonize \@req;
1445 1848
1446 my $pos = 0; 1849 my $pos = 0;
1447 for (0 .. $#$children) { 1850 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1851 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1852 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1853
1451 $pos += $alloc; 1854 $pos += $alloc;
1452 } 1855 }
1453 1856
1454 1 1857 1
1455} 1858}
1456 1859
1457############################################################################# 1860#############################################################################
1458 1861
1459package CFClient::UI::HBox; 1862package CFPlus::UI::HBox;
1460 1863
1461our @ISA = CFClient::UI::Box::; 1864our @ISA = CFPlus::UI::Box::;
1462 1865
1463sub new { 1866sub new {
1464 my $class = shift; 1867 my $class = shift;
1465 1868
1466 $class->SUPER::new ( 1869 $class->SUPER::new (
… …
1469 ) 1872 )
1470} 1873}
1471 1874
1472############################################################################# 1875#############################################################################
1473 1876
1474package CFClient::UI::VBox; 1877package CFPlus::UI::VBox;
1475 1878
1476our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1477 1880
1478sub new { 1881sub new {
1479 my $class = shift; 1882 my $class = shift;
1480 1883
1481 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1484 ) 1887 )
1485} 1888}
1486 1889
1487############################################################################# 1890#############################################################################
1488 1891
1489package CFClient::UI::Label; 1892package CFPlus::UI::Label;
1490 1893
1491our @ISA = CFClient::UI::DrawBG::; 1894our @ISA = CFPlus::UI::DrawBG::;
1492 1895
1493use CFClient::OpenGL; 1896use CFPlus::OpenGL;
1494 1897
1495sub new { 1898sub new {
1496 my ($class, %arg) = @_; 1899 my ($class, %arg) = @_;
1497 1900
1498 my $self = $class->SUPER::new ( 1901 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1904 #active_bg => none
1502 #font => default_font 1905 #font => default_font
1503 #text => initial text 1906 #text => initial text
1504 #markup => initial narkup 1907 #markup => initial narkup
1505 #max_w => maximum pixel width 1908 #max_w => maximum pixel width
1909 #style => 0, # render flags
1506 ellipsise => 3, # end 1910 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1911 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1912 fontsize => 1,
1509 align => -1, 1913 align => -1,
1510 valign => -1, 1914 valign => -1,
1511 padding_x => 2, 1915 padding_x => 2,
1512 padding_y => 2, 1916 padding_y => 2,
1513 can_events => 0, 1917 can_events => 0,
1514 %arg 1918 %arg
1515 ); 1919 );
1516 1920
1517 if (exists $self->{template}) { 1921 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1922 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1923 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1924 $self->{template} = $layout;
1521 } 1925 }
1522 1926
1523 if (exists $self->{markup}) { 1927 if (exists $self->{markup}) {
… …
1527 } 1931 }
1528 1932
1529 $self 1933 $self
1530} 1934}
1531 1935
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1936sub update {
1543 my ($self) = @_; 1937 my ($self) = @_;
1544 1938
1545 delete $self->{texture}; 1939 delete $self->{texture};
1546 $self->SUPER::update; 1940 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1951 my ($self, $text) = @_;
1558 1952
1559 return if $self->{text} eq "T$text"; 1953 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1954 $self->{text} = "T$text";
1561 1955
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1956 $self->{layout}->set_text ($text);
1564 1957
1565 delete $self->{size_req}; 1958 delete $self->{size_req};
1566 $self->realloc; 1959 $self->realloc;
1567 $self->update; 1960 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1966 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1967 $self->{text} = "M$markup";
1575 1968
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1969 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1970
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1971 $self->{layout}->set_markup ($markup);
1580 1972
1581 delete $self->{size_req}; 1973 delete $self->{size_req};
1582 $self->realloc; 1974 $self->realloc;
1583 $self->update; 1975 $self->update;
… …
1595 1987
1596 my ($w, $h) = $self->{layout}->size; 1988 my ($w, $h) = $self->{layout}->size;
1597 1989
1598 if (exists $self->{template}) { 1990 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1991 $self->{template}->set_font ($self->{font}) if $self->{font};
1992 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1993 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1994
1602 my ($w2, $h2) = $self->{template}->size; 1995 my ($w2, $h2) = $self->{template}->size;
1603 1996
1604 $w = List::Util::max $w, $w2; 1997 $w = List::Util::max $w, $w2;
… …
1609 }; 2002 };
1610 2003
1611 @{ $self->{size_req} } 2004 @{ $self->{size_req} }
1612} 2005}
1613 2006
2007sub baseline_shift {
2008 $_[0]{layout}->descent
2009}
2010
1614sub size_allocate { 2011sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 2012 my ($self, $w, $h) = @_;
1616 2013
1617 delete $self->{ox}; 2014 delete $self->{ox};
1618 2015
1619 delete $self->{texture} 2016 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2017 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2018
2019 1
1621} 2020}
1622 2021
1623sub set_fontsize { 2022sub set_fontsize {
1624 my ($self, $fontsize) = @_; 2023 my ($self, $fontsize) = @_;
1625 2024
1626 $self->{fontsize} = $fontsize; 2025 $self->{fontsize} = $fontsize;
2026 delete $self->{size_req};
1627 delete $self->{texture}; 2027 delete $self->{texture};
1628 2028
1629 $self->realloc; 2029 $self->realloc;
1630} 2030}
1631 2031
1632sub reconfigure { 2032sub reconfigure {
1633 my ($self) = @_; 2033 my ($self) = @_;
1634 2034
1635 delete $self->{size_req}; 2035 delete $self->{size_req};
2036 delete $self->{texture};
1636 2037
1637 $self->SUPER::reconfigure; 2038 $self->SUPER::reconfigure;
1638} 2039}
1639 2040
1640sub _draw { 2041sub _draw {
1641 my ($self) = @_; 2042 my ($self) = @_;
1642 2043
1643 $self->SUPER::_draw; # draw background, if applicable 2044 $self->SUPER::_draw; # draw background, if applicable
1644 2045
1645 my $tex = $self->{texture} ||= do { 2046 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 2047 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2048 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 2049 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2050 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2051 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2052 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 2053
1653 new_from_layout CFClient::Texture $self->{layout} 2054 [$self->{layout}->size]
1654 }; 2055 };
1655 2056
1656 unless (exists $self->{ox}) { 2057 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2058 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2059 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 2060 : ($self->{w} - $size->[0]) * 0.5);
1660 2061
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2062 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2063 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 2064 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 2065 };
1665 2066
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2067 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2068 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 2069
1671 if ($tex->{format} == GL_ALPHA) { 2070 $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} 2071}
1682 2072
1683############################################################################# 2073#############################################################################
1684 2074
1685package CFClient::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
1686 2076
1687our @ISA = CFClient::UI::Label::; 2077our @ISA = CFPlus::UI::Label::;
1688 2078
1689use CFClient::OpenGL; 2079use CFPlus::OpenGL;
1690 2080
1691sub new { 2081sub new {
1692 my $class = shift; 2082 my $class = shift;
1693 2083
1694 $class->SUPER::new ( 2084 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 2088 active_fg => [0, 0, 0],
1699 can_hover => 1, 2089 can_hover => 1,
1700 can_focus => 1, 2090 can_focus => 1,
1701 valign => 0, 2091 valign => 0,
1702 can_events => 1, 2092 can_events => 1,
2093 ellipsise => 0,
1703 #text => ... 2094 #text => ...
1704 #hidden => "*", 2095 #hidden => "*",
1705 @_ 2096 @_
1706 ) 2097 )
1707} 2098}
… …
1718 2109
1719 $text =~ s/./*/g if $self->{hidden}; 2110 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 2111 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 2112 delete $self->{size_req};
1722 2113
1723 $self->_emit (changed => $self->{text}); 2114 $self->emit (changed => $self->{text});
1724 2115
1725 $self->realloc; 2116 $self->realloc;
1726 $self->update; 2117 $self->update;
1727} 2118}
1728 2119
… …
1743 my ($w, $h) = $self->SUPER::size_request; 2134 my ($w, $h) = $self->SUPER::size_request;
1744 2135
1745 ($w + 1, $h) # add 1 for cursor 2136 ($w + 1, $h) # add 1 for cursor
1746} 2137}
1747 2138
1748sub key_down { 2139sub invoke_key_down {
1749 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1750 2141
1751 my $mod = $ev->{mod}; 2142 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 2143 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 2144 my $uni = $ev->{unicode};
1754 2145
1755 my $text = $self->get_text; 2146 my $text = $self->get_text;
2147
2148 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756 2149
1757 if ($uni == 8) { 2150 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2151 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 2152 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 2153 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 2154 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 2155 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 2156 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2157 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 2158 } elsif ($sym == CFPlus::SDLK_HOME) {
2159 # what a hack
2160 $self->{cursor} =
2161 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2162 ? length $1
2163 : 0;
2164 } elsif ($sym == CFPlus::SDLK_END) {
2165 # uh, again
2166 $self->{cursor} =
2167 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2168 ? $self->{cursor} + length $1
2169 : length $self->{text};
2170 } elsif ($uni == 21) { # ctrl-u
2171 $text = "";
1766 $self->{cursor} = 0; 2172 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 2173 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 2174 $self->emit ('escape');
1771 } elsif ($uni) { 2175 } elsif ($uni == 0x0d) {
2176 substr $text, $self->{cursor}++, 0, "\012";
2177 } elsif ($uni >= 0x20) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 2178 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 2179 } else {
1774 return 0; 2180 return 0;
1775 } 2181 }
1776 2182
1777 $self->_set_text ($text); 2183 $self->_set_text ($text);
1778 2184
1779 $self->realloc; 2185 $self->realloc;
2186 $self->update;
1780 2187
1781 1 2188 1
1782} 2189}
1783 2190
1784sub focus_in { 2191sub invoke_focus_in {
1785 my ($self) = @_; 2192 my ($self) = @_;
1786 2193
1787 $self->{last_activity} = $::NOW; 2194 $self->{last_activity} = $::NOW;
1788 2195
1789 $self->SUPER::focus_in; 2196 $self->SUPER::invoke_focus_in
1790} 2197}
1791 2198
1792sub button_down { 2199sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2200 my ($self, $ev, $x, $y) = @_;
1794 2201
1795 $self->SUPER::button_down ($ev, $x, $y); 2202 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2203
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2204 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2205
1799 # byte-index to char-index 2206 # byte-index to char-index
1800 my $text = $self->{text}; 2207 my $text = $self->{text};
1801 utf8::encode $text; 2208 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2209 $self->{cursor} = length $text;
1803 2210
1804 $self->_set_text ($self->{text}); 2211 $self->_set_text ($self->{text});
1805 $self->update; 2212 $self->update;
1806 2213
1807 1 2214 1
1808} 2215}
1809 2216
1810sub mouse_motion { 2217sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2218 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2219# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 2220
1814 0 2221 1
1815} 2222}
1816 2223
1817sub _draw { 2224sub _draw {
1818 my ($self) = @_; 2225 my ($self) = @_;
1819 2226
… …
1846 utf8::encode $text; 2253 utf8::encode $text;
1847 2254
1848 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849 } 2256 }
1850 2257
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2258 glBegin GL_LINES;
1853 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 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}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 2261 glEnd;
1856 } 2262 }
1857} 2263}
1858 2264
2265#############################################################################
2266
1859package CFClient::UI::Entry; 2267package CFPlus::UI::Entry;
1860 2268
1861our @ISA = CFClient::UI::EntryBase::; 2269our @ISA = CFPlus::UI::EntryBase::;
1862 2270
1863use CFClient::OpenGL; 2271use CFPlus::OpenGL;
1864 2272
1865sub key_down { 2273sub invoke_key_down {
1866 my ($self, $ev) = @_; 2274 my ($self, $ev) = @_;
1867 2275
1868 my $sym = $ev->{sym}; 2276 my $sym = $ev->{sym};
1869 2277
1870 if ($sym == 13) { 2278 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2279 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2280 my $txt = $self->get_text;
2281
1873 $self->{history_pointer} = -1; 2282 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2283 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2284 $self->emit (activate => $txt);
1876 $self->update; 2285 $self->update;
1877 2286
1878 } elsif ($sym == CFClient::SDLK_UP) { 2287 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2288 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2289 $self->{history_saveback} = $self->get_text;
1881 } 2290 }
1882 if (@{$self->{history} || []} > 0) { 2291 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2292 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2294 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2295 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2296 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2297 }
1889 2298
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2299 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2300 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2301 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2302
1894 if ($self->{history_pointer} >= 0) { 2303 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2304 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2305 } else {
1897 $self->set_text ($self->{history_saveback}); 2306 $self->set_text ($self->{history_saveback});
1898 } 2307 }
1899 2308
1900 } else { 2309 } else {
1901 return $self->SUPER::key_down ($ev) 2310 return $self->SUPER::invoke_key_down ($ev)
1902 } 2311 }
1903 2312
1904 1 2313 1
1905} 2314}
1906 2315
1907############################################################################# 2316#############################################################################
1908 2317
2318package CFPlus::UI::TextEdit;
2319
2320our @ISA = CFPlus::UI::EntryBase::;
2321
2322use CFPlus::OpenGL;
2323
2324sub move_cursor_ver {
2325 my ($self, $dy) = @_;
2326
2327 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2328
2329 $y += $dy;
2330
2331 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2332 $self->{cursor} = $index;
2333 delete $self->{cur_h};
2334 $self->update;
2335 return;
2336 }
2337}
2338
2339sub invoke_key_down {
2340 my ($self, $ev) = @_;
2341
2342 my $sym = $ev->{sym};
2343
2344 if ($sym == CFPlus::SDLK_UP) {
2345 $self->move_cursor_ver (-1);
2346 } elsif ($sym == CFPlus::SDLK_DOWN) {
2347 $self->move_cursor_ver (+1);
2348 } else {
2349 return $self->SUPER::invoke_key_down ($ev)
2350 }
2351
2352 1
2353}
2354
2355#############################################################################
2356
1909package CFClient::UI::Button; 2357package CFPlus::UI::Button;
1910 2358
1911our @ISA = CFClient::UI::Label::; 2359our @ISA = CFPlus::UI::Label::;
1912 2360
1913use CFClient::OpenGL; 2361use CFPlus::OpenGL;
1914 2362
1915my @tex = 2363my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2365 qw(b1_button_inactive.png b1_button_active.png);
1918 2366
1919sub new { 2367sub new {
1920 my $class = shift; 2368 my $class = shift;
1921 2369
1922 $class->SUPER::new ( 2370 $class->SUPER::new (
1923 padding_x => 4, 2371 padding_x => 4,
1924 padding_y => 4, 2372 padding_y => 4,
1925 fg => [1, 1, 1], 2373 fg => [1.0, 1.0, 1.0],
1926 active_fg => [0, 0, 1], 2374 active_fg => [0.8, 0.8, 0.8],
1927 can_hover => 1, 2375 can_hover => 1,
1928 align => 0, 2376 align => 0,
1929 valign => 0, 2377 valign => 0,
1930 can_events => 1, 2378 can_events => 1,
1931 @_ 2379 @_
1932 ) 2380 )
1933} 2381}
1934 2382
1935sub activate { }
1936
1937sub button_up { 2383sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2384 my ($self, $ev, $x, $y) = @_;
1939 2385
1940 $self->emit ("activate") 2386 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2387 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2388 && $y >= 0 && $y < $self->{h};
… …
1951 2397
1952 glEnable GL_TEXTURE_2D; 2398 glEnable GL_TEXTURE_2D;
1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2399 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954 glColor 0, 0, 0, 1; 2400 glColor 0, 0, 0, 1;
1955 2401
2402 my $tex = $tex[$GRAB == $self];
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2403 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 2404
1958 glDisable GL_TEXTURE_2D; 2405 glDisable GL_TEXTURE_2D;
1959 2406
1960 $self->SUPER::_draw; 2407 $self->SUPER::_draw;
1961} 2408}
1962 2409
1963############################################################################# 2410#############################################################################
1964 2411
1965package CFClient::UI::CheckBox; 2412package CFPlus::UI::CheckBox;
1966 2413
1967our @ISA = CFClient::UI::DrawBG::; 2414our @ISA = CFPlus::UI::DrawBG::;
1968 2415
1969my @tex = 2416my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2417 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2418 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2419
1973use CFClient::OpenGL; 2420use CFPlus::OpenGL;
1974 2421
1975sub new { 2422sub new {
1976 my $class = shift; 2423 my $class = shift;
1977 2424
1978 $class->SUPER::new ( 2425 $class->SUPER::new (
… …
1992 my ($self) = @_; 2439 my ($self) = @_;
1993 2440
1994 (6) x 2 2441 (6) x 2
1995} 2442}
1996 2443
2444sub toggle {
2445 my ($self) = @_;
2446
2447 $self->{state} = !$self->{state};
2448 $self->emit (changed => $self->{state});
2449 $self->update;
2450}
2451
1997sub button_down { 2452sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2453 my ($self, $ev, $x, $y) = @_;
1999 2454
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2455 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2456 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2457 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2458 } else {
2005 return 0 2459 return 0
2006 } 2460 }
2007 2461
2008 1 2462 1
… …
2028 glDisable GL_TEXTURE_2D; 2482 glDisable GL_TEXTURE_2D;
2029} 2483}
2030 2484
2031############################################################################# 2485#############################################################################
2032 2486
2033package CFClient::UI::Image; 2487package CFPlus::UI::Image;
2034 2488
2035our @ISA = CFClient::UI::Base::; 2489our @ISA = CFPlus::UI::Base::;
2036 2490
2037use CFClient::OpenGL; 2491use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2492
2040our %loaded_images; 2493our %texture_cache;
2041 2494
2042sub new { 2495sub new {
2043 my $class = shift; 2496 my $class = shift;
2044 2497
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2498 my $self = $class->SUPER::new (
2499 can_events => 0,
2500 @_,
2501 );
2046 2502
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2503 $self->{path} || $self->{tex}
2504 or Carp::croak "'path' or 'tex' attributes required";
2048 2505
2049 $loaded_images{$self->{image}} ||= 2506 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2507 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2508
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2509 CFPlus::weaken $texture_cache{$self->{path}};
2053 2510
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2511 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2512
2058 $self 2513 $self
2059} 2514}
2060 2515
2516sub STORABLE_freeze {
2517 my ($self, $cloning) = @_;
2518
2519 $self->{path}
2520 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2521
2522 $self->{path}
2523}
2524
2525sub STORABLE_attach {
2526 my ($self, $cloning, $path) = @_;
2527
2528 $self->new (path => $path)
2529}
2530
2061sub size_request { 2531sub size_request {
2062 my ($self) = @_; 2532 my ($self) = @_;
2063 2533
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2534 ($self->{tex}{w}, $self->{tex}{h})
2065} 2535}
2066 2536
2067sub _draw { 2537sub _draw {
2068 my ($self) = @_; 2538 my ($self) = @_;
2069 2539
… …
2079 } 2549 }
2080 2550
2081 glEnable GL_TEXTURE_2D; 2551 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2553
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2554 $tex->draw_quad (0, 0, $w, $h);
2085 2555
2086 glDisable GL_TEXTURE_2D; 2556 glDisable GL_TEXTURE_2D;
2087} 2557}
2088 2558
2089############################################################################# 2559#############################################################################
2090 2560
2561package CFPlus::UI::ImageButton;
2562
2563our @ISA = CFPlus::UI::Image::;
2564
2565use CFPlus::OpenGL;
2566
2567my %textures;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 padding_x => 4,
2574 padding_y => 4,
2575 fg => [1, 1, 1],
2576 active_fg => [0, 0, 1],
2577 can_hover => 1,
2578 align => 0,
2579 valign => 0,
2580 can_events => 1,
2581 @_
2582 );
2583}
2584
2585sub invoke_button_up {
2586 my ($self, $ev, $x, $y) = @_;
2587
2588 $self->emit ("activate")
2589 if $x >= 0 && $x < $self->{w}
2590 && $y >= 0 && $y < $self->{h};
2591
2592 1
2593}
2594
2595#############################################################################
2596
2091package CFClient::UI::VGauge; 2597package CFPlus::UI::VGauge;
2092 2598
2093our @ISA = CFClient::UI::Base::; 2599our @ISA = CFPlus::UI::Base::;
2094 2600
2095use List::Util qw(min max); 2601use List::Util qw(min max);
2096 2602
2097use CFClient::OpenGL; 2603use CFPlus::OpenGL;
2098 2604
2099my %tex = ( 2605my %tex = (
2100 food => [ 2606 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2607 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2608 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2609 ],
2104 grace => [ 2610 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2611 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/ 2612 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2613 ],
2108 hp => [ 2614 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2615 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2616 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2617 ],
2112 mana => [ 2618 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2619 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/ 2620 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2621 ],
2116); 2622);
2117 2623
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2624# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2684 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2685 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2686
2181 my $h1 = $self->{h} * (1 - $ycut1); 2687 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2688 my $h2 = $self->{h} * (1 - $ycut2);
2689 my $h3 = $self->{h};
2690
2691 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2692
2184 glEnable GL_BLEND; 2693 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2694 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2695 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2696 glEnable GL_TEXTURE_2D;
… …
2206 2715
2207 if ($t3) { 2716 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2717 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2718 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2719 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2720 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2721 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2722 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2723 glEnd;
2215 } 2724 }
2216 2725
2217 glDisable GL_BLEND; 2726 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2727 glDisable GL_TEXTURE_2D;
2219} 2728}
2220 2729
2221############################################################################# 2730#############################################################################
2222 2731
2223package CFClient::UI::Gauge; 2732package CFPlus::UI::Gauge;
2224 2733
2225our @ISA = CFClient::UI::VBox::; 2734our @ISA = CFPlus::UI::VBox::;
2226 2735
2227sub new { 2736sub new {
2228 my ($class, %arg) = @_; 2737 my ($class, %arg) = @_;
2229 2738
2230 my $self = $class->SUPER::new ( 2739 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2741 can_hover => 1,
2233 can_events => 1, 2742 can_events => 1,
2234 %arg, 2743 %arg,
2235 ); 2744 );
2236 2745
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2746 $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); 2747 $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"); 2748 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2749
2241 $self 2750 $self
2242} 2751}
2243 2752
2244sub set_fontsize { 2753sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2774 $self->{value}->set_text ($val);
2266} 2775}
2267 2776
2268############################################################################# 2777#############################################################################
2269 2778
2270package CFClient::UI::Slider; 2779package CFPlus::UI::Slider;
2271 2780
2272use strict; 2781use strict;
2273 2782
2274use CFClient::OpenGL; 2783use CFPlus::OpenGL;
2275 2784
2276our @ISA = CFClient::UI::DrawBG::; 2785our @ISA = CFPlus::UI::DrawBG::;
2277 2786
2278my @tex = 2787my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2788 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2789 qw(s1_slider.png s1_slider_bg.png);
2281 2790
2282sub new { 2791sub new {
2283 my $class = shift; 2792 my $class = shift;
2284 2793
… …
2305 $self->update; 2814 $self->update;
2306 2815
2307 $self 2816 $self
2308} 2817}
2309 2818
2310sub changed { }
2311
2312sub set_range { 2819sub set_range {
2313 my ($self, $range) = @_; 2820 my ($self, $range) = @_;
2314 2821
2315 ($range, $self->{range}) = ($self->{range}, $range); 2822 ($range, $self->{range}) = ($self->{range}, $range);
2316 2823
… …
2336 if $unit; 2843 if $unit;
2337 2844
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2845 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2846
2340 if ($value != $old_value) { 2847 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2848 $self->emit (changed => $value);
2342 $self->update; 2849 $self->update;
2343 } 2850 }
2344} 2851}
2345 2852
2346sub size_request { 2853sub size_request {
2347 my ($self) = @_; 2854 my ($self) = @_;
2348 2855
2349 ($self->{req_w}, $self->{req_h}) 2856 ($self->{req_w}, $self->{req_h})
2350} 2857}
2351 2858
2352sub button_down { 2859sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2860 my ($self, $ev, $x, $y) = @_;
2354 2861
2355 $self->SUPER::button_down ($ev, $x, $y); 2862 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2863
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2864 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2865
2359 $self->mouse_motion ($ev, $x, $y) 2866 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2867}
2361 2868
2362sub mouse_motion { 2869sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2870 my ($self, $ev, $x, $y) = @_;
2364 2871
2365 if ($GRAB == $self) { 2872 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2873 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2874
… …
2373 } else { 2880 } else {
2374 return 0; 2881 return 0;
2375 } 2882 }
2376 2883
2377 1 2884 1
2885}
2886
2887sub invoke_mouse_wheel {
2888 my ($self, $ev) = @_;
2889
2890 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2891
2892 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2893
2894 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2895
2896 ! ! $delta
2378} 2897}
2379 2898
2380sub update { 2899sub update {
2381 my ($self) = @_; 2900 my ($self) = @_;
2382 2901
… …
2431 glDisable GL_TEXTURE_2D; 2950 glDisable GL_TEXTURE_2D;
2432} 2951}
2433 2952
2434############################################################################# 2953#############################################################################
2435 2954
2436package CFClient::UI::ValSlider; 2955package CFPlus::UI::ValSlider;
2437 2956
2438our @ISA = CFClient::UI::HBox::; 2957our @ISA = CFPlus::UI::HBox::;
2439 2958
2440sub new { 2959sub new {
2441 my ($class, %arg) = @_; 2960 my ($class, %arg) = @_;
2442 2961
2443 my $range = delete $arg{range}; 2962 my $range = delete $arg{range};
2444 2963
2445 my $self = $class->SUPER::new ( 2964 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2965 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2966 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2967 to_value => sub { shift },
2449 from_value => sub { shift }, 2968 from_value => sub { shift },
2450 %arg, 2969 %arg,
2451 ); 2970 );
2452 2971
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2991sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2992sub set_value { shift->{slider}->set_value (@_) }
2474 2993
2475############################################################################# 2994#############################################################################
2476 2995
2477package CFClient::UI::TextScroller; 2996package CFPlus::UI::TextScroller;
2478 2997
2479our @ISA = CFClient::UI::HBox::; 2998our @ISA = CFPlus::UI::HBox::;
2480 2999
2481use CFClient::OpenGL; 3000use CFPlus::OpenGL;
2482 3001
2483sub new { 3002sub new {
2484 my $class = shift; 3003 my $class = shift;
2485 3004
2486 my $self = $class->SUPER::new ( 3005 my $self = $class->SUPER::new (
2487 fontsize => 1, 3006 fontsize => 1,
2488 can_events => 0, 3007 can_events => 1,
2489 indent => 0, 3008 indent => 0,
2490 #font => default_font 3009 #font => default_font
2491 @_, 3010 @_,
2492 3011
2493 layout => (new CFClient::Layout 1), 3012 layout => (new CFPlus::Layout),
2494 par => [], 3013 par => [],
3014 max_par => 0,
2495 height => 0, 3015 height => 0,
2496 children => [ 3016 children => [
2497 (new CFClient::UI::Empty expand => 1), 3017 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 3018 (new CFPlus::UI::Slider vertical => 1),
2499 ], 3019 ],
2500 ); 3020 );
2501 3021
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 3022 $self->{children}[1]->connect (changed => sub { $self->update });
2503 3023
… …
2509 3029
2510 $self->{fontsize} = $fontsize; 3030 $self->{fontsize} = $fontsize;
2511 $self->reflow; 3031 $self->reflow;
2512} 3032}
2513 3033
3034sub size_request {
3035 my ($self) = @_;
3036
3037 my ($empty, $slider) = @{ $self->{children} };
3038
3039 local $self->{children} = [$empty, $slider];
3040 $self->SUPER::size_request
3041}
3042
2514sub size_allocate { 3043sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 3044 my ($self, $w, $h) = @_;
2516 3045
2517 $self->SUPER::size_allocate ($w, $h); 3046 my ($empty, $slider, @other) = @{ $self->{children} };
3047 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 3048
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3049 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3050 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 3051 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3052 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 3053
2524 $self->reflow; 3054 $self->reflow;
2525}
2526 3055
2527sub text_size { 3056 local $self->{children} = [$empty, $slider];
3057 $self->SUPER::invoke_size_allocate ($w, $h)
3058}
3059
3060sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 3061 my ($self, $ev) = @_;
3062
3063 return 0 unless $ev->{dy}; # only vertical movements
3064
3065 $self->{children}[1]->emit (mouse_wheel => $ev);
3066
3067 1
3068}
3069
3070sub get_layout {
3071 my ($self, $para) = @_;
2529 3072
2530 my $layout = $self->{layout}; 3073 my $layout = $self->{layout};
2531 3074
3075 $layout->set_font ($self->{font}) if $self->{font};
3076 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3077 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 3078 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3079 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 3080 $layout->set_markup ($para->{markup});
3081
3082 $layout->set_shapes (
3083 map
3084 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3085 @{$para->{widget}}
2536 3086 );
3087
2537 $layout->size 3088 $layout
2538} 3089}
2539 3090
2540sub reflow { 3091sub reflow {
2541 my ($self) = @_; 3092 my ($self) = @_;
2542 3093
… …
2549 3100
2550 # todo: base offset on lines or so, not on pixels 3101 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 3102 $self->{children}[1]->set_value ($offset);
2552} 3103}
2553 3104
3105sub current_paragraph {
3106 my ($self) = @_;
3107
3108 $self->{top_paragraph} - 1
3109}
3110
3111sub scroll_to {
3112 my ($self, $para) = @_;
3113
3114 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3115
3116 $self->{scroll_to} = $para;
3117 $self->update;
3118}
3119
2554sub clear { 3120sub clear {
2555 my ($self) = @_; 3121 my ($self) = @_;
3122
3123 my (undef, undef, @other) = @{ $self->{children} };
3124 $self->remove ($_) for @other;
2556 3125
2557 $self->{par} = []; 3126 $self->{par} = [];
2558 $self->{height} = 0; 3127 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3128 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 3129}
2561 3130
2562sub add_paragraph { 3131sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 3132 my $self = shift;
2564 3133
2565 for my $line (split /\n/, $text) { 3134 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 3135 $para = {
3136 fg => [1, 1, 1, 1],
3137 indent => 0,
3138 markup => "",
3139 widget => [],
3140 ref $para ? %$para : (markup => $para),
3141 w => 1e10,
3142 wrapped => 1,
3143 };
3144
3145 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3146 push @{$self->{par}}, $para;
3147 }
3148
3149 if (my $max = $self->{max_par}) {
3150 shift @{$self->{par}} while @{$self->{par}} > $max;
3151 }
3152
3153 $self->{need_reflow}++;
3154 $self->update;
3155}
3156
3157sub scroll_to_bottom {
3158 my ($self) = @_;
3159
3160 $self->{scroll_to} = $#{$self->{par}};
3161 $self->update;
3162}
3163
3164sub force_uptodate {
3165 my ($self) = @_;
3166
3167 if (delete $self->{need_reflow}) {
3168 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3169
3170 my $height = 0;
3171
3172 for my $para (@{$self->{par}}) {
3173 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3174 my $layout = $self->get_layout ($para);
3175 my ($w, $h) = $layout->size;
3176
3177 $para->{w} = $w + $para->{indent};
3178 $para->{h} = $h;
3179 $para->{wrapped} = $layout->has_wrapped;
3180 }
3181
3182 $para->{y} = $height;
3183 $height += $para->{h};
3184 }
3185
2567 $self->{height} += $h; 3186 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3187 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 3188
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3189 delete $self->{texture};
3190 }
3191
3192 if (my $paridx = delete $self->{scroll_to}) {
3193 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3194 }
2572} 3195}
2573 3196
2574sub update { 3197sub update {
2575 my ($self) = @_; 3198 my ($self) = @_;
2576 3199
… …
2579 return unless $self->{h} > 0; 3202 return unless $self->{h} > 0;
2580 3203
2581 delete $self->{texture}; 3204 delete $self->{texture};
2582 3205
2583 $ROOT->on_post_alloc ($self => sub { 3206 $ROOT->on_post_alloc ($self => sub {
3207 $self->force_uptodate;
3208
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3209 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3210
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 { 3211 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3212 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3213 glClear GL_COLOR_BUFFER_BIT;
2616 3214
3215 package CFPlus::UI::Base;
3216 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3217 (0, 0, $self->{w}, $self->{h});
3218
3219 my $top = int $self->{children}[1]{range}[0];
3220
3221 my $paridx = 0;
3222 my $top_paragraph;
2617 my $top = int $self->{children}[1]{range}[0]; 3223 my $top = int $self->{children}[1]{range}[0];
2618 3224
2619 my $y0 = $top; 3225 my $y0 = $top;
2620 my $y1 = $top + $H; 3226 my $y1 = $top + $H;
2621 3227
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}}) { 3228 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3229 my $h = $para->{h};
3230 my $y = $para->{y};
2634 3231
2635 if ($y0 < $y + $h && $y < $y1) { 3232 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3233 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 3234
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3235 $layout->render ($para->{indent}, $y - $y0);
2642 3236
2643 glRasterPos $par->[3], $y - $y0; 3237 if (my @w = @{ $para->{widget} }) {
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3238 my @s = $layout->get_shapes;
3239
3240 for (@w) {
3241 my ($dx, $dy) = splice @s, 0, 2, ();
3242
3243 $_->{x} = $dx + $para->{indent};
3244 $_->{y} = $dy + $y - $y0;
3245
3246 $_->draw;
3247 }
3248 }
2645 } 3249 }
2646 3250
2647 $y += $h; 3251 $paridx++;
3252 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3253 }
2649 3254
2650 glDisable GL_BLEND; 3255 $self->{top_paragraph} = $top_paragraph;
2651 }; 3256 };
2652 }); 3257 });
3258}
3259
3260sub reconfigure {
3261 my ($self) = @_;
3262
3263 $self->SUPER::reconfigure;
3264
3265 $_->{w} = 1e10 for @{ $self->{par} };
3266 $self->reflow;
2653} 3267}
2654 3268
2655sub _draw { 3269sub _draw {
2656 my ($self) = @_; 3270 my ($self) = @_;
2657 3271
… …
2660 glColor 0, 0, 0, 1; 3274 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3275 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 3276 glDisable GL_TEXTURE_2D;
2663 3277
2664 $self->{children}[1]->draw; 3278 $self->{children}[1]->draw;
2665
2666} 3279}
2667 3280
2668############################################################################# 3281#############################################################################
2669 3282
2670package CFClient::UI::Animator; 3283package CFPlus::UI::Animator;
2671 3284
2672use CFClient::OpenGL; 3285use CFPlus::OpenGL;
2673 3286
2674our @ISA = CFClient::UI::Bin::; 3287our @ISA = CFPlus::UI::Bin::;
2675 3288
2676sub moveto { 3289sub moveto {
2677 my ($self, $x, $y) = @_; 3290 my ($self, $x, $y) = @_;
2678 3291
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3292 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3320 glPopMatrix;
2708} 3321}
2709 3322
2710############################################################################# 3323#############################################################################
2711 3324
2712package CFClient::UI::Flopper; 3325package CFPlus::UI::Flopper;
2713 3326
2714our @ISA = CFClient::UI::Button::; 3327our @ISA = CFPlus::UI::Button::;
2715 3328
2716sub new { 3329sub new {
2717 my $class = shift; 3330 my $class = shift;
2718 3331
2719 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3344 $self->{other}->toggle_visibility;
2732} 3345}
2733 3346
2734############################################################################# 3347#############################################################################
2735 3348
2736package CFClient::UI::Tooltip; 3349package CFPlus::UI::Tooltip;
2737 3350
2738our @ISA = CFClient::UI::Bin::; 3351our @ISA = CFPlus::UI::Bin::;
2739 3352
2740use CFClient::OpenGL; 3353use CFPlus::OpenGL;
2741 3354
2742sub new { 3355sub new {
2743 my $class = shift; 3356 my $class = shift;
2744 3357
2745 $class->SUPER::new ( 3358 $class->SUPER::new (
… …
2748 ) 3361 )
2749} 3362}
2750 3363
2751sub set_tooltip_from { 3364sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3365 my ($self, $widget) = @_;
3366
3367 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3368 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3369
2754 my $tooltip = $widget->{tooltip}; 3370 my $tooltip = $widget->{tooltip};
2755 3371
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3372 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3373 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3377 }
2762 3378
2763 $tooltip =~ s/^\n+//; 3379 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3380 $tooltip =~ s/\n+$//;
2765 3381
2766 $self->add (new CFClient::UI::Label 3382 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3383 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3384 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3385 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3386 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3387 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3388 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3389 );
2774} 3390}
2775 3391
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3395 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3396
2781 ($w + 4, $h + 4) 3397 ($w + 4, $h + 4)
2782} 3398}
2783 3399
2784sub size_allocate { 3400sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3401 my ($self, $w, $h) = @_;
2786 3402
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3403 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3404}
2789 3405
2790sub visibility_change { 3406sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3407 my ($self, $visible) = @_;
2792 3408
2793 return unless $visible; 3409 return unless $visible;
2794 3410
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3411 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3412 my $widget = $self->{owner}
2797 or return; 3413 or return;
2798 3414
3415 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3416 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3417
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3418 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3419 if $x + $self->{w} > $self->{root}{w};
2803 3420
2804 $self->move_abs ($x, $y); 3421 $self->move_abs ($x, $y);
3422 } else {
3423 $self->hide;
3424 }
2805 }); 3425 });
2806} 3426}
2807 3427
2808sub _draw { 3428sub _draw {
2809 my ($self) = @_; 3429 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3453 $self->SUPER::_draw;
2834} 3454}
2835 3455
2836############################################################################# 3456#############################################################################
2837 3457
2838package CFClient::UI::Face; 3458package CFPlus::UI::Face;
2839 3459
2840our @ISA = CFClient::UI::Base::; 3460our @ISA = CFPlus::UI::DrawBG::;
2841 3461
2842use CFClient::OpenGL; 3462use CFPlus::OpenGL;
2843 3463
2844sub new { 3464sub new {
2845 my $class = shift; 3465 my $class = shift;
2846 3466
2847 my $self = $class->SUPER::new ( 3467 my $self = $class->SUPER::new (
3468 size_w => 32,
3469 size_h => 8,
2848 aspect => 1, 3470 aspect => 1,
2849 can_events => 0, 3471 can_events => 0,
2850 @_, 3472 @_,
2851 ); 3473 );
2852 3474
2853 if ($self->{anim} && $self->{animspeed}) { 3475 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3476 CFPlus::weaken (my $widget = $self);
2855 3477
3478 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3479 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2856 $self->{timer} = Event->timer ( 3480 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3481 parked => 1,
2859 interval => $self->{animspeed},
2860 cb => sub { 3482 cb => sub {
3483 return unless $::CONN && $widget;
3484
2861 ++$widget->{frame}; 3485 ++$widget->{frame};
3486 $widget->update_face;
2862 $widget->update; 3487 $widget->update;
3488
3489 $widget->update_timer;
2863 }, 3490 },
2864 ); 3491 );
3492
3493 $self->update_face;
3494 $self->update_timer;
2865 } 3495 }
2866 3496
2867 $self 3497 $self
2868} 3498}
2869 3499
3500sub update_timer {
3501 my ($self) = @_;
3502
3503 return unless $self->{timer};
3504
3505 if ($self->{visible}) {
3506 $self->{timer}->at (
3507 $self->{anim_start}
3508 + $self->{animspeed}
3509 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3510 );
3511 $self->{timer}->start;
3512 } else {
3513 $self->{timer}->stop;
3514 }
3515}
3516
3517sub update_face {
3518 my ($self) = @_;
3519
3520 return unless $::CONN;
3521
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) {
3524 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3526 }
3527 }
3528}
3529
2870sub size_request { 3530sub size_request {
2871 (32, 8) 3531 my ($self) = @_;
3532
3533 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) {
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3537 } else {
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3539 $self->realloc;
3540 });
3541 }
3542 }
3543 }
3544
3545 ($self->{size_w} || 8, $self->{size_h} || 8)
2872} 3546}
2873 3547
2874sub update { 3548sub update {
2875 my ($self) = @_; 3549 my ($self) = @_;
2876 3550
2877 return unless $self->{visible}; 3551 return unless $self->{visible};
2878 3552
2879 $self->SUPER::update; 3553 $self->SUPER::update;
2880} 3554}
2881 3555
3556sub invoke_visibility_change {
3557 my ($self) = @_;
3558
3559 $self->update_timer;
3560
3561 0
3562}
3563
2882sub _draw { 3564sub _draw {
2883 my ($self) = @_; 3565 my ($self) = @_;
2884 3566
2885 return unless $::CONN; 3567 return unless $::CONN;
2886 3568
2887 my $face; 3569 $self->SUPER::_draw;
2888 3570
2889 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3571 my $faceid = $::CONN->{faceid}[$self->{face}]
2891 3572 or return;
2892 $face = $anim->[ $self->{frame} % @$anim ]
2893 if $anim && @$anim;
2894 }
2895 3573
2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3574 my $tex = $::CONN->{texture}[$faceid];
2897 3575
2898 if ($tex) { 3576 if ($tex) {
2899 glEnable GL_TEXTURE_2D; 3577 glEnable GL_TEXTURE_2D;
2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3578 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901 glColor 0, 0, 0, 1; 3579 glColor 0, 0, 0, 1;
… …
2905} 3583}
2906 3584
2907sub destroy { 3585sub destroy {
2908 my ($self) = @_; 3586 my ($self) = @_;
2909 3587
2910 $self->{timer}->cancel 3588 (delete $self->{timer})->cancel
2911 if $self->{timer}; 3589 if $self->{timer};
2912 3590
2913 $self->SUPER::destroy; 3591 $self->SUPER::destroy;
2914} 3592}
2915 3593
2916############################################################################# 3594#############################################################################
2917 3595
2918package CFClient::UI::Buttonbar; 3596package CFPlus::UI::Buttonbar;
2919 3597
2920our @ISA = CFClient::UI::HBox::; 3598our @ISA = CFPlus::UI::HBox::;
2921 3599
2922# TODO: should actualyl wrap buttons and other goodies. 3600# TODO: should actually wrap buttons and other goodies.
2923 3601
2924############################################################################# 3602#############################################################################
2925 3603
2926package CFClient::UI::Menu; 3604package CFPlus::UI::Menu;
2927 3605
2928our @ISA = CFClient::UI::FancyFrame::; 3606our @ISA = CFPlus::UI::Toplevel::;
2929 3607
2930use CFClient::OpenGL; 3608use CFPlus::OpenGL;
2931 3609
2932sub new { 3610sub new {
2933 my $class = shift; 3611 my $class = shift;
2934 3612
2935 my $self = $class->SUPER::new ( 3613 my $self = $class->SUPER::new (
2936 items => [], 3614 items => [],
2937 z => 100, 3615 z => 100,
2938 @_, 3616 @_,
2939 ); 3617 );
2940 3618
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3619 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3620
2943 for my $item (@{ $self->{items} }) { 3621 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3622 my ($widget, $cb, $tooltip) = @$item;
2945 3623
2946 # handle various types of items, only text for now 3624 # handle various types of items, only text for now
2947 if (!ref $widget) { 3625 if (!ref $widget) {
3626 if ($widget =~ /\t/) {
3627 my ($left, $right) = split /\t/, $widget, 2;
3628
2948 $widget = new CFClient::UI::Label 3629 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3630 can_hover => 1,
2950 can_events => 1, 3631 can_events => 1,
3632 tooltip => $tooltip,
3633 children => [
3634 (new CFPlus::UI::Label markup => $left, expand => 1),
3635 (new CFPlus::UI::Label markup => $right, align => +1),
3636 ],
3637 ;
3638
3639 } else {
3640 $widget = new CFPlus::UI::Label
3641 can_hover => 1,
3642 can_events => 1,
2951 markup => $widget, 3643 markup => $widget,
2952 tooltip => $tooltip 3644 tooltip => $tooltip;
3645 }
2953 } 3646 }
2954 3647
2955 $self->{item}{$widget} = $item; 3648 $self->{item}{$widget} = $item;
2956 3649
2957 $self->{vbox}->add ($widget); 3650 $self->{vbox}->add ($widget);
… …
2962 3655
2963# popup given the event (must be a mouse button down event currently) 3656# popup given the event (must be a mouse button down event currently)
2964sub popup { 3657sub popup {
2965 my ($self, $ev) = @_; 3658 my ($self, $ev) = @_;
2966 3659
2967 $self->_emit ("popdown"); 3660 $self->emit ("popdown");
2968 3661
2969 # maybe save $GRAB? must be careful about events... 3662 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3663 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3664 $self->{button} = $ev->{button};
2972 3665
2973 $self->show; 3666 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3667 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3668}
2976 3669
2977sub mouse_motion { 3670sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3671 my ($self, $ev, $x, $y) = @_;
2979 3672
2980 # TODO: should use vbox->find_widget or so 3673 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3674 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3675 $self->{hover} = $self->{item}{$HOVER};
2983 3676
2984 0 3677 0
2985} 3678}
2986 3679
2987sub button_up { 3680sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3681 my ($self, $ev, $x, $y) = @_;
2989 3682
2990 if ($ev->{button} == $self->{button}) { 3683 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3684 undef $GRAB;
2992 $self->hide; 3685 $self->hide;
2993 3686
2994 $self->_emit ("popdown"); 3687 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3688 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3689 } else {
2997 return 0 3690 return 0
2998 } 3691 }
2999 3692
3000 1 3693 1
3001} 3694}
3002 3695
3003############################################################################# 3696#############################################################################
3004 3697
3005package CFClient::UI::Multiplexer; 3698package CFPlus::UI::Multiplexer;
3006 3699
3007our @ISA = CFClient::UI::Container::; 3700our @ISA = CFPlus::UI::Container::;
3008 3701
3009sub new { 3702sub new {
3010 my $class = shift; 3703 my $class = shift;
3011 3704
3012 my $self = $class->SUPER::new ( 3705 my $self = $class->SUPER::new (
… …
3026 3719
3027 $self->{current} = $self->{children}[0] 3720 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3721 if @{ $self->{children} };
3029} 3722}
3030 3723
3724sub get_current_page {
3725 my ($self) = @_;
3726
3727 $self->{current}
3728}
3729
3031sub set_current_page { 3730sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3731 my ($self, $page_or_widget) = @_;
3033 3732
3034 my $widget = ref $page_or_widget 3733 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3734 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3735 : $self->{children}[$page_or_widget];
3037 3736
3038 $self->{current} = $widget; 3737 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3738 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3739
3041 $self->_emit (page_changed => $self->{current}); 3740 $self->emit (page_changed => $self->{current});
3042 3741
3043 $self->realloc; 3742 $self->realloc;
3044} 3743}
3045 3744
3046sub visible_children { 3745sub visible_children {
… …
3051 my ($self) = @_; 3750 my ($self) = @_;
3052 3751
3053 $self->{current}->size_request 3752 $self->{current}->size_request
3054} 3753}
3055 3754
3056sub size_allocate { 3755sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3756 my ($self, $w, $h) = @_;
3058 3757
3059 $self->{current}->configure (0, 0, $w, $h); 3758 $self->{current}->configure (0, 0, $w, $h);
3759
3760 1
3060} 3761}
3061 3762
3062sub _draw { 3763sub _draw {
3063 my ($self) = @_; 3764 my ($self) = @_;
3064 3765
3065 $self->{current}->draw; 3766 $self->{current}->draw;
3066} 3767}
3067 3768
3068############################################################################# 3769#############################################################################
3069 3770
3070package CFClient::UI::Notebook; 3771package CFPlus::UI::Notebook;
3071 3772
3072our @ISA = CFClient::UI::VBox::; 3773our @ISA = CFPlus::UI::VBox::;
3073 3774
3074sub new { 3775sub new {
3075 my $class = shift; 3776 my $class = shift;
3076 3777
3077 my $self = $class->SUPER::new ( 3778 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3779 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3780 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3781 # filter => # will be put between multiplexer and $self
3081 @_, 3782 @_,
3082 ); 3783 );
3083 3784
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3785 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3789}
3089 3790
3090sub add { 3791sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3792 my ($self, $title, $widget, $tooltip) = @_;
3092 3793
3093 Scalar::Util::weaken $self; 3794 CFPlus::weaken $self;
3094 3795
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3796 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3797 markup => $title,
3097 tooltip => $tooltip, 3798 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3799 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3800 );
3100 3801
3101 $self->{multiplexer}->add ($widget); 3802 $self->{multiplexer}->add ($widget);
3102} 3803}
3103 3804
3805sub get_current_page {
3806 my ($self) = @_;
3807
3808 $self->{multiplexer}->get_current_page
3809}
3810
3104sub set_current_page { 3811sub set_current_page {
3105 my ($self, $page) = @_; 3812 my ($self, $page) = @_;
3106 3813
3107 $self->{multiplexer}->set_current_page ($page); 3814 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3815 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3816}
3110 3817
3111############################################################################# 3818#############################################################################
3112 3819
3113package CFClient::UI::Combobox; 3820package CFPlus::UI::Selector;
3114 3821
3115use utf8; 3822use utf8;
3116 3823
3117our @ISA = CFClient::UI::Button::; 3824our @ISA = CFPlus::UI::Button::;
3118 3825
3119sub new { 3826sub new {
3120 my $class = shift; 3827 my $class = shift;
3121 3828
3122 my $self = $class->SUPER::new ( 3829 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3835 $self->_set_value ($self->{value});
3129 3836
3130 $self 3837 $self
3131} 3838}
3132 3839
3133sub button_down { 3840sub invoke_button_down {
3134 my ($self, $ev) = @_; 3841 my ($self, $ev) = @_;
3135 3842
3136 my @menu_items; 3843 my @menu_items;
3137 3844
3138 for (@{ $self->{options} }) { 3845 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3846 my ($value, $title, $tooltip) = @$_;
3140 3847
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3848 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3849 }
3143 3850
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3851 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3852}
3146 3853
3147sub _set_value { 3854sub _set_value {
3148 my ($self, $value) = @_; 3855 my ($self, $value) = @_;
3149 3856
… …
3159 my ($self, $value) = @_; 3866 my ($self, $value) = @_;
3160 3867
3161 return unless $self->{value} ne $value; 3868 return unless $self->{value} ne $value;
3162 3869
3163 $self->_set_value ($value); 3870 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3871 $self->emit (changed => $value);
3165} 3872}
3166 3873
3167############################################################################# 3874#############################################################################
3168 3875
3169package CFClient::UI::Statusbox; 3876package CFPlus::UI::Statusbox;
3170 3877
3171our @ISA = CFClient::UI::VBox::; 3878our @ISA = CFPlus::UI::VBox::;
3172 3879
3173sub new { 3880sub new {
3174 my $class = shift; 3881 my $class = shift;
3175 3882
3176 my $self = $class->SUPER::new ( 3883 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3884 fontsize => 0.8,
3178 @_, 3885 @_,
3179 ); 3886 );
3180 3887
3181 Scalar::Util::weaken (my $this = $self); 3888 CFPlus::weaken (my $this = $self);
3182 3889
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3890 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3891
3185 $self 3892 $self
3186} 3893}
… …
3188sub reorder { 3895sub reorder {
3189 my ($self) = @_; 3896 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3897 my $NOW = Time::HiRes::time;
3191 3898
3192 # freeze display when hovering over any label 3899 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3900 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3901 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3902 values %{ $self->{item} };
3196 3903
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3904 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3905 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3906 }
… …
3220 for ($short) { 3927 for ($short) {
3221 s/^\s+//; 3928 s/^\s+//;
3222 s/\s+/ /g; 3929 s/\s+/ /g;
3223 } 3930 }
3224 3931
3225 new CFClient::UI::Label 3932 new CFPlus::UI::Label
3226 markup => $short, 3933 markup => $short,
3227 tooltip => $item->{tooltip}, 3934 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3935 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3936 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3937 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3991 count => 1,
3285 %arg, 3992 %arg,
3286 }; 3993 };
3287 } 3994 }
3288 3995
3996 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3997 $self->reorder;
3998 });
3290} 3999}
3291 4000
3292sub reconfigure { 4001sub reconfigure {
3293 my ($self) = @_; 4002 my ($self) = @_;
3294 4003
… …
3307 $self->SUPER::destroy; 4016 $self->SUPER::destroy;
3308} 4017}
3309 4018
3310############################################################################# 4019#############################################################################
3311 4020
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; 4021package CFPlus::UI::Root;
3674 4022
3675our @ISA = CFClient::UI::Container::; 4023our @ISA = CFPlus::UI::Container::;
3676 4024
3677use List::Util qw(min max); 4025use List::Util qw(min max);
3678 4026
3679use CFClient::OpenGL; 4027use CFPlus::OpenGL;
3680 4028
3681sub new { 4029sub new {
3682 my $class = shift; 4030 my $class = shift;
3683 4031
3684 my $self = $class->SUPER::new ( 4032 my $self = $class->SUPER::new (
3685 visible => 1, 4033 visible => 1,
3686 @_, 4034 @_,
3687 ); 4035 );
3688 4036
3689 Scalar::Util::weaken ($self->{root} = $self); 4037 CFPlus::weaken ($self->{root} = $self);
3690 4038
3691 $self 4039 $self
3692} 4040}
3693 4041
3694sub size_request { 4042sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 4057 $coord = $max - $size if $coord > $max - $size;
3710 4058
3711 int $coord + 0.5 4059 int $coord + 0.5
3712} 4060}
3713 4061
3714sub size_allocate { 4062sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 4063 my ($self, $w, $h) = @_;
3716 4064
3717 for my $child ($self->children) { 4065 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4066 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 4067
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 4071 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 4072 $Y = _to_pixel $Y, $H, $self->{h};
3725 4073
3726 $child->configure ($X, $Y, $W, $H); 4074 $child->configure ($X, $Y, $W, $H);
3727 } 4075 }
4076
4077 1
3728} 4078}
3729 4079
3730sub coord2local { 4080sub coord2local {
3731 my ($self, $x, $y) = @_; 4081 my ($self, $x, $y) = @_;
3732 4082
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4208 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4209
3860 $w = 0 if $w < 0; 4210 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 4211 $h = 0 if $h < 0;
3862 4212
4213 $w = max $widget->{min_w}, $w;
4214 $h = max $widget->{min_h}, $h;
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};
… …
3877 4236
3878 while ($self->{post_alloc_hook}) { 4237 while ($self->{post_alloc_hook}) {
3879 $_->() 4238 $_->()
3880 for values %{delete $self->{post_alloc_hook}}; 4239 for values %{delete $self->{post_alloc_hook}};
3881 } 4240 }
3882
3883 4241
3884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4242 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4243 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3886 glClear GL_COLOR_BUFFER_BIT; 4244 glClear GL_COLOR_BUFFER_BIT;
3887 4245
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4248 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4249 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4250 glLoadIdentity;
3893 4251
3894 { 4252 {
3895 package CFClient::UI::Base; 4253 package CFPlus::UI::Base;
3896 4254
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4255 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4256 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4257
3901 $self->_draw; 4258 $self->_draw;
4259 }
3902} 4260}
3903 4261
3904############################################################################# 4262#############################################################################
3905 4263
3906package CFClient::UI; 4264package CFPlus::UI;
3907 4265
3908$ROOT = new CFClient::UI::Root; 4266$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4267$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4268
39111 42691
3912 4270

Diff Legend

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