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

Diff Legend

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