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

Diff Legend

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