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

Diff Legend

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