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.305 by root, Sun Jun 18 17:13:12 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC

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

Diff Legend

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