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

Diff Legend

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