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

Diff Legend

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