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

Diff Legend

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