ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 2007 UTC

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

Diff Legend

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