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

Diff Legend

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