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.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

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

Diff Legend

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