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.289 by root, Mon Jun 5 21:43:56 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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