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.372 by root, Sun Jul 15 22:13:43 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 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
981 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
982 %arg, 1073 %arg,
983 ); 1074 );
984 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
986 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
987 1087
988 $self 1088 $self
989} 1089}
1090
1091#TODO# update range on size_allocate depending on child
990 1092
991sub add { 1093sub add {
992 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
993 1095
994 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
995} 1097}
996 1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
997sub update { 1123sub update {
998 my ($self) = @_; 1124 my ($self) = @_;
999 1125
1000 $self->SUPER::update; 1126 $self->SUPER::update;
1001 1127 $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} 1128}
1006 1129
1007sub size_allocate { 1130sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1009 1132
1133 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1134 $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} 1135}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1136
1019############################################################################# 1137#############################################################################
1020 1138
1021package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1022 1140
1023our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1024 1142
1025use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1026 1144
1027sub new { 1145sub new {
1028 my $class = shift; 1146 my $class = shift;
1029 1147
1030 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1057} 1175}
1058 1176
1059############################################################################# 1177#############################################################################
1060 1178
1061package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1062 1180
1063our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1064 1182
1065use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1066 1284
1067my $bg = 1285my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1287 mipmap => 1, wrap => 1;
1070 1288
1071my @border = 1289my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1290 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); 1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1292
1075sub new { 1293sub new {
1076 my ($class, %arg) = @_; 1294 my ($class, %arg) = @_;
1077 1295
1078 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1299 border => 0.6,
1082 can_events => 1, 1300 can_events => 1,
1083 min_w => 16, 1301 min_w => 64,
1084 min_h => 16, 1302 min_h => 32,
1085 %arg, 1303 %arg,
1086 ); 1304 );
1087 1305
1088 $self->{title_widget} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1307 align => 0,
1090 valign => 1, 1308 valign => 1,
1091 text => $self->{title}, 1309 text => $self->{title},
1092 fontsize => $self->{border}, 1310 fontsize => $self->{border},
1093 if exists $self->{title}; 1311 if exists $self->{title};
1094 1312
1095 unless ($self->{no_close_button}) { 1313 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1314 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1315 new CFPlus::UI::ImageButton
1098 image => 'x1_close.png', 1316 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1317 on_activate => sub { $self->emit ("delete") };
1100 1318
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1320 }
1103 1321
1104 $self 1322 $self
1105} 1323}
1106 1324
1107sub add { 1325sub add {
1108 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1109 1327
1110 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1329 $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}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1331}
1114 1332
1115sub border { 1333sub border {
1116 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1117} 1335}
… …
1120 my ($self) = @_; 1338 my ($self) = @_;
1121 1339
1122 $self->{title_widget}->size_request 1340 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1341 if $self->{title_widget};
1124 1342
1125 $self->{close_btn}->size_request 1343 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1344 if $self->{close_button};
1127 1345
1128 my ($w, $h) = $self->SUPER::size_request; 1346 my ($w, $h) = $self->SUPER::size_request;
1129 1347
1130 ( 1348 (
1131 $w + $self->border * 2, 1349 $w + $self->border * 2,
1132 $h + $self->border * 2, 1350 $h + $self->border * 2,
1133 ) 1351 )
1134} 1352}
1135 1353
1136sub size_allocate { 1354sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1138 1356
1139 if ($self->{title_widget}) { 1357 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1358 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1359 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1360 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1361 }
1144 1362
1145 my $border = $self->border; 1363 my $border = $self->border;
1146 1364
1147 $h -= List::Util::max 0, $border * 2; 1365 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1366 $w -= List::Util::max 0, $border * 2;
1149 1367
1150 $self->child->configure ($border, $border, $w, $h); 1368 $self->child->configure ($border, $border, $w, $h);
1151 1369
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1371 if $self->{close_button};
1154}
1155 1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1380
1381 1
1382}
1383
1156sub button_down { 1384sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
1158 1386
1159 my ($w, $h) = @$self{qw(w h)}; 1387 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1388 my $border = $self->border;
1161 1389
… …
1192 1420
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1421 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1422
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1423 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1424 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1426 };
1199 } else { 1427 } else {
1200 return 0; 1428 return 0;
1201 } 1429 }
1202 1430
1203 1 1431 1
1204} 1432}
1205 1433
1206sub button_up { 1434sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1208 1436
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1437 ! ! delete $self->{motion}
1213} 1438}
1214 1439
1215sub mouse_motion { 1440sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
1217 1442
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1444
1220 !!$self->{motion} 1445 ! ! $self->{motion}
1446}
1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1221} 1454}
1222 1455
1223sub _draw { 1456sub _draw {
1224 my ($self) = @_; 1457 my ($self) = @_;
1225 1458
… …
1258 $self->{title_widget}->_draw; 1491 $self->{title_widget}->_draw;
1259 1492
1260 glTranslate 0, - ($border - $self->{h}); 1493 glTranslate 0, - ($border - $self->{h});
1261 } 1494 }
1262 1495
1263 $self->{close_btn}->draw 1496 $self->{close_button}->draw
1264 if $self->{close_btn}; 1497 if $self->{close_button};
1265} 1498}
1266 1499
1267############################################################################# 1500#############################################################################
1268 1501
1269package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1270 1503
1271our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1272 1505
1273use List::Util qw(max sum); 1506use List::Util qw(max sum);
1274 1507
1275use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1276 1509
1277sub new { 1510sub new {
1278 my $class = shift; 1511 my $class = shift;
1279 1512
1280 $class->SUPER::new ( 1513 $class->SUPER::new (
1281 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1282 @_, 1516 @_,
1283 ) 1517 )
1284} 1518}
1285 1519
1286sub children { 1520sub children {
1287 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288} 1522}
1289 1523
1290sub add { 1524sub add {
1291 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1292 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1293 $child->set_parent ($self); 1529 $child->set_parent ($self);
1294 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1295 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1296 $self->realloc; 1535 $self->realloc;
1297} 1536}
1298 1537
1299sub remove { 1538sub remove {
1300 my ($self, $child) = @_; 1539 my ($self, $child) = @_;
… …
1348 (sum @$ws), 1587 (sum @$ws),
1349 (sum @$hs), 1588 (sum @$hs),
1350 ) 1589 )
1351} 1590}
1352 1591
1353sub size_allocate { 1592sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1355 1594
1356 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1357 1596
1358 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1359 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1360 1599
1361 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1362 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1363 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1364 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1365 1604
1366 # linearly scale sizes
1367 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1368 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1369 1606
1370 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1371 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1372 1616
1373 my $y; 1617 my $y;
1374 1618
1375 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1376 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1390 } 1634 }
1391 1635
1392 $y += $row_h; 1636 $y += $row_h;
1393 } 1637 }
1394 1638
1639 1
1395} 1640}
1396 1641
1397sub find_widget { 1642sub find_widget {
1398 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1399 1644
… …
1418 } 1663 }
1419} 1664}
1420 1665
1421############################################################################# 1666#############################################################################
1422 1667
1423package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1424 1669
1425our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1426 1671
1427sub size_request { 1672sub size_request {
1428 my ($self) = @_; 1673 my ($self) = @_;
1429 1674
1430 $self->{vertical} 1675 $self->{vertical}
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1683 )
1439} 1684}
1440 1685
1441sub size_allocate { 1686sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1443 1688
1444 my $space = $self->{vertical} ? $h : $w; 1689 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1690 my @children = $self->visible_children;
1446 1691
1447 my @req; 1692 my @req;
1448 1693
1449 if ($self->{homogeneous}) { 1694 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1695 @req = ($space / (@children || 1)) x @children;
1451 } else { 1696 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1698 my $req = List::Util::sum @req;
1454 1699
1455 if ($req > $space) { 1700 if ($req > $space) {
1456 # ah well, not enough space 1701 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1702 $_ *= $space / $req for @req;
1458 } else { 1703 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1705
1461 $space = ($space - $req) / $expand; # remaining space to give away 1706 $space = ($space - $req) / $expand; # remaining space to give away
1462 1707
1463 $req[$_] += $space * $children->[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1709 for 0 .. $#children;
1465 } 1710 }
1466 } 1711 }
1467 1712
1468 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1469 1714
1470 my $pos = 0; 1715 my $pos = 0;
1471 for (0 .. $#$children) { 1716 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474 1719
1475 $pos += $alloc; 1720 $pos += $alloc;
1476 } 1721 }
1477 1722
1478 1 1723 1
1479} 1724}
1480 1725
1481############################################################################# 1726#############################################################################
1482 1727
1483package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1484 1729
1485our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1486 1731
1487sub new { 1732sub new {
1488 my $class = shift; 1733 my $class = shift;
1489 1734
1490 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1493 ) 1738 )
1494} 1739}
1495 1740
1496############################################################################# 1741#############################################################################
1497 1742
1498package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1499 1744
1500our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1501 1746
1502sub new { 1747sub new {
1503 my $class = shift; 1748 my $class = shift;
1504 1749
1505 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1508 ) 1753 )
1509} 1754}
1510 1755
1511############################################################################# 1756#############################################################################
1512 1757
1513package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1514 1759
1515our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1516 1761
1517use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1518 1763
1519sub new { 1764sub new {
1520 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1521 1766
1522 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1770 #active_bg => none
1526 #font => default_font 1771 #font => default_font
1527 #text => initial text 1772 #text => initial text
1528 #markup => initial narkup 1773 #markup => initial narkup
1529 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1530 ellipsise => 3, # end 1776 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1778 fontsize => 1,
1533 align => -1, 1779 align => -1,
1534 valign => -1, 1780 valign => -1,
1535 padding_x => 2, 1781 padding_x => 2,
1536 padding_y => 2, 1782 padding_y => 2,
1537 can_events => 0, 1783 can_events => 0,
1538 %arg 1784 %arg
1539 ); 1785 );
1540 1786
1541 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1790 $self->{template} = $layout;
1545 } 1791 }
1546 1792
1547 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1551 } 1797 }
1552 1798
1553 $self 1799 $self
1554} 1800}
1555 1801
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1802sub update {
1567 my ($self) = @_; 1803 my ($self) = @_;
1568 1804
1569 delete $self->{texture}; 1805 delete $self->{texture};
1570 $self->SUPER::update; 1806 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1582 1818
1583 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1585 1821
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1588 1823
1589 delete $self->{size_req}; 1824 delete $self->{size_req};
1590 $self->realloc; 1825 $self->realloc;
1591 $self->update; 1826 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1599 1834
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1836
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1604 1838
1605 delete $self->{size_req}; 1839 delete $self->{size_req};
1606 $self->realloc; 1840 $self->realloc;
1607 $self->update; 1841 $self->update;
… …
1619 1853
1620 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1621 1855
1622 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1860
1626 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1627 1862
1628 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
… …
1633 }; 1868 };
1634 1869
1635 @{ $self->{size_req} } 1870 @{ $self->{size_req} }
1636} 1871}
1637 1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1638sub size_allocate { 1877sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1640 1879
1641 delete $self->{ox}; 1880 delete $self->{ox};
1642 1881
1643 delete $self->{texture} 1882 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1883 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1884
1885 1
1645} 1886}
1646 1887
1647sub set_fontsize { 1888sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1649 1890
1650 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1651 delete $self->{texture}; 1893 delete $self->{texture};
1652 1894
1653 $self->realloc; 1895 $self->realloc;
1654} 1896}
1655 1897
1656sub reconfigure { 1898sub reconfigure {
1657 my ($self) = @_; 1899 my ($self) = @_;
1658 1900
1659 delete $self->{size_req}; 1901 delete $self->{size_req};
1902 delete $self->{texture};
1660 1903
1661 $self->SUPER::reconfigure; 1904 $self->SUPER::reconfigure;
1662} 1905}
1663 1906
1664sub _draw { 1907sub _draw {
1665 my ($self) = @_; 1908 my ($self) = @_;
1666 1909
1667 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1668 1911
1669 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1919
1677 new_from_layout CFClient::Texture $self->{layout} 1920 [$self->{layout}->size]
1678 }; 1921 };
1679 1922
1680 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1684 1927
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1931 };
1689 1932
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1935
1695 if ($tex->{format} == GL_ALPHA) { 1936 $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} 1937}
1706 1938
1707############################################################################# 1939#############################################################################
1708 1940
1709package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1710 1942
1711our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1712 1944
1713use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1714 1946
1715sub new { 1947sub new {
1716 my $class = shift; 1948 my $class = shift;
1717 1949
1718 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1723 can_hover => 1, 1955 can_hover => 1,
1724 can_focus => 1, 1956 can_focus => 1,
1725 valign => 0, 1957 valign => 0,
1726 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1727 #text => ... 1960 #text => ...
1728 #hidden => "*", 1961 #hidden => "*",
1729 @_ 1962 @_
1730 ) 1963 )
1731} 1964}
… …
1742 1975
1743 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1978 delete $self->{size_req};
1746 1979
1747 $self->_emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1748 1981
1749 $self->realloc; 1982 $self->realloc;
1750 $self->update; 1983 $self->update;
1751} 1984}
1752 1985
… …
1767 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1768 2001
1769 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1770} 2003}
1771 2004
1772sub key_down { 2005sub invoke_key_down {
1773 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1774 2007
1775 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1778 2011
1779 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1780 2015
1781 if ($uni == 8) { 2016 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1790 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 2040 $self->emit ('escape');
1795 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2045 } else {
1798 return 0; 2046 return 0;
1799 } 2047 }
1800 2048
1801 $self->_set_text ($text); 2049 $self->_set_text ($text);
1802 2050
1803 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1804 2053
1805 1 2054 1
1806} 2055}
1807 2056
1808sub focus_in { 2057sub invoke_focus_in {
1809 my ($self) = @_; 2058 my ($self) = @_;
1810 2059
1811 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1812 2061
1813 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1814} 2063}
1815 2064
1816sub button_down { 2065sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1818 2067
1819 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 2069
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2071
1823 # byte-index to char-index 2072 # byte-index to char-index
1824 my $text = $self->{text}; 2073 my $text = $self->{text};
1825 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1827 2076
1828 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1829 $self->update; 2078 $self->update;
1830 2079
1831 1 2080 1
1832} 2081}
1833 2082
1834sub mouse_motion { 2083sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2085# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 2086
1838 0 2087 1
1839} 2088}
1840 2089
1841sub _draw { 2090sub _draw {
1842 my ($self) = @_; 2091 my ($self) = @_;
1843 2092
… …
1870 utf8::encode $text; 2119 utf8::encode $text;
1871 2120
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2122 }
1874 2123
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2124 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 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}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2127 glEnd;
1880 } 2128 }
1881} 2129}
1882 2130
2131#############################################################################
2132
1883package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1884 2134
1885our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1886 2136
1887use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1888 2138
1889sub key_down { 2139sub invoke_key_down {
1890 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1891 2141
1892 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1893 2143
1894 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1897 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 2150 $self->emit (activate => $txt);
1900 $self->update; 2151 $self->update;
1901 2152
1902 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1905 } 2156 }
1906 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2161 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2163 }
1913 2164
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2168
1918 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1920 } else { 2171 } else {
1921 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1922 } 2173 }
1923 2174
1924 } else { 2175 } else {
1925 return $self->SUPER::key_down ($ev) 2176 return $self->SUPER::invoke_key_down ($ev)
1926 } 2177 }
1927 2178
1928 1 2179 1
1929} 2180}
1930 2181
1931############################################################################# 2182#############################################################################
1932 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1933package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1934 2224
1935our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1936 2226
1937use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1938 2228
1939my @tex = 2229my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1942 2232
1943sub new { 2233sub new {
1944 my $class = shift; 2234 my $class = shift;
1945 2235
… …
1954 can_events => 1, 2244 can_events => 1,
1955 @_ 2245 @_
1956 ) 2246 )
1957} 2247}
1958 2248
1959sub activate { }
1960
1961sub button_up { 2249sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1963 2251
1964 $self->emit ("activate") 2252 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 2254 && $y >= 0 && $y < $self->{h};
… …
1984 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1985} 2273}
1986 2274
1987############################################################################# 2275#############################################################################
1988 2276
2277package CFPlus::UI::CheckBox;
2278
2279our @ISA = CFPlus::UI::DrawBG::;
2280
2281my @tex =
2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2284
2285use CFPlus::OpenGL;
2286
2287sub new {
2288 my $class = shift;
2289
2290 $class->SUPER::new (
2291 padding_x => 2,
2292 padding_y => 2,
2293 fg => [1, 1, 1],
2294 active_fg => [1, 1, 0],
2295 bg => [0, 0, 0, 0.2],
2296 active_bg => [1, 1, 1, 0.5],
2297 state => 0,
2298 can_hover => 1,
2299 @_
2300 )
2301}
2302
2303sub size_request {
2304 my ($self) = @_;
2305
2306 (6) x 2
2307}
2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
2317sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_;
2319
2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2322 $self->toggle;
2323 } else {
2324 return 0
2325 }
2326
2327 1
2328}
2329
2330sub _draw {
2331 my ($self) = @_;
2332
2333 $self->SUPER::_draw;
2334
2335 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2336
2337 my ($w, $h) = @$self{qw(w h)};
2338
2339 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2340
2341 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2342
2343 my $tex = $self->{state} ? $tex[1] : $tex[0];
2344
2345 glEnable GL_TEXTURE_2D;
2346 $tex->draw_quad_alpha (0, 0, $s, $s);
2347 glDisable GL_TEXTURE_2D;
2348}
2349
2350#############################################################################
2351
2352package CFPlus::UI::Image;
2353
2354our @ISA = CFPlus::UI::Base::;
2355
2356use CFPlus::OpenGL;
2357
2358our %texture_cache;
2359
2360sub new {
2361 my $class = shift;
2362
2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2367
2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
2370
2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2373
2374 CFPlus::weaken $texture_cache{$self->{path}};
2375
2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2377
2378 $self
2379}
2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
2396sub size_request {
2397 my ($self) = @_;
2398
2399 ($self->{tex}{w}, $self->{tex}{h})
2400}
2401
2402sub _draw {
2403 my ($self) = @_;
2404
2405 my $tex = $self->{tex};
2406
2407 my ($w, $h) = ($self->{w}, $self->{h});
2408
2409 if ($self->{rot90}) {
2410 glRotate 90, 0, 0, 1;
2411 glTranslate 0, -$self->{w}, 0;
2412
2413 ($w, $h) = ($h, $w);
2414 }
2415
2416 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418
2419 $tex->draw_quad (0, 0, $w, $h);
2420
2421 glDisable GL_TEXTURE_2D;
2422}
2423
2424#############################################################################
2425
1989package CFClient::UI::ImageButton; 2426package CFPlus::UI::ImageButton;
1990 2427
1991our @ISA = CFClient::UI::Image::; 2428our @ISA = CFPlus::UI::Image::;
1992 2429
1993use CFClient::OpenGL; 2430use CFPlus::OpenGL;
1994 2431
1995my %textures; 2432my %textures;
1996 2433
1997sub new { 2434sub new {
1998 my $class = shift; 2435 my $class = shift;
… …
2008 can_events => 1, 2445 can_events => 1,
2009 @_ 2446 @_
2010 ); 2447 );
2011} 2448}
2012 2449
2013sub activate { }
2014
2015sub button_up { 2450sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2451 my ($self, $ev, $x, $y) = @_;
2017 2452
2018 $self->emit ("activate") 2453 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2454 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2455 && $y >= 0 && $y < $self->{h};
… …
2022 1 2457 1
2023} 2458}
2024 2459
2025############################################################################# 2460#############################################################################
2026 2461
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; 2462package CFPlus::UI::VGauge;
2096 2463
2097our @ISA = CFClient::UI::Base::; 2464our @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 2465
2157use List::Util qw(min max); 2466use List::Util qw(min max);
2158 2467
2159use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2160 2469
2161my %tex = ( 2470my %tex = (
2162 food => [ 2471 food => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2164 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2165 ], 2474 ],
2166 grace => [ 2475 grace => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 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/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2169 ], 2478 ],
2170 hp => [ 2479 hp => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2173 ], 2482 ],
2174 mana => [ 2483 mana => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 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/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2177 ], 2486 ],
2178); 2487);
2179 2488
2180# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2551
2243 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2557
2246 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
… …
2268 2580
2269 if ($t3) { 2581 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2588 glEnd;
2277 } 2589 }
2278 2590
2279 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2280 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2281} 2593}
2282 2594
2283############################################################################# 2595#############################################################################
2284 2596
2285package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2286 2598
2287our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2288 2600
2289sub new { 2601sub new {
2290 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2291 2603
2292 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2294 can_hover => 1, 2606 can_hover => 1,
2295 can_events => 1, 2607 can_events => 1,
2296 %arg, 2608 %arg,
2297 ); 2609 );
2298 2610
2299 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $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); 2612 $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"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2302 2614
2303 $self 2615 $self
2304} 2616}
2305 2617
2306sub set_fontsize { 2618sub set_fontsize {
… …
2327 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2328} 2640}
2329 2641
2330############################################################################# 2642#############################################################################
2331 2643
2332package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2333 2645
2334use strict; 2646use strict;
2335 2647
2336use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2337 2649
2338our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2339 2651
2340my @tex = 2652my @tex =
2341 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2342 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2343 2655
2344sub new { 2656sub new {
2345 my $class = shift; 2657 my $class = shift;
2346 2658
… …
2367 $self->update; 2679 $self->update;
2368 2680
2369 $self 2681 $self
2370} 2682}
2371 2683
2372sub changed { }
2373
2374sub set_range { 2684sub set_range {
2375 my ($self, $range) = @_; 2685 my ($self, $range) = @_;
2376 2686
2377 ($range, $self->{range}) = ($self->{range}, $range); 2687 ($range, $self->{range}) = ($self->{range}, $range);
2378 2688
… …
2398 if $unit; 2708 if $unit;
2399 2709
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2711
2402 if ($value != $old_value) { 2712 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2713 $self->emit (changed => $value);
2404 $self->update; 2714 $self->update;
2405 } 2715 }
2406} 2716}
2407 2717
2408sub size_request { 2718sub size_request {
2409 my ($self) = @_; 2719 my ($self) = @_;
2410 2720
2411 ($self->{req_w}, $self->{req_h}) 2721 ($self->{req_w}, $self->{req_h})
2412} 2722}
2413 2723
2414sub button_down { 2724sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2416 2726
2417 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2728
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2730
2421 $self->mouse_motion ($ev, $x, $y) 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2732}
2423 2733
2424sub mouse_motion { 2734sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2426 2736
2427 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2739
… …
2435 } else { 2745 } else {
2436 return 0; 2746 return 0;
2437 } 2747 }
2438 2748
2439 1 2749 1
2750}
2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2440} 2762}
2441 2763
2442sub update { 2764sub update {
2443 my ($self) = @_; 2765 my ($self) = @_;
2444 2766
… …
2493 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2494} 2816}
2495 2817
2496############################################################################# 2818#############################################################################
2497 2819
2498package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2499 2821
2500our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2501 2823
2502sub new { 2824sub new {
2503 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2504 2826
2505 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2506 2828
2507 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2508 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2509 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2510 to_value => sub { shift }, 2832 to_value => sub { shift },
2511 from_value => sub { shift }, 2833 from_value => sub { shift },
2512 %arg, 2834 %arg,
2513 ); 2835 );
2514 2836
… …
2534sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2535sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2536 2858
2537############################################################################# 2859#############################################################################
2538 2860
2539package CFClient::UI::TextScroller; 2861package CFPlus::UI::TextScroller;
2540 2862
2541our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2542 2864
2543use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2544 2866
2545sub new { 2867sub new {
2546 my $class = shift; 2868 my $class = shift;
2547 2869
2548 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2549 fontsize => 1, 2871 fontsize => 1,
2550 can_events => 0, 2872 can_events => 1,
2551 indent => 0, 2873 indent => 0,
2552 #font => default_font 2874 #font => default_font
2553 @_, 2875 @_,
2554 2876
2555 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2556 par => [], 2878 par => [],
2879 max_par => 0,
2557 height => 0, 2880 height => 0,
2558 children => [ 2881 children => [
2559 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2561 ], 2884 ],
2562 ); 2885 );
2563 2886
2564 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2565 2888
… …
2571 2894
2572 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2896 $self->reflow;
2574} 2897}
2575 2898
2899sub size_request {
2900 my ($self) = @_;
2901
2902 my ($empty, $slider) = @{ $self->{children} };
2903
2904 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request
2906}
2907
2576sub size_allocate { 2908sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2578 2910
2579 $self->SUPER::size_allocate ($w, $h); 2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2913
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2916 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2918
2586 $self->reflow; 2919 $self->reflow;
2587}
2588 2920
2589sub text_size { 2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2590 my ($self, $text, $indent) = @_; 2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2933}
2934
2935sub get_layout {
2936 my ($self, $para) = @_;
2591 2937
2592 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2593 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2943 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2945 $layout->set_markup ($para->{markup});
2946
2947 $layout->set_shapes (
2948 map
2949 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2950 @{$para->{widget}}
2598 2951 );
2952
2599 $layout->size 2953 $layout
2600} 2954}
2601 2955
2602sub reflow { 2956sub reflow {
2603 my ($self) = @_; 2957 my ($self) = @_;
2604 2958
… …
2611 2965
2612 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2613 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2614} 2968}
2615 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2616sub clear { 2985sub clear {
2617 my ($self) = @_; 2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2618 2990
2619 $self->{par} = []; 2991 $self->{par} = [];
2620 $self->{height} = 0; 2992 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2994}
2623 2995
2624sub add_paragraph { 2996sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2997 my $self = shift;
2626 2998
2627 for my $line (split /\n/, $text) { 2999 for my $para (@_) {
2628 my ($w, $h) = $self->text_size ($line); 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
3006 w => 1e10,
3007 wrapped => 1,
3008 };
3009
3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
3018 $self->{need_reflow}++;
3019 $self->update;
3020}
3021
3022sub scroll_to_bottom {
3023 my ($self) = @_;
3024
3025 $self->{scroll_to} = $#{$self->{par}};
3026 $self->update;
3027}
3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
2629 $self->{height} += $h; 3051 $self->{height} = $height;
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2631 }
2632 3053
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
2634} 3060}
2635 3061
2636sub update { 3062sub update {
2637 my ($self) = @_; 3063 my ($self) = @_;
2638 3064
… …
2641 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2642 3068
2643 delete $self->{texture}; 3069 delete $self->{texture};
2644 3070
2645 $ROOT->on_post_alloc ($self => sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 3075
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 { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2678 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2679 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2680 3089
2681 my $y0 = $top; 3090 my $y0 = $top;
2682 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2683 3092
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}}) { 3093 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2696 3096
2697 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 3098 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 3099
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3100 $layout->render ($para->{indent}, $y - $y0);
2704 3101
2705 glRasterPos $par->[3], $y - $y0; 3102 if (my @w = @{ $para->{widget} }) {
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3103 my @s = $layout->get_shapes;
3104
3105 for (@w) {
3106 my ($dx, $dy) = splice @s, 0, 2, ();
3107
3108 $_->{x} = $dx + $para->{indent};
3109 $_->{y} = $dy + $y - $y0;
3110
3111 $_->draw;
3112 }
3113 }
2707 } 3114 }
2708 3115
2709 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2710 } 3118 }
2711 3119
2712 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2713 }; 3121 };
2714 }); 3122 });
3123}
3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
2715} 3132}
2716 3133
2717sub _draw { 3134sub _draw {
2718 my ($self) = @_; 3135 my ($self) = @_;
2719 3136
… …
2722 glColor 0, 0, 0, 1; 3139 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3140 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2725 3142
2726 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2727
2728} 3144}
2729 3145
2730############################################################################# 3146#############################################################################
2731 3147
2732package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2733 3149
2734use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2735 3151
2736our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2737 3153
2738sub moveto { 3154sub moveto {
2739 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2740 3156
2741 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2769 glPopMatrix; 3185 glPopMatrix;
2770} 3186}
2771 3187
2772############################################################################# 3188#############################################################################
2773 3189
2774package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2775 3191
2776our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2777 3193
2778sub new { 3194sub new {
2779 my $class = shift; 3195 my $class = shift;
2780 3196
2781 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2793 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2794} 3210}
2795 3211
2796############################################################################# 3212#############################################################################
2797 3213
2798package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2799 3215
2800our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2801 3217
2802use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2803 3219
2804sub new { 3220sub new {
2805 my $class = shift; 3221 my $class = shift;
2806 3222
2807 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2810 ) 3226 )
2811} 3227}
2812 3228
2813sub set_tooltip_from { 3229sub set_tooltip_from {
2814 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2815 3234
2816 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2817 3236
2818 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2823 } 3242 }
2824 3243
2825 $tooltip =~ s/^\n+//; 3244 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//; 3245 $tooltip =~ s/\n+$//;
2827 3246
2828 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2829 markup => $tooltip, 3248 markup => $tooltip,
2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2831 fontsize => 0.8, 3250 fontsize => 0.8,
2832 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2833 ellipsise => 0, 3252 ellipsise => 0,
2834 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2835 ); 3254 );
2836} 3255}
2837 3256
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 3261
2843 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2844} 3263}
2845 3264
2846sub size_allocate { 3265sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2848 3267
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 3269}
2851 3270
2852sub visibility_change { 3271sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 3272 my ($self, $visible) = @_;
2854 3273
2855 return unless $visible; 3274 return unless $visible;
2856 3275
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2859 or return; 3278 or return;
2860 3279
3280 if ($widget->{visible}) {
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862 3282
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w}; 3284 if $x + $self->{w} > $self->{root}{w};
2865 3285
2866 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2867 }); 3290 });
2868} 3291}
2869 3292
2870sub _draw { 3293sub _draw {
2871 my ($self) = @_; 3294 my ($self) = @_;
… …
2895 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2896} 3319}
2897 3320
2898############################################################################# 3321#############################################################################
2899 3322
2900package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2901 3324
2902our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2903 3326
2904use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2905 3328
2906sub new { 3329sub new {
2907 my $class = shift; 3330 my $class = shift;
2908 3331
2909 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2911 can_events => 0, 3334 can_events => 0,
2912 @_, 3335 @_,
2913 ); 3336 );
2914 3337
2915 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
2916 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
2917 3340
2918 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
2919 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2920 hard => 1, 3343 hard => 1,
2921 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
2922 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
2923 ++$widget->{frame}; 3347 ++$widget->{frame};
2924 $widget->update; 3348 $widget->update;
2925 }, 3349 },
2926 ); 3350 );
2927 } 3351 }
… …
2944sub _draw { 3368sub _draw {
2945 my ($self) = @_; 3369 my ($self) = @_;
2946 3370
2947 return unless $::CONN; 3371 return unless $::CONN;
2948 3372
3373 $self->SUPER::_draw;
3374
2949 my $face; 3375 my $face;
2950 3376
2951 if ($self->{frame}) { 3377 if ($self->{frame}) {
2952 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
2953 3379
2954 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
2955 if $anim && @$anim; 3381 if $anim && @$anim;
2956 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
2957 3386
2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
2959 3388
2960 if ($tex) { 3389 if ($tex) {
2961 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2963 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2965 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
2966 } 3399 }
2967} 3400}
2968 3401
2969sub destroy { 3402sub destroy {
2970 my ($self) = @_; 3403 my ($self) = @_;
… …
2975 $self->SUPER::destroy; 3408 $self->SUPER::destroy;
2976} 3409}
2977 3410
2978############################################################################# 3411#############################################################################
2979 3412
2980package CFClient::UI::Buttonbar; 3413package CFPlus::UI::Buttonbar;
2981 3414
2982our @ISA = CFClient::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
2983 3416
2984# TODO: should actualyl wrap buttons and other goodies. 3417# TODO: should actually wrap buttons and other goodies.
2985 3418
2986############################################################################# 3419#############################################################################
2987 3420
2988package CFClient::UI::Menu; 3421package CFPlus::UI::Menu;
2989 3422
2990our @ISA = CFClient::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
2991 3424
2992use CFClient::OpenGL; 3425use CFPlus::OpenGL;
2993 3426
2994sub new { 3427sub new {
2995 my $class = shift; 3428 my $class = shift;
2996 3429
2997 my $self = $class->SUPER::new ( 3430 my $self = $class->SUPER::new (
2998 items => [], 3431 items => [],
2999 z => 100, 3432 z => 100,
3000 @_, 3433 @_,
3001 ); 3434 );
3002 3435
3003 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3004 3437
3005 for my $item (@{ $self->{items} }) { 3438 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3439 my ($widget, $cb, $tooltip) = @$item;
3007 3440
3008 # handle various types of items, only text for now 3441 # handle various types of items, only text for now
3009 if (!ref $widget) { 3442 if (!ref $widget) {
3443 if ($widget =~ /\t/) {
3444 my ($left, $right) = split /\t/, $widget, 2;
3445
3010 $widget = new CFClient::UI::Label 3446 $widget = new CFPlus::UI::HBox
3011 can_hover => 1, 3447 can_hover => 1,
3012 can_events => 1, 3448 can_events => 1,
3449 tooltip => $tooltip,
3450 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1),
3453 ],
3454 ;
3455
3456 } else {
3457 $widget = new CFPlus::UI::Label
3458 can_hover => 1,
3459 can_events => 1,
3013 markup => $widget, 3460 markup => $widget,
3014 tooltip => $tooltip 3461 tooltip => $tooltip;
3462 }
3015 } 3463 }
3016 3464
3017 $self->{item}{$widget} = $item; 3465 $self->{item}{$widget} = $item;
3018 3466
3019 $self->{vbox}->add ($widget); 3467 $self->{vbox}->add ($widget);
… …
3024 3472
3025# popup given the event (must be a mouse button down event currently) 3473# popup given the event (must be a mouse button down event currently)
3026sub popup { 3474sub popup {
3027 my ($self, $ev) = @_; 3475 my ($self, $ev) = @_;
3028 3476
3029 $self->_emit ("popdown"); 3477 $self->emit ("popdown");
3030 3478
3031 # maybe save $GRAB? must be careful about events... 3479 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3480 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3481 $self->{button} = $ev->{button};
3034 3482
3035 $self->show; 3483 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3484 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3485}
3038 3486
3039sub mouse_motion { 3487sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3488 my ($self, $ev, $x, $y) = @_;
3041 3489
3042 # TODO: should use vbox->find_widget or so 3490 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3491 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3492 $self->{hover} = $self->{item}{$HOVER};
3045 3493
3046 0 3494 0
3047} 3495}
3048 3496
3049sub button_up { 3497sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3498 my ($self, $ev, $x, $y) = @_;
3051 3499
3052 if ($ev->{button} == $self->{button}) { 3500 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3501 undef $GRAB;
3054 $self->hide; 3502 $self->hide;
3055 3503
3056 $self->_emit ("popdown"); 3504 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3505 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3506 } else {
3059 return 0 3507 return 0
3060 } 3508 }
3061 3509
3062 1 3510 1
3063} 3511}
3064 3512
3065############################################################################# 3513#############################################################################
3066 3514
3067package CFClient::UI::Multiplexer; 3515package CFPlus::UI::Multiplexer;
3068 3516
3069our @ISA = CFClient::UI::Container::; 3517our @ISA = CFPlus::UI::Container::;
3070 3518
3071sub new { 3519sub new {
3072 my $class = shift; 3520 my $class = shift;
3073 3521
3074 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
3088 3536
3089 $self->{current} = $self->{children}[0] 3537 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3538 if @{ $self->{children} };
3091} 3539}
3092 3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{current}
3545}
3546
3093sub set_current_page { 3547sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3548 my ($self, $page_or_widget) = @_;
3095 3549
3096 my $widget = ref $page_or_widget 3550 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3551 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3552 : $self->{children}[$page_or_widget];
3099 3553
3100 $self->{current} = $widget; 3554 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3555 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3556
3103 $self->_emit (page_changed => $self->{current}); 3557 $self->emit (page_changed => $self->{current});
3104 3558
3105 $self->realloc; 3559 $self->realloc;
3106} 3560}
3107 3561
3108sub visible_children { 3562sub visible_children {
… …
3113 my ($self) = @_; 3567 my ($self) = @_;
3114 3568
3115 $self->{current}->size_request 3569 $self->{current}->size_request
3116} 3570}
3117 3571
3118sub size_allocate { 3572sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3573 my ($self, $w, $h) = @_;
3120 3574
3121 $self->{current}->configure (0, 0, $w, $h); 3575 $self->{current}->configure (0, 0, $w, $h);
3576
3577 1
3122} 3578}
3123 3579
3124sub _draw { 3580sub _draw {
3125 my ($self) = @_; 3581 my ($self) = @_;
3126 3582
3127 $self->{current}->draw; 3583 $self->{current}->draw;
3128} 3584}
3129 3585
3130############################################################################# 3586#############################################################################
3131 3587
3132package CFClient::UI::Notebook; 3588package CFPlus::UI::Notebook;
3133 3589
3134our @ISA = CFClient::UI::VBox::; 3590our @ISA = CFPlus::UI::VBox::;
3135 3591
3136sub new { 3592sub new {
3137 my $class = shift; 3593 my $class = shift;
3138 3594
3139 my $self = $class->SUPER::new ( 3595 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar), 3596 buttonbar => (new CFPlus::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self 3598 # filter => # will be put between multiplexer and $self
3143 @_, 3599 @_,
3144 ); 3600 );
3145 3601
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3150} 3606}
3151 3607
3152sub add { 3608sub add {
3153 my ($self, $title, $widget, $tooltip) = @_; 3609 my ($self, $title, $widget, $tooltip) = @_;
3154 3610
3155 Scalar::Util::weaken $self; 3611 CFPlus::weaken $self;
3156 3612
3157 $self->{buttonbar}->add (new CFClient::UI::Button 3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3158 markup => $title, 3614 markup => $title,
3159 tooltip => $tooltip, 3615 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) }, 3616 on_activate => sub { $self->set_current_page ($widget) },
3161 ); 3617 );
3162 3618
3163 $self->{multiplexer}->add ($widget); 3619 $self->{multiplexer}->add ($widget);
3164} 3620}
3165 3621
3622sub get_current_page {
3623 my ($self) = @_;
3624
3625 $self->{multiplexer}->get_current_page
3626}
3627
3166sub set_current_page { 3628sub set_current_page {
3167 my ($self, $page) = @_; 3629 my ($self, $page) = @_;
3168 3630
3169 $self->{multiplexer}->set_current_page ($page); 3631 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3632 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3633}
3172 3634
3173############################################################################# 3635#############################################################################
3174 3636
3175package CFClient::UI::Combobox; 3637package CFPlus::UI::Selector;
3176 3638
3177use utf8; 3639use utf8;
3178 3640
3179our @ISA = CFClient::UI::Button::; 3641our @ISA = CFPlus::UI::Button::;
3180 3642
3181sub new { 3643sub new {
3182 my $class = shift; 3644 my $class = shift;
3183 3645
3184 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3190 $self->_set_value ($self->{value}); 3652 $self->_set_value ($self->{value});
3191 3653
3192 $self 3654 $self
3193} 3655}
3194 3656
3195sub button_down { 3657sub invoke_button_down {
3196 my ($self, $ev) = @_; 3658 my ($self, $ev) = @_;
3197 3659
3198 my @menu_items; 3660 my @menu_items;
3199 3661
3200 for (@{ $self->{options} }) { 3662 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_; 3663 my ($value, $title, $tooltip) = @$_;
3202 3664
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 } 3666 }
3205 3667
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207} 3669}
3208 3670
3209sub _set_value { 3671sub _set_value {
3210 my ($self, $value) = @_; 3672 my ($self, $value) = @_;
3211 3673
… …
3221 my ($self, $value) = @_; 3683 my ($self, $value) = @_;
3222 3684
3223 return unless $self->{value} ne $value; 3685 return unless $self->{value} ne $value;
3224 3686
3225 $self->_set_value ($value); 3687 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3688 $self->emit (changed => $value);
3227} 3689}
3228 3690
3229############################################################################# 3691#############################################################################
3230 3692
3231package CFClient::UI::Statusbox; 3693package CFPlus::UI::Statusbox;
3232 3694
3233our @ISA = CFClient::UI::VBox::; 3695our @ISA = CFPlus::UI::VBox::;
3234 3696
3235sub new { 3697sub new {
3236 my $class = shift; 3698 my $class = shift;
3237 3699
3238 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3239 fontsize => 0.8, 3701 fontsize => 0.8,
3240 @_, 3702 @_,
3241 ); 3703 );
3242 3704
3243 Scalar::Util::weaken (my $this = $self); 3705 CFPlus::weaken (my $this = $self);
3244 3706
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246 3708
3247 $self 3709 $self
3248} 3710}
… …
3250sub reorder { 3712sub reorder {
3251 my ($self) = @_; 3713 my ($self) = @_;
3252 my $NOW = Time::HiRes::time; 3714 my $NOW = Time::HiRes::time;
3253 3715
3254 # freeze display when hovering over any label 3716 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner} 3717 return if $CFPlus::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} }; 3719 values %{ $self->{item} };
3258 3720
3259 while (my ($k, $v) = each %{ $self->{item} }) { 3721 while (my ($k, $v) = each %{ $self->{item} }) {
3260 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3722 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3261 } 3723 }
… …
3282 for ($short) { 3744 for ($short) {
3283 s/^\s+//; 3745 s/^\s+//;
3284 s/\s+/ /g; 3746 s/\s+/ /g;
3285 } 3747 }
3286 3748
3287 new CFClient::UI::Label 3749 new CFPlus::UI::Label
3288 markup => $short, 3750 markup => $short,
3289 tooltip => $item->{tooltip}, 3751 tooltip => $item->{tooltip},
3290 tooltip_font => $::FONT_PROP, 3752 tooltip_font => $::FONT_PROP,
3291 tooltip_width => 0.67, 3753 tooltip_width => 0.67,
3292 fontsize => $item->{fontsize} || $self->{fontsize}, 3754 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3346 count => 1, 3808 count => 1,
3347 %arg, 3809 %arg,
3348 }; 3810 };
3349 } 3811 }
3350 3812
3813 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3814 $self->reorder;
3815 });
3352} 3816}
3353 3817
3354sub reconfigure { 3818sub reconfigure {
3355 my ($self) = @_; 3819 my ($self) = @_;
3356 3820
… …
3369 $self->SUPER::destroy; 3833 $self->SUPER::destroy;
3370} 3834}
3371 3835
3372############################################################################# 3836#############################################################################
3373 3837
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; 3838package CFPlus::UI::Root;
3737 3839
3738our @ISA = CFClient::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3739 3841
3740use List::Util qw(min max); 3842use List::Util qw(min max);
3741 3843
3742use CFClient::OpenGL; 3844use CFPlus::OpenGL;
3743 3845
3744sub new { 3846sub new {
3745 my $class = shift; 3847 my $class = shift;
3746 3848
3747 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3748 visible => 1, 3850 visible => 1,
3749 @_, 3851 @_,
3750 ); 3852 );
3751 3853
3752 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3753 3855
3754 $self 3856 $self
3755} 3857}
3756 3858
3757sub size_request { 3859sub size_request {
… …
3772 $coord = $max - $size if $coord > $max - $size; 3874 $coord = $max - $size if $coord > $max - $size;
3773 3875
3774 int $coord + 0.5 3876 int $coord + 0.5
3775} 3877}
3776 3878
3777sub size_allocate { 3879sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3880 my ($self, $w, $h) = @_;
3779 3881
3780 for my $child ($self->children) { 3882 for my $child ($self->children) {
3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3883 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782 3884
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3888 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3889 $Y = _to_pixel $Y, $H, $self->{h};
3788 3890
3789 $child->configure ($X, $Y, $W, $H); 3891 $child->configure ($X, $Y, $W, $H);
3790 } 3892 }
3893
3894 1
3791} 3895}
3792 3896
3793sub coord2local { 3897sub coord2local {
3794 my ($self, $x, $y) = @_; 3898 my ($self, $x, $y) = @_;
3795 3899
… …
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922 4026
3923 $w = 0 if $w < 0; 4027 $w = 0 if $w < 0;
3924 $h = 0 if $h < 0; 4028 $h = 0 if $h < 0;
3925 4029
4030 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h;
4032
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038
3926 $w = int $w + 0.5; 4039 $w = int $w + 0.5;
3927 $h = int $h + 0.5; 4040 $h = int $h + 0.5;
3928 4041
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w}; 4043 $widget->{old_w} = $widget->{w};
… …
3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3954 glMatrixMode GL_MODELVIEW; 4067 glMatrixMode GL_MODELVIEW;
3955 glLoadIdentity; 4068 glLoadIdentity;
3956 4069
3957 { 4070 {
3958 package CFClient::UI::Base; 4071 package CFPlus::UI::Base;
3959 4072
3960 ($draw_x, $draw_y, $draw_w, $draw_h) = 4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h}); 4074 (0, 0, $self->{w}, $self->{h});
3962 }
3963 4075
3964 $self->_draw; 4076 $self->_draw;
4077 }
3965} 4078}
3966 4079
3967############################################################################# 4080#############################################################################
3968 4081
3969package CFClient::UI; 4082package CFPlus::UI;
3970 4083
3971$ROOT = new CFClient::UI::Root; 4084$ROOT = new CFPlus::UI::Root;
3972$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3973 4086
39741 40871
3975 4088

Diff Legend

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