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

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

Diff Legend

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