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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.343 by root, Sun Aug 13 15:14:17 2006 UTC

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

Diff Legend

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