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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 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
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
986 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
987 1085
988 $self 1086 $self
989} 1087}
1088
1089#TODO# update range on size_allocate depending on child
990 1090
991sub add { 1091sub add {
992 my ($self, $widget) = @_; 1092 my ($self, $widget) = @_;
993 1093
994 $self->{vp}->add ($self->{child} = $widget); 1094 $self->{vp}->add ($self->{child} = $widget);
995} 1095}
996 1096
1097sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_;
1099
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev);
1103
1104 1
1105}
1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
997sub update { 1131sub update {
998 my ($self) = @_; 1132 my ($self) = @_;
999 1133
1000 $self->SUPER::update; 1134 $self->SUPER::update;
1001 1135 $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} 1136}
1006 1137
1007sub size_allocate { 1138sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1009 1140
1141 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1142 $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} 1143}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1144
1019############################################################################# 1145#############################################################################
1020 1146
1021package CFClient::UI::Frame; 1147package CFPlus::UI::Frame;
1022 1148
1023our @ISA = CFClient::UI::Bin::; 1149our @ISA = CFPlus::UI::Bin::;
1024 1150
1025use CFClient::OpenGL; 1151use CFPlus::OpenGL;
1026 1152
1027sub new { 1153sub new {
1028 my $class = shift; 1154 my $class = shift;
1029 1155
1030 $class->SUPER::new ( 1156 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1182 $self->SUPER::_draw;
1057} 1183}
1058 1184
1059############################################################################# 1185#############################################################################
1060 1186
1061package CFClient::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1062 1188
1063our @ISA = CFClient::UI::Bin::; 1189our @ISA = CFPlus::UI::Bin::;
1064 1190
1065use CFClient::OpenGL; 1191use CFPlus::OpenGL;
1192
1193sub new {
1194 my ($class, %arg) = @_;
1195
1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1288
1289our @ISA = CFPlus::UI::Bin::;
1290
1291use CFPlus::OpenGL;
1066 1292
1067my $bg = 1293my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1295 mipmap => 1, wrap => 1;
1070 1296
1071my @border = 1297my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1298 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); 1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1300
1075sub new { 1301sub new {
1076 my ($class, %arg) = @_; 1302 my ($class, %arg) = @_;
1077 1303
1078 my $self = $class->SUPER::new ( 1304 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1305 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1306 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1307 border => 0.6,
1082 can_events => 1, 1308 can_events => 1,
1083 min_w => 16, 1309 min_w => 64,
1084 min_h => 16, 1310 min_h => 32,
1085 %arg, 1311 %arg,
1086 ); 1312 );
1087 1313
1088 $self->{title_widget} = new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1315 align => 0,
1090 valign => 1, 1316 valign => 1,
1091 text => $self->{title}, 1317 text => $self->{title},
1092 fontsize => $self->{border}, 1318 fontsize => $self->{border},
1093 if exists $self->{title}; 1319 if exists $self->{title};
1094 1320
1321 if ($self->{has_close_button}) {
1322 $self->{close_button} =
1323 new CFPlus::UI::ImageButton
1324 path => 'x1_close.png',
1325 on_activate => sub { $self->emit ("delete") };
1326
1327 $self->CFPlus::UI::Container::add ($self->{close_button});
1328 }
1329
1095 $self 1330 $self
1096} 1331}
1097 1332
1098sub add { 1333sub add {
1099 my ($self, @widgets) = @_; 1334 my ($self, @widgets) = @_;
1100 1335
1101 $self->SUPER::add (@widgets); 1336 $self->SUPER::add (@widgets);
1337 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1339}
1104 1340
1105sub border { 1341sub border {
1106 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1107} 1343}
… …
1109sub size_request { 1345sub size_request {
1110 my ($self) = @_; 1346 my ($self) = @_;
1111 1347
1112 $self->{title_widget}->size_request 1348 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1349 if $self->{title_widget};
1350
1351 $self->{close_button}->size_request
1352 if $self->{close_button};
1114 1353
1115 my ($w, $h) = $self->SUPER::size_request; 1354 my ($w, $h) = $self->SUPER::size_request;
1116 1355
1117 ( 1356 (
1118 $w + $self->border * 2, 1357 $w + $self->border * 2,
1119 $h + $self->border * 2, 1358 $h + $self->border * 2,
1120 ) 1359 )
1121} 1360}
1122 1361
1123sub size_allocate { 1362sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1125 1364
1126 if ($self->{title_widget}) { 1365 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1366 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1367 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1368 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1369 }
1131 1370
1132 my $border = $self->border; 1371 my $border = $self->border;
1133 1372
1134 $h -= List::Util::max 0, $border * 2; 1373 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1374 $w -= List::Util::max 0, $border * 2;
1375
1376 $self->child->configure ($border, $border, $w, $h);
1377
1378 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1379 if $self->{close_button};
1380
1381 1
1382}
1383
1384sub invoke_delete {
1385 my ($self) = @_;
1386
1387 $self->hide;
1136 1388
1137 $self->child->configure ($border, $border, $w, $h); 1389 1
1138} 1390}
1139 1391
1140sub button_down { 1392sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1142 1394
1143 my ($w, $h) = @$self{qw(w h)}; 1395 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1396 my $border = $self->border;
1145 1397
… …
1176 1428
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1429 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1430
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1431 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1432 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1433 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1434 };
1183 } else { 1435 } else {
1184 return 0; 1436 return 0;
1185 } 1437 }
1186 1438
1187 1 1439 1
1188} 1440}
1189 1441
1190sub button_up { 1442sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1192 1444
1193 !!delete $self->{motion} 1445 ! ! delete $self->{motion}
1194} 1446}
1195 1447
1196sub mouse_motion { 1448sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1449 my ($self, $ev, $x, $y) = @_;
1198 1450
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1451 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1452
1201 !!$self->{motion} 1453 ! ! $self->{motion}
1454}
1455
1456sub invoke_visibility_change {
1457 my ($self, $visible) = @_;
1458
1459 delete $self->{motion} unless $visible;
1460
1461 0
1202} 1462}
1203 1463
1204sub _draw { 1464sub _draw {
1205 my ($self) = @_; 1465 my ($self) = @_;
1206 1466
… …
1235 $child->draw; 1495 $child->draw;
1236 1496
1237 if ($self->{title_widget}) { 1497 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1498 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1499 $self->{title_widget}->_draw;
1500
1501 glTranslate 0, - ($border - $self->{h});
1240 } 1502 }
1503
1504 $self->{close_button}->draw
1505 if $self->{close_button};
1241} 1506}
1242 1507
1243############################################################################# 1508#############################################################################
1244 1509
1245package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1246 1511
1247our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1248 1513
1249use List::Util qw(max sum); 1514use List::Util qw(max sum);
1250 1515
1251use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1252 1517
1253sub new { 1518sub new {
1254 my $class = shift; 1519 my $class = shift;
1255 1520
1256 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1257 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1258 @_, 1525 @_,
1259 ) 1526 )
1260} 1527}
1261 1528
1262sub children { 1529sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1531}
1265 1532
1533# TODO: store row/col info in child widget and use standard add/del
1266sub add { 1534sub add {
1267 my ($self, $x, $y, $child) = @_; 1535 my ($self) = shift;
1268 1536
1537 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1539 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1541 }
1271 1542
1543 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1545 $self->realloc;
1273} 1546}
1274 1547
1275sub remove { 1548sub remove {
1276 my ($self, $child) = @_; 1549 my ($self, $child) = @_;
1277 1550
1278 # TODO: not yet implemented 1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1279} 1556}
1280 1557
1281# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1282sub clear { 1559sub clear {
1283 my ($self) = @_; 1560 my ($self) = @_;
… …
1324 (sum @$ws), 1601 (sum @$ws),
1325 (sum @$hs), 1602 (sum @$hs),
1326 ) 1603 )
1327} 1604}
1328 1605
1329sub size_allocate { 1606sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1607 my ($self, $w, $h) = @_;
1331 1608
1332 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1333 1610
1334 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1335 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1336 1613
1337 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1338 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1339 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1340 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1341 1618
1342 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1620
1346 CFClient::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1347 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1348 1630
1349 my $y; 1631 my $y;
1350 1632
1351 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1352 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1366 } 1648 }
1367 1649
1368 $y += $row_h; 1650 $y += $row_h;
1369 } 1651 }
1370 1652
1653 1
1371} 1654}
1372 1655
1373sub find_widget { 1656sub find_widget {
1374 my ($self, $x, $y) = @_; 1657 my ($self, $x, $y) = @_;
1375 1658
… …
1394 } 1677 }
1395} 1678}
1396 1679
1397############################################################################# 1680#############################################################################
1398 1681
1399package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1400 1683
1684use List::Util qw(min max);
1685
1401our @ISA = CFClient::UI::Container::; 1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Box;
1765
1766our @ISA = CFPlus::UI::Container::;
1402 1767
1403sub size_request { 1768sub size_request {
1404 my ($self) = @_; 1769 my ($self) = @_;
1405 1770
1406 $self->{vertical} 1771 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1777 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1778 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1779 )
1415} 1780}
1416 1781
1417sub size_allocate { 1782sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1783 my ($self, $w, $h) = @_;
1419 1784
1420 my $space = $self->{vertical} ? $h : $w; 1785 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1786 my @children = $self->visible_children;
1422 1787
1423 my @req; 1788 my @req;
1424 1789
1425 if ($self->{homogeneous}) { 1790 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1791 @req = ($space / (@children || 1)) x @children;
1427 } else { 1792 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1793 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1794 my $req = List::Util::sum @req;
1430 1795
1431 if ($req > $space) { 1796 if ($req > $space) {
1432 # ah well, not enough space 1797 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1798 $_ *= $space / $req for @req;
1434 } else { 1799 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1800 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1801
1437 $space = ($space - $req) / $expand; # remaining space to give away 1802 $space = ($space - $req) / $expand; # remaining space to give away
1438 1803
1439 $req[$_] += $space * $children->[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1805 for 0 .. $#children;
1441 } 1806 }
1442 } 1807 }
1443 1808
1444 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1445 1810
1446 my $pos = 0; 1811 my $pos = 0;
1447 for (0 .. $#$children) { 1812 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1815
1451 $pos += $alloc; 1816 $pos += $alloc;
1452 } 1817 }
1453 1818
1454 1 1819 1
1455} 1820}
1456 1821
1457############################################################################# 1822#############################################################################
1458 1823
1459package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1460 1825
1461our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1462 1827
1463sub new { 1828sub new {
1464 my $class = shift; 1829 my $class = shift;
1465 1830
1466 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1469 ) 1834 )
1470} 1835}
1471 1836
1472############################################################################# 1837#############################################################################
1473 1838
1474package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1475 1840
1476our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1477 1842
1478sub new { 1843sub new {
1479 my $class = shift; 1844 my $class = shift;
1480 1845
1481 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1484 ) 1849 )
1485} 1850}
1486 1851
1487############################################################################# 1852#############################################################################
1488 1853
1489package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1490 1855
1491our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1492 1857
1493use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1494 1859
1495sub new { 1860sub new {
1496 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1497 1862
1498 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1866 #active_bg => none
1502 #font => default_font 1867 #font => default_font
1503 #text => initial text 1868 #text => initial text
1504 #markup => initial narkup 1869 #markup => initial narkup
1505 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1506 ellipsise => 3, # end 1872 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1874 fontsize => 1,
1509 align => -1, 1875 align => -1,
1510 valign => -1, 1876 valign => -1,
1511 padding_x => 2, 1877 padding_x => 2,
1512 padding_y => 2, 1878 padding_y => 2,
1513 can_events => 0, 1879 can_events => 0,
1514 %arg 1880 %arg
1515 ); 1881 );
1516 1882
1517 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1886 $self->{template} = $layout;
1521 } 1887 }
1522 1888
1523 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1527 } 1893 }
1528 1894
1529 $self 1895 $self
1530} 1896}
1531 1897
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1898sub update {
1543 my ($self) = @_; 1899 my ($self) = @_;
1544 1900
1545 delete $self->{texture}; 1901 delete $self->{texture};
1546 $self->SUPER::update; 1902 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1913 my ($self, $text) = @_;
1558 1914
1559 return if $self->{text} eq "T$text"; 1915 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1916 $self->{text} = "T$text";
1561 1917
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1918 $self->{layout}->set_text ($text);
1564 1919
1565 delete $self->{size_req}; 1920 delete $self->{size_req};
1566 $self->realloc; 1921 $self->realloc;
1567 $self->update; 1922 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1928 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1929 $self->{text} = "M$markup";
1575 1930
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1931 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1932
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1933 $self->{layout}->set_markup ($markup);
1580 1934
1581 delete $self->{size_req}; 1935 delete $self->{size_req};
1582 $self->realloc; 1936 $self->realloc;
1583 $self->update; 1937 $self->update;
… …
1595 1949
1596 my ($w, $h) = $self->{layout}->size; 1950 my ($w, $h) = $self->{layout}->size;
1597 1951
1598 if (exists $self->{template}) { 1952 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1953 $self->{template}->set_font ($self->{font}) if $self->{font};
1954 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1956
1602 my ($w2, $h2) = $self->{template}->size; 1957 my ($w2, $h2) = $self->{template}->size;
1603 1958
1604 $w = List::Util::max $w, $w2; 1959 $w = List::Util::max $w, $w2;
… …
1609 }; 1964 };
1610 1965
1611 @{ $self->{size_req} } 1966 @{ $self->{size_req} }
1612} 1967}
1613 1968
1969sub baseline_shift {
1970 $_[0]{layout}->descent
1971}
1972
1614sub size_allocate { 1973sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1974 my ($self, $w, $h) = @_;
1616 1975
1617 delete $self->{ox}; 1976 delete $self->{ox};
1618 1977
1619 delete $self->{texture} 1978 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1979 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1980
1981 1
1621} 1982}
1622 1983
1623sub set_fontsize { 1984sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1985 my ($self, $fontsize) = @_;
1625 1986
1626 $self->{fontsize} = $fontsize; 1987 $self->{fontsize} = $fontsize;
1988 delete $self->{size_req};
1627 delete $self->{texture}; 1989 delete $self->{texture};
1628 1990
1629 $self->realloc; 1991 $self->realloc;
1630} 1992}
1631 1993
1632sub reconfigure { 1994sub reconfigure {
1633 my ($self) = @_; 1995 my ($self) = @_;
1634 1996
1635 delete $self->{size_req}; 1997 delete $self->{size_req};
1998 delete $self->{texture};
1636 1999
1637 $self->SUPER::reconfigure; 2000 $self->SUPER::reconfigure;
1638} 2001}
1639 2002
1640sub _draw { 2003sub _draw {
1641 my ($self) = @_; 2004 my ($self) = @_;
1642 2005
1643 $self->SUPER::_draw; # draw background, if applicable 2006 $self->SUPER::_draw; # draw background, if applicable
1644 2007
1645 my $tex = $self->{texture} ||= do { 2008 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 2009 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2010 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 2011 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2012 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2013 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 2015
1653 new_from_layout CFClient::Texture $self->{layout} 2016 [$self->{layout}->size]
1654 }; 2017 };
1655 2018
1656 unless (exists $self->{ox}) { 2019 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 2022 : ($self->{w} - $size->[0]) * 0.5);
1660 2023
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 2026 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 2027 };
1665 2028
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 2031
1671 if ($tex->{format} == GL_ALPHA) { 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 2033}
1682 2034
1683############################################################################# 2035#############################################################################
1684 2036
1685package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1686 2038
1687our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1688 2040
1689use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1690 2042
1691sub new { 2043sub new {
1692 my $class = shift; 2044 my $class = shift;
1693 2045
1694 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1699 can_hover => 1, 2051 can_hover => 1,
1700 can_focus => 1, 2052 can_focus => 1,
1701 valign => 0, 2053 valign => 0,
1702 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1703 #text => ... 2056 #text => ...
1704 #hidden => "*", 2057 #hidden => "*",
1705 @_ 2058 @_
1706 ) 2059 )
1707} 2060}
… …
1718 2071
1719 $text =~ s/./*/g if $self->{hidden}; 2072 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 2073 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 2074 delete $self->{size_req};
1722 2075
1723 $self->_emit (changed => $self->{text}); 2076 $self->emit (changed => $self->{text});
1724 2077
1725 $self->realloc; 2078 $self->realloc;
1726 $self->update; 2079 $self->update;
1727} 2080}
1728 2081
… …
1743 my ($w, $h) = $self->SUPER::size_request; 2096 my ($w, $h) = $self->SUPER::size_request;
1744 2097
1745 ($w + 1, $h) # add 1 for cursor 2098 ($w + 1, $h) # add 1 for cursor
1746} 2099}
1747 2100
1748sub key_down { 2101sub invoke_key_down {
1749 my ($self, $ev) = @_; 2102 my ($self, $ev) = @_;
1750 2103
1751 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1754 2107
1755 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756 2111
1757 if ($uni == 8) { 2112 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1766 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 2136 $self->emit ('escape');
1771 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 2141 } else {
1774 return 0; 2142 return 0;
1775 } 2143 }
1776 2144
1777 $self->_set_text ($text); 2145 $self->_set_text ($text);
1778 2146
1779 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1780 2149
1781 1 2150 1
1782} 2151}
1783 2152
1784sub focus_in { 2153sub invoke_focus_in {
1785 my ($self) = @_; 2154 my ($self) = @_;
1786 2155
1787 $self->{last_activity} = $::NOW; 2156 $self->{last_activity} = $::NOW;
1788 2157
1789 $self->SUPER::focus_in; 2158 $self->SUPER::invoke_focus_in
1790} 2159}
1791 2160
1792sub button_down { 2161sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1794 2163
1795 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2165
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2167
1799 # byte-index to char-index 2168 # byte-index to char-index
1800 my $text = $self->{text}; 2169 my $text = $self->{text};
1801 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1803 2172
1804 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1805 $self->update; 2174 $self->update;
1806 2175
1807 1 2176 1
1808} 2177}
1809 2178
1810sub mouse_motion { 2179sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2180 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2181# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 2182
1814 0 2183 1
1815} 2184}
1816 2185
1817sub _draw { 2186sub _draw {
1818 my ($self) = @_; 2187 my ($self) = @_;
1819 2188
… …
1846 utf8::encode $text; 2215 utf8::encode $text;
1847 2216
1848 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849 } 2218 }
1850 2219
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2220 glBegin GL_LINES;
1853 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 2223 glEnd;
1856 } 2224 }
1857} 2225}
1858 2226
2227#############################################################################
2228
1859package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1860 2230
1861our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1862 2232
1863use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1864 2234
1865sub key_down { 2235sub invoke_key_down {
1866 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1867 2237
1868 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1869 2239
1870 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2243
1873 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2246 $self->emit (activate => $txt);
1876 $self->update; 2247 $self->update;
1877 2248
1878 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1881 } 2252 }
1882 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2257 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2259 }
1889 2260
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2264
1894 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2267 } else {
1897 $self->set_text ($self->{history_saveback}); 2268 $self->set_text ($self->{history_saveback});
1898 } 2269 }
1899 2270
1900 } else { 2271 } else {
1901 return $self->SUPER::key_down ($ev) 2272 return $self->SUPER::invoke_key_down ($ev)
1902 } 2273 }
1903 2274
1904 1 2275 1
1905} 2276}
1906 2277
1907############################################################################# 2278#############################################################################
1908 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1909package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1910 2320
1911our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1912 2322
1913use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1914 2324
1915my @tex = 2325my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
1918 2328
1919sub new { 2329sub new {
1920 my $class = shift; 2330 my $class = shift;
1921 2331
… …
1930 can_events => 1, 2340 can_events => 1,
1931 @_ 2341 @_
1932 ) 2342 )
1933} 2343}
1934 2344
1935sub activate { }
1936
1937sub button_up { 2345sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
1939 2347
1940 $self->emit ("activate") 2348 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2349 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2350 && $y >= 0 && $y < $self->{h};
… …
1960 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
1961} 2369}
1962 2370
1963############################################################################# 2371#############################################################################
1964 2372
1965package CFClient::UI::CheckBox; 2373package CFPlus::UI::CheckBox;
1966 2374
1967our @ISA = CFClient::UI::DrawBG::; 2375our @ISA = CFPlus::UI::DrawBG::;
1968 2376
1969my @tex = 2377my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2380
1973use CFClient::OpenGL; 2381use CFPlus::OpenGL;
1974 2382
1975sub new { 2383sub new {
1976 my $class = shift; 2384 my $class = shift;
1977 2385
1978 $class->SUPER::new ( 2386 $class->SUPER::new (
… …
1992 my ($self) = @_; 2400 my ($self) = @_;
1993 2401
1994 (6) x 2 2402 (6) x 2
1995} 2403}
1996 2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
1997sub button_down { 2413sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2414 my ($self, $ev, $x, $y) = @_;
1999 2415
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2418 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2419 } else {
2005 return 0 2420 return 0
2006 } 2421 }
2007 2422
2008 1 2423 1
… …
2028 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2029} 2444}
2030 2445
2031############################################################################# 2446#############################################################################
2032 2447
2033package CFClient::UI::Image; 2448package CFPlus::UI::Image;
2034 2449
2035our @ISA = CFClient::UI::Base::; 2450our @ISA = CFPlus::UI::Base::;
2036 2451
2037use CFClient::OpenGL; 2452use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2453
2040our %loaded_images; 2454our %texture_cache;
2041 2455
2042sub new { 2456sub new {
2043 my $class = shift; 2457 my $class = shift;
2044 2458
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
2046 2463
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2464 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required";
2048 2466
2049 $loaded_images{$self->{image}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2469
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
2053 2471
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2473
2058 $self 2474 $self
2059} 2475}
2060 2476
2477sub STORABLE_freeze {
2478 my ($self, $cloning) = @_;
2479
2480 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2482
2483 $self->{path}
2484}
2485
2486sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_;
2488
2489 $self->new (path => $path)
2490}
2491
2061sub size_request { 2492sub size_request {
2062 my ($self) = @_; 2493 my ($self) = @_;
2063 2494
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2495 ($self->{tex}{w}, $self->{tex}{h})
2065} 2496}
2066 2497
2067sub _draw { 2498sub _draw {
2068 my ($self) = @_; 2499 my ($self) = @_;
2069 2500
… …
2079 } 2510 }
2080 2511
2081 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2514
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2515 $tex->draw_quad (0, 0, $w, $h);
2085 2516
2086 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2087} 2518}
2088 2519
2089############################################################################# 2520#############################################################################
2090 2521
2522package CFPlus::UI::ImageButton;
2523
2524our @ISA = CFPlus::UI::Image::;
2525
2526use CFPlus::OpenGL;
2527
2528my %textures;
2529
2530sub new {
2531 my $class = shift;
2532
2533 my $self = $class->SUPER::new (
2534 padding_x => 4,
2535 padding_y => 4,
2536 fg => [1, 1, 1],
2537 active_fg => [0, 0, 1],
2538 can_hover => 1,
2539 align => 0,
2540 valign => 0,
2541 can_events => 1,
2542 @_
2543 );
2544}
2545
2546sub invoke_button_up {
2547 my ($self, $ev, $x, $y) = @_;
2548
2549 $self->emit ("activate")
2550 if $x >= 0 && $x < $self->{w}
2551 && $y >= 0 && $y < $self->{h};
2552
2553 1
2554}
2555
2556#############################################################################
2557
2091package CFClient::UI::VGauge; 2558package CFPlus::UI::VGauge;
2092 2559
2093our @ISA = CFClient::UI::Base::; 2560our @ISA = CFPlus::UI::Base::;
2094 2561
2095use List::Util qw(min max); 2562use List::Util qw(min max);
2096 2563
2097use CFClient::OpenGL; 2564use CFPlus::OpenGL;
2098 2565
2099my %tex = ( 2566my %tex = (
2100 food => [ 2567 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2570 ],
2104 grace => [ 2571 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2574 ],
2108 hp => [ 2575 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2578 ],
2112 mana => [ 2579 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2582 ],
2116); 2583);
2117 2584
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2645 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2646 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2647
2181 my $h1 = $self->{h} * (1 - $ycut1); 2648 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2649 my $h2 = $self->{h} * (1 - $ycut2);
2650 my $h3 = $self->{h};
2651
2652 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2653
2184 glEnable GL_BLEND; 2654 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2655 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2656 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2657 glEnable GL_TEXTURE_2D;
… …
2206 2676
2207 if ($t3) { 2677 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2680 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2681 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2682 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2683 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2684 glEnd;
2215 } 2685 }
2216 2686
2217 glDisable GL_BLEND; 2687 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2219} 2689}
2220 2690
2221############################################################################# 2691#############################################################################
2222 2692
2223package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2224 2694
2225our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2226 2696
2227sub new { 2697sub new {
2228 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2229 2699
2230 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2702 can_hover => 1,
2233 can_events => 1, 2703 can_events => 1,
2234 %arg, 2704 %arg,
2235 ); 2705 );
2236 2706
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2707 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2708 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2710
2241 $self 2711 $self
2242} 2712}
2243 2713
2244sub set_fontsize { 2714sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2266} 2736}
2267 2737
2268############################################################################# 2738#############################################################################
2269 2739
2270package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2271 2741
2272use strict; 2742use strict;
2273 2743
2274use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2275 2745
2276our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2277 2747
2278my @tex = 2748my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2281 2751
2282sub new { 2752sub new {
2283 my $class = shift; 2753 my $class = shift;
2284 2754
… …
2305 $self->update; 2775 $self->update;
2306 2776
2307 $self 2777 $self
2308} 2778}
2309 2779
2310sub changed { }
2311
2312sub set_range { 2780sub set_range {
2313 my ($self, $range) = @_; 2781 my ($self, $range) = @_;
2314 2782
2315 ($range, $self->{range}) = ($self->{range}, $range); 2783 ($range, $self->{range}) = ($self->{range}, $range);
2316 2784
… …
2336 if $unit; 2804 if $unit;
2337 2805
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2806 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2807
2340 if ($value != $old_value) { 2808 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2809 $self->emit (changed => $value);
2342 $self->update; 2810 $self->update;
2343 } 2811 }
2344} 2812}
2345 2813
2346sub size_request { 2814sub size_request {
2347 my ($self) = @_; 2815 my ($self) = @_;
2348 2816
2349 ($self->{req_w}, $self->{req_h}) 2817 ($self->{req_w}, $self->{req_h})
2350} 2818}
2351 2819
2352sub button_down { 2820sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2821 my ($self, $ev, $x, $y) = @_;
2354 2822
2355 $self->SUPER::button_down ($ev, $x, $y); 2823 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2824
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2826
2359 $self->mouse_motion ($ev, $x, $y) 2827 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2828}
2361 2829
2362sub mouse_motion { 2830sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2831 my ($self, $ev, $x, $y) = @_;
2364 2832
2365 if ($GRAB == $self) { 2833 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2835
… …
2373 } else { 2841 } else {
2374 return 0; 2842 return 0;
2375 } 2843 }
2376 2844
2377 1 2845 1
2846}
2847
2848sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_;
2850
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856
2857 ! ! $delta
2378} 2858}
2379 2859
2380sub update { 2860sub update {
2381 my ($self) = @_; 2861 my ($self) = @_;
2382 2862
… …
2431 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2432} 2912}
2433 2913
2434############################################################################# 2914#############################################################################
2435 2915
2436package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2437 2917
2438our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2439 2919
2440sub new { 2920sub new {
2441 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2442 2922
2443 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2444 2924
2445 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2928 to_value => sub { shift },
2449 from_value => sub { shift }, 2929 from_value => sub { shift },
2450 %arg, 2930 %arg,
2451 ); 2931 );
2452 2932
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2474 2954
2475############################################################################# 2955#############################################################################
2476 2956
2477package CFClient::UI::TextScroller; 2957package CFPlus::UI::TextScroller;
2478 2958
2479our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2480 2960
2481use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2482 2962
2483sub new { 2963sub new {
2484 my $class = shift; 2964 my $class = shift;
2485 2965
2486 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2487 fontsize => 1, 2967 fontsize => 1,
2488 can_events => 0, 2968 can_events => 1,
2489 indent => 0, 2969 indent => 0,
2490 #font => default_font 2970 #font => default_font
2491 @_, 2971 @_,
2492 2972
2493 layout => (new CFClient::Layout 1), 2973 layout => (new CFPlus::Layout),
2494 par => [], 2974 par => [],
2975 max_par => 0,
2495 height => 0, 2976 height => 0,
2496 children => [ 2977 children => [
2497 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2980 ],
2500 ); 2981 );
2501 2982
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2503 2984
… …
2509 2990
2510 $self->{fontsize} = $fontsize; 2991 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2992 $self->reflow;
2512} 2993}
2513 2994
2995sub size_request {
2996 my ($self) = @_;
2997
2998 my ($empty, $slider) = @{ $self->{children} };
2999
3000 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request
3002}
3003
2514sub size_allocate { 3004sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2516 3006
2517 $self->SUPER::size_allocate ($w, $h); 3007 my ($empty, $slider, @other) = @{ $self->{children} };
3008 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 3009
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3010 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3011 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 3012 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3013 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 3014
2524 $self->reflow; 3015 $self->reflow;
2525}
2526 3016
2527sub text_size { 3017 local $self->{children} = [$empty, $slider];
3018 $self->SUPER::invoke_size_allocate ($w, $h)
3019}
3020
3021sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 3022 my ($self, $ev) = @_;
3023
3024 return 0 unless $ev->{dy}; # only vertical movements
3025
3026 $self->{children}[1]->emit (mouse_wheel => $ev);
3027
3028 1
3029}
3030
3031sub get_layout {
3032 my ($self, $para) = @_;
2529 3033
2530 my $layout = $self->{layout}; 3034 my $layout = $self->{layout};
2531 3035
3036 $layout->set_font ($self->{font}) if $self->{font};
3037 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3038 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 3039 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3040 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 3041 $layout->set_markup ($para->{markup});
3042
3043 $layout->set_shapes (
3044 map
3045 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3046 @{$para->{widget}}
2536 3047 );
3048
2537 $layout->size 3049 $layout
2538} 3050}
2539 3051
2540sub reflow { 3052sub reflow {
2541 my ($self) = @_; 3053 my ($self) = @_;
2542 3054
… …
2549 3061
2550 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2552} 3064}
2553 3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
3079}
3080
2554sub clear { 3081sub clear {
2555 my ($self) = @_; 3082 my ($self) = @_;
3083
3084 my (undef, undef, @other) = @{ $self->{children} };
3085 $self->remove ($_) for @other;
2556 3086
2557 $self->{par} = []; 3087 $self->{par} = [];
2558 $self->{height} = 0; 3088 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 3090}
2561 3091
2562sub add_paragraph { 3092sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 3093 my $self = shift;
2564 3094
2565 for my $line (split /\n/, $text) { 3095 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 3096 $para = {
3097 fg => [1, 1, 1, 1],
3098 indent => 0,
3099 markup => "",
3100 widget => [],
3101 ref $para ? %$para : (markup => $para),
3102 w => 1e10,
3103 wrapped => 1,
3104 };
3105
3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
3114 $self->{need_reflow}++;
3115 $self->update;
3116}
3117
3118sub scroll_to_bottom {
3119 my ($self) = @_;
3120
3121 $self->{scroll_to} = $#{$self->{par}};
3122 $self->update;
3123}
3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
2567 $self->{height} += $h; 3147 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 3149
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
2572} 3156}
2573 3157
2574sub update { 3158sub update {
2575 my ($self) = @_; 3159 my ($self) = @_;
2576 3160
… …
2579 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2580 3164
2581 delete $self->{texture}; 3165 delete $self->{texture};
2582 3166
2583 $ROOT->on_post_alloc ($self => sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3171
2586 if (delete $self->{need_reflow}) {
2587 my $height = 0;
2588
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2605
2606 $self->{height} = $height;
2607
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610 delete $self->{texture};
2611 }
2612
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3173 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2616 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2617 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2618 3185
2619 my $y0 = $top; 3186 my $y0 = $top;
2620 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2621 3188
2622 my $y = 0;
2623
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 3189 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2634 3192
2635 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3194 my $layout = $self->get_layout ($para);
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 3195
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3196 $layout->render ($para->{indent}, $y - $y0);
2642 3197
2643 glRasterPos $par->[3], $y - $y0; 3198 if (my @w = @{ $para->{widget} }) {
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3199 my @s = $layout->get_shapes;
3200
3201 for (@w) {
3202 my ($dx, $dy) = splice @s, 0, 2, ();
3203
3204 $_->{x} = $dx + $para->{indent};
3205 $_->{y} = $dy + $y - $y0;
3206
3207 $_->draw;
3208 }
3209 }
2645 } 3210 }
2646 3211
2647 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3214 }
2649 3215
2650 glDisable GL_BLEND; 3216 $self->{top_paragraph} = $top_paragraph;
2651 }; 3217 };
2652 }); 3218 });
3219}
3220
3221sub reconfigure {
3222 my ($self) = @_;
3223
3224 $self->SUPER::reconfigure;
3225
3226 $_->{w} = 1e10 for @{ $self->{par} };
3227 $self->reflow;
2653} 3228}
2654 3229
2655sub _draw { 3230sub _draw {
2656 my ($self) = @_; 3231 my ($self) = @_;
2657 3232
… …
2660 glColor 0, 0, 0, 1; 3235 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3236 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 3237 glDisable GL_TEXTURE_2D;
2663 3238
2664 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2665
2666} 3240}
2667 3241
2668############################################################################# 3242#############################################################################
2669 3243
2670package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2671 3245
2672use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2673 3247
2674our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2675 3249
2676sub moveto { 3250sub moveto {
2677 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2678 3252
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3281 glPopMatrix;
2708} 3282}
2709 3283
2710############################################################################# 3284#############################################################################
2711 3285
2712package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2713 3287
2714our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2715 3289
2716sub new { 3290sub new {
2717 my $class = shift; 3291 my $class = shift;
2718 3292
2719 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2732} 3306}
2733 3307
2734############################################################################# 3308#############################################################################
2735 3309
2736package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2737 3311
2738our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2739 3313
2740use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2741 3315
2742sub new { 3316sub new {
2743 my $class = shift; 3317 my $class = shift;
2744 3318
2745 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2748 ) 3322 )
2749} 3323}
2750 3324
2751sub set_tooltip_from { 3325sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3330
2754 my $tooltip = $widget->{tooltip}; 3331 my $tooltip = $widget->{tooltip};
2755 3332
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3333 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3338 }
2762 3339
2763 $tooltip =~ s/^\n+//; 3340 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3341 $tooltip =~ s/\n+$//;
2765 3342
2766 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3344 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3346 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3348 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3350 );
2774} 3351}
2775 3352
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3356 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3357
2781 ($w + 4, $h + 4) 3358 ($w + 4, $h + 4)
2782} 3359}
2783 3360
2784sub size_allocate { 3361sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3362 my ($self, $w, $h) = @_;
2786 3363
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3364 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3365}
2789 3366
2790sub visibility_change { 3367sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3368 my ($self, $visible) = @_;
2792 3369
2793 return unless $visible; 3370 return unless $visible;
2794 3371
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3372 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3373 my $widget = $self->{owner}
2797 or return; 3374 or return;
2798 3375
3376 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3377 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3378
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3379 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3380 if $x + $self->{w} > $self->{root}{w};
2803 3381
2804 $self->move_abs ($x, $y); 3382 $self->move_abs ($x, $y);
3383 } else {
3384 $self->hide;
3385 }
2805 }); 3386 });
2806} 3387}
2807 3388
2808sub _draw { 3389sub _draw {
2809 my ($self) = @_; 3390 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
2834} 3415}
2835 3416
2836############################################################################# 3417#############################################################################
2837 3418
2838package CFClient::UI::Face; 3419package CFPlus::UI::Face;
2839 3420
2840our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
2841 3422
2842use CFClient::OpenGL; 3423use CFPlus::OpenGL;
2843 3424
2844sub new { 3425sub new {
2845 my $class = shift; 3426 my $class = shift;
2846 3427
2847 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
2848 aspect => 1, 3431 aspect => 1,
2849 can_events => 0, 3432 can_events => 0,
2850 @_, 3433 @_,
2851 ); 3434 );
2852 3435
2853 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
2855 3438
2856 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3441 hard => 1,
2859 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
2860 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
2861 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
2862 $widget->update; 3448 $self->update;
2863 }, 3449 },
2864 ); 3450 );
3451
3452 $self->update_face;
2865 } 3453 }
2866 3454
2867 $self 3455 $self
2868} 3456}
2869 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
2870sub size_request { 3471sub size_request {
2871 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
2872} 3487}
2873 3488
2874sub update { 3489sub update {
2875 my ($self) = @_; 3490 my ($self) = @_;
2876 3491
… …
2882sub _draw { 3497sub _draw {
2883 my ($self) = @_; 3498 my ($self) = @_;
2884 3499
2885 return unless $::CONN; 3500 return unless $::CONN;
2886 3501
2887 my $face; 3502 $self->SUPER::_draw;
2888 3503
2889 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
2891 3505 or return;
2892 $face = $anim->[ $self->{frame} % @$anim ]
2893 if $anim && @$anim;
2894 }
2895 3506
2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
2897 3508
2898 if ($tex) { 3509 if ($tex) {
2899 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;
… …
2913 $self->SUPER::destroy; 3524 $self->SUPER::destroy;
2914} 3525}
2915 3526
2916############################################################################# 3527#############################################################################
2917 3528
2918package CFClient::UI::Buttonbar; 3529package CFPlus::UI::Buttonbar;
2919 3530
2920our @ISA = CFClient::UI::HBox::; 3531our @ISA = CFPlus::UI::HBox::;
2921 3532
2922# TODO: should actualyl wrap buttons and other goodies. 3533# TODO: should actually wrap buttons and other goodies.
2923 3534
2924############################################################################# 3535#############################################################################
2925 3536
2926package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
2927 3538
2928our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
2929 3540
2930use CFClient::OpenGL; 3541use CFPlus::OpenGL;
2931 3542
2932sub new { 3543sub new {
2933 my $class = shift; 3544 my $class = shift;
2934 3545
2935 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
2936 items => [], 3547 items => [],
2937 z => 100, 3548 z => 100,
2938 @_, 3549 @_,
2939 ); 3550 );
2940 3551
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3553
2943 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
2945 3556
2946 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
2947 if (!ref $widget) { 3558 if (!ref $widget) {
3559 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2;
3561
2948 $widget = new CFClient::UI::Label 3562 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3563 can_hover => 1,
2950 can_events => 1, 3564 can_events => 1,
3565 tooltip => $tooltip,
3566 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1),
3569 ],
3570 ;
3571
3572 } else {
3573 $widget = new CFPlus::UI::Label
3574 can_hover => 1,
3575 can_events => 1,
2951 markup => $widget, 3576 markup => $widget,
2952 tooltip => $tooltip 3577 tooltip => $tooltip;
3578 }
2953 } 3579 }
2954 3580
2955 $self->{item}{$widget} = $item; 3581 $self->{item}{$widget} = $item;
2956 3582
2957 $self->{vbox}->add ($widget); 3583 $self->{vbox}->add ($widget);
… …
2962 3588
2963# popup given the event (must be a mouse button down event currently) 3589# popup given the event (must be a mouse button down event currently)
2964sub popup { 3590sub popup {
2965 my ($self, $ev) = @_; 3591 my ($self, $ev) = @_;
2966 3592
2967 $self->_emit ("popdown"); 3593 $self->emit ("popdown");
2968 3594
2969 # maybe save $GRAB? must be careful about events... 3595 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3596 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3597 $self->{button} = $ev->{button};
2972 3598
2973 $self->show; 3599 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3600 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3601}
2976 3602
2977sub mouse_motion { 3603sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3604 my ($self, $ev, $x, $y) = @_;
2979 3605
2980 # TODO: should use vbox->find_widget or so 3606 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3607 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3608 $self->{hover} = $self->{item}{$HOVER};
2983 3609
2984 0 3610 0
2985} 3611}
2986 3612
2987sub button_up { 3613sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3614 my ($self, $ev, $x, $y) = @_;
2989 3615
2990 if ($ev->{button} == $self->{button}) { 3616 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3617 undef $GRAB;
2992 $self->hide; 3618 $self->hide;
2993 3619
2994 $self->_emit ("popdown"); 3620 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3621 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3622 } else {
2997 return 0 3623 return 0
2998 } 3624 }
2999 3625
3000 1 3626 1
3001} 3627}
3002 3628
3003############################################################################# 3629#############################################################################
3004 3630
3005package CFClient::UI::Multiplexer; 3631package CFPlus::UI::Multiplexer;
3006 3632
3007our @ISA = CFClient::UI::Container::; 3633our @ISA = CFPlus::UI::Container::;
3008 3634
3009sub new { 3635sub new {
3010 my $class = shift; 3636 my $class = shift;
3011 3637
3012 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
… …
3026 3652
3027 $self->{current} = $self->{children}[0] 3653 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3654 if @{ $self->{children} };
3029} 3655}
3030 3656
3657sub get_current_page {
3658 my ($self) = @_;
3659
3660 $self->{current}
3661}
3662
3031sub set_current_page { 3663sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3664 my ($self, $page_or_widget) = @_;
3033 3665
3034 my $widget = ref $page_or_widget 3666 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3667 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3668 : $self->{children}[$page_or_widget];
3037 3669
3038 $self->{current} = $widget; 3670 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3671 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3672
3041 $self->_emit (page_changed => $self->{current}); 3673 $self->emit (page_changed => $self->{current});
3042 3674
3043 $self->realloc; 3675 $self->realloc;
3044} 3676}
3045 3677
3046sub visible_children { 3678sub visible_children {
… …
3051 my ($self) = @_; 3683 my ($self) = @_;
3052 3684
3053 $self->{current}->size_request 3685 $self->{current}->size_request
3054} 3686}
3055 3687
3056sub size_allocate { 3688sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3689 my ($self, $w, $h) = @_;
3058 3690
3059 $self->{current}->configure (0, 0, $w, $h); 3691 $self->{current}->configure (0, 0, $w, $h);
3692
3693 1
3060} 3694}
3061 3695
3062sub _draw { 3696sub _draw {
3063 my ($self) = @_; 3697 my ($self) = @_;
3064 3698
3065 $self->{current}->draw; 3699 $self->{current}->draw;
3066} 3700}
3067 3701
3068############################################################################# 3702#############################################################################
3069 3703
3070package CFClient::UI::Notebook; 3704package CFPlus::UI::Notebook;
3071 3705
3072our @ISA = CFClient::UI::VBox::; 3706our @ISA = CFPlus::UI::VBox::;
3073 3707
3074sub new { 3708sub new {
3075 my $class = shift; 3709 my $class = shift;
3076 3710
3077 my $self = $class->SUPER::new ( 3711 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3712 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3714 # filter => # will be put between multiplexer and $self
3081 @_, 3715 @_,
3082 ); 3716 );
3083 3717
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3722}
3089 3723
3090sub add { 3724sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3725 my ($self, $title, $widget, $tooltip) = @_;
3092 3726
3093 Scalar::Util::weaken $self; 3727 CFPlus::weaken $self;
3094 3728
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3730 markup => $title,
3097 tooltip => $tooltip, 3731 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3732 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3733 );
3100 3734
3101 $self->{multiplexer}->add ($widget); 3735 $self->{multiplexer}->add ($widget);
3102} 3736}
3103 3737
3738sub get_current_page {
3739 my ($self) = @_;
3740
3741 $self->{multiplexer}->get_current_page
3742}
3743
3104sub set_current_page { 3744sub set_current_page {
3105 my ($self, $page) = @_; 3745 my ($self, $page) = @_;
3106 3746
3107 $self->{multiplexer}->set_current_page ($page); 3747 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3748 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3749}
3110 3750
3111############################################################################# 3751#############################################################################
3112 3752
3113package CFClient::UI::Combobox; 3753package CFPlus::UI::Selector;
3114 3754
3115use utf8; 3755use utf8;
3116 3756
3117our @ISA = CFClient::UI::Button::; 3757our @ISA = CFPlus::UI::Button::;
3118 3758
3119sub new { 3759sub new {
3120 my $class = shift; 3760 my $class = shift;
3121 3761
3122 my $self = $class->SUPER::new ( 3762 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3768 $self->_set_value ($self->{value});
3129 3769
3130 $self 3770 $self
3131} 3771}
3132 3772
3133sub button_down { 3773sub invoke_button_down {
3134 my ($self, $ev) = @_; 3774 my ($self, $ev) = @_;
3135 3775
3136 my @menu_items; 3776 my @menu_items;
3137 3777
3138 for (@{ $self->{options} }) { 3778 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3779 my ($value, $title, $tooltip) = @$_;
3140 3780
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3782 }
3143 3783
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3785}
3146 3786
3147sub _set_value { 3787sub _set_value {
3148 my ($self, $value) = @_; 3788 my ($self, $value) = @_;
3149 3789
… …
3159 my ($self, $value) = @_; 3799 my ($self, $value) = @_;
3160 3800
3161 return unless $self->{value} ne $value; 3801 return unless $self->{value} ne $value;
3162 3802
3163 $self->_set_value ($value); 3803 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3804 $self->emit (changed => $value);
3165} 3805}
3166 3806
3167############################################################################# 3807#############################################################################
3168 3808
3169package CFClient::UI::Statusbox; 3809package CFPlus::UI::Statusbox;
3170 3810
3171our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3172 3812
3173sub new { 3813sub new {
3174 my $class = shift; 3814 my $class = shift;
3175 3815
3176 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3817 fontsize => 0.8,
3178 @_, 3818 @_,
3179 ); 3819 );
3180 3820
3181 Scalar::Util::weaken (my $this = $self); 3821 CFPlus::weaken (my $this = $self);
3182 3822
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3824
3185 $self 3825 $self
3186} 3826}
… …
3188sub reorder { 3828sub reorder {
3189 my ($self) = @_; 3829 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3830 my $NOW = Time::HiRes::time;
3191 3831
3192 # freeze display when hovering over any label 3832 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3833 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3835 values %{ $self->{item} };
3196 3836
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3839 }
… …
3220 for ($short) { 3860 for ($short) {
3221 s/^\s+//; 3861 s/^\s+//;
3222 s/\s+/ /g; 3862 s/\s+/ /g;
3223 } 3863 }
3224 3864
3225 new CFClient::UI::Label 3865 new CFPlus::UI::Label
3226 markup => $short, 3866 markup => $short,
3227 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3924 count => 1,
3285 %arg, 3925 %arg,
3286 }; 3926 };
3287 } 3927 }
3288 3928
3929 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3930 $self->reorder;
3931 });
3290} 3932}
3291 3933
3292sub reconfigure { 3934sub reconfigure {
3293 my ($self) = @_; 3935 my ($self) = @_;
3294 3936
… …
3307 $self->SUPER::destroy; 3949 $self->SUPER::destroy;
3308} 3950}
3309 3951
3310############################################################################# 3952#############################################################################
3311 3953
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root; 3954package CFPlus::UI::Root;
3674 3955
3675our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3676 3957
3677use List::Util qw(min max); 3958use List::Util qw(min max);
3678 3959
3679use CFClient::OpenGL; 3960use CFPlus::OpenGL;
3680 3961
3681sub new { 3962sub new {
3682 my $class = shift; 3963 my $class = shift;
3683 3964
3684 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3685 visible => 1, 3966 visible => 1,
3686 @_, 3967 @_,
3687 ); 3968 );
3688 3969
3689 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3690 3971
3691 $self 3972 $self
3692} 3973}
3693 3974
3694sub size_request { 3975sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 3990 $coord = $max - $size if $coord > $max - $size;
3710 3991
3711 int $coord + 0.5 3992 int $coord + 0.5
3712} 3993}
3713 3994
3714sub size_allocate { 3995sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3996 my ($self, $w, $h) = @_;
3716 3997
3717 for my $child ($self->children) { 3998 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 4000
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 4004 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 4005 $Y = _to_pixel $Y, $H, $self->{h};
3725 4006
3726 $child->configure ($X, $Y, $W, $H); 4007 $child->configure ($X, $Y, $W, $H);
3727 } 4008 }
4009
4010 1
3728} 4011}
3729 4012
3730sub coord2local { 4013sub coord2local {
3731 my ($self, $x, $y) = @_; 4014 my ($self, $x, $y) = @_;
3732 4015
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4142
3860 $w = 0 if $w < 0; 4143 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 4144 $h = 0 if $h < 0;
3862 4145
4146 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h;
4148
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154
3863 $w = int $w + 0.5; 4155 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 4156 $h = int $h + 0.5;
3865 4157
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 4159 $widget->{old_w} = $widget->{w};
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4184 glLoadIdentity;
3893 4185
3894 { 4186 {
3895 package CFClient::UI::Base; 4187 package CFPlus::UI::Base;
3896 4188
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4191
3901 $self->_draw; 4192 $self->_draw;
4193 }
3902} 4194}
3903 4195
3904############################################################################# 4196#############################################################################
3905 4197
3906package CFClient::UI; 4198package CFPlus::UI;
3907 4199
3908$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4202
39111 42031
3912 4204

Diff Legend

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