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.311 by root, Fri Jun 23 22:35:16 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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