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

Diff Legend

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