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

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

Diff Legend

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