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.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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