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

Diff Legend

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