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.395 by root, Sat Jul 21 13:56:00 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
1139sub invoke_mouse_wheel {
998 my ($self) = @_; 1140 my ($self, $ev) = @_;
999 1141
1000 $self->SUPER::update; 1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1001 1144
1002 # todo: overwrite size_allocate of child 1145 $self->{hslider}->emit (mouse_wheel => $ev)
1003 my $child = $self->{vp}->child; 1146 if $ev->{dx};
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006 1147
1148 1
1149}
1150
1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_;
1153
1154 if ($ev->{button} == 2) {
1155 $self->grab_focus;
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1;
1168 }
1169
1170 0
1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1192}
1193
1007sub size_allocate { 1194sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1009 1196
1197 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1198 $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} 1199}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1200
1019############################################################################# 1201#############################################################################
1020 1202
1021package CFClient::UI::Frame; 1203package CFPlus::UI::Frame;
1022 1204
1023our @ISA = CFClient::UI::Bin::; 1205our @ISA = CFPlus::UI::Bin::;
1024 1206
1025use CFClient::OpenGL; 1207use CFPlus::OpenGL;
1026 1208
1027sub new { 1209sub new {
1028 my $class = shift; 1210 my $class = shift;
1029 1211
1030 $class->SUPER::new ( 1212 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1238 $self->SUPER::_draw;
1057} 1239}
1058 1240
1059############################################################################# 1241#############################################################################
1060 1242
1061package CFClient::UI::FancyFrame; 1243package CFPlus::UI::FancyFrame;
1062 1244
1063our @ISA = CFClient::UI::Bin::; 1245our @ISA = CFPlus::UI::Bin::;
1064 1246
1065use CFClient::OpenGL; 1247use CFPlus::OpenGL;
1248
1249sub new {
1250 my ($class, %arg) = @_;
1251
1252 if ((exists $arg{label}) && !ref $arg{label}) {
1253 $arg{label} = new CFPlus::UI::Label
1254 align => 1,
1255 valign => 0,
1256 text => $arg{label},
1257 fontsize => ($arg{border} || 0.8) * 0.75;
1258 }
1259
1260 my $self = $class->SUPER::new (
1261 # label => "",
1262 fg => [0.6, 0.3, 0.1],
1263 border => 0.8,
1264 style => 'single',
1265 %arg,
1266 );
1267
1268 $self
1269}
1270
1271sub add {
1272 my ($self, @widgets) = @_;
1273
1274 $self->SUPER::add (@widgets);
1275 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1276}
1277
1278sub border {
1279 int $_[0]{border} * $::FONTSIZE
1280}
1281
1282sub size_request {
1283 my ($self) = @_;
1284
1285 ($self->{label_w}, undef) = $self->{label}->size_request
1286 if $self->{label};
1287
1288 my ($w, $h) = $self->SUPER::size_request;
1289
1290 (
1291 $w + $self->border * 2,
1292 $h + $self->border * 2,
1293 )
1294}
1295
1296sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_;
1298
1299 my $border = $self->border;
1300
1301 $w -= List::Util::max 0, $border * 2;
1302 $h -= List::Util::max 0, $border * 2;
1303
1304 if (my $label = $self->{label}) {
1305 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1306 $label->{h} = List::Util::min $h, $border;
1307 $label->invoke_size_allocate ($label->{w}, $label->{h});
1308 }
1309
1310 $self->child->configure ($border, $border, $w, $h);
1311
1312 1
1313}
1314
1315sub _draw {
1316 my ($self) = @_;
1317
1318 my $child = $self->{children}[0];
1319
1320 my $border = $self->border;
1321 my ($w, $h) = ($self->{w}, $self->{h});
1322
1323 $child->draw;
1324
1325 glColor @{$self->{fg}};
1326 glBegin GL_LINE_STRIP;
1327 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1331 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1333 glEnd;
1334
1335 if ($self->{label}) {
1336 glTranslate $border * 2, 0;
1337 $self->{label}->_draw;
1338 }
1339}
1340
1341#############################################################################
1342
1343package CFPlus::UI::Toplevel;
1344
1345our @ISA = CFPlus::UI::Bin::;
1346
1347use CFPlus::OpenGL;
1066 1348
1067my $bg = 1349my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1350 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1351 mipmap => 1, wrap => 1;
1070 1352
1071my @border = 1353my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1354 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); 1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1074 1360
1075sub new { 1361sub new {
1076 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1077 1363
1078 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1366 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1367 border => 0.6,
1082 can_events => 1, 1368 can_events => 1,
1083 min_w => 16, 1369 min_w => 64,
1084 min_h => 16, 1370 min_h => 32,
1085 %arg, 1371 %arg,
1086 ); 1372 );
1087 1373
1088 $self->{title_widget} = new CFClient::UI::Label 1374 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1375 align => 0,
1090 valign => 1, 1376 valign => 1,
1091 text => $self->{title}, 1377 text => $self->{title},
1092 fontsize => $self->{border}, 1378 fontsize => $self->{border},
1093 if exists $self->{title}; 1379 if exists $self->{title};
1094 1380
1381 if ($self->{has_close_button}) {
1382 $self->{close_button} =
1383 new CFPlus::UI::ImageButton
1384 path => 'x1_close.png',
1385 on_activate => sub { $self->emit ("delete") };
1386
1387 $self->CFPlus::UI::Container::add ($self->{close_button});
1388 }
1389
1095 $self 1390 $self
1096} 1391}
1097 1392
1098sub add { 1393sub add {
1099 my ($self, @widgets) = @_; 1394 my ($self, @widgets) = @_;
1100 1395
1101 $self->SUPER::add (@widgets); 1396 $self->SUPER::add (@widgets);
1397 $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}; 1398 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1399}
1104 1400
1105sub border { 1401sub border {
1106 int $_[0]{border} * $::FONTSIZE 1402 int $_[0]{border} * $::FONTSIZE
1107} 1403}
… …
1109sub size_request { 1405sub size_request {
1110 my ($self) = @_; 1406 my ($self) = @_;
1111 1407
1112 $self->{title_widget}->size_request 1408 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1409 if $self->{title_widget};
1410
1411 $self->{close_button}->size_request
1412 if $self->{close_button};
1114 1413
1115 my ($w, $h) = $self->SUPER::size_request; 1414 my ($w, $h) = $self->SUPER::size_request;
1116 1415
1117 ( 1416 (
1118 $w + $self->border * 2, 1417 $w + $self->border * 2,
1119 $h + $self->border * 2, 1418 $h + $self->border * 2,
1120 ) 1419 )
1121} 1420}
1122 1421
1123sub size_allocate { 1422sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1423 my ($self, $w, $h) = @_;
1125 1424
1126 if ($self->{title_widget}) { 1425 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1426 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1427 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1428 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1429 }
1131 1430
1132 my $border = $self->border; 1431 my $border = $self->border;
1133 1432
1134 $h -= List::Util::max 0, $border * 2; 1433 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1434 $w -= List::Util::max 0, $border * 2;
1435
1436 $self->child->configure ($border, $border, $w, $h);
1437
1438 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1439 if $self->{close_button};
1440
1441 1
1442}
1443
1444sub invoke_delete {
1445 my ($self) = @_;
1446
1447 $self->hide;
1136 1448
1137 $self->child->configure ($border, $border, $w, $h); 1449 1
1138} 1450}
1139 1451
1140sub button_down { 1452sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1453 my ($self, $ev, $x, $y) = @_;
1142 1454
1143 my ($w, $h) = @$self{qw(w h)}; 1455 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1456 my $border = $self->border;
1145 1457
… …
1176 1488
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1489 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1490
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1491 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1492 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1493 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1494 };
1183 } else { 1495 } else {
1184 return 0; 1496 return 0;
1185 } 1497 }
1186 1498
1187 1 1499 1
1188} 1500}
1189 1501
1190sub button_up { 1502sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1192 1504
1193 !!delete $self->{motion} 1505 ! ! delete $self->{motion}
1194} 1506}
1195 1507
1196sub mouse_motion { 1508sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1509 my ($self, $ev, $x, $y) = @_;
1198 1510
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1512
1201 !!$self->{motion} 1513 ! ! $self->{motion}
1514}
1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
1202} 1522}
1203 1523
1204sub _draw { 1524sub _draw {
1205 my ($self) = @_; 1525 my ($self) = @_;
1206 1526
… …
1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1214 1534
1215 my $border = $self->border; 1535 my $border = $self->border;
1216 1536
1217 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1218 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1222 1556
1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1224 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1225 1559
1226 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1235 $child->draw; 1569 $child->draw;
1236 1570
1237 if ($self->{title_widget}) { 1571 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1572 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1573 $self->{title_widget}->_draw;
1574
1575 glTranslate 0, - ($border - $self->{h});
1240 } 1576 }
1577
1578 $self->{close_button}->draw
1579 if $self->{close_button};
1241} 1580}
1242 1581
1243############################################################################# 1582#############################################################################
1244 1583
1245package CFClient::UI::Table; 1584package CFPlus::UI::Table;
1246 1585
1247our @ISA = CFClient::UI::Base::; 1586our @ISA = CFPlus::UI::Container::;
1248 1587
1249use List::Util qw(max sum); 1588use List::Util qw(max sum);
1250 1589
1251use CFClient::OpenGL; 1590use CFPlus::OpenGL;
1252 1591
1253sub new { 1592sub new {
1254 my $class = shift; 1593 my $class = shift;
1255 1594
1256 $class->SUPER::new ( 1595 $class->SUPER::new (
1257 col_expand => [], 1596 col_expand => [],
1597 row_expand => [],
1258 @_, 1598 @_,
1259 ) 1599 )
1260} 1600}
1261 1601
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264}
1265
1266sub add { 1602sub add {
1267 my ($self, $x, $y, $child) = @_; 1603 my ($self, @widgets) = @_;
1268 1604
1269 $child->set_parent ($self); 1605 for my $child (@widgets) {
1270 $self->{children}[$y][$x] = $child; 1606 $child->{rowspan} ||= 1;
1607 $child->{colspan} ||= 1;
1608 }
1271 1609
1272 $self->realloc; 1610 $self->SUPER::add (@widgets);
1273} 1611}
1274 1612
1275sub remove { 1613sub add_at {
1614 my $self = shift;
1615
1616 my @widgets;
1617
1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1621 $child->{row} = $row;
1622 $child->{col} = $col;
1623
1624 push @widgets, $child;
1625 }
1626
1627 $self->add (@widgets);
1628}
1629
1630sub get_wh {
1276 my ($self, $child) = @_; 1631 my ($self) = @_;
1277 1632
1278 # TODO: not yet implemented 1633 my (@w, @h);
1279}
1280
1281# TODO: move to container class maybe? send children a signal on removal?
1282sub clear {
1283 my ($self) = @_;
1284 1634
1285 my @children = $self->children; 1635 my @children = $self->children;
1286 delete $self->{children}; 1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 }
1287 1646 }
1288 for (@children) {
1289 delete $_->{parent};
1290 $_->hide;
1291 }
1292 1647
1293 $self->realloc; 1648 # second pass, rows
1294} 1649 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)}; 1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1309 1651
1310 $w[$x] = max $w[$x], $w; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1311 $h[$y] = max $h[$y], $h; 1653
1654 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1312 } 1656 }
1313 } 1657 }
1314 1658
1315 (\@w, \@h) 1659 (\@w, \@h)
1316} 1660}
… …
1324 (sum @$ws), 1668 (sum @$ws),
1325 (sum @$hs), 1669 (sum @$hs),
1326 ) 1670 )
1327} 1671}
1328 1672
1329sub size_allocate { 1673sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1674 my ($self, $w, $h) = @_;
1331 1675
1332 my ($ws, $hs) = $self->get_wh; 1676 my ($ws, $hs) = $self->get_wh;
1333 1677
1334 my $req_w = (sum @$ws) || 1; 1678 my $req_w = (sum @$ws) || 1;
1335 my $req_h = (sum @$hs) || 1; 1679 my $req_h = (sum @$hs) || 1;
1336 1680
1337 # TODO: nicer code && do row_expand 1681 # now linearly scale the rows/columns to the allocated size
1338 my @col_expand = @{$self->{col_expand}}; 1682 my @col_expand = @{$self->{col_expand}};
1339 @col_expand = (1) x @$ws unless @col_expand; 1683 @col_expand = (1) x @$ws unless @col_expand;
1340 my $col_expand = (sum @col_expand) || 1; 1684 my $col_expand = (sum @col_expand) || 1;
1341 1685
1342 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1686 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1687
1346 CFClient::UI::harmonize $ws; 1688 CFPlus::UI::harmonize $ws;
1689
1690 my @row_expand = @{$self->{row_expand}};
1691 @row_expand = (1) x @$ws unless @row_expand;
1692 my $row_expand = (sum @row_expand) || 1;
1693
1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1695
1347 CFClient::UI::harmonize $hs; 1696 CFPlus::UI::harmonize $hs;
1348 1697
1349 my $y; 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1350 1700
1351 for my $r (0 .. $#{$self->{children}}) { 1701 for my $widget ($self->children) {
1352 my $row = $self->{children}[$r] 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1353 or next;
1354 1703
1355 my $x = 0; 1704 $widget->configure (
1356 my $row_h = $hs->[$r]; 1705 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1357 1707 );
1358 for my $c (0 .. $#$row) { 1708 }
1359 my $col_w = $ws->[$c];
1360 1709
1361 if (my $widget = $row->[$c]) { 1710 1
1362 $widget->configure ($x, $y, $col_w, $row_h); 1711}
1363 }
1364 1712
1365 $x += $col_w; 1713#############################################################################
1714
1715package CFPlus::UI::Fixed;
1716
1717use List::Util qw(min max);
1718
1719our @ISA = CFPlus::UI::Container::;
1720
1721sub add {
1722 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1723
1724 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1725 $self->SUPER::add ($child);
1726}
1727
1728sub _scale($$$) {
1729 my ($mode, $val, $max) = @_;
1730
1731 $mode eq "abs" ? $val
1732 : $mode eq "rel" ? $val * $max
1733 : 0
1734}
1735
1736sub size_request {
1737 my ($self) = @_;
1738
1739 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1740
1741 # determine overall size by querying abs widgets
1742 for my $child ($self->visible_children) {
1743 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1744
1745 if ($pos eq "abs") {
1746 $w = _scale $size, $w, $child->{req_w};
1747 $h = _scale $size, $h, $child->{req_h};
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1366 } 1751 }
1367
1368 $y += $row_h;
1369 } 1752 }
1370 1753
1371} 1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1372 1756
1373sub find_widget { 1757 # now layout remaining widgets
1758 for my $child ($self->visible_children) {
1759 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1760
1761 if ($pos ne "abs") {
1762 $x = _scale $pos, $x, $W;
1763 $y = _scale $pos, $x, $H;
1764 $w = _scale $size, $w, $child->{req_w};
1765 $h = _scale $size, $h, $child->{req_h};
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1769 }
1770 }
1771
1772 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1;
1774
1775 ($W, $H)
1776}
1777
1778sub invoke_size_allocate {
1374 my ($self, $x, $y) = @_; 1779 my ($self, $W, $H) = @_;
1375 1780
1376 $x -= $self->{x}; 1781 for my $child ($self->visible_children) {
1377 $y -= $self->{y}; 1782 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1378 1783
1379 my $res; 1784 $x = _scale $pos, $x, $W;
1785 $y = _scale $pos, $x, $H;
1786 $w = _scale $size, $w, $child->{req_w};
1787 $h = _scale $size, $h, $child->{req_h};
1380 1788
1381 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1789 $child->configure ($x, $y, $w, $h);
1382 $res = $_->find_widget ($x, $y) 1790 }
1383 and return $res; 1791
1384 } 1792 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} 1793}
1396 1794
1397############################################################################# 1795#############################################################################
1398 1796
1399package CFClient::UI::Box; 1797package CFPlus::UI::Box;
1400 1798
1401our @ISA = CFClient::UI::Container::; 1799our @ISA = CFPlus::UI::Container::;
1402 1800
1403sub size_request { 1801sub size_request {
1404 my ($self) = @_; 1802 my ($self) = @_;
1405 1803
1406 $self->{vertical} 1804 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1810 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1811 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1812 )
1415} 1813}
1416 1814
1417sub size_allocate { 1815sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1816 my ($self, $w, $h) = @_;
1419 1817
1420 my $space = $self->{vertical} ? $h : $w; 1818 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1819 my @children = $self->visible_children;
1422 1820
1423 my @req; 1821 my @req;
1424 1822
1425 if ($self->{homogeneous}) { 1823 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1824 @req = ($space / (@children || 1)) x @children;
1427 } else { 1825 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1826 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1827 my $req = List::Util::sum @req;
1430 1828
1431 if ($req > $space) { 1829 if ($req > $space) {
1432 # ah well, not enough space 1830 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1831 $_ *= $space / $req for @req;
1434 } else { 1832 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1833 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1834
1437 $space = ($space - $req) / $expand; # remaining space to give away 1835 $space = ($space - $req) / $expand; # remaining space to give away
1438 1836
1439 $req[$_] += $space * $children->[$_]{expand} 1837 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1838 for 0 .. $#children;
1441 } 1839 }
1442 } 1840 }
1443 1841
1444 CFClient::UI::harmonize \@req; 1842 CFPlus::UI::harmonize \@req;
1445 1843
1446 my $pos = 0; 1844 my $pos = 0;
1447 for (0 .. $#$children) { 1845 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1846 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1847 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1848
1451 $pos += $alloc; 1849 $pos += $alloc;
1452 } 1850 }
1453 1851
1454 1 1852 1
1455} 1853}
1456 1854
1457############################################################################# 1855#############################################################################
1458 1856
1459package CFClient::UI::HBox; 1857package CFPlus::UI::HBox;
1460 1858
1461our @ISA = CFClient::UI::Box::; 1859our @ISA = CFPlus::UI::Box::;
1462 1860
1463sub new { 1861sub new {
1464 my $class = shift; 1862 my $class = shift;
1465 1863
1466 $class->SUPER::new ( 1864 $class->SUPER::new (
… …
1469 ) 1867 )
1470} 1868}
1471 1869
1472############################################################################# 1870#############################################################################
1473 1871
1474package CFClient::UI::VBox; 1872package CFPlus::UI::VBox;
1475 1873
1476our @ISA = CFClient::UI::Box::; 1874our @ISA = CFPlus::UI::Box::;
1477 1875
1478sub new { 1876sub new {
1479 my $class = shift; 1877 my $class = shift;
1480 1878
1481 $class->SUPER::new ( 1879 $class->SUPER::new (
… …
1484 ) 1882 )
1485} 1883}
1486 1884
1487############################################################################# 1885#############################################################################
1488 1886
1489package CFClient::UI::Label; 1887package CFPlus::UI::Label;
1490 1888
1491our @ISA = CFClient::UI::DrawBG::; 1889our @ISA = CFPlus::UI::DrawBG::;
1492 1890
1493use CFClient::OpenGL; 1891use CFPlus::OpenGL;
1494 1892
1495sub new { 1893sub new {
1496 my ($class, %arg) = @_; 1894 my ($class, %arg) = @_;
1497 1895
1498 my $self = $class->SUPER::new ( 1896 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1899 #active_bg => none
1502 #font => default_font 1900 #font => default_font
1503 #text => initial text 1901 #text => initial text
1504 #markup => initial narkup 1902 #markup => initial narkup
1505 #max_w => maximum pixel width 1903 #max_w => maximum pixel width
1904 #style => 0, # render flags
1506 ellipsise => 3, # end 1905 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1906 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1907 fontsize => 1,
1509 align => -1, 1908 align => -1,
1510 valign => -1, 1909 valign => -1,
1511 padding_x => 2, 1910 padding_x => 2,
1512 padding_y => 2, 1911 padding_y => 2,
1513 can_events => 0, 1912 can_events => 0,
1514 %arg 1913 %arg
1515 ); 1914 );
1516 1915
1517 if (exists $self->{template}) { 1916 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1917 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1918 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1919 $self->{template} = $layout;
1521 } 1920 }
1522 1921
1523 if (exists $self->{markup}) { 1922 if (exists $self->{markup}) {
… …
1527 } 1926 }
1528 1927
1529 $self 1928 $self
1530} 1929}
1531 1930
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1931sub update {
1543 my ($self) = @_; 1932 my ($self) = @_;
1544 1933
1545 delete $self->{texture}; 1934 delete $self->{texture};
1546 $self->SUPER::update; 1935 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1946 my ($self, $text) = @_;
1558 1947
1559 return if $self->{text} eq "T$text"; 1948 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1949 $self->{text} = "T$text";
1561 1950
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1951 $self->{layout}->set_text ($text);
1564 1952
1565 delete $self->{size_req}; 1953 delete $self->{size_req};
1566 $self->realloc; 1954 $self->realloc;
1567 $self->update; 1955 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1961 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1962 $self->{text} = "M$markup";
1575 1963
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1964 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1965
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1966 $self->{layout}->set_markup ($markup);
1580 1967
1581 delete $self->{size_req}; 1968 delete $self->{size_req};
1582 $self->realloc; 1969 $self->realloc;
1583 $self->update; 1970 $self->update;
… …
1595 1982
1596 my ($w, $h) = $self->{layout}->size; 1983 my ($w, $h) = $self->{layout}->size;
1597 1984
1598 if (exists $self->{template}) { 1985 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1986 $self->{template}->set_font ($self->{font}) if $self->{font};
1987 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1988 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1989
1602 my ($w2, $h2) = $self->{template}->size; 1990 my ($w2, $h2) = $self->{template}->size;
1603 1991
1604 $w = List::Util::max $w, $w2; 1992 $w = List::Util::max $w, $w2;
… …
1609 }; 1997 };
1610 1998
1611 @{ $self->{size_req} } 1999 @{ $self->{size_req} }
1612} 2000}
1613 2001
2002sub baseline_shift {
2003 $_[0]{layout}->descent
2004}
2005
1614sub size_allocate { 2006sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 2007 my ($self, $w, $h) = @_;
1616 2008
1617 delete $self->{ox}; 2009 delete $self->{ox};
1618 2010
1619 delete $self->{texture} 2011 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2012 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2013
2014 1
1621} 2015}
1622 2016
1623sub set_fontsize { 2017sub set_fontsize {
1624 my ($self, $fontsize) = @_; 2018 my ($self, $fontsize) = @_;
1625 2019
1626 $self->{fontsize} = $fontsize; 2020 $self->{fontsize} = $fontsize;
2021 delete $self->{size_req};
1627 delete $self->{texture}; 2022 delete $self->{texture};
1628 2023
1629 $self->realloc; 2024 $self->realloc;
1630} 2025}
1631 2026
1632sub reconfigure { 2027sub reconfigure {
1633 my ($self) = @_; 2028 my ($self) = @_;
1634 2029
1635 delete $self->{size_req}; 2030 delete $self->{size_req};
2031 delete $self->{texture};
1636 2032
1637 $self->SUPER::reconfigure; 2033 $self->SUPER::reconfigure;
1638} 2034}
1639 2035
1640sub _draw { 2036sub _draw {
1641 my ($self) = @_; 2037 my ($self) = @_;
1642 2038
1643 $self->SUPER::_draw; # draw background, if applicable 2039 $self->SUPER::_draw; # draw background, if applicable
1644 2040
1645 my $tex = $self->{texture} ||= do { 2041 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 2042 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2043 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 2044 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2045 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2046 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2047 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 2048
1653 new_from_layout CFClient::Texture $self->{layout} 2049 [$self->{layout}->size]
1654 }; 2050 };
1655 2051
1656 unless (exists $self->{ox}) { 2052 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2053 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2054 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 2055 : ($self->{w} - $size->[0]) * 0.5);
1660 2056
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2057 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2058 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 2059 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 2060 };
1665 2061
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2062 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2063 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 2064
1671 if ($tex->{format} == GL_ALPHA) { 2065 $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} 2066}
1682 2067
1683############################################################################# 2068#############################################################################
1684 2069
1685package CFClient::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
1686 2071
1687our @ISA = CFClient::UI::Label::; 2072our @ISA = CFPlus::UI::Label::;
1688 2073
1689use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1690 2075
1691sub new { 2076sub new {
1692 my $class = shift; 2077 my $class = shift;
1693 2078
1694 $class->SUPER::new ( 2079 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 2083 active_fg => [0, 0, 0],
1699 can_hover => 1, 2084 can_hover => 1,
1700 can_focus => 1, 2085 can_focus => 1,
1701 valign => 0, 2086 valign => 0,
1702 can_events => 1, 2087 can_events => 1,
2088 ellipsise => 0,
1703 #text => ... 2089 #text => ...
1704 #hidden => "*", 2090 #hidden => "*",
1705 @_ 2091 @_
1706 ) 2092 )
1707} 2093}
… …
1718 2104
1719 $text =~ s/./*/g if $self->{hidden}; 2105 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 2106 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 2107 delete $self->{size_req};
1722 2108
1723 $self->_emit (changed => $self->{text}); 2109 $self->emit (changed => $self->{text});
1724 2110
1725 $self->realloc; 2111 $self->realloc;
1726 $self->update; 2112 $self->update;
1727} 2113}
1728 2114
… …
1743 my ($w, $h) = $self->SUPER::size_request; 2129 my ($w, $h) = $self->SUPER::size_request;
1744 2130
1745 ($w + 1, $h) # add 1 for cursor 2131 ($w + 1, $h) # add 1 for cursor
1746} 2132}
1747 2133
1748sub key_down { 2134sub invoke_key_down {
1749 my ($self, $ev) = @_; 2135 my ($self, $ev) = @_;
1750 2136
1751 my $mod = $ev->{mod}; 2137 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 2138 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 2139 my $uni = $ev->{unicode};
1754 2140
1755 my $text = $self->get_text; 2141 my $text = $self->get_text;
2142
2143 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756 2144
1757 if ($uni == 8) { 2145 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2146 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 2147 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 2148 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 2149 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 2150 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 2151 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2152 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 2153 } elsif ($sym == CFPlus::SDLK_HOME) {
2154 # what a hack
2155 $self->{cursor} =
2156 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2157 ? length $1
2158 : 0;
2159 } elsif ($sym == CFPlus::SDLK_END) {
2160 # uh, again
2161 $self->{cursor} =
2162 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2163 ? $self->{cursor} + length $1
2164 : length $self->{text};
2165 } elsif ($uni == 21) { # ctrl-u
2166 $text = "";
1766 $self->{cursor} = 0; 2167 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 2168 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 2169 $self->emit ('escape');
1771 } elsif ($uni) { 2170 } elsif ($uni == 0x0d) {
2171 substr $text, $self->{cursor}++, 0, "\012";
2172 } elsif ($uni >= 0x20) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 2173 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 2174 } else {
1774 return 0; 2175 return 0;
1775 } 2176 }
1776 2177
1777 $self->_set_text ($text); 2178 $self->_set_text ($text);
1778 2179
1779 $self->realloc; 2180 $self->realloc;
2181 $self->update;
1780 2182
1781 1 2183 1
1782} 2184}
1783 2185
1784sub focus_in { 2186sub invoke_focus_in {
1785 my ($self) = @_; 2187 my ($self) = @_;
1786 2188
1787 $self->{last_activity} = $::NOW; 2189 $self->{last_activity} = $::NOW;
1788 2190
1789 $self->SUPER::focus_in; 2191 $self->SUPER::invoke_focus_in
1790} 2192}
1791 2193
1792sub button_down { 2194sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2195 my ($self, $ev, $x, $y) = @_;
1794 2196
1795 $self->SUPER::button_down ($ev, $x, $y); 2197 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2198
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2199 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2200
1799 # byte-index to char-index 2201 # byte-index to char-index
1800 my $text = $self->{text}; 2202 my $text = $self->{text};
1801 utf8::encode $text; 2203 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2204 $self->{cursor} = length $text;
1803 2205
1804 $self->_set_text ($self->{text}); 2206 $self->_set_text ($self->{text});
1805 $self->update; 2207 $self->update;
1806 2208
1807 1 2209 1
1808} 2210}
1809 2211
1810sub mouse_motion { 2212sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2213 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2214# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 2215
1814 0 2216 1
1815} 2217}
1816 2218
1817sub _draw { 2219sub _draw {
1818 my ($self) = @_; 2220 my ($self) = @_;
1819 2221
… …
1846 utf8::encode $text; 2248 utf8::encode $text;
1847 2249
1848 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2250 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849 } 2251 }
1850 2252
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2253 glBegin GL_LINES;
1853 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2254 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}; 2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 2256 glEnd;
1856 } 2257 }
1857} 2258}
1858 2259
2260#############################################################################
2261
1859package CFClient::UI::Entry; 2262package CFPlus::UI::Entry;
1860 2263
1861our @ISA = CFClient::UI::EntryBase::; 2264our @ISA = CFPlus::UI::EntryBase::;
1862 2265
1863use CFClient::OpenGL; 2266use CFPlus::OpenGL;
1864 2267
1865sub key_down { 2268sub invoke_key_down {
1866 my ($self, $ev) = @_; 2269 my ($self, $ev) = @_;
1867 2270
1868 my $sym = $ev->{sym}; 2271 my $sym = $ev->{sym};
1869 2272
1870 if ($sym == 13) { 2273 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2274 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2275 my $txt = $self->get_text;
2276
1873 $self->{history_pointer} = -1; 2277 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2278 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2279 $self->emit (activate => $txt);
1876 $self->update; 2280 $self->update;
1877 2281
1878 } elsif ($sym == CFClient::SDLK_UP) { 2282 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2283 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2284 $self->{history_saveback} = $self->get_text;
1881 } 2285 }
1882 if (@{$self->{history} || []} > 0) { 2286 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2287 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2289 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2290 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2291 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2292 }
1889 2293
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2294 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2295 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2296 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2297
1894 if ($self->{history_pointer} >= 0) { 2298 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2299 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2300 } else {
1897 $self->set_text ($self->{history_saveback}); 2301 $self->set_text ($self->{history_saveback});
1898 } 2302 }
1899 2303
1900 } else { 2304 } else {
1901 return $self->SUPER::key_down ($ev) 2305 return $self->SUPER::invoke_key_down ($ev)
1902 } 2306 }
1903 2307
1904 1 2308 1
1905} 2309}
1906 2310
1907############################################################################# 2311#############################################################################
1908 2312
2313package CFPlus::UI::TextEdit;
2314
2315our @ISA = CFPlus::UI::EntryBase::;
2316
2317use CFPlus::OpenGL;
2318
2319sub move_cursor_ver {
2320 my ($self, $dy) = @_;
2321
2322 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2323
2324 $y += $dy;
2325
2326 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2327 $self->{cursor} = $index;
2328 delete $self->{cur_h};
2329 $self->update;
2330 return;
2331 }
2332}
2333
2334sub invoke_key_down {
2335 my ($self, $ev) = @_;
2336
2337 my $sym = $ev->{sym};
2338
2339 if ($sym == CFPlus::SDLK_UP) {
2340 $self->move_cursor_ver (-1);
2341 } elsif ($sym == CFPlus::SDLK_DOWN) {
2342 $self->move_cursor_ver (+1);
2343 } else {
2344 return $self->SUPER::invoke_key_down ($ev)
2345 }
2346
2347 1
2348}
2349
2350#############################################################################
2351
1909package CFClient::UI::Button; 2352package CFPlus::UI::Button;
1910 2353
1911our @ISA = CFClient::UI::Label::; 2354our @ISA = CFPlus::UI::Label::;
1912 2355
1913use CFClient::OpenGL; 2356use CFPlus::OpenGL;
1914 2357
1915my @tex = 2358my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2359 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2360 qw(b1_button_inactive.png b1_button_active.png);
1918 2361
1919sub new { 2362sub new {
1920 my $class = shift; 2363 my $class = shift;
1921 2364
1922 $class->SUPER::new ( 2365 $class->SUPER::new (
1923 padding_x => 4, 2366 padding_x => 4,
1924 padding_y => 4, 2367 padding_y => 4,
1925 fg => [1, 1, 1], 2368 fg => [1.0, 1.0, 1.0],
1926 active_fg => [0, 0, 1], 2369 active_fg => [0.8, 0.8, 0.8],
1927 can_hover => 1, 2370 can_hover => 1,
1928 align => 0, 2371 align => 0,
1929 valign => 0, 2372 valign => 0,
1930 can_events => 1, 2373 can_events => 1,
1931 @_ 2374 @_
1932 ) 2375 )
1933} 2376}
1934 2377
1935sub activate { }
1936
1937sub button_up { 2378sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2379 my ($self, $ev, $x, $y) = @_;
1939 2380
1940 $self->emit ("activate") 2381 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2382 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2383 && $y >= 0 && $y < $self->{h};
… …
1951 2392
1952 glEnable GL_TEXTURE_2D; 2393 glEnable GL_TEXTURE_2D;
1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954 glColor 0, 0, 0, 1; 2395 glColor 0, 0, 0, 1;
1955 2396
2397 my $tex = $tex[$GRAB == $self];
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2398 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 2399
1958 glDisable GL_TEXTURE_2D; 2400 glDisable GL_TEXTURE_2D;
1959 2401
1960 $self->SUPER::_draw; 2402 $self->SUPER::_draw;
1961} 2403}
1962 2404
1963############################################################################# 2405#############################################################################
1964 2406
1965package CFClient::UI::CheckBox; 2407package CFPlus::UI::CheckBox;
1966 2408
1967our @ISA = CFClient::UI::DrawBG::; 2409our @ISA = CFPlus::UI::DrawBG::;
1968 2410
1969my @tex = 2411my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2412 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2413 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2414
1973use CFClient::OpenGL; 2415use CFPlus::OpenGL;
1974 2416
1975sub new { 2417sub new {
1976 my $class = shift; 2418 my $class = shift;
1977 2419
1978 $class->SUPER::new ( 2420 $class->SUPER::new (
… …
1992 my ($self) = @_; 2434 my ($self) = @_;
1993 2435
1994 (6) x 2 2436 (6) x 2
1995} 2437}
1996 2438
2439sub toggle {
2440 my ($self) = @_;
2441
2442 $self->{state} = !$self->{state};
2443 $self->emit (changed => $self->{state});
2444 $self->update;
2445}
2446
1997sub button_down { 2447sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
1999 2449
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2450 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2451 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2452 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2453 } else {
2005 return 0 2454 return 0
2006 } 2455 }
2007 2456
2008 1 2457 1
… …
2028 glDisable GL_TEXTURE_2D; 2477 glDisable GL_TEXTURE_2D;
2029} 2478}
2030 2479
2031############################################################################# 2480#############################################################################
2032 2481
2033package CFClient::UI::Image; 2482package CFPlus::UI::Image;
2034 2483
2035our @ISA = CFClient::UI::Base::; 2484our @ISA = CFPlus::UI::Base::;
2036 2485
2037use CFClient::OpenGL; 2486use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2487
2040our %loaded_images; 2488our %texture_cache;
2041 2489
2042sub new { 2490sub new {
2043 my $class = shift; 2491 my $class = shift;
2044 2492
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2493 my $self = $class->SUPER::new (
2494 can_events => 0,
2495 @_,
2496 );
2046 2497
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2498 $self->{path} || $self->{tex}
2499 or Carp::croak "'path' or 'tex' attributes required";
2048 2500
2049 $loaded_images{$self->{image}} ||= 2501 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2502 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2503
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2504 CFPlus::weaken $texture_cache{$self->{path}};
2053 2505
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2506 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2507
2058 $self 2508 $self
2059} 2509}
2060 2510
2511sub STORABLE_freeze {
2512 my ($self, $cloning) = @_;
2513
2514 $self->{path}
2515 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2516
2517 $self->{path}
2518}
2519
2520sub STORABLE_attach {
2521 my ($self, $cloning, $path) = @_;
2522
2523 $self->new (path => $path)
2524}
2525
2061sub size_request { 2526sub size_request {
2062 my ($self) = @_; 2527 my ($self) = @_;
2063 2528
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2529 ($self->{tex}{w}, $self->{tex}{h})
2065} 2530}
2066 2531
2067sub _draw { 2532sub _draw {
2068 my ($self) = @_; 2533 my ($self) = @_;
2069 2534
… …
2079 } 2544 }
2080 2545
2081 glEnable GL_TEXTURE_2D; 2546 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2548
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2549 $tex->draw_quad (0, 0, $w, $h);
2085 2550
2086 glDisable GL_TEXTURE_2D; 2551 glDisable GL_TEXTURE_2D;
2087} 2552}
2088 2553
2089############################################################################# 2554#############################################################################
2090 2555
2556package CFPlus::UI::ImageButton;
2557
2558our @ISA = CFPlus::UI::Image::;
2559
2560use CFPlus::OpenGL;
2561
2562my %textures;
2563
2564sub new {
2565 my $class = shift;
2566
2567 my $self = $class->SUPER::new (
2568 padding_x => 4,
2569 padding_y => 4,
2570 fg => [1, 1, 1],
2571 active_fg => [0, 0, 1],
2572 can_hover => 1,
2573 align => 0,
2574 valign => 0,
2575 can_events => 1,
2576 @_
2577 );
2578}
2579
2580sub invoke_button_up {
2581 my ($self, $ev, $x, $y) = @_;
2582
2583 $self->emit ("activate")
2584 if $x >= 0 && $x < $self->{w}
2585 && $y >= 0 && $y < $self->{h};
2586
2587 1
2588}
2589
2590#############################################################################
2591
2091package CFClient::UI::VGauge; 2592package CFPlus::UI::VGauge;
2092 2593
2093our @ISA = CFClient::UI::Base::; 2594our @ISA = CFPlus::UI::Base::;
2094 2595
2095use List::Util qw(min max); 2596use List::Util qw(min max);
2096 2597
2097use CFClient::OpenGL; 2598use CFPlus::OpenGL;
2098 2599
2099my %tex = ( 2600my %tex = (
2100 food => [ 2601 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2602 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2603 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2604 ],
2104 grace => [ 2605 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2606 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/ 2607 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2608 ],
2108 hp => [ 2609 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2610 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2611 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2612 ],
2112 mana => [ 2613 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2614 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/ 2615 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2616 ],
2116); 2617);
2117 2618
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2619# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2679 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2680 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2681
2181 my $h1 = $self->{h} * (1 - $ycut1); 2682 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2683 my $h2 = $self->{h} * (1 - $ycut2);
2684 my $h3 = $self->{h};
2685
2686 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2687
2184 glEnable GL_BLEND; 2688 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2689 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2690 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2691 glEnable GL_TEXTURE_2D;
… …
2206 2710
2207 if ($t3) { 2711 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2712 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2713 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2714 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2715 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2716 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2717 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2718 glEnd;
2215 } 2719 }
2216 2720
2217 glDisable GL_BLEND; 2721 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2722 glDisable GL_TEXTURE_2D;
2219} 2723}
2220 2724
2221############################################################################# 2725#############################################################################
2222 2726
2223package CFClient::UI::Gauge; 2727package CFPlus::UI::Gauge;
2224 2728
2225our @ISA = CFClient::UI::VBox::; 2729our @ISA = CFPlus::UI::VBox::;
2226 2730
2227sub new { 2731sub new {
2228 my ($class, %arg) = @_; 2732 my ($class, %arg) = @_;
2229 2733
2230 my $self = $class->SUPER::new ( 2734 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2736 can_hover => 1,
2233 can_events => 1, 2737 can_events => 1,
2234 %arg, 2738 %arg,
2235 ); 2739 );
2236 2740
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2741 $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); 2742 $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"); 2743 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2744
2241 $self 2745 $self
2242} 2746}
2243 2747
2244sub set_fontsize { 2748sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2769 $self->{value}->set_text ($val);
2266} 2770}
2267 2771
2268############################################################################# 2772#############################################################################
2269 2773
2270package CFClient::UI::Slider; 2774package CFPlus::UI::Slider;
2271 2775
2272use strict; 2776use strict;
2273 2777
2274use CFClient::OpenGL; 2778use CFPlus::OpenGL;
2275 2779
2276our @ISA = CFClient::UI::DrawBG::; 2780our @ISA = CFPlus::UI::DrawBG::;
2277 2781
2278my @tex = 2782my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2783 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2784 qw(s1_slider.png s1_slider_bg.png);
2281 2785
2282sub new { 2786sub new {
2283 my $class = shift; 2787 my $class = shift;
2284 2788
… …
2305 $self->update; 2809 $self->update;
2306 2810
2307 $self 2811 $self
2308} 2812}
2309 2813
2310sub changed { }
2311
2312sub set_range { 2814sub set_range {
2313 my ($self, $range) = @_; 2815 my ($self, $range) = @_;
2314 2816
2315 ($range, $self->{range}) = ($self->{range}, $range); 2817 ($range, $self->{range}) = ($self->{range}, $range);
2316 2818
… …
2336 if $unit; 2838 if $unit;
2337 2839
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2840 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2841
2340 if ($value != $old_value) { 2842 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2843 $self->emit (changed => $value);
2342 $self->update; 2844 $self->update;
2343 } 2845 }
2344} 2846}
2345 2847
2346sub size_request { 2848sub size_request {
2347 my ($self) = @_; 2849 my ($self) = @_;
2348 2850
2349 ($self->{req_w}, $self->{req_h}) 2851 ($self->{req_w}, $self->{req_h})
2350} 2852}
2351 2853
2352sub button_down { 2854sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2855 my ($self, $ev, $x, $y) = @_;
2354 2856
2355 $self->SUPER::button_down ($ev, $x, $y); 2857 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2858
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2859 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2860
2359 $self->mouse_motion ($ev, $x, $y) 2861 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2862}
2361 2863
2362sub mouse_motion { 2864sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2865 my ($self, $ev, $x, $y) = @_;
2364 2866
2365 if ($GRAB == $self) { 2867 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2868 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2869
… …
2373 } else { 2875 } else {
2374 return 0; 2876 return 0;
2375 } 2877 }
2376 2878
2377 1 2879 1
2880}
2881
2882sub invoke_mouse_wheel {
2883 my ($self, $ev) = @_;
2884
2885 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2886
2887 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2888
2889 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2890
2891 ! ! $delta
2378} 2892}
2379 2893
2380sub update { 2894sub update {
2381 my ($self) = @_; 2895 my ($self) = @_;
2382 2896
… …
2431 glDisable GL_TEXTURE_2D; 2945 glDisable GL_TEXTURE_2D;
2432} 2946}
2433 2947
2434############################################################################# 2948#############################################################################
2435 2949
2436package CFClient::UI::ValSlider; 2950package CFPlus::UI::ValSlider;
2437 2951
2438our @ISA = CFClient::UI::HBox::; 2952our @ISA = CFPlus::UI::HBox::;
2439 2953
2440sub new { 2954sub new {
2441 my ($class, %arg) = @_; 2955 my ($class, %arg) = @_;
2442 2956
2443 my $range = delete $arg{range}; 2957 my $range = delete $arg{range};
2444 2958
2445 my $self = $class->SUPER::new ( 2959 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2960 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2961 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2962 to_value => sub { shift },
2449 from_value => sub { shift }, 2963 from_value => sub { shift },
2450 %arg, 2964 %arg,
2451 ); 2965 );
2452 2966
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2986sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2987sub set_value { shift->{slider}->set_value (@_) }
2474 2988
2475############################################################################# 2989#############################################################################
2476 2990
2477package CFClient::UI::TextScroller; 2991package CFPlus::UI::TextScroller;
2478 2992
2479our @ISA = CFClient::UI::HBox::; 2993our @ISA = CFPlus::UI::HBox::;
2480 2994
2481use CFClient::OpenGL; 2995use CFPlus::OpenGL;
2482 2996
2483sub new { 2997sub new {
2484 my $class = shift; 2998 my $class = shift;
2485 2999
2486 my $self = $class->SUPER::new ( 3000 my $self = $class->SUPER::new (
2487 fontsize => 1, 3001 fontsize => 1,
2488 can_events => 0, 3002 can_events => 1,
2489 indent => 0, 3003 indent => 0,
2490 #font => default_font 3004 #font => default_font
2491 @_, 3005 @_,
2492 3006
2493 layout => (new CFClient::Layout 1), 3007 layout => (new CFPlus::Layout),
2494 par => [], 3008 par => [],
3009 max_par => 0,
2495 height => 0, 3010 height => 0,
2496 children => [ 3011 children => [
2497 (new CFClient::UI::Empty expand => 1), 3012 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 3013 (new CFPlus::UI::Slider vertical => 1),
2499 ], 3014 ],
2500 ); 3015 );
2501 3016
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 3017 $self->{children}[1]->connect (changed => sub { $self->update });
2503 3018
… …
2509 3024
2510 $self->{fontsize} = $fontsize; 3025 $self->{fontsize} = $fontsize;
2511 $self->reflow; 3026 $self->reflow;
2512} 3027}
2513 3028
3029sub size_request {
3030 my ($self) = @_;
3031
3032 my ($empty, $slider) = @{ $self->{children} };
3033
3034 local $self->{children} = [$empty, $slider];
3035 $self->SUPER::size_request
3036}
3037
2514sub size_allocate { 3038sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 3039 my ($self, $w, $h) = @_;
2516 3040
2517 $self->SUPER::size_allocate ($w, $h); 3041 my ($empty, $slider, @other) = @{ $self->{children} };
3042 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 3043
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3044 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3045 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 3046 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3047 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 3048
2524 $self->reflow; 3049 $self->reflow;
2525}
2526 3050
2527sub text_size { 3051 local $self->{children} = [$empty, $slider];
3052 $self->SUPER::invoke_size_allocate ($w, $h)
3053}
3054
3055sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 3056 my ($self, $ev) = @_;
3057
3058 return 0 unless $ev->{dy}; # only vertical movements
3059
3060 $self->{children}[1]->emit (mouse_wheel => $ev);
3061
3062 1
3063}
3064
3065sub get_layout {
3066 my ($self, $para) = @_;
2529 3067
2530 my $layout = $self->{layout}; 3068 my $layout = $self->{layout};
2531 3069
3070 $layout->set_font ($self->{font}) if $self->{font};
3071 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3072 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 3073 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3074 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 3075 $layout->set_markup ($para->{markup});
3076
3077 $layout->set_shapes (
3078 map
3079 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3080 @{$para->{widget}}
2536 3081 );
3082
2537 $layout->size 3083 $layout
2538} 3084}
2539 3085
2540sub reflow { 3086sub reflow {
2541 my ($self) = @_; 3087 my ($self) = @_;
2542 3088
… …
2549 3095
2550 # todo: base offset on lines or so, not on pixels 3096 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 3097 $self->{children}[1]->set_value ($offset);
2552} 3098}
2553 3099
3100sub current_paragraph {
3101 my ($self) = @_;
3102
3103 $self->{top_paragraph} - 1
3104}
3105
3106sub scroll_to {
3107 my ($self, $para) = @_;
3108
3109 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3110
3111 $self->{scroll_to} = $para;
3112 $self->update;
3113}
3114
2554sub clear { 3115sub clear {
2555 my ($self) = @_; 3116 my ($self) = @_;
3117
3118 my (undef, undef, @other) = @{ $self->{children} };
3119 $self->remove ($_) for @other;
2556 3120
2557 $self->{par} = []; 3121 $self->{par} = [];
2558 $self->{height} = 0; 3122 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3123 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 3124}
2561 3125
2562sub add_paragraph { 3126sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 3127 my $self = shift;
2564 3128
2565 for my $line (split /\n/, $text) { 3129 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 3130 $para = {
3131 fg => [1, 1, 1, 1],
3132 indent => 0,
3133 markup => "",
3134 widget => [],
3135 ref $para ? %$para : (markup => $para),
3136 w => 1e10,
3137 wrapped => 1,
3138 };
3139
3140 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3141 push @{$self->{par}}, $para;
3142 }
3143
3144 if (my $max = $self->{max_par}) {
3145 shift @{$self->{par}} while @{$self->{par}} > $max;
3146 }
3147
3148 $self->{need_reflow}++;
3149 $self->update;
3150}
3151
3152sub scroll_to_bottom {
3153 my ($self) = @_;
3154
3155 $self->{scroll_to} = $#{$self->{par}};
3156 $self->update;
3157}
3158
3159sub force_uptodate {
3160 my ($self) = @_;
3161
3162 if (delete $self->{need_reflow}) {
3163 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3164
3165 my $height = 0;
3166
3167 for my $para (@{$self->{par}}) {
3168 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3169 my $layout = $self->get_layout ($para);
3170 my ($w, $h) = $layout->size;
3171
3172 $para->{w} = $w + $para->{indent};
3173 $para->{h} = $h;
3174 $para->{wrapped} = $layout->has_wrapped;
3175 }
3176
3177 $para->{y} = $height;
3178 $height += $para->{h};
3179 }
3180
2567 $self->{height} += $h; 3181 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3182 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 3183
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3184 delete $self->{texture};
3185 }
3186
3187 if (my $paridx = delete $self->{scroll_to}) {
3188 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3189 }
2572} 3190}
2573 3191
2574sub update { 3192sub update {
2575 my ($self) = @_; 3193 my ($self) = @_;
2576 3194
… …
2579 return unless $self->{h} > 0; 3197 return unless $self->{h} > 0;
2580 3198
2581 delete $self->{texture}; 3199 delete $self->{texture};
2582 3200
2583 $ROOT->on_post_alloc ($self => sub { 3201 $ROOT->on_post_alloc ($self => sub {
3202 $self->force_uptodate;
3203
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3204 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3205
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 { 3206 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3207 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3208 glClear GL_COLOR_BUFFER_BIT;
2616 3209
3210 package CFPlus::UI::Base;
3211 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3212 (0, 0, $self->{w}, $self->{h});
3213
3214 my $top = int $self->{children}[1]{range}[0];
3215
3216 my $paridx = 0;
3217 my $top_paragraph;
2617 my $top = int $self->{children}[1]{range}[0]; 3218 my $top = int $self->{children}[1]{range}[0];
2618 3219
2619 my $y0 = $top; 3220 my $y0 = $top;
2620 my $y1 = $top + $H; 3221 my $y1 = $top + $H;
2621 3222
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}}) { 3223 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3224 my $h = $para->{h};
3225 my $y = $para->{y};
2634 3226
2635 if ($y0 < $y + $h && $y < $y1) { 3227 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3228 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 3229
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3230 $layout->render ($para->{indent}, $y - $y0);
2642 3231
2643 glRasterPos $par->[3], $y - $y0; 3232 if (my @w = @{ $para->{widget} }) {
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3233 my @s = $layout->get_shapes;
3234
3235 for (@w) {
3236 my ($dx, $dy) = splice @s, 0, 2, ();
3237
3238 $_->{x} = $dx + $para->{indent};
3239 $_->{y} = $dy + $y - $y0;
3240
3241 $_->draw;
3242 }
3243 }
2645 } 3244 }
2646 3245
2647 $y += $h; 3246 $paridx++;
3247 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3248 }
2649 3249
2650 glDisable GL_BLEND; 3250 $self->{top_paragraph} = $top_paragraph;
2651 }; 3251 };
2652 }); 3252 });
3253}
3254
3255sub reconfigure {
3256 my ($self) = @_;
3257
3258 $self->SUPER::reconfigure;
3259
3260 $_->{w} = 1e10 for @{ $self->{par} };
3261 $self->reflow;
2653} 3262}
2654 3263
2655sub _draw { 3264sub _draw {
2656 my ($self) = @_; 3265 my ($self) = @_;
2657 3266
… …
2660 glColor 0, 0, 0, 1; 3269 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3270 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 3271 glDisable GL_TEXTURE_2D;
2663 3272
2664 $self->{children}[1]->draw; 3273 $self->{children}[1]->draw;
2665
2666} 3274}
2667 3275
2668############################################################################# 3276#############################################################################
2669 3277
2670package CFClient::UI::Animator; 3278package CFPlus::UI::Animator;
2671 3279
2672use CFClient::OpenGL; 3280use CFPlus::OpenGL;
2673 3281
2674our @ISA = CFClient::UI::Bin::; 3282our @ISA = CFPlus::UI::Bin::;
2675 3283
2676sub moveto { 3284sub moveto {
2677 my ($self, $x, $y) = @_; 3285 my ($self, $x, $y) = @_;
2678 3286
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3287 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3315 glPopMatrix;
2708} 3316}
2709 3317
2710############################################################################# 3318#############################################################################
2711 3319
2712package CFClient::UI::Flopper; 3320package CFPlus::UI::Flopper;
2713 3321
2714our @ISA = CFClient::UI::Button::; 3322our @ISA = CFPlus::UI::Button::;
2715 3323
2716sub new { 3324sub new {
2717 my $class = shift; 3325 my $class = shift;
2718 3326
2719 my $self = $class->SUPER::new ( 3327 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3339 $self->{other}->toggle_visibility;
2732} 3340}
2733 3341
2734############################################################################# 3342#############################################################################
2735 3343
2736package CFClient::UI::Tooltip; 3344package CFPlus::UI::Tooltip;
2737 3345
2738our @ISA = CFClient::UI::Bin::; 3346our @ISA = CFPlus::UI::Bin::;
2739 3347
2740use CFClient::OpenGL; 3348use CFPlus::OpenGL;
2741 3349
2742sub new { 3350sub new {
2743 my $class = shift; 3351 my $class = shift;
2744 3352
2745 $class->SUPER::new ( 3353 $class->SUPER::new (
… …
2748 ) 3356 )
2749} 3357}
2750 3358
2751sub set_tooltip_from { 3359sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3360 my ($self, $widget) = @_;
3361
3362 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3363 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3364
2754 my $tooltip = $widget->{tooltip}; 3365 my $tooltip = $widget->{tooltip};
2755 3366
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3367 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3368 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3372 }
2762 3373
2763 $tooltip =~ s/^\n+//; 3374 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3375 $tooltip =~ s/\n+$//;
2765 3376
2766 $self->add (new CFClient::UI::Label 3377 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3378 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3379 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3380 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3381 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3382 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3383 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3384 );
2774} 3385}
2775 3386
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3390 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3391
2781 ($w + 4, $h + 4) 3392 ($w + 4, $h + 4)
2782} 3393}
2783 3394
2784sub size_allocate { 3395sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3396 my ($self, $w, $h) = @_;
2786 3397
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3398 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3399}
2789 3400
2790sub visibility_change { 3401sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3402 my ($self, $visible) = @_;
2792 3403
2793 return unless $visible; 3404 return unless $visible;
2794 3405
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3406 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3407 my $widget = $self->{owner}
2797 or return; 3408 or return;
2798 3409
3410 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3411 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3412
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3413 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3414 if $x + $self->{w} > $self->{root}{w};
2803 3415
2804 $self->move_abs ($x, $y); 3416 $self->move_abs ($x, $y);
3417 } else {
3418 $self->hide;
3419 }
2805 }); 3420 });
2806} 3421}
2807 3422
2808sub _draw { 3423sub _draw {
2809 my ($self) = @_; 3424 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3448 $self->SUPER::_draw;
2834} 3449}
2835 3450
2836############################################################################# 3451#############################################################################
2837 3452
2838package CFClient::UI::Face; 3453package CFPlus::UI::Face;
2839 3454
2840our @ISA = CFClient::UI::Base::; 3455our @ISA = CFPlus::UI::DrawBG::;
2841 3456
2842use CFClient::OpenGL; 3457use CFPlus::OpenGL;
2843 3458
2844sub new { 3459sub new {
2845 my $class = shift; 3460 my $class = shift;
2846 3461
2847 my $self = $class->SUPER::new ( 3462 my $self = $class->SUPER::new (
3463 size_w => 32,
3464 size_h => 8,
2848 aspect => 1, 3465 aspect => 1,
2849 can_events => 0, 3466 can_events => 0,
2850 @_, 3467 @_,
2851 ); 3468 );
2852 3469
2853 if ($self->{anim} && $self->{animspeed}) { 3470 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3471 CFPlus::weaken (my $widget = $self);
2855 3472
3473 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3474 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2856 $self->{timer} = Event->timer ( 3475 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3476 parked => 1,
2859 interval => $self->{animspeed},
2860 cb => sub { 3477 cb => sub {
3478 return unless $::CONN && $widget;
3479
2861 ++$widget->{frame}; 3480 ++$widget->{frame};
3481 $widget->update_face;
2862 $widget->update; 3482 $widget->update;
3483
3484 $widget->update_timer;
2863 }, 3485 },
2864 ); 3486 );
3487
3488 $self->update_face;
3489 $self->update_timer;
2865 } 3490 }
2866 3491
2867 $self 3492 $self
2868} 3493}
2869 3494
3495sub update_timer {
3496 my ($self) = @_;
3497
3498 return unless $self->{timer};
3499
3500 if ($self->{visible}) {
3501 $self->{timer}->at (
3502 $self->{anim_start}
3503 + $self->{animspeed}
3504 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3505 );
3506 $self->{timer}->start;
3507 } else {
3508 $self->{timer}->stop;
3509 }
3510}
3511
3512sub update_face {
3513 my ($self) = @_;
3514
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
2870sub size_request { 3525sub size_request {
2871 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc;
3535 });
3536 }
3537 }
3538 }
3539
3540 ($self->{size_w} || 8, $self->{size_h} || 8)
2872} 3541}
2873 3542
2874sub update { 3543sub update {
2875 my ($self) = @_; 3544 my ($self) = @_;
2876 3545
2877 return unless $self->{visible}; 3546 return unless $self->{visible};
2878 3547
2879 $self->SUPER::update; 3548 $self->SUPER::update;
2880} 3549}
2881 3550
3551sub invoke_visibility_change {
3552 my ($self) = @_;
3553
3554 $self->update_timer;
3555
3556 0
3557}
3558
2882sub _draw { 3559sub _draw {
2883 my ($self) = @_; 3560 my ($self) = @_;
2884 3561
2885 return unless $::CONN; 3562 return unless $::CONN;
2886 3563
2887 my $face; 3564 $self->SUPER::_draw;
2888 3565
2889 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3566 my $faceid = $::CONN->{faceid}[$self->{face}]
2891 3567 or return;
2892 $face = $anim->[ $self->{frame} % @$anim ]
2893 if $anim && @$anim;
2894 }
2895 3568
2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3569 my $tex = $::CONN->{texture}[$faceid];
2897 3570
2898 if ($tex) { 3571 if ($tex) {
2899 glEnable GL_TEXTURE_2D; 3572 glEnable GL_TEXTURE_2D;
2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901 glColor 0, 0, 0, 1; 3574 glColor 0, 0, 0, 1;
… …
2905} 3578}
2906 3579
2907sub destroy { 3580sub destroy {
2908 my ($self) = @_; 3581 my ($self) = @_;
2909 3582
2910 $self->{timer}->cancel 3583 (delete $self->{timer})->cancel
2911 if $self->{timer}; 3584 if $self->{timer};
2912 3585
2913 $self->SUPER::destroy; 3586 $self->SUPER::destroy;
2914} 3587}
2915 3588
2916############################################################################# 3589#############################################################################
2917 3590
2918package CFClient::UI::Buttonbar; 3591package CFPlus::UI::Buttonbar;
2919 3592
2920our @ISA = CFClient::UI::HBox::; 3593our @ISA = CFPlus::UI::HBox::;
2921 3594
2922# TODO: should actualyl wrap buttons and other goodies. 3595# TODO: should actually wrap buttons and other goodies.
2923 3596
2924############################################################################# 3597#############################################################################
2925 3598
2926package CFClient::UI::Menu; 3599package CFPlus::UI::Menu;
2927 3600
2928our @ISA = CFClient::UI::FancyFrame::; 3601our @ISA = CFPlus::UI::Toplevel::;
2929 3602
2930use CFClient::OpenGL; 3603use CFPlus::OpenGL;
2931 3604
2932sub new { 3605sub new {
2933 my $class = shift; 3606 my $class = shift;
2934 3607
2935 my $self = $class->SUPER::new ( 3608 my $self = $class->SUPER::new (
2936 items => [], 3609 items => [],
2937 z => 100, 3610 z => 100,
2938 @_, 3611 @_,
2939 ); 3612 );
2940 3613
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3614 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3615
2943 for my $item (@{ $self->{items} }) { 3616 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3617 my ($widget, $cb, $tooltip) = @$item;
2945 3618
2946 # handle various types of items, only text for now 3619 # handle various types of items, only text for now
2947 if (!ref $widget) { 3620 if (!ref $widget) {
3621 if ($widget =~ /\t/) {
3622 my ($left, $right) = split /\t/, $widget, 2;
3623
2948 $widget = new CFClient::UI::Label 3624 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3625 can_hover => 1,
2950 can_events => 1, 3626 can_events => 1,
3627 tooltip => $tooltip,
3628 children => [
3629 (new CFPlus::UI::Label markup => $left, expand => 1),
3630 (new CFPlus::UI::Label markup => $right, align => +1),
3631 ],
3632 ;
3633
3634 } else {
3635 $widget = new CFPlus::UI::Label
3636 can_hover => 1,
3637 can_events => 1,
2951 markup => $widget, 3638 markup => $widget,
2952 tooltip => $tooltip 3639 tooltip => $tooltip;
3640 }
2953 } 3641 }
2954 3642
2955 $self->{item}{$widget} = $item; 3643 $self->{item}{$widget} = $item;
2956 3644
2957 $self->{vbox}->add ($widget); 3645 $self->{vbox}->add ($widget);
… …
2962 3650
2963# popup given the event (must be a mouse button down event currently) 3651# popup given the event (must be a mouse button down event currently)
2964sub popup { 3652sub popup {
2965 my ($self, $ev) = @_; 3653 my ($self, $ev) = @_;
2966 3654
2967 $self->_emit ("popdown"); 3655 $self->emit ("popdown");
2968 3656
2969 # maybe save $GRAB? must be careful about events... 3657 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3658 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3659 $self->{button} = $ev->{button};
2972 3660
2973 $self->show; 3661 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3662 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3663}
2976 3664
2977sub mouse_motion { 3665sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3666 my ($self, $ev, $x, $y) = @_;
2979 3667
2980 # TODO: should use vbox->find_widget or so 3668 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3669 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3670 $self->{hover} = $self->{item}{$HOVER};
2983 3671
2984 0 3672 0
2985} 3673}
2986 3674
2987sub button_up { 3675sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3676 my ($self, $ev, $x, $y) = @_;
2989 3677
2990 if ($ev->{button} == $self->{button}) { 3678 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3679 undef $GRAB;
2992 $self->hide; 3680 $self->hide;
2993 3681
2994 $self->_emit ("popdown"); 3682 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3683 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3684 } else {
2997 return 0 3685 return 0
2998 } 3686 }
2999 3687
3000 1 3688 1
3001} 3689}
3002 3690
3003############################################################################# 3691#############################################################################
3004 3692
3005package CFClient::UI::Multiplexer; 3693package CFPlus::UI::Multiplexer;
3006 3694
3007our @ISA = CFClient::UI::Container::; 3695our @ISA = CFPlus::UI::Container::;
3008 3696
3009sub new { 3697sub new {
3010 my $class = shift; 3698 my $class = shift;
3011 3699
3012 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
… …
3026 3714
3027 $self->{current} = $self->{children}[0] 3715 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3716 if @{ $self->{children} };
3029} 3717}
3030 3718
3719sub get_current_page {
3720 my ($self) = @_;
3721
3722 $self->{current}
3723}
3724
3031sub set_current_page { 3725sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3726 my ($self, $page_or_widget) = @_;
3033 3727
3034 my $widget = ref $page_or_widget 3728 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3729 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3730 : $self->{children}[$page_or_widget];
3037 3731
3038 $self->{current} = $widget; 3732 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3733 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3734
3041 $self->_emit (page_changed => $self->{current}); 3735 $self->emit (page_changed => $self->{current});
3042 3736
3043 $self->realloc; 3737 $self->realloc;
3044} 3738}
3045 3739
3046sub visible_children { 3740sub visible_children {
… …
3051 my ($self) = @_; 3745 my ($self) = @_;
3052 3746
3053 $self->{current}->size_request 3747 $self->{current}->size_request
3054} 3748}
3055 3749
3056sub size_allocate { 3750sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3751 my ($self, $w, $h) = @_;
3058 3752
3059 $self->{current}->configure (0, 0, $w, $h); 3753 $self->{current}->configure (0, 0, $w, $h);
3754
3755 1
3060} 3756}
3061 3757
3062sub _draw { 3758sub _draw {
3063 my ($self) = @_; 3759 my ($self) = @_;
3064 3760
3065 $self->{current}->draw; 3761 $self->{current}->draw;
3066} 3762}
3067 3763
3068############################################################################# 3764#############################################################################
3069 3765
3070package CFClient::UI::Notebook; 3766package CFPlus::UI::Notebook;
3071 3767
3072our @ISA = CFClient::UI::VBox::; 3768our @ISA = CFPlus::UI::VBox::;
3073 3769
3074sub new { 3770sub new {
3075 my $class = shift; 3771 my $class = shift;
3076 3772
3077 my $self = $class->SUPER::new ( 3773 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3774 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3775 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3776 # filter => # will be put between multiplexer and $self
3081 @_, 3777 @_,
3082 ); 3778 );
3083 3779
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3780 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3784}
3089 3785
3090sub add { 3786sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3787 my ($self, $title, $widget, $tooltip) = @_;
3092 3788
3093 Scalar::Util::weaken $self; 3789 CFPlus::weaken $self;
3094 3790
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3791 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3792 markup => $title,
3097 tooltip => $tooltip, 3793 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3794 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3795 );
3100 3796
3101 $self->{multiplexer}->add ($widget); 3797 $self->{multiplexer}->add ($widget);
3102} 3798}
3103 3799
3800sub get_current_page {
3801 my ($self) = @_;
3802
3803 $self->{multiplexer}->get_current_page
3804}
3805
3104sub set_current_page { 3806sub set_current_page {
3105 my ($self, $page) = @_; 3807 my ($self, $page) = @_;
3106 3808
3107 $self->{multiplexer}->set_current_page ($page); 3809 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3810 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3811}
3110 3812
3111############################################################################# 3813#############################################################################
3112 3814
3113package CFClient::UI::Combobox; 3815package CFPlus::UI::Selector;
3114 3816
3115use utf8; 3817use utf8;
3116 3818
3117our @ISA = CFClient::UI::Button::; 3819our @ISA = CFPlus::UI::Button::;
3118 3820
3119sub new { 3821sub new {
3120 my $class = shift; 3822 my $class = shift;
3121 3823
3122 my $self = $class->SUPER::new ( 3824 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3830 $self->_set_value ($self->{value});
3129 3831
3130 $self 3832 $self
3131} 3833}
3132 3834
3133sub button_down { 3835sub invoke_button_down {
3134 my ($self, $ev) = @_; 3836 my ($self, $ev) = @_;
3135 3837
3136 my @menu_items; 3838 my @menu_items;
3137 3839
3138 for (@{ $self->{options} }) { 3840 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3841 my ($value, $title, $tooltip) = @$_;
3140 3842
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3843 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3844 }
3143 3845
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3846 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3847}
3146 3848
3147sub _set_value { 3849sub _set_value {
3148 my ($self, $value) = @_; 3850 my ($self, $value) = @_;
3149 3851
… …
3159 my ($self, $value) = @_; 3861 my ($self, $value) = @_;
3160 3862
3161 return unless $self->{value} ne $value; 3863 return unless $self->{value} ne $value;
3162 3864
3163 $self->_set_value ($value); 3865 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3866 $self->emit (changed => $value);
3165} 3867}
3166 3868
3167############################################################################# 3869#############################################################################
3168 3870
3169package CFClient::UI::Statusbox; 3871package CFPlus::UI::Statusbox;
3170 3872
3171our @ISA = CFClient::UI::VBox::; 3873our @ISA = CFPlus::UI::VBox::;
3172 3874
3173sub new { 3875sub new {
3174 my $class = shift; 3876 my $class = shift;
3175 3877
3176 my $self = $class->SUPER::new ( 3878 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3879 fontsize => 0.8,
3178 @_, 3880 @_,
3179 ); 3881 );
3180 3882
3181 Scalar::Util::weaken (my $this = $self); 3883 CFPlus::weaken (my $this = $self);
3182 3884
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3885 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3886
3185 $self 3887 $self
3186} 3888}
… …
3188sub reorder { 3890sub reorder {
3189 my ($self) = @_; 3891 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3892 my $NOW = Time::HiRes::time;
3191 3893
3192 # freeze display when hovering over any label 3894 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3895 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3896 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3897 values %{ $self->{item} };
3196 3898
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3899 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3900 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3901 }
… …
3220 for ($short) { 3922 for ($short) {
3221 s/^\s+//; 3923 s/^\s+//;
3222 s/\s+/ /g; 3924 s/\s+/ /g;
3223 } 3925 }
3224 3926
3225 new CFClient::UI::Label 3927 new CFPlus::UI::Label
3226 markup => $short, 3928 markup => $short,
3227 tooltip => $item->{tooltip}, 3929 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3930 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3931 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3932 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3986 count => 1,
3285 %arg, 3987 %arg,
3286 }; 3988 };
3287 } 3989 }
3288 3990
3991 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3992 $self->reorder;
3993 });
3290} 3994}
3291 3995
3292sub reconfigure { 3996sub reconfigure {
3293 my ($self) = @_; 3997 my ($self) = @_;
3294 3998
… …
3307 $self->SUPER::destroy; 4011 $self->SUPER::destroy;
3308} 4012}
3309 4013
3310############################################################################# 4014#############################################################################
3311 4015
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; 4016package CFPlus::UI::Root;
3674 4017
3675our @ISA = CFClient::UI::Container::; 4018our @ISA = CFPlus::UI::Container::;
3676 4019
3677use List::Util qw(min max); 4020use List::Util qw(min max);
3678 4021
3679use CFClient::OpenGL; 4022use CFPlus::OpenGL;
3680 4023
3681sub new { 4024sub new {
3682 my $class = shift; 4025 my $class = shift;
3683 4026
3684 my $self = $class->SUPER::new ( 4027 my $self = $class->SUPER::new (
3685 visible => 1, 4028 visible => 1,
3686 @_, 4029 @_,
3687 ); 4030 );
3688 4031
3689 Scalar::Util::weaken ($self->{root} = $self); 4032 CFPlus::weaken ($self->{root} = $self);
3690 4033
3691 $self 4034 $self
3692} 4035}
3693 4036
3694sub size_request { 4037sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 4052 $coord = $max - $size if $coord > $max - $size;
3710 4053
3711 int $coord + 0.5 4054 int $coord + 0.5
3712} 4055}
3713 4056
3714sub size_allocate { 4057sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 4058 my ($self, $w, $h) = @_;
3716 4059
3717 for my $child ($self->children) { 4060 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 4062
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 4066 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 4067 $Y = _to_pixel $Y, $H, $self->{h};
3725 4068
3726 $child->configure ($X, $Y, $W, $H); 4069 $child->configure ($X, $Y, $W, $H);
3727 } 4070 }
4071
4072 1
3728} 4073}
3729 4074
3730sub coord2local { 4075sub coord2local {
3731 my ($self, $x, $y) = @_; 4076 my ($self, $x, $y) = @_;
3732 4077
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4203 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4204
3860 $w = 0 if $w < 0; 4205 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 4206 $h = 0 if $h < 0;
3862 4207
4208 $w = max $widget->{min_w}, $w;
4209 $h = max $widget->{min_h}, $h;
4210
4211# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4212# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4213
4214 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4215 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4216
3863 $w = int $w + 0.5; 4217 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 4218 $h = int $h + 0.5;
3865 4219
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4220 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 4221 $widget->{old_w} = $widget->{w};
… …
3877 4231
3878 while ($self->{post_alloc_hook}) { 4232 while ($self->{post_alloc_hook}) {
3879 $_->() 4233 $_->()
3880 for values %{delete $self->{post_alloc_hook}}; 4234 for values %{delete $self->{post_alloc_hook}};
3881 } 4235 }
3882
3883 4236
3884 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4237 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4238 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3886 glClear GL_COLOR_BUFFER_BIT; 4239 glClear GL_COLOR_BUFFER_BIT;
3887 4240
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4243 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4244 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4245 glLoadIdentity;
3893 4246
3894 { 4247 {
3895 package CFClient::UI::Base; 4248 package CFPlus::UI::Base;
3896 4249
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4250 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4251 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4252
3901 $self->_draw; 4253 $self->_draw;
4254 }
3902} 4255}
3903 4256
3904############################################################################# 4257#############################################################################
3905 4258
3906package CFClient::UI; 4259package CFPlus::UI;
3907 4260
3908$ROOT = new CFClient::UI::Root; 4261$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4262$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4263
39111 42641
3912 4265

Diff Legend

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