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

Diff Legend

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