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.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30: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};
… …
686 if $children; 746 if $children;
687 747
688 $self 748 $self
689} 749}
690 750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
757}
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;
… …
755 $_->draw for @{$self->{children}}; 823 $_->draw for @{$self->{children}};
756} 824}
757 825
758############################################################################# 826#############################################################################
759 827
760package CFClient::UI::Bin; 828package CFPlus::UI::Bin;
761 829
762our @ISA = CFClient::UI::Container::; 830our @ISA = CFPlus::UI::Container::;
763 831
764sub new { 832sub new {
765 my ($class, %arg) = @_; 833 my ($class, %arg) = @_;
766 834
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 835 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 836
769 $class->SUPER::new (children => [$child], %arg) 837 $class->SUPER::new (children => [$child], %arg)
770} 838}
771 839
772sub add { 840sub add {
… …
779sub remove { 847sub remove {
780 my ($self, $widget) = @_; 848 my ($self, $widget) = @_;
781 849
782 $self->SUPER::remove ($widget); 850 $self->SUPER::remove ($widget);
783 851
784 $self->{children} = [new CFClient::UI::Empty] 852 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 853 unless @{$self->{children}};
786} 854}
787 855
788sub child { $_[0]->{children}[0] } 856sub child { $_[0]->{children}[0] }
789 857
790sub size_request { 858sub size_request {
791 $_[0]{children}[0]->size_request 859 $_[0]{children}[0]->size_request
792} 860}
793 861
794sub size_allocate { 862sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 863 my ($self, $w, $h) = @_;
796 864
797 $self->{children}[0]->configure (0, 0, $w, $h); 865 $self->{children}[0]->configure (0, 0, $w, $h);
866
867 1
798} 868}
799 869
800############################################################################# 870#############################################################################
801 871
802# back-buffered drawing area 872# back-buffered drawing area
803 873
804package CFClient::UI::Window; 874package CFPlus::UI::Window;
805 875
806our @ISA = CFClient::UI::Bin::; 876our @ISA = CFPlus::UI::Bin::;
807 877
808use CFClient::OpenGL; 878use CFPlus::OpenGL;
809 879
810sub new { 880sub new {
811 my ($class, %arg) = @_; 881 my ($class, %arg) = @_;
812 882
813 my $self = $class->SUPER::new (%arg); 883 my $self = $class->SUPER::new (%arg);
… …
818 888
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 889 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 890 $self->SUPER::update;
821} 891}
822 892
823sub size_allocate { 893sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
825 895
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 896 $self->update;
897
898 $self->SUPER::invoke_size_allocate ($w, $h)
828} 899}
829 900
830sub _render { 901sub _render {
831 my ($self) = @_; 902 my ($self) = @_;
832 903
… …
834} 905}
835 906
836sub render_child { 907sub render_child {
837 my ($self) = @_; 908 my ($self) = @_;
838 909
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 910 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 911 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 912 glClear GL_COLOR_BUFFER_BIT;
842 913
843 { 914 {
844 package CFClient::UI::Base; 915 package CFPlus::UI::Base;
845 916
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 917 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 918 (0, 0, $self->{w}, $self->{h});
919
920 $self->_render;
848 } 921 }
849
850 $self->_render;
851 }; 922 };
852} 923}
853 924
854sub _draw { 925sub _draw {
855 my ($self) = @_; 926 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 927
859 my $tex = $self->{texture} 928 my $tex = $self->{texture}
860 or return; 929 or return;
861 930
862 glEnable GL_TEXTURE_2D; 931 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 933 glColor 0, 0, 0, 1;
865 934
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 935 $tex->draw_quad_alpha_premultiplied (0, 0);
867 936
868 glDisable GL_TEXTURE_2D; 937 glDisable GL_TEXTURE_2D;
869} 938}
870 939
871############################################################################# 940#############################################################################
872 941
873package CFClient::UI::ViewPort; 942package CFPlus::UI::ViewPort;
874 943
944use List::Util qw(min max);
945
875our @ISA = CFClient::UI::Window::; 946our @ISA = CFPlus::UI::Window::;
876 947
877sub new { 948sub new {
878 my $class = shift; 949 my $class = shift;
879 950
880 $class->SUPER::new ( 951 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 964 $h = 10 if $self->{scroll_y};
894 965
895 ($w, $h) 966 ($w, $h)
896} 967}
897 968
898sub size_allocate { 969sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 970 my ($self, $w, $h) = @_;
900 971
901 my $child = $self->child; 972 my $child = $self->child;
902 973
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 974 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 975 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 976
906 $self->child->configure (0, 0, $w, $h); 977 $self->child->configure (0, 0, $w, $h);
907 $self->update; 978 $self->update;
979
980 1
908} 981}
909 982
910sub set_offset { 983sub set_offset {
911 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
912 985
986 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
987 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
988
989 if ($x != $self->{view_x} or $y != $self->{view_y}) {
913 $self->{view_x} = int $x; 990 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 991 $self->{view_y} = $y;
915 992
993 $self->emit (changed => $x, $y);
916 $self->update; 994 $self->update;
995 }
917} 996}
918 997
919# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 999sub coord2local {
921 my ($self, $x, $y) = @_; 1000 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
937 1016
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1019 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1021 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1023 }
945} 1024}
946 1025
947sub _render { 1026sub _render {
948 my ($self) = @_; 1027 my ($self) = @_;
949 1028
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 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}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1031
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1033
955 $self->SUPER::_render; 1034 $self->SUPER::_render;
956} 1035}
957 1036
958############################################################################# 1037#############################################################################
959 1038
960package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
961 1040
962our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
963 1042
964sub new { 1043sub new {
965 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
966 1045
967 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
968 1047
969 my $self; 1048 my $self;
970 1049
971 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1060 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1062 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1065 },
977 ; 1066 ;
978 1067
979 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
981 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
982 %arg, 1076 %arg,
983 ); 1077 );
984 1078
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
1093 $self->SUPER::add_at (0, 0, $self->{vp});
1094
986 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
987 1096
988 $self 1097 $self
989} 1098}
1099
1100#TODO# update range on size_allocate depending on child
990 1101
991sub add { 1102sub add {
992 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
993 1104
994 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
995} 1106}
996 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
997sub update { 1132sub update {
998 my ($self) = @_; 1133 my ($self) = @_;
999 1134
1135 $self->update_slider;
1000 $self->SUPER::update; 1136 $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} 1137}
1006 1138
1139sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_;
1141
1142 $self->{vslider}->emit (mouse_wheel => $ev)
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev)
1146 if $ev->{dx};
1147
1148 1
1149}
1150
1151sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_;
1153
1154 if ($ev->{button} == 2) {
1155 $self->grab_focus;
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1;
1168 }
1169
1170 0
1171}
1172
1173sub invoke_button_up {
1174 my ($self, $ev, $x, $y) = @_;
1175
1176 if (delete $self->{motion}) {
1177 return 1;
1178 }
1179
1180 0
1181}
1182
1183sub invoke_mouse_motion {
1184 my ($self, $ev, $x, $y) = @_;
1185
1186 if ($self->{motion}) {
1187 $self->{motion}->($ev, $x, $y);
1188 return 1;
1189 }
1190
1191 0
1192}
1193
1007sub size_allocate { 1194sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1195 my ($self, $w, $h) = @_;
1009 1196
1197 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1198 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1199}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1200
1019############################################################################# 1201#############################################################################
1020 1202
1021package CFClient::UI::Frame; 1203package CFPlus::UI::Frame;
1022 1204
1023our @ISA = CFClient::UI::Bin::; 1205our @ISA = CFPlus::UI::Bin::;
1024 1206
1025use CFClient::OpenGL; 1207use CFPlus::OpenGL;
1026 1208
1027sub new { 1209sub new {
1028 my $class = shift; 1210 my $class = shift;
1029 1211
1030 $class->SUPER::new ( 1212 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1238 $self->SUPER::_draw;
1057} 1239}
1058 1240
1059############################################################################# 1241#############################################################################
1060 1242
1061package CFClient::UI::FancyFrame; 1243package CFPlus::UI::FancyFrame;
1062 1244
1063our @ISA = CFClient::UI::Bin::; 1245our @ISA = CFPlus::UI::Bin::;
1064 1246
1065use CFClient::OpenGL; 1247use CFPlus::OpenGL;
1248
1249sub new {
1250 my ($class, %arg) = @_;
1251
1252 if ((exists $arg{label}) && !ref $arg{label}) {
1253 $arg{label} = new CFPlus::UI::Label
1254 align => 1,
1255 valign => 0,
1256 text => $arg{label},
1257 fontsize => ($arg{border} || 0.8) * 0.75;
1258 }
1259
1260 my $self = $class->SUPER::new (
1261 # label => "",
1262 fg => [0.6, 0.3, 0.1],
1263 border => 0.8,
1264 style => 'single',
1265 %arg,
1266 );
1267
1268 $self
1269}
1270
1271sub add {
1272 my ($self, @widgets) = @_;
1273
1274 $self->SUPER::add (@widgets);
1275 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1276}
1277
1278sub border {
1279 int $_[0]{border} * $::FONTSIZE
1280}
1281
1282sub size_request {
1283 my ($self) = @_;
1284
1285 ($self->{label_w}, undef) = $self->{label}->size_request
1286 if $self->{label};
1287
1288 my ($w, $h) = $self->SUPER::size_request;
1289
1290 (
1291 $w + $self->border * 2,
1292 $h + $self->border * 2,
1293 )
1294}
1295
1296sub invoke_size_allocate {
1297 my ($self, $w, $h) = @_;
1298
1299 my $border = $self->border;
1300
1301 $w -= List::Util::max 0, $border * 2;
1302 $h -= List::Util::max 0, $border * 2;
1303
1304 if (my $label = $self->{label}) {
1305 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1306 $label->{h} = List::Util::min $h, $border;
1307 $label->invoke_size_allocate ($label->{w}, $label->{h});
1308 }
1309
1310 $self->child->configure ($border, $border, $w, $h);
1311
1312 1
1313}
1314
1315sub _draw {
1316 my ($self) = @_;
1317
1318 my $child = $self->{children}[0];
1319
1320 my $border = $self->border;
1321 my ($w, $h) = ($self->{w}, $self->{h});
1322
1323 $child->draw;
1324
1325 glColor @{$self->{fg}};
1326 glBegin GL_LINE_STRIP;
1327 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1330 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1331 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1332 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1333 glEnd;
1334
1335 if ($self->{label}) {
1336 glTranslate $border * 2, 0;
1337 $self->{label}->_draw;
1338 }
1339}
1340
1341#############################################################################
1342
1343package CFPlus::UI::Toplevel;
1344
1345our @ISA = CFPlus::UI::Bin::;
1346
1347use CFPlus::OpenGL;
1066 1348
1067my $bg = 1349my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1350 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1351 mipmap => 1, wrap => 1;
1070 1352
1071my @border = 1353my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1354 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1355 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1356
1357my @icon =
1358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1359 qw(x1_move.png x1_resize.png);
1074 1360
1075sub new { 1361sub new {
1076 my ($class, %arg) = @_; 1362 my ($class, %arg) = @_;
1077 1363
1078 my $self = $class->SUPER::new ( 1364 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1365 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1366 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1367 border => 0.6,
1082 can_events => 1, 1368 can_events => 1,
1083 min_w => 16, 1369 min_w => 64,
1084 min_h => 16, 1370 min_h => 32,
1085 %arg, 1371 %arg,
1086 ); 1372 );
1087 1373
1088 $self->{title_widget} = new CFClient::UI::Label 1374 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1375 align => 0,
1090 valign => 1, 1376 valign => 1,
1091 text => $self->{title}, 1377 text => $self->{title},
1092 fontsize => $self->{border}, 1378 fontsize => $self->{border},
1093 if exists $self->{title}; 1379 if exists $self->{title};
1094 1380
1095 unless ($self->{no_close_button}) { 1381 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1382 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1383 new CFPlus::UI::ImageButton
1098 image => 'x1_close.png', 1384 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1385 on_activate => sub { $self->emit ("delete") };
1100 1386
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1387 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1388 }
1103 1389
1104 $self 1390 $self
1105} 1391}
1106 1392
1107sub add { 1393sub add {
1108 my ($self, @widgets) = @_; 1394 my ($self, @widgets) = @_;
1109 1395
1110 $self->SUPER::add (@widgets); 1396 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1397 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1398 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1399}
1114 1400
1115sub border { 1401sub border {
1116 int $_[0]{border} * $::FONTSIZE 1402 int $_[0]{border} * $::FONTSIZE
1117} 1403}
… …
1120 my ($self) = @_; 1406 my ($self) = @_;
1121 1407
1122 $self->{title_widget}->size_request 1408 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1409 if $self->{title_widget};
1124 1410
1125 $self->{close_btn}->size_request 1411 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1412 if $self->{close_button};
1127 1413
1128 my ($w, $h) = $self->SUPER::size_request; 1414 my ($w, $h) = $self->SUPER::size_request;
1129 1415
1130 ( 1416 (
1131 $w + $self->border * 2, 1417 $w + $self->border * 2,
1132 $h + $self->border * 2, 1418 $h + $self->border * 2,
1133 ) 1419 )
1134} 1420}
1135 1421
1136sub size_allocate { 1422sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1423 my ($self, $w, $h) = @_;
1138 1424
1139 if ($self->{title_widget}) { 1425 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1426 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1427 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1428 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1429 }
1144 1430
1145 my $border = $self->border; 1431 my $border = $self->border;
1146 1432
1147 $h -= List::Util::max 0, $border * 2; 1433 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1434 $w -= List::Util::max 0, $border * 2;
1149 1435
1150 $self->child->configure ($border, $border, $w, $h); 1436 $self->child->configure ($border, $border, $w, $h);
1151 1437
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1438 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1439 if $self->{close_button};
1154}
1155 1440
1441 1
1442}
1443
1444sub invoke_delete {
1445 my ($self) = @_;
1446
1447 $self->hide;
1448
1449 1
1450}
1451
1156sub button_down { 1452sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1453 my ($self, $ev, $x, $y) = @_;
1158 1454
1159 my ($w, $h) = @$self{qw(w h)}; 1455 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1456 my $border = $self->border;
1161 1457
… …
1192 1488
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1489 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1490
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1491 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1492 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1493 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1494 };
1199 } else { 1495 } else {
1200 return 0; 1496 return 0;
1201 } 1497 }
1202 1498
1203 1 1499 1
1204} 1500}
1205 1501
1206sub button_up { 1502sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1503 my ($self, $ev, $x, $y) = @_;
1208 1504
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1505 ! ! delete $self->{motion}
1213} 1506}
1214 1507
1215sub mouse_motion { 1508sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1509 my ($self, $ev, $x, $y) = @_;
1217 1510
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1511 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1512
1220 !!$self->{motion} 1513 ! ! $self->{motion}
1514}
1515
1516sub invoke_visibility_change {
1517 my ($self, $visible) = @_;
1518
1519 delete $self->{motion} unless $visible;
1520
1521 0
1221} 1522}
1222 1523
1223sub _draw { 1524sub _draw {
1224 my ($self) = @_; 1525 my ($self) = @_;
1225 1526
… …
1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1533 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1233 1534
1234 my $border = $self->border; 1535 my $border = $self->border;
1235 1536
1236 glColor @{ $self->{border_bg} }; 1537 glColor @{ $self->{border_bg} };
1237 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1538 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1539 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1540 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1541 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1542
1543 # move
1544 my $w2 = ($w - $border) * .5;
1545 my $h2 = ($h - $border) * .5;
1546 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1547 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1548 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1549
1550 # resize
1551 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1553 unless $self->{has_close_button};
1554 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1241 1556
1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1557 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1243 glColor @{ $self->{bg} }; 1558 glColor @{ $self->{bg} };
1244 1559
1245 # TODO: repeat texture not scale 1560 # TODO: repeat texture not scale
… …
1258 $self->{title_widget}->_draw; 1573 $self->{title_widget}->_draw;
1259 1574
1260 glTranslate 0, - ($border - $self->{h}); 1575 glTranslate 0, - ($border - $self->{h});
1261 } 1576 }
1262 1577
1263 $self->{close_btn}->draw 1578 $self->{close_button}->draw
1264 if $self->{close_btn}; 1579 if $self->{close_button};
1265} 1580}
1266 1581
1267############################################################################# 1582#############################################################################
1268 1583
1269package CFClient::UI::Table; 1584package CFPlus::UI::Table;
1270 1585
1271our @ISA = CFClient::UI::Base::; 1586our @ISA = CFPlus::UI::Base::;
1272 1587
1273use List::Util qw(max sum); 1588use List::Util qw(max sum);
1274 1589
1275use CFClient::OpenGL; 1590use CFPlus::OpenGL;
1276 1591
1277sub new { 1592sub new {
1278 my $class = shift; 1593 my $class = shift;
1279 1594
1280 $class->SUPER::new ( 1595 $class->SUPER::new (
1596 children => [],
1281 col_expand => [], 1597 col_expand => [],
1598 row_expand => [],
1282 @_, 1599 @_,
1283 ) 1600 )
1284} 1601}
1285 1602
1286sub children { 1603sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288} 1605}
1289 1606
1607# TODO: store row/col info in child widget and use standard add/del
1290sub add { 1608sub add {
1291 my ($self, $x, $y, $child) = @_; 1609 my $self = shift;
1292 1610
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1612 $self->add_at (@_);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1617
1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620
1293 $child->set_parent ($self); 1621 $child->set_parent ($self);
1294 $self->{children}[$y][$x] = $child; 1622 $self->{children}[$row][$col] = $child;
1623 }
1295 1624
1625 $self->{force_realloc} = 1;
1626 $self->{force_size_alloc} = 1;
1296 $self->realloc; 1627 $self->realloc;
1297} 1628}
1298 1629
1299sub remove { 1630sub remove {
1300 my ($self, $child) = @_; 1631 my ($self, $child) = @_;
1301 1632
1302 # TODO: not yet implemented 1633 for (@{ $self->{children} }) {
1634 for (@{ $_ || [] }) {
1635 $_ = undef if $_ == $child;
1636 }
1637 }
1303} 1638}
1304 1639
1305# TODO: move to container class maybe? send children a signal on removal? 1640# TODO: move to container class maybe? send children a signal on removal?
1306sub clear { 1641sub clear {
1307 my ($self) = @_; 1642 my ($self) = @_;
… …
1348 (sum @$ws), 1683 (sum @$ws),
1349 (sum @$hs), 1684 (sum @$hs),
1350 ) 1685 )
1351} 1686}
1352 1687
1353sub size_allocate { 1688sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1689 my ($self, $w, $h) = @_;
1355 1690
1356 my ($ws, $hs) = $self->get_wh; 1691 my ($ws, $hs) = $self->get_wh;
1357 1692
1358 my $req_w = (sum @$ws) || 1; 1693 my $req_w = (sum @$ws) || 1;
1359 my $req_h = (sum @$hs) || 1; 1694 my $req_h = (sum @$hs) || 1;
1360 1695
1361 # TODO: nicer code && do row_expand 1696 # TODO: nicer code
1362 my @col_expand = @{$self->{col_expand}}; 1697 my @col_expand = @{$self->{col_expand}};
1363 @col_expand = (1) x @$ws unless @col_expand; 1698 @col_expand = (1) x @$ws unless @col_expand;
1364 my $col_expand = (sum @col_expand) || 1; 1699 my $col_expand = (sum @col_expand) || 1;
1365 1700
1366 # linearly scale sizes
1367 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1701 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369 1702
1370 CFClient::UI::harmonize $ws; 1703 CFPlus::UI::harmonize $ws;
1704
1705 my @row_expand = @{$self->{row_expand}};
1706 @row_expand = (1) x @$ws unless @row_expand;
1707 my $row_expand = (sum @row_expand) || 1;
1708
1709 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1710
1371 CFClient::UI::harmonize $hs; 1711 CFPlus::UI::harmonize $hs;
1372 1712
1373 my $y; 1713 my $y;
1374 1714
1375 for my $r (0 .. $#{$self->{children}}) { 1715 for my $r (0 .. $#{$self->{children}}) {
1376 my $row = $self->{children}[$r] 1716 my $row = $self->{children}[$r]
… …
1390 } 1730 }
1391 1731
1392 $y += $row_h; 1732 $y += $row_h;
1393 } 1733 }
1394 1734
1735 1
1395} 1736}
1396 1737
1397sub find_widget { 1738sub find_widget {
1398 my ($self, $x, $y) = @_; 1739 my ($self, $x, $y) = @_;
1399 1740
… …
1418 } 1759 }
1419} 1760}
1420 1761
1421############################################################################# 1762#############################################################################
1422 1763
1423package CFClient::UI::Box; 1764package CFPlus::UI::Fixed;
1424 1765
1766use List::Util qw(min max);
1767
1425our @ISA = CFClient::UI::Container::; 1768our @ISA = CFPlus::UI::Container::;
1769
1770sub add {
1771 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1772
1773 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1774 $self->SUPER::add ($child);
1775}
1776
1777sub _scale($$$) {
1778 my ($mode, $val, $max) = @_;
1779
1780 $mode eq "abs" ? $val
1781 : $mode eq "rel" ? $val * $max
1782 : 0
1783}
1784
1785sub size_request {
1786 my ($self) = @_;
1787
1788 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1789
1790 # determine overall size by querying abs widgets
1791 for my $child ($self->visible_children) {
1792 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1793
1794 if ($pos eq "abs") {
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797
1798 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1799 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1800 }
1801 }
1802
1803 my $W = $x2 - $x1;
1804 my $H = $y2 - $y1;
1805
1806 # now layout remaining widgets
1807 for my $child ($self->visible_children) {
1808 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1809
1810 if ($pos ne "abs") {
1811 $x = _scale $pos, $x, $W;
1812 $y = _scale $pos, $x, $H;
1813 $w = _scale $size, $w, $child->{req_w};
1814 $h = _scale $size, $h, $child->{req_h};
1815
1816 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1817 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1818 }
1819 }
1820
1821 my $W = $x2 - $x1;
1822 my $H = $y2 - $y1;
1823
1824 ($W, $H)
1825}
1826
1827sub invoke_size_allocate {
1828 my ($self, $W, $H) = @_;
1829
1830 for my $child ($self->visible_children) {
1831 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1832
1833 $x = _scale $pos, $x, $W;
1834 $y = _scale $pos, $x, $H;
1835 $w = _scale $size, $w, $child->{req_w};
1836 $h = _scale $size, $h, $child->{req_h};
1837
1838 $child->configure ($x, $y, $w, $h);
1839 }
1840
1841 1
1842}
1843
1844#############################################################################
1845
1846package CFPlus::UI::Box;
1847
1848our @ISA = CFPlus::UI::Container::;
1426 1849
1427sub size_request { 1850sub size_request {
1428 my ($self) = @_; 1851 my ($self) = @_;
1429 1852
1430 $self->{vertical} 1853 $self->{vertical}
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1859 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1860 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1861 )
1439} 1862}
1440 1863
1441sub size_allocate { 1864sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1865 my ($self, $w, $h) = @_;
1443 1866
1444 my $space = $self->{vertical} ? $h : $w; 1867 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1868 my @children = $self->visible_children;
1446 1869
1447 my @req; 1870 my @req;
1448 1871
1449 if ($self->{homogeneous}) { 1872 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1873 @req = ($space / (@children || 1)) x @children;
1451 } else { 1874 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1875 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1876 my $req = List::Util::sum @req;
1454 1877
1455 if ($req > $space) { 1878 if ($req > $space) {
1456 # ah well, not enough space 1879 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1880 $_ *= $space / $req for @req;
1458 } else { 1881 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1882 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1883
1461 $space = ($space - $req) / $expand; # remaining space to give away 1884 $space = ($space - $req) / $expand; # remaining space to give away
1462 1885
1463 $req[$_] += $space * $children->[$_]{expand} 1886 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1887 for 0 .. $#children;
1465 } 1888 }
1466 } 1889 }
1467 1890
1468 CFClient::UI::harmonize \@req; 1891 CFPlus::UI::harmonize \@req;
1469 1892
1470 my $pos = 0; 1893 my $pos = 0;
1471 for (0 .. $#$children) { 1894 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1895 my $alloc = $req[$_];
1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1896 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474 1897
1475 $pos += $alloc; 1898 $pos += $alloc;
1476 } 1899 }
1477 1900
1478 1 1901 1
1479} 1902}
1480 1903
1481############################################################################# 1904#############################################################################
1482 1905
1483package CFClient::UI::HBox; 1906package CFPlus::UI::HBox;
1484 1907
1485our @ISA = CFClient::UI::Box::; 1908our @ISA = CFPlus::UI::Box::;
1486 1909
1487sub new { 1910sub new {
1488 my $class = shift; 1911 my $class = shift;
1489 1912
1490 $class->SUPER::new ( 1913 $class->SUPER::new (
… …
1493 ) 1916 )
1494} 1917}
1495 1918
1496############################################################################# 1919#############################################################################
1497 1920
1498package CFClient::UI::VBox; 1921package CFPlus::UI::VBox;
1499 1922
1500our @ISA = CFClient::UI::Box::; 1923our @ISA = CFPlus::UI::Box::;
1501 1924
1502sub new { 1925sub new {
1503 my $class = shift; 1926 my $class = shift;
1504 1927
1505 $class->SUPER::new ( 1928 $class->SUPER::new (
… …
1508 ) 1931 )
1509} 1932}
1510 1933
1511############################################################################# 1934#############################################################################
1512 1935
1513package CFClient::UI::Label; 1936package CFPlus::UI::Label;
1514 1937
1515our @ISA = CFClient::UI::DrawBG::; 1938our @ISA = CFPlus::UI::DrawBG::;
1516 1939
1517use CFClient::OpenGL; 1940use CFPlus::OpenGL;
1518 1941
1519sub new { 1942sub new {
1520 my ($class, %arg) = @_; 1943 my ($class, %arg) = @_;
1521 1944
1522 my $self = $class->SUPER::new ( 1945 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1948 #active_bg => none
1526 #font => default_font 1949 #font => default_font
1527 #text => initial text 1950 #text => initial text
1528 #markup => initial narkup 1951 #markup => initial narkup
1529 #max_w => maximum pixel width 1952 #max_w => maximum pixel width
1953 #style => 0, # render flags
1530 ellipsise => 3, # end 1954 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1955 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1956 fontsize => 1,
1533 align => -1, 1957 align => -1,
1534 valign => -1, 1958 valign => -1,
1535 padding_x => 2, 1959 padding_x => 2,
1536 padding_y => 2, 1960 padding_y => 2,
1537 can_events => 0, 1961 can_events => 0,
1538 %arg 1962 %arg
1539 ); 1963 );
1540 1964
1541 if (exists $self->{template}) { 1965 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1966 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1967 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1968 $self->{template} = $layout;
1545 } 1969 }
1546 1970
1547 if (exists $self->{markup}) { 1971 if (exists $self->{markup}) {
… …
1551 } 1975 }
1552 1976
1553 $self 1977 $self
1554} 1978}
1555 1979
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1980sub update {
1567 my ($self) = @_; 1981 my ($self) = @_;
1568 1982
1569 delete $self->{texture}; 1983 delete $self->{texture};
1570 $self->SUPER::update; 1984 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1995 my ($self, $text) = @_;
1582 1996
1583 return if $self->{text} eq "T$text"; 1997 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1998 $self->{text} = "T$text";
1585 1999
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 2000 $self->{layout}->set_text ($text);
1588 2001
1589 delete $self->{size_req}; 2002 delete $self->{size_req};
1590 $self->realloc; 2003 $self->realloc;
1591 $self->update; 2004 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 2010 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 2011 $self->{text} = "M$markup";
1599 2012
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 2013 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 2014
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 2015 $self->{layout}->set_markup ($markup);
1604 2016
1605 delete $self->{size_req}; 2017 delete $self->{size_req};
1606 $self->realloc; 2018 $self->realloc;
1607 $self->update; 2019 $self->update;
… …
1619 2031
1620 my ($w, $h) = $self->{layout}->size; 2032 my ($w, $h) = $self->{layout}->size;
1621 2033
1622 if (exists $self->{template}) { 2034 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 2035 $self->{template}->set_font ($self->{font}) if $self->{font};
2036 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2037 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 2038
1626 my ($w2, $h2) = $self->{template}->size; 2039 my ($w2, $h2) = $self->{template}->size;
1627 2040
1628 $w = List::Util::max $w, $w2; 2041 $w = List::Util::max $w, $w2;
… …
1633 }; 2046 };
1634 2047
1635 @{ $self->{size_req} } 2048 @{ $self->{size_req} }
1636} 2049}
1637 2050
2051sub baseline_shift {
2052 $_[0]{layout}->descent
2053}
2054
1638sub size_allocate { 2055sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 2056 my ($self, $w, $h) = @_;
1640 2057
1641 delete $self->{ox}; 2058 delete $self->{ox};
1642 2059
1643 delete $self->{texture} 2060 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2061 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2062
2063 1
1645} 2064}
1646 2065
1647sub set_fontsize { 2066sub set_fontsize {
1648 my ($self, $fontsize) = @_; 2067 my ($self, $fontsize) = @_;
1649 2068
1650 $self->{fontsize} = $fontsize; 2069 $self->{fontsize} = $fontsize;
2070 delete $self->{size_req};
1651 delete $self->{texture}; 2071 delete $self->{texture};
1652 2072
1653 $self->realloc; 2073 $self->realloc;
1654} 2074}
1655 2075
1656sub reconfigure { 2076sub reconfigure {
1657 my ($self) = @_; 2077 my ($self) = @_;
1658 2078
1659 delete $self->{size_req}; 2079 delete $self->{size_req};
2080 delete $self->{texture};
1660 2081
1661 $self->SUPER::reconfigure; 2082 $self->SUPER::reconfigure;
1662} 2083}
1663 2084
1664sub _draw { 2085sub _draw {
1665 my ($self) = @_; 2086 my ($self) = @_;
1666 2087
1667 $self->SUPER::_draw; # draw background, if applicable 2088 $self->SUPER::_draw; # draw background, if applicable
1668 2089
1669 my $tex = $self->{texture} ||= do { 2090 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 2091 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2092 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 2093 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2094 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2095 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2096 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2097
1677 new_from_layout CFClient::Texture $self->{layout} 2098 [$self->{layout}->size]
1678 }; 2099 };
1679 2100
1680 unless (exists $self->{ox}) { 2101 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2102 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2103 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2104 : ($self->{w} - $size->[0]) * 0.5);
1684 2105
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2106 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2107 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2108 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 2109 };
1689 2110
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2111 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2112 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 2113
1695 if ($tex->{format} == GL_ALPHA) { 2114 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 2115}
1706 2116
1707############################################################################# 2117#############################################################################
1708 2118
1709package CFClient::UI::EntryBase; 2119package CFPlus::UI::EntryBase;
1710 2120
1711our @ISA = CFClient::UI::Label::; 2121our @ISA = CFPlus::UI::Label::;
1712 2122
1713use CFClient::OpenGL; 2123use CFPlus::OpenGL;
1714 2124
1715sub new { 2125sub new {
1716 my $class = shift; 2126 my $class = shift;
1717 2127
1718 $class->SUPER::new ( 2128 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 2132 active_fg => [0, 0, 0],
1723 can_hover => 1, 2133 can_hover => 1,
1724 can_focus => 1, 2134 can_focus => 1,
1725 valign => 0, 2135 valign => 0,
1726 can_events => 1, 2136 can_events => 1,
2137 ellipsise => 0,
1727 #text => ... 2138 #text => ...
1728 #hidden => "*", 2139 #hidden => "*",
1729 @_ 2140 @_
1730 ) 2141 )
1731} 2142}
… …
1742 2153
1743 $text =~ s/./*/g if $self->{hidden}; 2154 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 2155 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 2156 delete $self->{size_req};
1746 2157
1747 $self->_emit (changed => $self->{text}); 2158 $self->emit (changed => $self->{text});
1748 2159
1749 $self->realloc; 2160 $self->realloc;
1750 $self->update; 2161 $self->update;
1751} 2162}
1752 2163
… …
1767 my ($w, $h) = $self->SUPER::size_request; 2178 my ($w, $h) = $self->SUPER::size_request;
1768 2179
1769 ($w + 1, $h) # add 1 for cursor 2180 ($w + 1, $h) # add 1 for cursor
1770} 2181}
1771 2182
1772sub key_down { 2183sub invoke_key_down {
1773 my ($self, $ev) = @_; 2184 my ($self, $ev) = @_;
1774 2185
1775 my $mod = $ev->{mod}; 2186 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 2187 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2188 my $uni = $ev->{unicode};
1778 2189
1779 my $text = $self->get_text; 2190 my $text = $self->get_text;
2191
2192 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1780 2193
1781 if ($uni == 8) { 2194 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2195 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2196 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2197 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2198 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2199 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2200 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2201 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2202 } elsif ($sym == CFPlus::SDLK_HOME) {
2203 # what a hack
2204 $self->{cursor} =
2205 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2206 ? length $1
2207 : 0;
2208 } elsif ($sym == CFPlus::SDLK_END) {
2209 # uh, again
2210 $self->{cursor} =
2211 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2212 ? $self->{cursor} + length $1
2213 : length $self->{text};
2214 } elsif ($uni == 21) { # ctrl-u
2215 $text = "";
1790 $self->{cursor} = 0; 2216 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2217 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 2218 $self->emit ('escape');
1795 } elsif ($uni) { 2219 } elsif ($uni == 0x0d) {
2220 substr $text, $self->{cursor}++, 0, "\012";
2221 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2222 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2223 } else {
1798 return 0; 2224 return 0;
1799 } 2225 }
1800 2226
1801 $self->_set_text ($text); 2227 $self->_set_text ($text);
1802 2228
1803 $self->realloc; 2229 $self->realloc;
2230 $self->update;
1804 2231
1805 1 2232 1
1806} 2233}
1807 2234
1808sub focus_in { 2235sub invoke_focus_in {
1809 my ($self) = @_; 2236 my ($self) = @_;
1810 2237
1811 $self->{last_activity} = $::NOW; 2238 $self->{last_activity} = $::NOW;
1812 2239
1813 $self->SUPER::focus_in; 2240 $self->SUPER::invoke_focus_in
1814} 2241}
1815 2242
1816sub button_down { 2243sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 2244 my ($self, $ev, $x, $y) = @_;
1818 2245
1819 $self->SUPER::button_down ($ev, $x, $y); 2246 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 2247
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2248 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2249
1823 # byte-index to char-index 2250 # byte-index to char-index
1824 my $text = $self->{text}; 2251 my $text = $self->{text};
1825 utf8::encode $text; 2252 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2253 $self->{cursor} = length $text;
1827 2254
1828 $self->_set_text ($self->{text}); 2255 $self->_set_text ($self->{text});
1829 $self->update; 2256 $self->update;
1830 2257
1831 1 2258 1
1832} 2259}
1833 2260
1834sub mouse_motion { 2261sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 2262 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2263# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 2264
1838 0 2265 1
1839} 2266}
1840 2267
1841sub _draw { 2268sub _draw {
1842 my ($self) = @_; 2269 my ($self) = @_;
1843 2270
… …
1870 utf8::encode $text; 2297 utf8::encode $text;
1871 2298
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2299 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2300 }
1874 2301
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2302 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2303 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2304 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2305 glEnd;
1880 } 2306 }
1881} 2307}
1882 2308
2309#############################################################################
2310
1883package CFClient::UI::Entry; 2311package CFPlus::UI::Entry;
1884 2312
1885our @ISA = CFClient::UI::EntryBase::; 2313our @ISA = CFPlus::UI::EntryBase::;
1886 2314
1887use CFClient::OpenGL; 2315use CFPlus::OpenGL;
1888 2316
1889sub key_down { 2317sub invoke_key_down {
1890 my ($self, $ev) = @_; 2318 my ($self, $ev) = @_;
1891 2319
1892 my $sym = $ev->{sym}; 2320 my $sym = $ev->{sym};
1893 2321
1894 if ($sym == 13) { 2322 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2323 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2324 my $txt = $self->get_text;
2325
1897 $self->{history_pointer} = -1; 2326 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2327 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 2328 $self->emit (activate => $txt);
1900 $self->update; 2329 $self->update;
1901 2330
1902 } elsif ($sym == CFClient::SDLK_UP) { 2331 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2332 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2333 $self->{history_saveback} = $self->get_text;
1905 } 2334 }
1906 if (@{$self->{history} || []} > 0) { 2335 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2336 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2338 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2339 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2340 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2341 }
1913 2342
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2343 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2344 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2345 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2346
1918 if ($self->{history_pointer} >= 0) { 2347 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2348 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1920 } else { 2349 } else {
1921 $self->set_text ($self->{history_saveback}); 2350 $self->set_text ($self->{history_saveback});
1922 } 2351 }
1923 2352
1924 } else { 2353 } else {
1925 return $self->SUPER::key_down ($ev) 2354 return $self->SUPER::invoke_key_down ($ev)
1926 } 2355 }
1927 2356
1928 1 2357 1
1929} 2358}
1930 2359
1931############################################################################# 2360#############################################################################
1932 2361
2362package CFPlus::UI::TextEdit;
2363
2364our @ISA = CFPlus::UI::EntryBase::;
2365
2366use CFPlus::OpenGL;
2367
2368sub move_cursor_ver {
2369 my ($self, $dy) = @_;
2370
2371 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2372
2373 $y += $dy;
2374
2375 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2376 $self->{cursor} = $index;
2377 delete $self->{cur_h};
2378 $self->update;
2379 return;
2380 }
2381}
2382
2383sub invoke_key_down {
2384 my ($self, $ev) = @_;
2385
2386 my $sym = $ev->{sym};
2387
2388 if ($sym == CFPlus::SDLK_UP) {
2389 $self->move_cursor_ver (-1);
2390 } elsif ($sym == CFPlus::SDLK_DOWN) {
2391 $self->move_cursor_ver (+1);
2392 } else {
2393 return $self->SUPER::invoke_key_down ($ev)
2394 }
2395
2396 1
2397}
2398
2399#############################################################################
2400
1933package CFClient::UI::Button; 2401package CFPlus::UI::Button;
1934 2402
1935our @ISA = CFClient::UI::Label::; 2403our @ISA = CFPlus::UI::Label::;
1936 2404
1937use CFClient::OpenGL; 2405use CFPlus::OpenGL;
1938 2406
1939my @tex = 2407my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2408 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2409 qw(b1_button_inactive.png b1_button_active.png);
1942 2410
1943sub new { 2411sub new {
1944 my $class = shift; 2412 my $class = shift;
1945 2413
1946 $class->SUPER::new ( 2414 $class->SUPER::new (
1947 padding_x => 4, 2415 padding_x => 4,
1948 padding_y => 4, 2416 padding_y => 4,
1949 fg => [1, 1, 1], 2417 fg => [1.0, 1.0, 1.0],
1950 active_fg => [0, 0, 1], 2418 active_fg => [0.8, 0.8, 0.8],
1951 can_hover => 1, 2419 can_hover => 1,
1952 align => 0, 2420 align => 0,
1953 valign => 0, 2421 valign => 0,
1954 can_events => 1, 2422 can_events => 1,
1955 @_ 2423 @_
1956 ) 2424 )
1957} 2425}
1958 2426
1959sub activate { }
1960
1961sub button_up { 2427sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 2428 my ($self, $ev, $x, $y) = @_;
1963 2429
1964 $self->emit ("activate") 2430 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 2431 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 2432 && $y >= 0 && $y < $self->{h};
… …
1975 2441
1976 glEnable GL_TEXTURE_2D; 2442 glEnable GL_TEXTURE_2D;
1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1978 glColor 0, 0, 0, 1; 2444 glColor 0, 0, 0, 1;
1979 2445
2446 my $tex = $tex[$GRAB == $self];
1980 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2447 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1981 2448
1982 glDisable GL_TEXTURE_2D; 2449 glDisable GL_TEXTURE_2D;
1983 2450
1984 $self->SUPER::_draw; 2451 $self->SUPER::_draw;
1985} 2452}
1986 2453
1987############################################################################# 2454#############################################################################
1988 2455
2456package CFPlus::UI::CheckBox;
2457
2458our @ISA = CFPlus::UI::DrawBG::;
2459
2460my @tex =
2461 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2462 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2463
2464use CFPlus::OpenGL;
2465
2466sub new {
2467 my $class = shift;
2468
2469 $class->SUPER::new (
2470 padding_x => 2,
2471 padding_y => 2,
2472 fg => [1, 1, 1],
2473 active_fg => [1, 1, 0],
2474 bg => [0, 0, 0, 0.2],
2475 active_bg => [1, 1, 1, 0.5],
2476 state => 0,
2477 can_hover => 1,
2478 @_
2479 )
2480}
2481
2482sub size_request {
2483 my ($self) = @_;
2484
2485 (6) x 2
2486}
2487
2488sub toggle {
2489 my ($self) = @_;
2490
2491 $self->{state} = !$self->{state};
2492 $self->emit (changed => $self->{state});
2493 $self->update;
2494}
2495
2496sub invoke_button_down {
2497 my ($self, $ev, $x, $y) = @_;
2498
2499 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2500 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2501 $self->toggle;
2502 } else {
2503 return 0
2504 }
2505
2506 1
2507}
2508
2509sub _draw {
2510 my ($self) = @_;
2511
2512 $self->SUPER::_draw;
2513
2514 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2515
2516 my ($w, $h) = @$self{qw(w h)};
2517
2518 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2519
2520 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2521
2522 my $tex = $self->{state} ? $tex[1] : $tex[0];
2523
2524 glEnable GL_TEXTURE_2D;
2525 $tex->draw_quad_alpha (0, 0, $s, $s);
2526 glDisable GL_TEXTURE_2D;
2527}
2528
2529#############################################################################
2530
2531package CFPlus::UI::Image;
2532
2533our @ISA = CFPlus::UI::Base::;
2534
2535use CFPlus::OpenGL;
2536
2537our %texture_cache;
2538
2539sub new {
2540 my $class = shift;
2541
2542 my $self = $class->SUPER::new (
2543 can_events => 0,
2544 @_,
2545 );
2546
2547 $self->{path} || $self->{tex}
2548 or Carp::croak "'path' or 'tex' attributes required";
2549
2550 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2551 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2552
2553 CFPlus::weaken $texture_cache{$self->{path}};
2554
2555 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2556
2557 $self
2558}
2559
2560sub STORABLE_freeze {
2561 my ($self, $cloning) = @_;
2562
2563 $self->{path}
2564 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2565
2566 $self->{path}
2567}
2568
2569sub STORABLE_attach {
2570 my ($self, $cloning, $path) = @_;
2571
2572 $self->new (path => $path)
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577
2578 ($self->{tex}{w}, $self->{tex}{h})
2579}
2580
2581sub _draw {
2582 my ($self) = @_;
2583
2584 my $tex = $self->{tex};
2585
2586 my ($w, $h) = ($self->{w}, $self->{h});
2587
2588 if ($self->{rot90}) {
2589 glRotate 90, 0, 0, 1;
2590 glTranslate 0, -$self->{w}, 0;
2591
2592 ($w, $h) = ($h, $w);
2593 }
2594
2595 glEnable GL_TEXTURE_2D;
2596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2597
2598 $tex->draw_quad (0, 0, $w, $h);
2599
2600 glDisable GL_TEXTURE_2D;
2601}
2602
2603#############################################################################
2604
1989package CFClient::UI::ImageButton; 2605package CFPlus::UI::ImageButton;
1990 2606
1991our @ISA = CFClient::UI::Image::; 2607our @ISA = CFPlus::UI::Image::;
1992 2608
1993use CFClient::OpenGL; 2609use CFPlus::OpenGL;
1994 2610
1995my %textures; 2611my %textures;
1996 2612
1997sub new { 2613sub new {
1998 my $class = shift; 2614 my $class = shift;
… …
2008 can_events => 1, 2624 can_events => 1,
2009 @_ 2625 @_
2010 ); 2626 );
2011} 2627}
2012 2628
2013sub activate { }
2014
2015sub button_up { 2629sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2630 my ($self, $ev, $x, $y) = @_;
2017 2631
2018 $self->emit ("activate") 2632 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2633 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2634 && $y >= 0 && $y < $self->{h};
… …
2022 1 2636 1
2023} 2637}
2024 2638
2025############################################################################# 2639#############################################################################
2026 2640
2027package CFClient::UI::CheckBox;
2028
2029our @ISA = CFClient::UI::DrawBG::;
2030
2031my @tex =
2032 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2033 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034
2035use CFClient::OpenGL;
2036
2037sub new {
2038 my $class = shift;
2039
2040 $class->SUPER::new (
2041 padding_x => 2,
2042 padding_y => 2,
2043 fg => [1, 1, 1],
2044 active_fg => [1, 1, 0],
2045 bg => [0, 0, 0, 0.2],
2046 active_bg => [1, 1, 1, 0.5],
2047 state => 0,
2048 can_hover => 1,
2049 @_
2050 )
2051}
2052
2053sub size_request {
2054 my ($self) = @_;
2055
2056 (6) x 2
2057}
2058
2059sub button_down {
2060 my ($self, $ev, $x, $y) = @_;
2061
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
2070 1
2071}
2072
2073sub _draw {
2074 my ($self) = @_;
2075
2076 $self->SUPER::_draw;
2077
2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2079
2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083
2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2085
2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
2088 glEnable GL_TEXTURE_2D;
2089 $tex->draw_quad_alpha (0, 0, $s, $s);
2090 glDisable GL_TEXTURE_2D;
2091}
2092
2093#############################################################################
2094
2095package CFClient::UI::Image; 2641package CFPlus::UI::VGauge;
2096 2642
2097our @ISA = CFClient::UI::Base::; 2643our @ISA = CFPlus::UI::Base::;
2098
2099use CFClient::OpenGL;
2100use Carp qw/confess/;
2101
2102our %loaded_images;
2103
2104sub new {
2105 my $class = shift;
2106
2107 my $self = $class->SUPER::new (can_events => 0, @_);
2108
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2110
2111 $loaded_images{$self->{image}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2113
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2115
2116 Scalar::Util::weaken $loaded_images{$self->{image}};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119
2120 $self
2121}
2122
2123sub size_request {
2124 my ($self) = @_;
2125
2126 ($self->{tex}->{w}, $self->{tex}->{h})
2127}
2128
2129sub _draw {
2130 my ($self) = @_;
2131
2132 my $tex = $self->{tex};
2133
2134 my ($w, $h) = ($self->{w}, $self->{h});
2135
2136 if ($self->{rot90}) {
2137 glRotate 90, 0, 0, 1;
2138 glTranslate 0, -$self->{w}, 0;
2139
2140 ($w, $h) = ($h, $w);
2141 }
2142
2143 glEnable GL_TEXTURE_2D;
2144 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2145
2146 $tex->draw_quad_alpha (0, 0, $w, $h);
2147
2148 glDisable GL_TEXTURE_2D;
2149}
2150
2151#############################################################################
2152
2153package CFClient::UI::VGauge;
2154
2155our @ISA = CFClient::UI::Base::;
2156 2644
2157use List::Util qw(min max); 2645use List::Util qw(min max);
2158 2646
2159use CFClient::OpenGL; 2647use CFPlus::OpenGL;
2160 2648
2161my %tex = ( 2649my %tex = (
2162 food => [ 2650 food => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2651 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2652 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165 ], 2653 ],
2166 grace => [ 2654 grace => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2655 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2656 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169 ], 2657 ],
2170 hp => [ 2658 hp => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2659 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2660 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173 ], 2661 ],
2174 mana => [ 2662 mana => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2663 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2664 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177 ], 2665 ],
2178); 2666);
2179 2667
2180# eg. VGauge->new (gauge => 'food'), default gauge: food 2668# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2728 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2729 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2730
2243 my $h1 = $self->{h} * (1 - $ycut1); 2731 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2732 my $h2 = $self->{h} * (1 - $ycut2);
2733 my $h3 = $self->{h};
2734
2735 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2736
2246 glEnable GL_BLEND; 2737 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2738 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2739 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2740 glEnable GL_TEXTURE_2D;
… …
2268 2759
2269 if ($t3) { 2760 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2761 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2762 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2763 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2764 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2765 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2766 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2767 glEnd;
2277 } 2768 }
2278 2769
2279 glDisable GL_BLEND; 2770 glDisable GL_BLEND;
2280 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2281} 2772}
2282 2773
2283############################################################################# 2774#############################################################################
2284 2775
2285package CFClient::UI::Gauge; 2776package CFPlus::UI::Gauge;
2286 2777
2287our @ISA = CFClient::UI::VBox::; 2778our @ISA = CFPlus::UI::VBox::;
2288 2779
2289sub new { 2780sub new {
2290 my ($class, %arg) = @_; 2781 my ($class, %arg) = @_;
2291 2782
2292 my $self = $class->SUPER::new ( 2783 my $self = $class->SUPER::new (
… …
2294 can_hover => 1, 2785 can_hover => 1,
2295 can_events => 1, 2786 can_events => 1,
2296 %arg, 2787 %arg,
2297 ); 2788 );
2298 2789
2299 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2790 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2300 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2791 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2301 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2792 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2302 2793
2303 $self 2794 $self
2304} 2795}
2305 2796
2306sub set_fontsize { 2797sub set_fontsize {
… …
2327 $self->{value}->set_text ($val); 2818 $self->{value}->set_text ($val);
2328} 2819}
2329 2820
2330############################################################################# 2821#############################################################################
2331 2822
2332package CFClient::UI::Slider; 2823package CFPlus::UI::Slider;
2333 2824
2334use strict; 2825use strict;
2335 2826
2336use CFClient::OpenGL; 2827use CFPlus::OpenGL;
2337 2828
2338our @ISA = CFClient::UI::DrawBG::; 2829our @ISA = CFPlus::UI::DrawBG::;
2339 2830
2340my @tex = 2831my @tex =
2341 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2832 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342 qw(s1_slider.png s1_slider_bg.png); 2833 qw(s1_slider.png s1_slider_bg.png);
2343 2834
2344sub new { 2835sub new {
2345 my $class = shift; 2836 my $class = shift;
2346 2837
… …
2367 $self->update; 2858 $self->update;
2368 2859
2369 $self 2860 $self
2370} 2861}
2371 2862
2372sub changed { }
2373
2374sub set_range { 2863sub set_range {
2375 my ($self, $range) = @_; 2864 my ($self, $range) = @_;
2376 2865
2377 ($range, $self->{range}) = ($self->{range}, $range); 2866 ($range, $self->{range}) = ($self->{range}, $range);
2378 2867
… …
2398 if $unit; 2887 if $unit;
2399 2888
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2889 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2890
2402 if ($value != $old_value) { 2891 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2892 $self->emit (changed => $value);
2404 $self->update; 2893 $self->update;
2405 } 2894 }
2406} 2895}
2407 2896
2408sub size_request { 2897sub size_request {
2409 my ($self) = @_; 2898 my ($self) = @_;
2410 2899
2411 ($self->{req_w}, $self->{req_h}) 2900 ($self->{req_w}, $self->{req_h})
2412} 2901}
2413 2902
2414sub button_down { 2903sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2904 my ($self, $ev, $x, $y) = @_;
2416 2905
2417 $self->SUPER::button_down ($ev, $x, $y); 2906 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2907
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2908 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2909
2421 $self->mouse_motion ($ev, $x, $y) 2910 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2911}
2423 2912
2424sub mouse_motion { 2913sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2914 my ($self, $ev, $x, $y) = @_;
2426 2915
2427 if ($GRAB == $self) { 2916 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2917 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2918
… …
2435 } else { 2924 } else {
2436 return 0; 2925 return 0;
2437 } 2926 }
2438 2927
2439 1 2928 1
2929}
2930
2931sub invoke_mouse_wheel {
2932 my ($self, $ev) = @_;
2933
2934 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2935
2936 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2937
2938 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2939
2940 ! ! $delta
2440} 2941}
2441 2942
2442sub update { 2943sub update {
2443 my ($self) = @_; 2944 my ($self) = @_;
2444 2945
… …
2493 glDisable GL_TEXTURE_2D; 2994 glDisable GL_TEXTURE_2D;
2494} 2995}
2495 2996
2496############################################################################# 2997#############################################################################
2497 2998
2498package CFClient::UI::ValSlider; 2999package CFPlus::UI::ValSlider;
2499 3000
2500our @ISA = CFClient::UI::HBox::; 3001our @ISA = CFPlus::UI::HBox::;
2501 3002
2502sub new { 3003sub new {
2503 my ($class, %arg) = @_; 3004 my ($class, %arg) = @_;
2504 3005
2505 my $range = delete $arg{range}; 3006 my $range = delete $arg{range};
2506 3007
2507 my $self = $class->SUPER::new ( 3008 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3009 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3010 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift }, 3011 to_value => sub { shift },
2511 from_value => sub { shift }, 3012 from_value => sub { shift },
2512 %arg, 3013 %arg,
2513 ); 3014 );
2514 3015
… …
2534sub set_range { shift->{slider}->set_range (@_) } 3035sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) } 3036sub set_value { shift->{slider}->set_value (@_) }
2536 3037
2537############################################################################# 3038#############################################################################
2538 3039
2539package CFClient::UI::TextScroller; 3040package CFPlus::UI::TextScroller;
2540 3041
2541our @ISA = CFClient::UI::HBox::; 3042our @ISA = CFPlus::UI::HBox::;
2542 3043
2543use CFClient::OpenGL; 3044use CFPlus::OpenGL;
2544 3045
2545sub new { 3046sub new {
2546 my $class = shift; 3047 my $class = shift;
2547 3048
2548 my $self = $class->SUPER::new ( 3049 my $self = $class->SUPER::new (
2549 fontsize => 1, 3050 fontsize => 1,
2550 can_events => 0, 3051 can_events => 1,
2551 indent => 0, 3052 indent => 0,
2552 #font => default_font 3053 #font => default_font
2553 @_, 3054 @_,
2554 3055
2555 layout => (new CFClient::Layout 1), 3056 layout => (new CFPlus::Layout),
2556 par => [], 3057 par => [],
3058 max_par => 0,
2557 height => 0, 3059 height => 0,
2558 children => [ 3060 children => [
2559 (new CFClient::UI::Empty expand => 1), 3061 (new CFPlus::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 3062 (new CFPlus::UI::Slider vertical => 1),
2561 ], 3063 ],
2562 ); 3064 );
2563 3065
2564 $self->{children}[1]->connect (changed => sub { $self->update }); 3066 $self->{children}[1]->connect (changed => sub { $self->update });
2565 3067
… …
2571 3073
2572 $self->{fontsize} = $fontsize; 3074 $self->{fontsize} = $fontsize;
2573 $self->reflow; 3075 $self->reflow;
2574} 3076}
2575 3077
3078sub size_request {
3079 my ($self) = @_;
3080
3081 my ($empty, $slider) = @{ $self->{children} };
3082
3083 local $self->{children} = [$empty, $slider];
3084 $self->SUPER::size_request
3085}
3086
2576sub size_allocate { 3087sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 3088 my ($self, $w, $h) = @_;
2578 3089
2579 $self->SUPER::size_allocate ($w, $h); 3090 my ($empty, $slider, @other) = @{ $self->{children} };
3091 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 3092
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3093 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3094 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 3095 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3096 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 3097
2586 $self->reflow; 3098 $self->reflow;
2587}
2588 3099
2589sub text_size { 3100 local $self->{children} = [$empty, $slider];
3101 $self->SUPER::invoke_size_allocate ($w, $h)
3102}
3103
3104sub invoke_mouse_wheel {
2590 my ($self, $text, $indent) = @_; 3105 my ($self, $ev) = @_;
3106
3107 return 0 unless $ev->{dy}; # only vertical movements
3108
3109 $self->{children}[1]->emit (mouse_wheel => $ev);
3110
3111 1
3112}
3113
3114sub get_layout {
3115 my ($self, $para) = @_;
2591 3116
2592 my $layout = $self->{layout}; 3117 my $layout = $self->{layout};
2593 3118
3119 $layout->set_font ($self->{font}) if $self->{font};
3120 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 3122 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3123 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 3124 $layout->set_markup ($para->{markup});
3125
3126 $layout->set_shapes (
3127 map
3128 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3129 @{$para->{widget}}
2598 3130 );
3131
2599 $layout->size 3132 $layout
2600} 3133}
2601 3134
2602sub reflow { 3135sub reflow {
2603 my ($self) = @_; 3136 my ($self) = @_;
2604 3137
… …
2611 3144
2612 # todo: base offset on lines or so, not on pixels 3145 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset); 3146 $self->{children}[1]->set_value ($offset);
2614} 3147}
2615 3148
3149sub current_paragraph {
3150 my ($self) = @_;
3151
3152 $self->{top_paragraph} - 1
3153}
3154
3155sub scroll_to {
3156 my ($self, $para) = @_;
3157
3158 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3159
3160 $self->{scroll_to} = $para;
3161 $self->update;
3162}
3163
2616sub clear { 3164sub clear {
2617 my ($self) = @_; 3165 my ($self) = @_;
3166
3167 my (undef, undef, @other) = @{ $self->{children} };
3168 $self->remove ($_) for @other;
2618 3169
2619 $self->{par} = []; 3170 $self->{par} = [];
2620 $self->{height} = 0; 3171 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3172 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 3173}
2623 3174
2624sub add_paragraph { 3175sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 3176 my $self = shift;
2626 3177
2627 for my $line (split /\n/, $text) { 3178 for my $para (@_) {
2628 my ($w, $h) = $self->text_size ($line); 3179 $para = {
3180 fg => [1, 1, 1, 1],
3181 indent => 0,
3182 markup => "",
3183 widget => [],
3184 ref $para ? %$para : (markup => $para),
3185 w => 1e10,
3186 wrapped => 1,
3187 };
3188
3189 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3190 push @{$self->{par}}, $para;
3191 }
3192
3193 if (my $max = $self->{max_par}) {
3194 shift @{$self->{par}} while @{$self->{par}} > $max;
3195 }
3196
3197 $self->{need_reflow}++;
3198 $self->update;
3199}
3200
3201sub scroll_to_bottom {
3202 my ($self) = @_;
3203
3204 $self->{scroll_to} = $#{$self->{par}};
3205 $self->update;
3206}
3207
3208sub force_uptodate {
3209 my ($self) = @_;
3210
3211 if (delete $self->{need_reflow}) {
3212 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3213
3214 my $height = 0;
3215
3216 for my $para (@{$self->{par}}) {
3217 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3218 my $layout = $self->get_layout ($para);
3219 my ($w, $h) = $layout->size;
3220
3221 $para->{w} = $w + $para->{indent};
3222 $para->{h} = $h;
3223 $para->{wrapped} = $layout->has_wrapped;
3224 }
3225
3226 $para->{y} = $height;
3227 $height += $para->{h};
3228 }
3229
2629 $self->{height} += $h; 3230 $self->{height} = $height;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3231 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631 }
2632 3232
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3233 delete $self->{texture};
3234 }
3235
3236 if (my $paridx = delete $self->{scroll_to}) {
3237 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3238 }
2634} 3239}
2635 3240
2636sub update { 3241sub update {
2637 my ($self) = @_; 3242 my ($self) = @_;
2638 3243
… …
2641 return unless $self->{h} > 0; 3246 return unless $self->{h} > 0;
2642 3247
2643 delete $self->{texture}; 3248 delete $self->{texture};
2644 3249
2645 $ROOT->on_post_alloc ($self => sub { 3250 $ROOT->on_post_alloc ($self => sub {
3251 $self->force_uptodate;
3252
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3253 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 3254
2648 if (delete $self->{need_reflow}) {
2649 my $height = 0;
2650
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3];
2662 $_->[1] = $h;
2663 }
2664
2665 $height += $_->[1];
2666 }
2667
2668 $self->{height} = $height;
2669
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2671
2672 delete $self->{texture};
2673 }
2674
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3255 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 3256 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 3257 glClear GL_COLOR_BUFFER_BIT;
2678 3258
3259 package CFPlus::UI::Base;
3260 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3261 (0, 0, $self->{w}, $self->{h});
3262
3263 my $top = int $self->{children}[1]{range}[0];
3264
3265 my $paridx = 0;
3266 my $top_paragraph;
2679 my $top = int $self->{children}[1]{range}[0]; 3267 my $top = int $self->{children}[1]{range}[0];
2680 3268
2681 my $y0 = $top; 3269 my $y0 = $top;
2682 my $y1 = $top + $H; 3270 my $y1 = $top + $H;
2683 3271
2684 my $y = 0;
2685
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694 for my $par (@{$self->{par}}) { 3272 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 3273 my $h = $para->{h};
3274 my $y = $para->{y};
2696 3275
2697 if ($y0 < $y + $h && $y < $y1) { 3276 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 3277 my $layout = $self->get_layout ($para);
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 3278
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3279 $layout->render ($para->{indent}, $y - $y0);
2704 3280
2705 glRasterPos $par->[3], $y - $y0; 3281 if (my @w = @{ $para->{widget} }) {
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3282 my @s = $layout->get_shapes;
3283
3284 for (@w) {
3285 my ($dx, $dy) = splice @s, 0, 2, ();
3286
3287 $_->{x} = $dx + $para->{indent};
3288 $_->{y} = $dy + $y - $y0;
3289
3290 $_->draw;
3291 }
3292 }
2707 } 3293 }
2708 3294
2709 $y += $h; 3295 $paridx++;
3296 $top_paragraph ||= $paridx if $y >= $top;
2710 } 3297 }
2711 3298
2712 glDisable GL_BLEND; 3299 $self->{top_paragraph} = $top_paragraph;
2713 }; 3300 };
2714 }); 3301 });
3302}
3303
3304sub reconfigure {
3305 my ($self) = @_;
3306
3307 $self->SUPER::reconfigure;
3308
3309 $_->{w} = 1e10 for @{ $self->{par} };
3310 $self->reflow;
2715} 3311}
2716 3312
2717sub _draw { 3313sub _draw {
2718 my ($self) = @_; 3314 my ($self) = @_;
2719 3315
… …
2722 glColor 0, 0, 0, 1; 3318 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3319 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 3320 glDisable GL_TEXTURE_2D;
2725 3321
2726 $self->{children}[1]->draw; 3322 $self->{children}[1]->draw;
2727
2728} 3323}
2729 3324
2730############################################################################# 3325#############################################################################
2731 3326
2732package CFClient::UI::Animator; 3327package CFPlus::UI::Animator;
2733 3328
2734use CFClient::OpenGL; 3329use CFPlus::OpenGL;
2735 3330
2736our @ISA = CFClient::UI::Bin::; 3331our @ISA = CFPlus::UI::Bin::;
2737 3332
2738sub moveto { 3333sub moveto {
2739 my ($self, $x, $y) = @_; 3334 my ($self, $x, $y) = @_;
2740 3335
2741 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3336 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2769 glPopMatrix; 3364 glPopMatrix;
2770} 3365}
2771 3366
2772############################################################################# 3367#############################################################################
2773 3368
2774package CFClient::UI::Flopper; 3369package CFPlus::UI::Flopper;
2775 3370
2776our @ISA = CFClient::UI::Button::; 3371our @ISA = CFPlus::UI::Button::;
2777 3372
2778sub new { 3373sub new {
2779 my $class = shift; 3374 my $class = shift;
2780 3375
2781 my $self = $class->SUPER::new ( 3376 my $self = $class->SUPER::new (
… …
2793 $self->{other}->toggle_visibility; 3388 $self->{other}->toggle_visibility;
2794} 3389}
2795 3390
2796############################################################################# 3391#############################################################################
2797 3392
2798package CFClient::UI::Tooltip; 3393package CFPlus::UI::Tooltip;
2799 3394
2800our @ISA = CFClient::UI::Bin::; 3395our @ISA = CFPlus::UI::Bin::;
2801 3396
2802use CFClient::OpenGL; 3397use CFPlus::OpenGL;
2803 3398
2804sub new { 3399sub new {
2805 my $class = shift; 3400 my $class = shift;
2806 3401
2807 $class->SUPER::new ( 3402 $class->SUPER::new (
… …
2810 ) 3405 )
2811} 3406}
2812 3407
2813sub set_tooltip_from { 3408sub set_tooltip_from {
2814 my ($self, $widget) = @_; 3409 my ($self, $widget) = @_;
3410
3411 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3412 if $widget->{tooltip} =~ /^#(.*)$/;
2815 3413
2816 my $tooltip = $widget->{tooltip}; 3414 my $tooltip = $widget->{tooltip};
2817 3415
2818 if ($ENV{CFPLUS_DEBUG} & 2) { 3416 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n" 3417 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2823 } 3421 }
2824 3422
2825 $tooltip =~ s/^\n+//; 3423 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//; 3424 $tooltip =~ s/\n+$//;
2827 3425
2828 $self->add (new CFClient::UI::Label 3426 $self->add (new CFPlus::UI::Label
2829 markup => $tooltip, 3427 markup => $tooltip,
2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3428 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831 fontsize => 0.8, 3429 fontsize => 0.8,
2832 fg => [0, 0, 0, 1], 3430 style => 1, # FLAG_INVERSE
2833 ellipsise => 0, 3431 ellipsise => 0,
2834 font => ($widget->{tooltip_font} || $::FONT_PROP), 3432 font => ($widget->{tooltip_font} || $::FONT_PROP),
2835 ); 3433 );
2836} 3434}
2837 3435
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3439 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 3440
2843 ($w + 4, $h + 4) 3441 ($w + 4, $h + 4)
2844} 3442}
2845 3443
2846sub size_allocate { 3444sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 3445 my ($self, $w, $h) = @_;
2848 3446
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 3447 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 3448}
2851 3449
2852sub visibility_change { 3450sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 3451 my ($self, $visible) = @_;
2854 3452
2855 return unless $visible; 3453 return unless $visible;
2856 3454
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 3455 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner} 3456 my $widget = $self->{owner}
2859 or return; 3457 or return;
2860 3458
3459 if ($widget->{visible}) {
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3460 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862 3461
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3462 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w}; 3463 if $x + $self->{w} > $self->{root}{w};
2865 3464
2866 $self->move_abs ($x, $y); 3465 $self->move_abs ($x, $y);
3466 } else {
3467 $self->hide;
3468 }
2867 }); 3469 });
2868} 3470}
2869 3471
2870sub _draw { 3472sub _draw {
2871 my ($self) = @_; 3473 my ($self) = @_;
… …
2895 $self->SUPER::_draw; 3497 $self->SUPER::_draw;
2896} 3498}
2897 3499
2898############################################################################# 3500#############################################################################
2899 3501
2900package CFClient::UI::Face; 3502package CFPlus::UI::Face;
2901 3503
2902our @ISA = CFClient::UI::Base::; 3504our @ISA = CFPlus::UI::DrawBG::;
2903 3505
2904use CFClient::OpenGL; 3506use CFPlus::OpenGL;
2905 3507
2906sub new { 3508sub new {
2907 my $class = shift; 3509 my $class = shift;
2908 3510
2909 my $self = $class->SUPER::new ( 3511 my $self = $class->SUPER::new (
3512 size_w => 32,
3513 size_h => 8,
2910 aspect => 1, 3514 aspect => 1,
2911 can_events => 0, 3515 can_events => 0,
2912 @_, 3516 @_,
2913 ); 3517 );
2914 3518
2915 if ($self->{anim} && $self->{animspeed}) { 3519 if ($self->{anim} && $self->{animspeed}) {
2916 Scalar::Util::weaken (my $widget = $self); 3520 CFPlus::weaken (my $widget = $self);
2917 3521
3522 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3523 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2918 $self->{timer} = Event->timer ( 3524 $self->{timer} = Event->timer (
2919 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920 hard => 1, 3525 parked => 1,
2921 interval => $self->{animspeed},
2922 cb => sub { 3526 cb => sub {
3527 return unless $::CONN && $widget;
3528
2923 ++$widget->{frame}; 3529 ++$widget->{frame};
3530 $widget->update_face;
2924 $widget->update; 3531 $widget->update;
3532
3533 $widget->update_timer;
2925 }, 3534 },
2926 ); 3535 );
3536
3537 $self->update_face;
3538 $self->update_timer;
2927 } 3539 }
2928 3540
2929 $self 3541 $self
2930} 3542}
2931 3543
3544sub update_timer {
3545 my ($self) = @_;
3546
3547 return unless $self->{timer};
3548
3549 if ($self->{visible}) {
3550 $self->{timer}->at (
3551 $self->{anim_start}
3552 + $self->{animspeed}
3553 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3554 );
3555 $self->{timer}->start;
3556 } else {
3557 $self->{timer}->stop;
3558 }
3559}
3560
3561sub update_face {
3562 my ($self) = @_;
3563
3564 return unless $::CONN;
3565
3566 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3567 if ($anim && @$anim) {
3568 delete $self->{wait_face};
3569 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3570 }
3571 }
3572}
3573
2932sub size_request { 3574sub size_request {
2933 (32, 8) 3575 my ($self) = @_;
3576
3577 if ($::CONN) {
3578 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3579 if (my $tex = $::CONN->{texture}[$faceid]) {
3580 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3581 } else {
3582 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3583 $self->realloc;
3584 });
3585 }
3586 }
3587 }
3588
3589 ($self->{size_w} || 8, $self->{size_h} || 8)
2934} 3590}
2935 3591
2936sub update { 3592sub update {
2937 my ($self) = @_; 3593 my ($self) = @_;
2938 3594
2939 return unless $self->{visible}; 3595 return unless $self->{visible};
2940 3596
2941 $self->SUPER::update; 3597 $self->SUPER::update;
2942} 3598}
2943 3599
3600sub invoke_visibility_change {
3601 my ($self) = @_;
3602
3603 $self->update_timer;
3604
3605 0
3606}
3607
2944sub _draw { 3608sub _draw {
2945 my ($self) = @_; 3609 my ($self) = @_;
2946 3610
2947 return unless $::CONN; 3611 return unless $::CONN;
2948 3612
2949 my $face; 3613 $self->SUPER::_draw;
2950 3614
2951 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}]; 3615 my $faceid = $::CONN->{faceid}[$self->{face}]
2953 3616 or return;
2954 $face = $anim->[ $self->{frame} % @$anim ]
2955 if $anim && @$anim;
2956 }
2957 3617
2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3618 my $tex = $::CONN->{texture}[$faceid];
2959 3619
2960 if ($tex) { 3620 if ($tex) {
2961 glEnable GL_TEXTURE_2D; 3621 glEnable GL_TEXTURE_2D;
2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2963 glColor 0, 0, 0, 1; 3623 glColor 0, 0, 0, 1;
… …
2967} 3627}
2968 3628
2969sub destroy { 3629sub destroy {
2970 my ($self) = @_; 3630 my ($self) = @_;
2971 3631
2972 $self->{timer}->cancel 3632 (delete $self->{timer})->cancel
2973 if $self->{timer}; 3633 if $self->{timer};
2974 3634
2975 $self->SUPER::destroy; 3635 $self->SUPER::destroy;
2976} 3636}
2977 3637
2978############################################################################# 3638#############################################################################
2979 3639
2980package CFClient::UI::Buttonbar; 3640package CFPlus::UI::Buttonbar;
2981 3641
2982our @ISA = CFClient::UI::HBox::; 3642our @ISA = CFPlus::UI::HBox::;
2983 3643
2984# TODO: should actualyl wrap buttons and other goodies. 3644# TODO: should actually wrap buttons and other goodies.
2985 3645
2986############################################################################# 3646#############################################################################
2987 3647
2988package CFClient::UI::Menu; 3648package CFPlus::UI::Menu;
2989 3649
2990our @ISA = CFClient::UI::FancyFrame::; 3650our @ISA = CFPlus::UI::Toplevel::;
2991 3651
2992use CFClient::OpenGL; 3652use CFPlus::OpenGL;
2993 3653
2994sub new { 3654sub new {
2995 my $class = shift; 3655 my $class = shift;
2996 3656
2997 my $self = $class->SUPER::new ( 3657 my $self = $class->SUPER::new (
2998 items => [], 3658 items => [],
2999 z => 100, 3659 z => 100,
3000 @_, 3660 @_,
3001 ); 3661 );
3002 3662
3003 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3663 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004 3664
3005 for my $item (@{ $self->{items} }) { 3665 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3666 my ($widget, $cb, $tooltip) = @$item;
3007 3667
3008 # handle various types of items, only text for now 3668 # handle various types of items, only text for now
3009 if (!ref $widget) { 3669 if (!ref $widget) {
3670 if ($widget =~ /\t/) {
3671 my ($left, $right) = split /\t/, $widget, 2;
3672
3010 $widget = new CFClient::UI::Label 3673 $widget = new CFPlus::UI::HBox
3011 can_hover => 1, 3674 can_hover => 1,
3012 can_events => 1, 3675 can_events => 1,
3676 tooltip => $tooltip,
3677 children => [
3678 (new CFPlus::UI::Label markup => $left, expand => 1),
3679 (new CFPlus::UI::Label markup => $right, align => +1),
3680 ],
3681 ;
3682
3683 } else {
3684 $widget = new CFPlus::UI::Label
3685 can_hover => 1,
3686 can_events => 1,
3013 markup => $widget, 3687 markup => $widget,
3014 tooltip => $tooltip 3688 tooltip => $tooltip;
3689 }
3015 } 3690 }
3016 3691
3017 $self->{item}{$widget} = $item; 3692 $self->{item}{$widget} = $item;
3018 3693
3019 $self->{vbox}->add ($widget); 3694 $self->{vbox}->add ($widget);
… …
3024 3699
3025# popup given the event (must be a mouse button down event currently) 3700# popup given the event (must be a mouse button down event currently)
3026sub popup { 3701sub popup {
3027 my ($self, $ev) = @_; 3702 my ($self, $ev) = @_;
3028 3703
3029 $self->_emit ("popdown"); 3704 $self->emit ("popdown");
3030 3705
3031 # maybe save $GRAB? must be careful about events... 3706 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3707 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3708 $self->{button} = $ev->{button};
3034 3709
3035 $self->show; 3710 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3711 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3712}
3038 3713
3039sub mouse_motion { 3714sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3715 my ($self, $ev, $x, $y) = @_;
3041 3716
3042 # TODO: should use vbox->find_widget or so 3717 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3718 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3719 $self->{hover} = $self->{item}{$HOVER};
3045 3720
3046 0 3721 0
3047} 3722}
3048 3723
3049sub button_up { 3724sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3725 my ($self, $ev, $x, $y) = @_;
3051 3726
3052 if ($ev->{button} == $self->{button}) { 3727 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3728 undef $GRAB;
3054 $self->hide; 3729 $self->hide;
3055 3730
3056 $self->_emit ("popdown"); 3731 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3732 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3733 } else {
3059 return 0 3734 return 0
3060 } 3735 }
3061 3736
3062 1 3737 1
3063} 3738}
3064 3739
3065############################################################################# 3740#############################################################################
3066 3741
3067package CFClient::UI::Multiplexer; 3742package CFPlus::UI::Multiplexer;
3068 3743
3069our @ISA = CFClient::UI::Container::; 3744our @ISA = CFPlus::UI::Container::;
3070 3745
3071sub new { 3746sub new {
3072 my $class = shift; 3747 my $class = shift;
3073 3748
3074 my $self = $class->SUPER::new ( 3749 my $self = $class->SUPER::new (
… …
3088 3763
3089 $self->{current} = $self->{children}[0] 3764 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3765 if @{ $self->{children} };
3091} 3766}
3092 3767
3768sub get_current_page {
3769 my ($self) = @_;
3770
3771 $self->{current}
3772}
3773
3093sub set_current_page { 3774sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3775 my ($self, $page_or_widget) = @_;
3095 3776
3096 my $widget = ref $page_or_widget 3777 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3778 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3779 : $self->{children}[$page_or_widget];
3099 3780
3100 $self->{current} = $widget; 3781 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3782 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3783
3103 $self->_emit (page_changed => $self->{current}); 3784 $self->emit (page_changed => $self->{current});
3104 3785
3105 $self->realloc; 3786 $self->realloc;
3106} 3787}
3107 3788
3108sub visible_children { 3789sub visible_children {
… …
3113 my ($self) = @_; 3794 my ($self) = @_;
3114 3795
3115 $self->{current}->size_request 3796 $self->{current}->size_request
3116} 3797}
3117 3798
3118sub size_allocate { 3799sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3800 my ($self, $w, $h) = @_;
3120 3801
3121 $self->{current}->configure (0, 0, $w, $h); 3802 $self->{current}->configure (0, 0, $w, $h);
3803
3804 1
3122} 3805}
3123 3806
3124sub _draw { 3807sub _draw {
3125 my ($self) = @_; 3808 my ($self) = @_;
3126 3809
3127 $self->{current}->draw; 3810 $self->{current}->draw;
3128} 3811}
3129 3812
3130############################################################################# 3813#############################################################################
3131 3814
3132package CFClient::UI::Notebook; 3815package CFPlus::UI::Notebook;
3133 3816
3134our @ISA = CFClient::UI::VBox::; 3817our @ISA = CFPlus::UI::VBox::;
3135 3818
3136sub new { 3819sub new {
3137 my $class = shift; 3820 my $class = shift;
3138 3821
3139 my $self = $class->SUPER::new ( 3822 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar), 3823 buttonbar => (new CFPlus::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3824 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self 3825 # filter => # will be put between multiplexer and $self
3143 @_, 3826 @_,
3144 ); 3827 );
3145 3828
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3829 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3150} 3833}
3151 3834
3152sub add { 3835sub add {
3153 my ($self, $title, $widget, $tooltip) = @_; 3836 my ($self, $title, $widget, $tooltip) = @_;
3154 3837
3155 Scalar::Util::weaken $self; 3838 CFPlus::weaken $self;
3156 3839
3157 $self->{buttonbar}->add (new CFClient::UI::Button 3840 $self->{buttonbar}->add (new CFPlus::UI::Button
3158 markup => $title, 3841 markup => $title,
3159 tooltip => $tooltip, 3842 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) }, 3843 on_activate => sub { $self->set_current_page ($widget) },
3161 ); 3844 );
3162 3845
3163 $self->{multiplexer}->add ($widget); 3846 $self->{multiplexer}->add ($widget);
3164} 3847}
3165 3848
3849sub get_current_page {
3850 my ($self) = @_;
3851
3852 $self->{multiplexer}->get_current_page
3853}
3854
3166sub set_current_page { 3855sub set_current_page {
3167 my ($self, $page) = @_; 3856 my ($self, $page) = @_;
3168 3857
3169 $self->{multiplexer}->set_current_page ($page); 3858 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3859 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3860}
3172 3861
3173############################################################################# 3862#############################################################################
3174 3863
3175package CFClient::UI::Combobox; 3864package CFPlus::UI::Selector;
3176 3865
3177use utf8; 3866use utf8;
3178 3867
3179our @ISA = CFClient::UI::Button::; 3868our @ISA = CFPlus::UI::Button::;
3180 3869
3181sub new { 3870sub new {
3182 my $class = shift; 3871 my $class = shift;
3183 3872
3184 my $self = $class->SUPER::new ( 3873 my $self = $class->SUPER::new (
… …
3190 $self->_set_value ($self->{value}); 3879 $self->_set_value ($self->{value});
3191 3880
3192 $self 3881 $self
3193} 3882}
3194 3883
3195sub button_down { 3884sub invoke_button_down {
3196 my ($self, $ev) = @_; 3885 my ($self, $ev) = @_;
3197 3886
3198 my @menu_items; 3887 my @menu_items;
3199 3888
3200 for (@{ $self->{options} }) { 3889 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_; 3890 my ($value, $title, $tooltip) = @$_;
3202 3891
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3892 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 } 3893 }
3205 3894
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3895 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207} 3896}
3208 3897
3209sub _set_value { 3898sub _set_value {
3210 my ($self, $value) = @_; 3899 my ($self, $value) = @_;
3211 3900
… …
3221 my ($self, $value) = @_; 3910 my ($self, $value) = @_;
3222 3911
3223 return unless $self->{value} ne $value; 3912 return unless $self->{value} ne $value;
3224 3913
3225 $self->_set_value ($value); 3914 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3915 $self->emit (changed => $value);
3227} 3916}
3228 3917
3229############################################################################# 3918#############################################################################
3230 3919
3231package CFClient::UI::Statusbox; 3920package CFPlus::UI::Statusbox;
3232 3921
3233our @ISA = CFClient::UI::VBox::; 3922our @ISA = CFPlus::UI::VBox::;
3234 3923
3235sub new { 3924sub new {
3236 my $class = shift; 3925 my $class = shift;
3237 3926
3238 my $self = $class->SUPER::new ( 3927 my $self = $class->SUPER::new (
3239 fontsize => 0.8, 3928 fontsize => 0.8,
3240 @_, 3929 @_,
3241 ); 3930 );
3242 3931
3243 Scalar::Util::weaken (my $this = $self); 3932 CFPlus::weaken (my $this = $self);
3244 3933
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3934 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246 3935
3247 $self 3936 $self
3248} 3937}
… …
3250sub reorder { 3939sub reorder {
3251 my ($self) = @_; 3940 my ($self) = @_;
3252 my $NOW = Time::HiRes::time; 3941 my $NOW = Time::HiRes::time;
3253 3942
3254 # freeze display when hovering over any label 3943 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner} 3944 return if $CFPlus::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3945 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} }; 3946 values %{ $self->{item} };
3258 3947
3259 while (my ($k, $v) = each %{ $self->{item} }) { 3948 while (my ($k, $v) = each %{ $self->{item} }) {
3260 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3949 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261 } 3950 }
… …
3282 for ($short) { 3971 for ($short) {
3283 s/^\s+//; 3972 s/^\s+//;
3284 s/\s+/ /g; 3973 s/\s+/ /g;
3285 } 3974 }
3286 3975
3287 new CFClient::UI::Label 3976 new CFPlus::UI::Label
3288 markup => $short, 3977 markup => $short,
3289 tooltip => $item->{tooltip}, 3978 tooltip => $item->{tooltip},
3290 tooltip_font => $::FONT_PROP, 3979 tooltip_font => $::FONT_PROP,
3291 tooltip_width => 0.67, 3980 tooltip_width => 0.67,
3292 fontsize => $item->{fontsize} || $self->{fontsize}, 3981 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3346 count => 1, 4035 count => 1,
3347 %arg, 4036 %arg,
3348 }; 4037 };
3349 } 4038 }
3350 4039
4040 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 4041 $self->reorder;
4042 });
3352} 4043}
3353 4044
3354sub reconfigure { 4045sub reconfigure {
3355 my ($self) = @_; 4046 my ($self) = @_;
3356 4047
… …
3369 $self->SUPER::destroy; 4060 $self->SUPER::destroy;
3370} 4061}
3371 4062
3372############################################################################# 4063#############################################################################
3373 4064
3374package CFClient::UI::Inventory;
3375
3376our @ISA = CFClient::UI::ScrolledWindow::;
3377
3378sub new {
3379 my $class = shift;
3380
3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 }
3609}
3610
3611#############################################################################
3612
3613package CFClient::UI::SpellList;
3614
3615our @ISA = CFClient::UI::Table::;
3616
3617sub new {
3618 my $class = shift;
3619
3620 my $self = $class->SUPER::new (
3621 binding => [],
3622 commands => [],
3623 @_,
3624 )
3625}
3626
3627my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3628
3629my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3635my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3637my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3638 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3639
3640sub rebuild_spell_list {
3641 my ($self) = @_;
3642
3643 $CFClient::UI::ROOT->on_refresh ($self => sub {
3644 $self->clear;
3645
3646 return unless $::CONN;
3647
3648 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3649 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3650 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3651 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3652 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3653
3654 my $row = 0;
3655
3656 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3657 my $spell = $self->{spell}{$_};
3658
3659 $row++;
3660
3661 my $spell_cb = sub {
3662 my ($widget, $ev) = @_;
3663
3664 if ($ev->{button} == 1) {
3665 $::CONN->user_send ("cast $spell->{name}");
3666 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu
3670 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ],
3674 )->popup ($ev);
3675 } else {
3676 return 0;
3677 }
3678
3679 1
3680 };
3681
3682 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3683
3684 #TODO: add path info to tooltip
3685 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3686
3687 $self->add (0, $row, new CFClient::UI::Face
3688 face => $spell->{face},
3689 can_hover => 1,
3690 can_events => 1,
3691 tooltip => $tooltip,
3692 on_button_down => $spell_cb,
3693 );
3694
3695 $self->add (1, $row, new CFClient::UI::Label
3696 expand => 1,
3697 text => $spell->{name},
3698 can_hover => 1,
3699 can_events => 1,
3700 tooltip => $tooltip,
3701 on_button_down => $spell_cb,
3702 );
3703
3704 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3705 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3706 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3707 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3708 }
3709 });
3710}
3711
3712sub add_spell {
3713 my ($self, $spell) = @_;
3714
3715 $self->{spell}->{$spell->{name}} = $spell;
3716 $self->rebuild_spell_list;
3717}
3718
3719sub remove_spell {
3720 my ($self, $spell) = @_;
3721
3722 delete $self->{spell}->{$spell->{name}};
3723 $self->rebuild_spell_list;
3724}
3725
3726sub clear_spells {
3727 my ($self) = @_;
3728
3729 $self->{spell} = {};
3730 $self->rebuild_spell_list;
3731}
3732
3733#############################################################################
3734
3735package CFClient::UI::Root; 4065package CFPlus::UI::Root;
3736 4066
3737our @ISA = CFClient::UI::Container::; 4067our @ISA = CFPlus::UI::Container::;
3738 4068
3739use List::Util qw(min max); 4069use List::Util qw(min max);
3740 4070
3741use CFClient::OpenGL; 4071use CFPlus::OpenGL;
3742 4072
3743sub new { 4073sub new {
3744 my $class = shift; 4074 my $class = shift;
3745 4075
3746 my $self = $class->SUPER::new ( 4076 my $self = $class->SUPER::new (
3747 visible => 1, 4077 visible => 1,
3748 @_, 4078 @_,
3749 ); 4079 );
3750 4080
3751 Scalar::Util::weaken ($self->{root} = $self); 4081 CFPlus::weaken ($self->{root} = $self);
3752 4082
3753 $self 4083 $self
3754} 4084}
3755 4085
3756sub size_request { 4086sub size_request {
… …
3771 $coord = $max - $size if $coord > $max - $size; 4101 $coord = $max - $size if $coord > $max - $size;
3772 4102
3773 int $coord + 0.5 4103 int $coord + 0.5
3774} 4104}
3775 4105
3776sub size_allocate { 4106sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_; 4107 my ($self, $w, $h) = @_;
3778 4108
3779 for my $child ($self->children) { 4109 for my $child ($self->children) {
3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4110 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3781 4111
… …
3785 $X = _to_pixel $X, $W, $self->{w}; 4115 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h}; 4116 $Y = _to_pixel $Y, $H, $self->{h};
3787 4117
3788 $child->configure ($X, $Y, $W, $H); 4118 $child->configure ($X, $Y, $W, $H);
3789 } 4119 }
4120
4121 1
3790} 4122}
3791 4123
3792sub coord2local { 4124sub coord2local {
3793 my ($self, $x, $y) = @_; 4125 my ($self, $x, $y) = @_;
3794 4126
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4252 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 4253
3922 $w = 0 if $w < 0; 4254 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 4255 $h = 0 if $h < 0;
3924 4256
4257 $w = max $widget->{min_w}, $w;
4258 $h = max $widget->{min_h}, $h;
4259
4260# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4261# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4262
4263 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4264 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4265
3925 $w = int $w + 0.5; 4266 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 4267 $h = int $h + 0.5;
3927 4268
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4269 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 4270 $widget->{old_w} = $widget->{w};
… …
3939 4280
3940 while ($self->{post_alloc_hook}) { 4281 while ($self->{post_alloc_hook}) {
3941 $_->() 4282 $_->()
3942 for values %{delete $self->{post_alloc_hook}}; 4283 for values %{delete $self->{post_alloc_hook}};
3943 } 4284 }
3944
3945 4285
3946 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4286 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4287 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3948 glClear GL_COLOR_BUFFER_BIT; 4288 glClear GL_COLOR_BUFFER_BIT;
3949 4289
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4292 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 4293 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 4294 glLoadIdentity;
3955 4295
3956 { 4296 {
3957 package CFClient::UI::Base; 4297 package CFPlus::UI::Base;
3958 4298
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 4299 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 4300 (0, 0, $self->{w}, $self->{h});
3961 }
3962 4301
3963 $self->_draw; 4302 $self->_draw;
4303 }
3964} 4304}
3965 4305
3966############################################################################# 4306#############################################################################
3967 4307
3968package CFClient::UI; 4308package CFPlus::UI;
3969 4309
3970$ROOT = new CFClient::UI::Root; 4310$ROOT = new CFPlus::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4311$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972 4312
39731 43131
3974 4314

Diff Legend

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