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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->focus_out; 316 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
289} 318}
290 319
291sub set_visibility { 320sub set_visibility {
292 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
293 322
294 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
295 324
296 $visible ? $self->hide 325 $visible ? $self->show
297 : $self->show; 326 : $self->hide;
298} 327}
299 328
300sub toggle_visibility { 329sub toggle_visibility {
301 my ($self) = @_; 330 my ($self) = @_;
302 331
… …
336sub size_request { 365sub size_request {
337 require Carp; 366 require Carp;
338 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
339} 368}
340 369
370sub baseline_shift {
371 0
372}
373
341sub configure { 374sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
343 376
344 if ($self->{aspect}) { 377 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
346 379
347 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 382
350 # use alignment to adjust x, y 383 # use alignment to adjust x, y
351 384
352 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
367 400
368 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
369 } 402 }
370} 403}
371 404
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 405sub children {
377 # nop 406 # nop
378} 407}
379 408
380sub visible_children { 409sub visible_children {
… …
398 427
399 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
400 429
401 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
402 431
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 435 }
407} 436}
408 437
409# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
410sub coord2local { 439sub coord2local {
411 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
412 441
442 Carp::confess unless $self->{parent};#d#
443
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 445}
415 446
416# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
417sub coord2global { 448sub coord2global {
418 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
419 450
451 Carp::confess unless $self->{parent};#d#
452
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 454}
422 455
423sub focus_in { 456sub invoke_focus_in {
424 my ($self) = @_; 457 my ($self) = @_;
425 458
426 return if $FOCUS == $self; 459 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
428 461
429 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
430 463
431 $self->_emit (focus_in => $focus); 464 $self->update;
432 465
433 $focus->update if $focus; 466 0
434 $FOCUS->update;
435} 467}
436 468
437sub focus_out { 469sub invoke_focus_out {
438 my ($self) = @_; 470 my ($self) = @_;
439 471
440 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
441 473
442 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
443 475
444 $self->_emit (focus_out => $focus); 476 $self->update;
445 477
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 479 unless $FOCUS;
450}
451 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
452sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 492sub invoke_button_up { 0 }
454sub key_down { 0 } 493sub invoke_key_down { 0 }
455sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
456 496
457sub button_down { 497sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
459 499
460 $self->focus_in; 500 $self->grab_focus;
461 501
462 0 502 0
503}
504
505sub connect {
506 my ($self, $signal, $cb) = @_;
507
508 push @{ $self->{signal_cb}{$signal} }, $cb;
509
510 defined wantarray and CFPlus::guard {
511 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512 @{ $self->{signal_cb}{$signal} };
513 }
514}
515
516sub disconnect_all {
517 my ($self, $signal) = @_;
518
519 delete $self->{signal_cb}{$signal};
520}
521
522my %has_coords = (
523 button_down => 1,
524 button_up => 1,
525 mouse_motion => 1,
526 mouse_wheel => 1,
527);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
533 # and needlessly verbose code, either.
534 my @append
535 = $has_coords{$signal}
536 ? $args[0]->xy ($self)
537 : ();
538
539 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
540
541 for my $cb (
542 @{$self->{signal_cb}{$signal} || []}, # before
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
463} 550}
464 551
465sub find_widget { 552sub find_widget {
466 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
467 554
… …
475} 562}
476 563
477sub set_parent { 564sub set_parent {
478 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
479 566
480 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 569}
506 570
507sub realloc { 571sub realloc {
508 my ($self) = @_; 572 my ($self) = @_;
509 573
… …
542 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
543 607
544 # update screen rectangle 608 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 611
550 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 615
… …
576 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
579 glEnd; 641 glEnd;
580 glPopMatrix; 642 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 644 }
583 645
584 $self->_draw; 646 $self->_draw;
585 glPopMatrix; 647 glPopMatrix;
586} 648}
… …
589 my ($self) = @_; 651 my ($self) = @_;
590 652
591 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
592} 654}
593 655
656my $cntx;#d#
594sub DESTROY { 657sub DESTROY {
595 my ($self) = @_; 658 my ($self) = @_;
596 659
597 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
598 661
599 eval { $self->destroy }; 662 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
665 delete $WIDGET{$self+0};
601} 666}
602 667
603############################################################################# 668#############################################################################
604 669
605package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
606 671
607our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
608 673
609use strict; 674use strict;
610use CFClient::OpenGL; 675use CFPlus::OpenGL;
611 676
612sub new { 677sub new {
613 my $class = shift; 678 my $class = shift;
614 679
615 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
646 } 711 }
647} 712}
648 713
649############################################################################# 714#############################################################################
650 715
651package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
652 717
653our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
654 719
655sub new { 720sub new {
656 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
658} 723}
… …
665 730
666sub draw { } 731sub draw { }
667 732
668############################################################################# 733#############################################################################
669 734
670package CFClient::UI::Container; 735package CFPlus::UI::Container;
671 736
672our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
673 738
674sub new { 739sub new {
675 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
676 741
677 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
686 if $children; 751 if $children;
687 752
688 $self 753 $self
689} 754}
690 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
691sub add { 764sub add {
692 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
693 766
694 $_->set_parent ($self) 767 $_->set_parent ($self)
695 for @widgets; 768 for @widgets;
… …
755 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
756} 829}
757 830
758############################################################################# 831#############################################################################
759 832
760package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
761 834
762our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
763 836
764sub new { 837sub new {
765 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
766 839
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 841
769 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
770} 843}
771 844
772sub add { 845sub add {
… …
779sub remove { 852sub remove {
780 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
781 854
782 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
783 856
784 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 858 unless @{$self->{children}};
786} 859}
787 860
788sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
789 862
790sub size_request { 863sub size_request {
791 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
792} 865}
793 866
794sub size_allocate { 867sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
796 869
797 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
798} 873}
799 874
800############################################################################# 875#############################################################################
801 876
802# back-buffered drawing area 877# back-buffered drawing area
803 878
804package CFClient::UI::Window; 879package CFPlus::UI::Window;
805 880
806our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
807 882
808use CFClient::OpenGL; 883use CFPlus::OpenGL;
809 884
810sub new { 885sub new {
811 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
812 887
813 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
818 893
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 895 $self->SUPER::update;
821} 896}
822 897
823sub size_allocate { 898sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
825 900
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
828} 904}
829 905
830sub _render { 906sub _render {
831 my ($self) = @_; 907 my ($self) = @_;
832 908
… …
834} 910}
835 911
836sub render_child { 912sub render_child {
837 my ($self) = @_; 913 my ($self) = @_;
838 914
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
842 918
843 { 919 {
844 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
845 921
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
848 } 926 }
849
850 $self->_render;
851 }; 927 };
852} 928}
853 929
854sub _draw { 930sub _draw {
855 my ($self) = @_; 931 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 932
859 my $tex = $self->{texture} 933 my $tex = $self->{texture}
860 or return; 934 or return;
861 935
862 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
865 939
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
867 941
868 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
869} 943}
870 944
871############################################################################# 945#############################################################################
872 946
873package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
874 948
875our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
876 950
877sub new { 951sub new {
878 my $class = shift; 952 my $class = shift;
879 953
880 $class->SUPER::new ( 954 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
894 968
895 ($w, $h) 969 ($w, $h)
896} 970}
897 971
898sub size_allocate { 972sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
900 974
901 my $child = $self->child; 975 my $child = $self->child;
902 976
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 979
906 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
907 $self->update; 981 $self->update;
982
983 1
908} 984}
909 985
910sub set_offset { 986sub set_offset {
911 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
912 988
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1016 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1018 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1020 }
945} 1021}
946 1022
947sub _render { 1023sub _render {
948 my ($self) = @_; 1024 my ($self) = @_;
949 1025
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1028
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1030
955 $self->SUPER::_render; 1031 $self->SUPER::_render;
956} 1032}
957 1033
958############################################################################# 1034#############################################################################
959 1035
960package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
961 1037
962our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
963 1039
964sub new { 1040sub new {
965 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
966 1042
967 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
968 1044
969 my $self; 1045 my $self;
970 1046
971 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1057 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1059 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1062 },
977 ; 1063 ;
978 1064
979 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
981 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
982 %arg, 1073 %arg,
983 ); 1074 );
984 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
1082 $self->SUPER::add (0, 0, $self->{vp});
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
986 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
987 1087
988 $self 1088 $self
989} 1089}
1090
1091#TODO# update range on size_allocate depending on child
990 1092
991sub add { 1093sub add {
992 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
993 1095
994 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
995} 1097}
996 1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
997sub update { 1123sub update {
998 my ($self) = @_; 1124 my ($self) = @_;
999 1125
1000 $self->SUPER::update; 1126 $self->SUPER::update;
1001 1127 $self->update_slider;
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1128}
1006 1129
1007sub size_allocate { 1130sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
1009 1132
1133 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1134 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1135}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1136
1019############################################################################# 1137#############################################################################
1020 1138
1021package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
1022 1140
1023our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
1024 1142
1025use CFClient::OpenGL; 1143use CFPlus::OpenGL;
1026 1144
1027sub new { 1145sub new {
1028 my $class = shift; 1146 my $class = shift;
1029 1147
1030 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
1057} 1175}
1058 1176
1059############################################################################# 1177#############################################################################
1060 1178
1061package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
1062 1180
1063our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1064 1182
1065use CFClient::OpenGL; 1183use CFPlus::OpenGL;
1184
1185sub new {
1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1066 1284
1067my $bg = 1285my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1287 mipmap => 1, wrap => 1;
1070 1288
1071my @border = 1289my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1292
1075sub new { 1293sub new {
1076 my ($class, %arg) = @_; 1294 my ($class, %arg) = @_;
1077 1295
1078 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1299 border => 0.6,
1082 can_events => 1, 1300 can_events => 1,
1083 min_w => 16, 1301 min_w => 64,
1084 min_h => 16, 1302 min_h => 32,
1085 %arg, 1303 %arg,
1086 ); 1304 );
1087 1305
1088 $self->{title_widget} = new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1307 align => 0,
1090 valign => 1, 1308 valign => 1,
1091 text => $self->{title}, 1309 text => $self->{title},
1092 fontsize => $self->{border}, 1310 fontsize => $self->{border},
1093 if exists $self->{title}; 1311 if exists $self->{title};
1094 1312
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 }
1321
1095 $self 1322 $self
1096} 1323}
1097 1324
1098sub add { 1325sub add {
1099 my ($self, @widgets) = @_; 1326 my ($self, @widgets) = @_;
1100 1327
1101 $self->SUPER::add (@widgets); 1328 $self->SUPER::add (@widgets);
1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1331}
1104 1332
1105sub border { 1333sub border {
1106 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1107} 1335}
… …
1109sub size_request { 1337sub size_request {
1110 my ($self) = @_; 1338 my ($self) = @_;
1111 1339
1112 $self->{title_widget}->size_request 1340 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1341 if $self->{title_widget};
1342
1343 $self->{close_button}->size_request
1344 if $self->{close_button};
1114 1345
1115 my ($w, $h) = $self->SUPER::size_request; 1346 my ($w, $h) = $self->SUPER::size_request;
1116 1347
1117 ( 1348 (
1118 $w + $self->border * 2, 1349 $w + $self->border * 2,
1119 $h + $self->border * 2, 1350 $h + $self->border * 2,
1120 ) 1351 )
1121} 1352}
1122 1353
1123sub size_allocate { 1354sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1125 1356
1126 if ($self->{title_widget}) { 1357 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1358 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1359 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1360 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1361 }
1131 1362
1132 my $border = $self->border; 1363 my $border = $self->border;
1133 1364
1134 $h -= List::Util::max 0, $border * 2; 1365 $h -= List::Util::max 0, $border * 2;
1135 $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;
1136 1380
1137 $self->child->configure ($border, $border, $w, $h); 1381 1
1138} 1382}
1139 1383
1140sub button_down { 1384sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
1142 1386
1143 my ($w, $h) = @$self{qw(w h)}; 1387 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1388 my $border = $self->border;
1145 1389
… …
1176 1420
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1421 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1422
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1423 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1424 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1426 };
1183 } else { 1427 } else {
1184 return 0; 1428 return 0;
1185 } 1429 }
1186 1430
1187 1 1431 1
1188} 1432}
1189 1433
1190sub button_up { 1434sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1192 1436
1193 !!delete $self->{motion} 1437 ! ! delete $self->{motion}
1194} 1438}
1195 1439
1196sub mouse_motion { 1440sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
1198 1442
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1444
1201 !!$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
1202} 1454}
1203 1455
1204sub _draw { 1456sub _draw {
1205 my ($self) = @_; 1457 my ($self) = @_;
1206 1458
… …
1235 $child->draw; 1487 $child->draw;
1236 1488
1237 if ($self->{title_widget}) { 1489 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1490 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1491 $self->{title_widget}->_draw;
1492
1493 glTranslate 0, - ($border - $self->{h});
1240 } 1494 }
1495
1496 $self->{close_button}->draw
1497 if $self->{close_button};
1241} 1498}
1242 1499
1243############################################################################# 1500#############################################################################
1244 1501
1245package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1246 1503
1247our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1248 1505
1249use List::Util qw(max sum); 1506use List::Util qw(max sum);
1250 1507
1251use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1252 1509
1253sub new { 1510sub new {
1254 my $class = shift; 1511 my $class = shift;
1255 1512
1256 $class->SUPER::new ( 1513 $class->SUPER::new (
1257 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1258 @_, 1516 @_,
1259 ) 1517 )
1260} 1518}
1261 1519
1262sub children { 1520sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1522}
1265 1523
1266sub add { 1524sub add {
1267 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1268 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1529 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1271 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1535 $self->realloc;
1273} 1536}
1274 1537
1275sub remove { 1538sub remove {
1276 my ($self, $child) = @_; 1539 my ($self, $child) = @_;
… …
1324 (sum @$ws), 1587 (sum @$ws),
1325 (sum @$hs), 1588 (sum @$hs),
1326 ) 1589 )
1327} 1590}
1328 1591
1329sub size_allocate { 1592sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1331 1594
1332 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1333 1596
1334 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1335 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1336 1599
1337 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1338 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1339 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1340 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1341 1604
1342 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1606
1346 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
1347 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1348 1616
1349 my $y; 1617 my $y;
1350 1618
1351 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1352 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1366 } 1634 }
1367 1635
1368 $y += $row_h; 1636 $y += $row_h;
1369 } 1637 }
1370 1638
1639 1
1371} 1640}
1372 1641
1373sub find_widget { 1642sub find_widget {
1374 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1375 1644
… …
1394 } 1663 }
1395} 1664}
1396 1665
1397############################################################################# 1666#############################################################################
1398 1667
1399package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1400 1669
1401our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1402 1671
1403sub size_request { 1672sub size_request {
1404 my ($self) = @_; 1673 my ($self) = @_;
1405 1674
1406 $self->{vertical} 1675 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1683 )
1415} 1684}
1416 1685
1417sub size_allocate { 1686sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1419 1688
1420 my $space = $self->{vertical} ? $h : $w; 1689 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1690 my @children = $self->visible_children;
1422 1691
1423 my @req; 1692 my @req;
1424 1693
1425 if ($self->{homogeneous}) { 1694 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1695 @req = ($space / (@children || 1)) x @children;
1427 } else { 1696 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1698 my $req = List::Util::sum @req;
1430 1699
1431 if ($req > $space) { 1700 if ($req > $space) {
1432 # ah well, not enough space 1701 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1702 $_ *= $space / $req for @req;
1434 } else { 1703 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1705
1437 $space = ($space - $req) / $expand; # remaining space to give away 1706 $space = ($space - $req) / $expand; # remaining space to give away
1438 1707
1439 $req[$_] += $space * $children->[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1709 for 0 .. $#children;
1441 } 1710 }
1442 } 1711 }
1443 1712
1444 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1445 1714
1446 my $pos = 0; 1715 my $pos = 0;
1447 for (0 .. $#$children) { 1716 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1449 $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));
1450 1719
1451 $pos += $alloc; 1720 $pos += $alloc;
1452 } 1721 }
1453 1722
1454 1 1723 1
1455} 1724}
1456 1725
1457############################################################################# 1726#############################################################################
1458 1727
1459package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1460 1729
1461our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1462 1731
1463sub new { 1732sub new {
1464 my $class = shift; 1733 my $class = shift;
1465 1734
1466 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1469 ) 1738 )
1470} 1739}
1471 1740
1472############################################################################# 1741#############################################################################
1473 1742
1474package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1475 1744
1476our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1477 1746
1478sub new { 1747sub new {
1479 my $class = shift; 1748 my $class = shift;
1480 1749
1481 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1484 ) 1753 )
1485} 1754}
1486 1755
1487############################################################################# 1756#############################################################################
1488 1757
1489package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1490 1759
1491our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1492 1761
1493use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1494 1763
1495sub new { 1764sub new {
1496 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1497 1766
1498 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1770 #active_bg => none
1502 #font => default_font 1771 #font => default_font
1503 #text => initial text 1772 #text => initial text
1504 #markup => initial narkup 1773 #markup => initial narkup
1505 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1506 ellipsise => 3, # end 1776 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1778 fontsize => 1,
1509 align => -1, 1779 align => -1,
1510 valign => -1, 1780 valign => -1,
1511 padding_x => 2, 1781 padding_x => 2,
1512 padding_y => 2, 1782 padding_y => 2,
1513 can_events => 0, 1783 can_events => 0,
1514 %arg 1784 %arg
1515 ); 1785 );
1516 1786
1517 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1790 $self->{template} = $layout;
1521 } 1791 }
1522 1792
1523 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1527 } 1797 }
1528 1798
1529 $self 1799 $self
1530} 1800}
1531 1801
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1802sub update {
1543 my ($self) = @_; 1803 my ($self) = @_;
1544 1804
1545 delete $self->{texture}; 1805 delete $self->{texture};
1546 $self->SUPER::update; 1806 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1558 1818
1559 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1561 1821
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1564 1823
1565 delete $self->{size_req}; 1824 delete $self->{size_req};
1566 $self->realloc; 1825 $self->realloc;
1567 $self->update; 1826 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1575 1834
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1836
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1580 1838
1581 delete $self->{size_req}; 1839 delete $self->{size_req};
1582 $self->realloc; 1840 $self->realloc;
1583 $self->update; 1841 $self->update;
… …
1595 1853
1596 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1597 1855
1598 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1599 $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);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1860
1602 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1603 1862
1604 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
… …
1609 }; 1868 };
1610 1869
1611 @{ $self->{size_req} } 1870 @{ $self->{size_req} }
1612} 1871}
1613 1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1614sub size_allocate { 1877sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1616 1879
1617 delete $self->{ox}; 1880 delete $self->{ox};
1618 1881
1619 delete $self->{texture} 1882 delete $self->{texture}
1620 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
1621} 1886}
1622 1887
1623sub set_fontsize { 1888sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1625 1890
1626 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1627 delete $self->{texture}; 1893 delete $self->{texture};
1628 1894
1629 $self->realloc; 1895 $self->realloc;
1630} 1896}
1631 1897
1632sub reconfigure { 1898sub reconfigure {
1633 my ($self) = @_; 1899 my ($self) = @_;
1634 1900
1635 delete $self->{size_req}; 1901 delete $self->{size_req};
1902 delete $self->{texture};
1636 1903
1637 $self->SUPER::reconfigure; 1904 $self->SUPER::reconfigure;
1638} 1905}
1639 1906
1640sub _draw { 1907sub _draw {
1641 my ($self) = @_; 1908 my ($self) = @_;
1642 1909
1643 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1644 1911
1645 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1919
1653 new_from_layout CFClient::Texture $self->{layout} 1920 [$self->{layout}->size]
1654 }; 1921 };
1655 1922
1656 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1660 1927
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1931 };
1665 1932
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1935
1671 if ($tex->{format} == GL_ALPHA) { 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 1937}
1682 1938
1683############################################################################# 1939#############################################################################
1684 1940
1685package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1686 1942
1687our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1688 1944
1689use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1690 1946
1691sub new { 1947sub new {
1692 my $class = shift; 1948 my $class = shift;
1693 1949
1694 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1699 can_hover => 1, 1955 can_hover => 1,
1700 can_focus => 1, 1956 can_focus => 1,
1701 valign => 0, 1957 valign => 0,
1702 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1703 #text => ... 1960 #text => ...
1704 #hidden => "*", 1961 #hidden => "*",
1705 @_ 1962 @_
1706 ) 1963 )
1707} 1964}
… …
1718 1975
1719 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1978 delete $self->{size_req};
1722 1979
1723 $self->_emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1724 1981
1725 $self->realloc; 1982 $self->realloc;
1726 $self->update; 1983 $self->update;
1727} 1984}
1728 1985
… …
1743 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1744 2001
1745 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1746} 2003}
1747 2004
1748sub key_down { 2005sub invoke_key_down {
1749 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1750 2007
1751 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1754 2011
1755 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;
1756 2015
1757 if ($uni == 8) { 2016 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } 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 = "";
1766 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 2040 $self->emit ('escape');
1771 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 2045 } else {
1774 return 0; 2046 return 0;
1775 } 2047 }
1776 2048
1777 $self->_set_text ($text); 2049 $self->_set_text ($text);
1778 2050
1779 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1780 2053
1781 1 2054 1
1782} 2055}
1783 2056
1784sub focus_in { 2057sub invoke_focus_in {
1785 my ($self) = @_; 2058 my ($self) = @_;
1786 2059
1787 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1788 2061
1789 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1790} 2063}
1791 2064
1792sub button_down { 2065sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1794 2067
1795 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2069
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2071
1799 # byte-index to char-index 2072 # byte-index to char-index
1800 my $text = $self->{text}; 2073 my $text = $self->{text};
1801 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1803 2076
1804 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1805 $self->update; 2078 $self->update;
1806 2079
1807 1 2080 1
1808} 2081}
1809 2082
1810sub mouse_motion { 2083sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1812# 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#
1813 2086
1814 0 2087 1
1815} 2088}
1816 2089
1817sub _draw { 2090sub _draw {
1818 my ($self) = @_; 2091 my ($self) = @_;
1819 2092
… …
1846 utf8::encode $text; 2119 utf8::encode $text;
1847 2120
1848 @$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)
1849 } 2122 }
1850 2123
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2124 glBegin GL_LINES;
1853 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};
1854 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};
1855 glEnd; 2127 glEnd;
1856 } 2128 }
1857} 2129}
1858 2130
2131#############################################################################
2132
1859package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1860 2134
1861our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1862 2136
1863use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1864 2138
1865sub key_down { 2139sub invoke_key_down {
1866 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1867 2141
1868 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1869 2143
1870 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1873 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2150 $self->emit (activate => $txt);
1876 $self->update; 2151 $self->update;
1877 2152
1878 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1881 } 2156 }
1882 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2161 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2163 }
1889 2164
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2168
1894 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2171 } else {
1897 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1898 } 2173 }
1899 2174
1900 } else { 2175 } else {
1901 return $self->SUPER::key_down ($ev) 2176 return $self->SUPER::invoke_key_down ($ev)
1902 } 2177 }
1903 2178
1904 1 2179 1
1905} 2180}
1906 2181
1907############################################################################# 2182#############################################################################
1908 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
1909package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1910 2224
1911our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1912 2226
1913use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1914 2228
1915my @tex = 2229my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1918 2232
1919sub new { 2233sub new {
1920 my $class = shift; 2234 my $class = shift;
1921 2235
… …
1930 can_events => 1, 2244 can_events => 1,
1931 @_ 2245 @_
1932 ) 2246 )
1933} 2247}
1934 2248
1935sub activate { }
1936
1937sub button_up { 2249sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1939 2251
1940 $self->emit ("activate") 2252 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2254 && $y >= 0 && $y < $self->{h};
… …
1960 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1961} 2273}
1962 2274
1963############################################################################# 2275#############################################################################
1964 2276
1965package CFClient::UI::CheckBox; 2277package CFPlus::UI::CheckBox;
1966 2278
1967our @ISA = CFClient::UI::DrawBG::; 2279our @ISA = CFPlus::UI::DrawBG::;
1968 2280
1969my @tex = 2281my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2284
1973use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1974 2286
1975sub new { 2287sub new {
1976 my $class = shift; 2288 my $class = shift;
1977 2289
1978 $class->SUPER::new ( 2290 $class->SUPER::new (
… …
1992 my ($self) = @_; 2304 my ($self) = @_;
1993 2305
1994 (6) x 2 2306 (6) x 2
1995} 2307}
1996 2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
1997sub button_down { 2317sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1999 2319
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2322 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2323 } else {
2005 return 0 2324 return 0
2006 } 2325 }
2007 2326
2008 1 2327 1
… …
2028 glDisable GL_TEXTURE_2D; 2347 glDisable GL_TEXTURE_2D;
2029} 2348}
2030 2349
2031############################################################################# 2350#############################################################################
2032 2351
2033package CFClient::UI::Image; 2352package CFPlus::UI::Image;
2034 2353
2035our @ISA = CFClient::UI::Base::; 2354our @ISA = CFPlus::UI::Base::;
2036 2355
2037use CFClient::OpenGL; 2356use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2357
2040our %loaded_images; 2358our %texture_cache;
2041 2359
2042sub new { 2360sub new {
2043 my $class = shift; 2361 my $class = shift;
2044 2362
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2046 2367
2047 $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";
2048 2370
2049 $loaded_images{$self->{image}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 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;
2051 2373
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
2053 2375
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2377
2058 $self 2378 $self
2059} 2379}
2060 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
2061sub size_request { 2396sub size_request {
2062 my ($self) = @_; 2397 my ($self) = @_;
2063 2398
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2399 ($self->{tex}{w}, $self->{tex}{h})
2065} 2400}
2066 2401
2067sub _draw { 2402sub _draw {
2068 my ($self) = @_; 2403 my ($self) = @_;
2069 2404
… …
2079 } 2414 }
2080 2415
2081 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2418
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2419 $tex->draw_quad (0, 0, $w, $h);
2085 2420
2086 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
2087} 2422}
2088 2423
2089############################################################################# 2424#############################################################################
2090 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
2091package CFClient::UI::VGauge; 2462package CFPlus::UI::VGauge;
2092 2463
2093our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2094 2465
2095use List::Util qw(min max); 2466use List::Util qw(min max);
2096 2467
2097use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2098 2469
2099my %tex = ( 2470my %tex = (
2100 food => [ 2471 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2474 ],
2104 grace => [ 2475 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2478 ],
2108 hp => [ 2479 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2482 ],
2112 mana => [ 2483 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2486 ],
2116); 2487);
2117 2488
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2551
2181 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2182 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);
2183 2557
2184 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
… …
2206 2580
2207 if ($t3) { 2581 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2588 glEnd;
2215 } 2589 }
2216 2590
2217 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2219} 2593}
2220 2594
2221############################################################################# 2595#############################################################################
2222 2596
2223package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2224 2598
2225our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2226 2600
2227sub new { 2601sub new {
2228 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2229 2603
2230 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2606 can_hover => 1,
2233 can_events => 1, 2607 can_events => 1,
2234 %arg, 2608 %arg,
2235 ); 2609 );
2236 2610
2237 $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");
2238 $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);
2239 $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");
2240 2614
2241 $self 2615 $self
2242} 2616}
2243 2617
2244sub set_fontsize { 2618sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2266} 2640}
2267 2641
2268############################################################################# 2642#############################################################################
2269 2643
2270package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2271 2645
2272use strict; 2646use strict;
2273 2647
2274use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2275 2649
2276our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2277 2651
2278my @tex = 2652my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2281 2655
2282sub new { 2656sub new {
2283 my $class = shift; 2657 my $class = shift;
2284 2658
… …
2305 $self->update; 2679 $self->update;
2306 2680
2307 $self 2681 $self
2308} 2682}
2309 2683
2310sub changed { }
2311
2312sub set_range { 2684sub set_range {
2313 my ($self, $range) = @_; 2685 my ($self, $range) = @_;
2314 2686
2315 ($range, $self->{range}) = ($self->{range}, $range); 2687 ($range, $self->{range}) = ($self->{range}, $range);
2316 2688
… …
2336 if $unit; 2708 if $unit;
2337 2709
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2711
2340 if ($value != $old_value) { 2712 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2713 $self->emit (changed => $value);
2342 $self->update; 2714 $self->update;
2343 } 2715 }
2344} 2716}
2345 2717
2346sub size_request { 2718sub size_request {
2347 my ($self) = @_; 2719 my ($self) = @_;
2348 2720
2349 ($self->{req_w}, $self->{req_h}) 2721 ($self->{req_w}, $self->{req_h})
2350} 2722}
2351 2723
2352sub button_down { 2724sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2354 2726
2355 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2728
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2730
2359 $self->mouse_motion ($ev, $x, $y) 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2732}
2361 2733
2362sub mouse_motion { 2734sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2364 2736
2365 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2739
… …
2373 } else { 2745 } else {
2374 return 0; 2746 return 0;
2375 } 2747 }
2376 2748
2377 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
2378} 2762}
2379 2763
2380sub update { 2764sub update {
2381 my ($self) = @_; 2765 my ($self) = @_;
2382 2766
… …
2431 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2432} 2816}
2433 2817
2434############################################################################# 2818#############################################################################
2435 2819
2436package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2437 2821
2438our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2439 2823
2440sub new { 2824sub new {
2441 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2442 2826
2443 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2444 2828
2445 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2832 to_value => sub { shift },
2449 from_value => sub { shift }, 2833 from_value => sub { shift },
2450 %arg, 2834 %arg,
2451 ); 2835 );
2452 2836
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2474 2858
2475############################################################################# 2859#############################################################################
2476 2860
2477package CFClient::UI::TextScroller; 2861package CFPlus::UI::TextScroller;
2478 2862
2479our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2480 2864
2481use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2482 2866
2483sub new { 2867sub new {
2484 my $class = shift; 2868 my $class = shift;
2485 2869
2486 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2487 fontsize => 1, 2871 fontsize => 1,
2488 can_events => 0, 2872 can_events => 1,
2489 indent => 0, 2873 indent => 0,
2490 #font => default_font 2874 #font => default_font
2491 @_, 2875 @_,
2492 2876
2493 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2494 par => [], 2878 par => [],
2879 max_par => 0,
2495 height => 0, 2880 height => 0,
2496 children => [ 2881 children => [
2497 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2884 ],
2500 ); 2885 );
2501 2886
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2503 2888
… …
2509 2894
2510 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2896 $self->reflow;
2512} 2897}
2513 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
2514sub size_allocate { 2908sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2516 2910
2517 $self->SUPER::size_allocate ($w, $h); 2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2913
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2916 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2918
2524 $self->reflow; 2919 $self->reflow;
2525}
2526 2920
2527sub text_size { 2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2528 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) = @_;
2529 2937
2530 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2531 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2943 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $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}}
2536 2951 );
2952
2537 $layout->size 2953 $layout
2538} 2954}
2539 2955
2540sub reflow { 2956sub reflow {
2541 my ($self) = @_; 2957 my ($self) = @_;
2542 2958
… …
2549 2965
2550 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2552} 2968}
2553 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
2554sub clear { 2985sub clear {
2555 my ($self) = @_; 2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2556 2990
2557 $self->{par} = []; 2991 $self->{par} = [];
2558 $self->{height} = 0; 2992 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2994}
2561 2995
2562sub add_paragraph { 2996sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2997 my $self = shift;
2564 2998
2565 for my $line (split /\n/, $text) { 2999 for my $para (@_) {
2566 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
2567 $self->{height} += $h; 3051 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 3053
2571 $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 }
2572} 3060}
2573 3061
2574sub update { 3062sub update {
2575 my ($self) = @_; 3063 my ($self) = @_;
2576 3064
… …
2579 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2580 3068
2581 delete $self->{texture}; 3069 delete $self->{texture};
2582 3070
2583 $ROOT->on_post_alloc ($self => sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3075
2586 if (delete $self->{need_reflow}) {
2587 my $height = 0;
2588
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2605
2606 $self->{height} = $height;
2607
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610 delete $self->{texture};
2611 }
2612
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3077 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2616 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;
2617 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2618 3089
2619 my $y0 = $top; 3090 my $y0 = $top;
2620 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2621 3092
2622 my $y = 0;
2623
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2634 3096
2635 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3098 my $layout = $self->get_layout ($para);
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 3099
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3100 $layout->render ($para->{indent}, $y - $y0);
2642 3101
2643 glRasterPos $par->[3], $y - $y0; 3102 if (my @w = @{ $para->{widget} }) {
2644 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 }
2645 } 3114 }
2646 3115
2647 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3118 }
2649 3119
2650 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2651 }; 3121 };
2652 }); 3122 });
3123}
3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
2653} 3132}
2654 3133
2655sub _draw { 3134sub _draw {
2656 my ($self) = @_; 3135 my ($self) = @_;
2657 3136
… …
2660 glColor 0, 0, 0, 1; 3139 glColor 0, 0, 0, 1;
2661 $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});
2662 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2663 3142
2664 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2665
2666} 3144}
2667 3145
2668############################################################################# 3146#############################################################################
2669 3147
2670package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2671 3149
2672use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2673 3151
2674our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2675 3153
2676sub moveto { 3154sub moveto {
2677 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2678 3156
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3185 glPopMatrix;
2708} 3186}
2709 3187
2710############################################################################# 3188#############################################################################
2711 3189
2712package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2713 3191
2714our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2715 3193
2716sub new { 3194sub new {
2717 my $class = shift; 3195 my $class = shift;
2718 3196
2719 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2732} 3210}
2733 3211
2734############################################################################# 3212#############################################################################
2735 3213
2736package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2737 3215
2738our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2739 3217
2740use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2741 3219
2742sub new { 3220sub new {
2743 my $class = shift; 3221 my $class = shift;
2744 3222
2745 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2748 ) 3226 )
2749} 3227}
2750 3228
2751sub set_tooltip_from { 3229sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3234
2754 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2755 3236
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3242 }
2762 3243
2763 $tooltip =~ s/^\n+//; 3244 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3245 $tooltip =~ s/\n+$//;
2765 3246
2766 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3248 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3250 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3252 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3254 );
2774} 3255}
2775 3256
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3261
2781 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2782} 3263}
2783 3264
2784sub size_allocate { 3265sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2786 3267
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3269}
2789 3270
2790sub visibility_change { 3271sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3272 my ($self, $visible) = @_;
2792 3273
2793 return unless $visible; 3274 return unless $visible;
2794 3275
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2797 or return; 3278 or return;
2798 3279
3280 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3282
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3284 if $x + $self->{w} > $self->{root}{w};
2803 3285
2804 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2805 }); 3290 });
2806} 3291}
2807 3292
2808sub _draw { 3293sub _draw {
2809 my ($self) = @_; 3294 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2834} 3319}
2835 3320
2836############################################################################# 3321#############################################################################
2837 3322
2838package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2839 3324
2840our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2841 3326
2842use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2843 3328
2844sub new { 3329sub new {
2845 my $class = shift; 3330 my $class = shift;
2846 3331
2847 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
… …
2849 can_events => 0, 3334 can_events => 0,
2850 @_, 3335 @_,
2851 ); 3336 );
2852 3337
2853 if ($self->{anim} && $self->{animspeed}) { 3338 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3339 CFPlus::weaken (my $widget = $self);
2855 3340
2856 $self->{timer} = Event->timer ( 3341 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3342 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3343 hard => 1,
2859 interval => $self->{animspeed}, 3344 interval => $self->{animspeed},
2860 cb => sub { 3345 cb => sub {
3346 delete $self->{wait_face};
2861 ++$widget->{frame}; 3347 ++$widget->{frame};
2862 $widget->update; 3348 $widget->update;
2863 }, 3349 },
2864 ); 3350 );
2865 } 3351 }
… …
2882sub _draw { 3368sub _draw {
2883 my ($self) = @_; 3369 my ($self) = @_;
2884 3370
2885 return unless $::CONN; 3371 return unless $::CONN;
2886 3372
3373 $self->SUPER::_draw;
3374
2887 my $face; 3375 my $face;
2888 3376
2889 if ($self->{frame}) { 3377 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3378 my $anim = $::CONN->{anim}[$self->{anim}];
2891 3379
2892 $face = $anim->[ $self->{frame} % @$anim ] 3380 $face = $anim->[ $self->{frame} % @$anim ]
2893 if $anim && @$anim; 3381 if $anim && @$anim;
2894 } 3382 }
3383
3384 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3385 or return;
2895 3386
2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3387 my $tex = $::CONN->{texture}[$faceid];
2897 3388
2898 if ($tex) { 3389 if ($tex) {
2899 glEnable GL_TEXTURE_2D; 3390 glEnable GL_TEXTURE_2D;
2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901 glColor 0, 0, 0, 1; 3392 glColor 0, 0, 0, 1;
2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3393 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2903 glDisable GL_TEXTURE_2D; 3394 glDisable GL_TEXTURE_2D;
3395 } else {
3396 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3397 $self->update;
3398 });
2904 } 3399 }
2905} 3400}
2906 3401
2907sub destroy { 3402sub destroy {
2908 my ($self) = @_; 3403 my ($self) = @_;
… …
2913 $self->SUPER::destroy; 3408 $self->SUPER::destroy;
2914} 3409}
2915 3410
2916############################################################################# 3411#############################################################################
2917 3412
2918package CFClient::UI::Buttonbar; 3413package CFPlus::UI::Buttonbar;
2919 3414
2920our @ISA = CFClient::UI::HBox::; 3415our @ISA = CFPlus::UI::HBox::;
2921 3416
2922# TODO: should actualyl wrap buttons and other goodies. 3417# TODO: should actually wrap buttons and other goodies.
2923 3418
2924############################################################################# 3419#############################################################################
2925 3420
2926package CFClient::UI::Menu; 3421package CFPlus::UI::Menu;
2927 3422
2928our @ISA = CFClient::UI::FancyFrame::; 3423our @ISA = CFPlus::UI::Toplevel::;
2929 3424
2930use CFClient::OpenGL; 3425use CFPlus::OpenGL;
2931 3426
2932sub new { 3427sub new {
2933 my $class = shift; 3428 my $class = shift;
2934 3429
2935 my $self = $class->SUPER::new ( 3430 my $self = $class->SUPER::new (
2936 items => [], 3431 items => [],
2937 z => 100, 3432 z => 100,
2938 @_, 3433 @_,
2939 ); 3434 );
2940 3435
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3436 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3437
2943 for my $item (@{ $self->{items} }) { 3438 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3439 my ($widget, $cb, $tooltip) = @$item;
2945 3440
2946 # handle various types of items, only text for now 3441 # handle various types of items, only text for now
2947 if (!ref $widget) { 3442 if (!ref $widget) {
3443 if ($widget =~ /\t/) {
3444 my ($left, $right) = split /\t/, $widget, 2;
3445
2948 $widget = new CFClient::UI::Label 3446 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3447 can_hover => 1,
2950 can_events => 1, 3448 can_events => 1,
3449 tooltip => $tooltip,
3450 children => [
3451 (new CFPlus::UI::Label markup => $left, expand => 1),
3452 (new CFPlus::UI::Label markup => $right, align => +1),
3453 ],
3454 ;
3455
3456 } else {
3457 $widget = new CFPlus::UI::Label
3458 can_hover => 1,
3459 can_events => 1,
2951 markup => $widget, 3460 markup => $widget,
2952 tooltip => $tooltip 3461 tooltip => $tooltip;
3462 }
2953 } 3463 }
2954 3464
2955 $self->{item}{$widget} = $item; 3465 $self->{item}{$widget} = $item;
2956 3466
2957 $self->{vbox}->add ($widget); 3467 $self->{vbox}->add ($widget);
… …
2962 3472
2963# popup given the event (must be a mouse button down event currently) 3473# popup given the event (must be a mouse button down event currently)
2964sub popup { 3474sub popup {
2965 my ($self, $ev) = @_; 3475 my ($self, $ev) = @_;
2966 3476
2967 $self->_emit ("popdown"); 3477 $self->emit ("popdown");
2968 3478
2969 # maybe save $GRAB? must be careful about events... 3479 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3480 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3481 $self->{button} = $ev->{button};
2972 3482
2973 $self->show; 3483 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3484 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3485}
2976 3486
2977sub mouse_motion { 3487sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3488 my ($self, $ev, $x, $y) = @_;
2979 3489
2980 # TODO: should use vbox->find_widget or so 3490 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3491 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3492 $self->{hover} = $self->{item}{$HOVER};
2983 3493
2984 0 3494 0
2985} 3495}
2986 3496
2987sub button_up { 3497sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3498 my ($self, $ev, $x, $y) = @_;
2989 3499
2990 if ($ev->{button} == $self->{button}) { 3500 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3501 undef $GRAB;
2992 $self->hide; 3502 $self->hide;
2993 3503
2994 $self->_emit ("popdown"); 3504 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3505 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3506 } else {
2997 return 0 3507 return 0
2998 } 3508 }
2999 3509
3000 1 3510 1
3001} 3511}
3002 3512
3003############################################################################# 3513#############################################################################
3004 3514
3005package CFClient::UI::Multiplexer; 3515package CFPlus::UI::Multiplexer;
3006 3516
3007our @ISA = CFClient::UI::Container::; 3517our @ISA = CFPlus::UI::Container::;
3008 3518
3009sub new { 3519sub new {
3010 my $class = shift; 3520 my $class = shift;
3011 3521
3012 my $self = $class->SUPER::new ( 3522 my $self = $class->SUPER::new (
… …
3026 3536
3027 $self->{current} = $self->{children}[0] 3537 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3538 if @{ $self->{children} };
3029} 3539}
3030 3540
3541sub get_current_page {
3542 my ($self) = @_;
3543
3544 $self->{current}
3545}
3546
3031sub set_current_page { 3547sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3548 my ($self, $page_or_widget) = @_;
3033 3549
3034 my $widget = ref $page_or_widget 3550 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3551 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3552 : $self->{children}[$page_or_widget];
3037 3553
3038 $self->{current} = $widget; 3554 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3555 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3556
3041 $self->_emit (page_changed => $self->{current}); 3557 $self->emit (page_changed => $self->{current});
3042 3558
3043 $self->realloc; 3559 $self->realloc;
3044} 3560}
3045 3561
3046sub visible_children { 3562sub visible_children {
… …
3051 my ($self) = @_; 3567 my ($self) = @_;
3052 3568
3053 $self->{current}->size_request 3569 $self->{current}->size_request
3054} 3570}
3055 3571
3056sub size_allocate { 3572sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3573 my ($self, $w, $h) = @_;
3058 3574
3059 $self->{current}->configure (0, 0, $w, $h); 3575 $self->{current}->configure (0, 0, $w, $h);
3576
3577 1
3060} 3578}
3061 3579
3062sub _draw { 3580sub _draw {
3063 my ($self) = @_; 3581 my ($self) = @_;
3064 3582
3065 $self->{current}->draw; 3583 $self->{current}->draw;
3066} 3584}
3067 3585
3068############################################################################# 3586#############################################################################
3069 3587
3070package CFClient::UI::Notebook; 3588package CFPlus::UI::Notebook;
3071 3589
3072our @ISA = CFClient::UI::VBox::; 3590our @ISA = CFPlus::UI::VBox::;
3073 3591
3074sub new { 3592sub new {
3075 my $class = shift; 3593 my $class = shift;
3076 3594
3077 my $self = $class->SUPER::new ( 3595 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3596 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3597 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3598 # filter => # will be put between multiplexer and $self
3081 @_, 3599 @_,
3082 ); 3600 );
3083 3601
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3602 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3606}
3089 3607
3090sub add { 3608sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3609 my ($self, $title, $widget, $tooltip) = @_;
3092 3610
3093 Scalar::Util::weaken $self; 3611 CFPlus::weaken $self;
3094 3612
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3613 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3614 markup => $title,
3097 tooltip => $tooltip, 3615 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3616 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3617 );
3100 3618
3101 $self->{multiplexer}->add ($widget); 3619 $self->{multiplexer}->add ($widget);
3102} 3620}
3103 3621
3622sub get_current_page {
3623 my ($self) = @_;
3624
3625 $self->{multiplexer}->get_current_page
3626}
3627
3104sub set_current_page { 3628sub set_current_page {
3105 my ($self, $page) = @_; 3629 my ($self, $page) = @_;
3106 3630
3107 $self->{multiplexer}->set_current_page ($page); 3631 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3632 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3633}
3110 3634
3111############################################################################# 3635#############################################################################
3112 3636
3113package CFClient::UI::Combobox; 3637package CFPlus::UI::Selector;
3114 3638
3115use utf8; 3639use utf8;
3116 3640
3117our @ISA = CFClient::UI::Button::; 3641our @ISA = CFPlus::UI::Button::;
3118 3642
3119sub new { 3643sub new {
3120 my $class = shift; 3644 my $class = shift;
3121 3645
3122 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3652 $self->_set_value ($self->{value});
3129 3653
3130 $self 3654 $self
3131} 3655}
3132 3656
3133sub button_down { 3657sub invoke_button_down {
3134 my ($self, $ev) = @_; 3658 my ($self, $ev) = @_;
3135 3659
3136 my @menu_items; 3660 my @menu_items;
3137 3661
3138 for (@{ $self->{options} }) { 3662 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3663 my ($value, $title, $tooltip) = @$_;
3140 3664
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3665 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3666 }
3143 3667
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3668 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3669}
3146 3670
3147sub _set_value { 3671sub _set_value {
3148 my ($self, $value) = @_; 3672 my ($self, $value) = @_;
3149 3673
… …
3159 my ($self, $value) = @_; 3683 my ($self, $value) = @_;
3160 3684
3161 return unless $self->{value} ne $value; 3685 return unless $self->{value} ne $value;
3162 3686
3163 $self->_set_value ($value); 3687 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3688 $self->emit (changed => $value);
3165} 3689}
3166 3690
3167############################################################################# 3691#############################################################################
3168 3692
3169package CFClient::UI::Statusbox; 3693package CFPlus::UI::Statusbox;
3170 3694
3171our @ISA = CFClient::UI::VBox::; 3695our @ISA = CFPlus::UI::VBox::;
3172 3696
3173sub new { 3697sub new {
3174 my $class = shift; 3698 my $class = shift;
3175 3699
3176 my $self = $class->SUPER::new ( 3700 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3701 fontsize => 0.8,
3178 @_, 3702 @_,
3179 ); 3703 );
3180 3704
3181 Scalar::Util::weaken (my $this = $self); 3705 CFPlus::weaken (my $this = $self);
3182 3706
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3707 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3708
3185 $self 3709 $self
3186} 3710}
… …
3188sub reorder { 3712sub reorder {
3189 my ($self) = @_; 3713 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3714 my $NOW = Time::HiRes::time;
3191 3715
3192 # freeze display when hovering over any label 3716 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3717 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3718 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3719 values %{ $self->{item} };
3196 3720
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3721 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3722 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3723 }
… …
3220 for ($short) { 3744 for ($short) {
3221 s/^\s+//; 3745 s/^\s+//;
3222 s/\s+/ /g; 3746 s/\s+/ /g;
3223 } 3747 }
3224 3748
3225 new CFClient::UI::Label 3749 new CFPlus::UI::Label
3226 markup => $short, 3750 markup => $short,
3227 tooltip => $item->{tooltip}, 3751 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3752 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3753 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3754 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3808 count => 1,
3285 %arg, 3809 %arg,
3286 }; 3810 };
3287 } 3811 }
3288 3812
3813 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3814 $self->reorder;
3815 });
3290} 3816}
3291 3817
3292sub reconfigure { 3818sub reconfigure {
3293 my ($self) = @_; 3819 my ($self) = @_;
3294 3820
… …
3307 $self->SUPER::destroy; 3833 $self->SUPER::destroy;
3308} 3834}
3309 3835
3310############################################################################# 3836#############################################################################
3311 3837
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root; 3838package CFPlus::UI::Root;
3674 3839
3675our @ISA = CFClient::UI::Container::; 3840our @ISA = CFPlus::UI::Container::;
3676 3841
3677use List::Util qw(min max); 3842use List::Util qw(min max);
3678 3843
3679use CFClient::OpenGL; 3844use CFPlus::OpenGL;
3680 3845
3681sub new { 3846sub new {
3682 my $class = shift; 3847 my $class = shift;
3683 3848
3684 my $self = $class->SUPER::new ( 3849 my $self = $class->SUPER::new (
3685 visible => 1, 3850 visible => 1,
3686 @_, 3851 @_,
3687 ); 3852 );
3688 3853
3689 Scalar::Util::weaken ($self->{root} = $self); 3854 CFPlus::weaken ($self->{root} = $self);
3690 3855
3691 $self 3856 $self
3692} 3857}
3693 3858
3694sub size_request { 3859sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 3874 $coord = $max - $size if $coord > $max - $size;
3710 3875
3711 int $coord + 0.5 3876 int $coord + 0.5
3712} 3877}
3713 3878
3714sub size_allocate { 3879sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3880 my ($self, $w, $h) = @_;
3716 3881
3717 for my $child ($self->children) { 3882 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3883 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3884
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3888 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3889 $Y = _to_pixel $Y, $H, $self->{h};
3725 3890
3726 $child->configure ($X, $Y, $W, $H); 3891 $child->configure ($X, $Y, $W, $H);
3727 } 3892 }
3893
3894 1
3728} 3895}
3729 3896
3730sub coord2local { 3897sub coord2local {
3731 my ($self, $x, $y) = @_; 3898 my ($self, $x, $y) = @_;
3732 3899
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4025 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4026
3860 $w = 0 if $w < 0; 4027 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 4028 $h = 0 if $h < 0;
3862 4029
4030 $w = max $widget->{min_w}, $w;
4031 $h = max $widget->{min_h}, $h;
4032
4033# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4034# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4035
4036 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4037 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4038
3863 $w = int $w + 0.5; 4039 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 4040 $h = int $h + 0.5;
3865 4041
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4042 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 4043 $widget->{old_w} = $widget->{w};
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4066 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4067 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4068 glLoadIdentity;
3893 4069
3894 { 4070 {
3895 package CFClient::UI::Base; 4071 package CFPlus::UI::Base;
3896 4072
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4073 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4074 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4075
3901 $self->_draw; 4076 $self->_draw;
4077 }
3902} 4078}
3903 4079
3904############################################################################# 4080#############################################################################
3905 4081
3906package CFClient::UI; 4082package CFPlus::UI;
3907 4083
3908$ROOT = new CFClient::UI::Root; 4084$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4085$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4086
39111 40871
3912 4088

Diff Legend

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