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.312 by root, Fri Jun 23 23:54:30 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->emit ("focus_out"); 316 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
288} 318}
… …
290sub set_visibility { 320sub set_visibility {
291 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
292 322
293 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
294 324
295 $visible ? $self->hide 325 $visible ? $self->show
296 : $self->show; 326 : $self->hide;
297} 327}
298 328
299sub toggle_visibility { 329sub toggle_visibility {
300 my ($self) = @_; 330 my ($self) = @_;
301 331
… …
345 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
346 376
347 if ($self->{aspect}) { 377 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
349 379
350 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
352 382
353 # use alignment to adjust x, y 383 # use alignment to adjust x, y
354 384
355 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
397 427
398 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
399 429
400 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
401 431
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
405 } 435 }
406} 436}
407 437
408# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
409sub coord2local { 439sub coord2local {
410 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
411 441
442 Carp::confess unless $self->{parent};#d#
443
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 445}
414 446
415# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
416sub coord2global { 448sub coord2global {
417 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
418 450
451 Carp::confess unless $self->{parent};#d#
452
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 454}
421 455
422sub invoke_focus_in { 456sub invoke_focus_in {
423 my ($self) = @_; 457 my ($self) = @_;
424 458
425 return if $FOCUS == $self; 459 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
427 461
428 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
429 463
430 $focus->update if $focus; 464 $self->update;
431 $FOCUS->update;
432 465
433 0 466 0
434} 467}
435 468
436sub invoke_focus_out { 469sub invoke_focus_out {
437 my ($self) = @_; 470 my ($self) = @_;
438 471
439 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
440 473
441 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
442 475
443 $focus->update if $focus; #? 476 $self->update;
444 477
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 479 unless $FOCUS;
447 480
448 0 481 0
449} 482}
450 483
451sub grab_focus { 484sub grab_focus {
452 my ($self) = @_; 485 my ($self) = @_;
453 486
487 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 488 $self->emit ("focus_in");
455} 489}
456 490
457sub invoke_mouse_motion { 1 } 491sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 492sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 493sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
461 496
462sub invoke_button_down { 497sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
464 499
465 $self->grab_focus; 500 $self->grab_focus;
466 501
467 1 502 0
468} 503}
469 504
470sub connect { 505sub connect {
471 my ($self, $signal, $cb) = @_; 506 my ($self, $signal, $cb) = @_;
472 507
473 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
474} 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);
475 528
476sub emit { 529sub emit {
477 my ($self, $signal, @args) = @_; 530 my ($self, $signal, @args) = @_;
478 531
479 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 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
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 550}
484 551
485sub find_widget { 552sub find_widget {
486 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
487 554
… …
495} 562}
496 563
497sub set_parent { 564sub set_parent {
498 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
499 566
500 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
502} 569}
503 570
504sub realloc { 571sub realloc {
505 my ($self) = @_; 572 my ($self) = @_;
… …
571 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
574 glEnd; 641 glEnd;
575 glPopMatrix; 642 glPopMatrix;
576 #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;
577 } 644 }
578 645
579 $self->_draw; 646 $self->_draw;
580 glPopMatrix; 647 glPopMatrix;
581} 648}
… …
584 my ($self) = @_; 651 my ($self) = @_;
585 652
586 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
587} 654}
588 655
656my $cntx;#d#
589sub DESTROY { 657sub DESTROY {
590 my ($self) = @_; 658 my ($self) = @_;
591 659
592 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
593 661
594 eval { $self->destroy }; 662 eval { $self->destroy };
595 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};
596} 666}
597 667
598############################################################################# 668#############################################################################
599 669
600package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
601 671
602our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
603 673
604use strict; 674use strict;
605use CFClient::OpenGL; 675use CFPlus::OpenGL;
606 676
607sub new { 677sub new {
608 my $class = shift; 678 my $class = shift;
609 679
610 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
641 } 711 }
642} 712}
643 713
644############################################################################# 714#############################################################################
645 715
646package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
647 717
648our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
649 719
650sub new { 720sub new {
651 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
653} 723}
… …
660 730
661sub draw { } 731sub draw { }
662 732
663############################################################################# 733#############################################################################
664 734
665package CFClient::UI::Container; 735package CFPlus::UI::Container;
666 736
667our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
668 738
669sub new { 739sub new {
670 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
671 741
672 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
681 if $children; 751 if $children;
682 752
683 $self 753 $self
684} 754}
685 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
686sub add { 764sub add {
687 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
688 766
689 $_->set_parent ($self) 767 $_->set_parent ($self)
690 for @widgets; 768 for @widgets;
… …
750 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
751} 829}
752 830
753############################################################################# 831#############################################################################
754 832
755package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
756 834
757our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
758 836
759sub new { 837sub new {
760 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
761 839
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
763 841
764 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
765} 843}
766 844
767sub add { 845sub add {
… …
774sub remove { 852sub remove {
775 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
776 854
777 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
778 856
779 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
780 unless @{$self->{children}}; 858 unless @{$self->{children}};
781} 859}
782 860
783sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
784 862
… …
796 874
797############################################################################# 875#############################################################################
798 876
799# back-buffered drawing area 877# back-buffered drawing area
800 878
801package CFClient::UI::Window; 879package CFPlus::UI::Window;
802 880
803our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
804 882
805use CFClient::OpenGL; 883use CFPlus::OpenGL;
806 884
807sub new { 885sub new {
808 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
809 887
810 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
832} 910}
833 911
834sub render_child { 912sub render_child {
835 my ($self) = @_; 913 my ($self) = @_;
836 914
837 $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 {
838 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
840 918
841 { 919 {
842 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
843 921
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
846 } 926 }
847
848 $self->_render;
849 }; 927 };
850} 928}
851 929
852sub _draw { 930sub _draw {
853 my ($self) = @_; 931 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 932
857 my $tex = $self->{texture} 933 my $tex = $self->{texture}
858 or return; 934 or return;
859 935
860 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
863 939
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
865 941
866 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
867} 943}
868 944
869############################################################################# 945#############################################################################
870 946
871package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
872 948
873our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
874 950
875sub new { 951sub new {
876 my $class = shift; 952 my $class = shift;
877 953
878 $class->SUPER::new ( 954 $class->SUPER::new (
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1016 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1018 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1020 }
945} 1021}
946 1022
947sub _render { 1023sub _render {
948 my ($self) = @_; 1024 my ($self) = @_;
949 1025
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1028
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1030
955 $self->SUPER::_render; 1031 $self->SUPER::_render;
956} 1032}
957 1033
958############################################################################# 1034#############################################################################
959 1035
960package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
961 1037
962our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
963 1039
964sub new { 1040sub new {
965 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
966 1042
967 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
968 1044
969 my $self; 1045 my $self;
970 1046
971 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1057 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1059 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1062 },
977 ; 1063 ;
978 1064
979 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
981 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
982 %arg, 1072 %arg,
983 ); 1073 );
984 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
986 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
987 1080
988 $self 1081 $self
989} 1082}
1083
1084#TODO# update range on size_allocate depending on child
990 1085
991sub add { 1086sub add {
992 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
993 1088
994 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
995} 1090}
996 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114}
1115
997sub update { 1116sub update {
998 my ($self) = @_; 1117 my ($self) = @_;
999 1118
1000 $self->SUPER::update; 1119 $self->SUPER::update;
1001 1120 $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} 1121}
1006 1122
1007sub invoke_size_allocate { 1123sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1009 1125
1010 my $child = $self->{vp}->child; 1126 $self->update_slider;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h) 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1128}
1015 1129
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1130#############################################################################
1020 1131
1021package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1022 1133
1023our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1024 1135
1025use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1026 1137
1027sub new { 1138sub new {
1028 my $class = shift; 1139 my $class = shift;
1029 1140
1030 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1057} 1168}
1058 1169
1059############################################################################# 1170#############################################################################
1060 1171
1061package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1062 1173
1063our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1064 1175
1065use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1066 1277
1067my $bg = 1278my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1280 mipmap => 1, wrap => 1;
1070 1281
1071my @border = 1282my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1283 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); 1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1285
1075sub new { 1286sub new {
1076 my ($class, %arg) = @_; 1287 my ($class, %arg) = @_;
1077 1288
1078 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1292 border => 0.6,
1082 can_events => 1, 1293 can_events => 1,
1083 min_w => 16, 1294 min_w => 64,
1084 min_h => 16, 1295 min_h => 32,
1085 %arg, 1296 %arg,
1086 ); 1297 );
1087 1298
1088 $self->{title_widget} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1300 align => 0,
1090 valign => 1, 1301 valign => 1,
1091 text => $self->{title}, 1302 text => $self->{title},
1092 fontsize => $self->{border}, 1303 fontsize => $self->{border},
1093 if exists $self->{title}; 1304 if exists $self->{title};
1094 1305
1095 if ($self->{has_close_button}) { 1306 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1307 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1308 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1309 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1310 on_activate => sub { $self->emit ("delete") };
1100 1311
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1313 }
1103 1314
1104 $self 1315 $self
1105} 1316}
1106 1317
1107sub add { 1318sub add {
1108 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1109 1320
1110 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1324}
1114 1325
1115sub border { 1326sub border {
1116 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1117} 1328}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1361 $self->child->configure ($border, $border, $w, $h);
1151 1362
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1363 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1364 if $self->{close_button};
1154 1365
1366 1
1367}
1368
1369sub invoke_delete {
1370 my ($self) = @_;
1371
1372 $self->hide;
1373
1155 1 1374 1
1156} 1375}
1157 1376
1158sub invoke_button_down { 1377sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1437
1219 ! ! $self->{motion} 1438 ! ! $self->{motion}
1220} 1439}
1221 1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1447}
1448
1222sub _draw { 1449sub _draw {
1223 my ($self) = @_; 1450 my ($self) = @_;
1224 1451
1225 my $child = $self->{children}[0]; 1452 my $child = $self->{children}[0];
1226 1453
… …
1263 if $self->{close_button}; 1490 if $self->{close_button};
1264} 1491}
1265 1492
1266############################################################################# 1493#############################################################################
1267 1494
1268package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1269 1496
1270our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1271 1498
1272use List::Util qw(max sum); 1499use List::Util qw(max sum);
1273 1500
1274use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1275 1502
1276sub new { 1503sub new {
1277 my $class = shift; 1504 my $class = shift;
1278 1505
1279 $class->SUPER::new ( 1506 $class->SUPER::new (
1280 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1281 @_, 1509 @_,
1282 ) 1510 )
1283} 1511}
1284 1512
1285sub children { 1513sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287} 1515}
1288 1516
1289sub add { 1517sub add {
1290 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1291 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1292 $child->set_parent ($self); 1522 $child->set_parent ($self);
1293 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1294 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1295 $self->realloc; 1528 $self->realloc;
1296} 1529}
1297 1530
1298sub remove { 1531sub remove {
1299 my ($self, $child) = @_; 1532 my ($self, $child) = @_;
… …
1355 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1356 1589
1357 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1359 1592
1360 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1361 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1364 1597
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1599
1369 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1370 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1371 1609
1372 my $y; 1610 my $y;
1373 1611
1374 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1375 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1418 } 1656 }
1419} 1657}
1420 1658
1421############################################################################# 1659#############################################################################
1422 1660
1423package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1424 1662
1425our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1426 1664
1427sub size_request { 1665sub size_request {
1428 my ($self) = @_; 1666 my ($self) = @_;
1429 1667
1430 $self->{vertical} 1668 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1702 for 0 .. $#children;
1465 } 1703 }
1466 } 1704 }
1467 1705
1468 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1469 1707
1470 my $pos = 0; 1708 my $pos = 0;
1471 for (0 .. $#children) { 1709 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1716 1
1479} 1717}
1480 1718
1481############################################################################# 1719#############################################################################
1482 1720
1483package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1484 1722
1485our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1486 1724
1487sub new { 1725sub new {
1488 my $class = shift; 1726 my $class = shift;
1489 1727
1490 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1493 ) 1731 )
1494} 1732}
1495 1733
1496############################################################################# 1734#############################################################################
1497 1735
1498package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1499 1737
1500our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1501 1739
1502sub new { 1740sub new {
1503 my $class = shift; 1741 my $class = shift;
1504 1742
1505 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1508 ) 1746 )
1509} 1747}
1510 1748
1511############################################################################# 1749#############################################################################
1512 1750
1513package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1514 1752
1515our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1516 1754
1517use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1518 1756
1519sub new { 1757sub new {
1520 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1521 1759
1522 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1763 #active_bg => none
1526 #font => default_font 1764 #font => default_font
1527 #text => initial text 1765 #text => initial text
1528 #markup => initial narkup 1766 #markup => initial narkup
1529 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1530 ellipsise => 3, # end 1769 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1771 fontsize => 1,
1533 align => -1, 1772 align => -1,
1534 valign => -1, 1773 valign => -1,
1535 padding_x => 2, 1774 padding_x => 2,
1536 padding_y => 2, 1775 padding_y => 2,
1537 can_events => 0, 1776 can_events => 0,
1538 %arg 1777 %arg
1539 ); 1778 );
1540 1779
1541 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1783 $self->{template} = $layout;
1545 } 1784 }
1546 1785
1547 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1551 } 1790 }
1552 1791
1553 $self 1792 $self
1554} 1793}
1555 1794
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1795sub update {
1567 my ($self) = @_; 1796 my ($self) = @_;
1568 1797
1569 delete $self->{texture}; 1798 delete $self->{texture};
1570 $self->SUPER::update; 1799 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1582 1811
1583 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1585 1814
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1588 1816
1589 delete $self->{size_req}; 1817 delete $self->{size_req};
1590 $self->realloc; 1818 $self->realloc;
1591 $self->update; 1819 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1599 1827
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1829
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1604 1831
1605 delete $self->{size_req}; 1832 delete $self->{size_req};
1606 $self->realloc; 1833 $self->realloc;
1607 $self->update; 1834 $self->update;
… …
1619 1846
1620 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1621 1848
1622 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1853
1626 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1627 1855
1628 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
… …
1652 1880
1653sub set_fontsize { 1881sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1655 1883
1656 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1657 delete $self->{texture}; 1886 delete $self->{texture};
1658 1887
1659 $self->realloc; 1888 $self->realloc;
1660} 1889}
1661 1890
1662sub reconfigure { 1891sub reconfigure {
1663 my ($self) = @_; 1892 my ($self) = @_;
1664 1893
1665 delete $self->{size_req}; 1894 delete $self->{size_req};
1895 delete $self->{texture};
1666 1896
1667 $self->SUPER::reconfigure; 1897 $self->SUPER::reconfigure;
1668} 1898}
1669 1899
1670sub _draw { 1900sub _draw {
1671 my ($self) = @_; 1901 my ($self) = @_;
1672 1902
1673 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1674 1904
1675 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1912
1683 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1684 }; 1914 };
1685 1915
1686 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1690 1920
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1924 };
1695 1925
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1928
1701 if ($tex->{format} == GL_ALPHA) { 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1708 }
1709
1710 glDisable GL_TEXTURE_2D;
1711} 1930}
1712 1931
1713############################################################################# 1932#############################################################################
1714 1933
1715package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1716 1935
1717our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1718 1937
1719use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1720 1939
1721sub new { 1940sub new {
1722 my $class = shift; 1941 my $class = shift;
1723 1942
1724 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1729 can_hover => 1, 1948 can_hover => 1,
1730 can_focus => 1, 1949 can_focus => 1,
1731 valign => 0, 1950 valign => 0,
1732 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1733 #text => ... 1953 #text => ...
1734 #hidden => "*", 1954 #hidden => "*",
1735 @_ 1955 @_
1736 ) 1956 )
1737} 1957}
… …
1782 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1784 2004
1785 my $text = $self->get_text; 2005 my $text = $self->get_text;
1786 2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2008
1787 if ($uni == 8) { 2009 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1796 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2033 $self->emit ('escape');
1801 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2038 } else {
1804 return 0; 2039 return 0;
1805 } 2040 }
1806 2041
1807 $self->_set_text ($text); 2042 $self->_set_text ($text);
1808 2043
1809 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1810 2046
1811 1 2047 1
1812} 2048}
1813 2049
1814sub invoke_focus_in { 2050sub invoke_focus_in {
… …
1826 2062
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2064
1829 # byte-index to char-index 2065 # byte-index to char-index
1830 my $text = $self->{text}; 2066 my $text = $self->{text};
1831 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1833 2069
1834 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1835 $self->update; 2071 $self->update;
1836 2072
1837 1 2073 1
… …
1876 utf8::encode $text; 2112 utf8::encode $text;
1877 2113
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2115 }
1880 2116
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2117 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2120 glEnd;
1886 } 2121 }
1887} 2122}
1888 2123
2124#############################################################################
2125
1889package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1890 2127
1891our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1892 2129
1893use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1894 2131
1895sub invoke_key_down { 2132sub invoke_key_down {
1896 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1897 2134
1898 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1899 2136
1900 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
1903 2140
1904 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2143 $self->emit (activate => $txt);
1907 $self->update; 2144 $self->update;
1908 2145
1909 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1912 } 2149 }
1913 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2154 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2156 }
1920 2157
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2161
1925 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2172 1
1936} 2173}
1937 2174
1938############################################################################# 2175#############################################################################
1939 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1940package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1941 2217
1942our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1943 2219
1944use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1945 2221
1946my @tex = 2222my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1949 2225
1950sub new { 2226sub new {
1951 my $class = shift; 2227 my $class = shift;
1952 2228
… …
1989 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1990} 2266}
1991 2267
1992############################################################################# 2268#############################################################################
1993 2269
2270package CFPlus::UI::CheckBox;
2271
2272our @ISA = CFPlus::UI::DrawBG::;
2273
2274my @tex =
2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2277
2278use CFPlus::OpenGL;
2279
2280sub new {
2281 my $class = shift;
2282
2283 $class->SUPER::new (
2284 padding_x => 2,
2285 padding_y => 2,
2286 fg => [1, 1, 1],
2287 active_fg => [1, 1, 0],
2288 bg => [0, 0, 0, 0.2],
2289 active_bg => [1, 1, 1, 0.5],
2290 state => 0,
2291 can_hover => 1,
2292 @_
2293 )
2294}
2295
2296sub size_request {
2297 my ($self) = @_;
2298
2299 (6) x 2
2300}
2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
2310sub invoke_button_down {
2311 my ($self, $ev, $x, $y) = @_;
2312
2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2315 $self->toggle;
2316 } else {
2317 return 0
2318 }
2319
2320 1
2321}
2322
2323sub _draw {
2324 my ($self) = @_;
2325
2326 $self->SUPER::_draw;
2327
2328 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2329
2330 my ($w, $h) = @$self{qw(w h)};
2331
2332 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333
2334 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2335
2336 my $tex = $self->{state} ? $tex[1] : $tex[0];
2337
2338 glEnable GL_TEXTURE_2D;
2339 $tex->draw_quad_alpha (0, 0, $s, $s);
2340 glDisable GL_TEXTURE_2D;
2341}
2342
2343#############################################################################
2344
2345package CFPlus::UI::Image;
2346
2347our @ISA = CFPlus::UI::Base::;
2348
2349use CFPlus::OpenGL;
2350
2351our %texture_cache;
2352
2353sub new {
2354 my $class = shift;
2355
2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2360
2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2363
2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2366
2367 CFPlus::weaken $texture_cache{$self->{path}};
2368
2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2370
2371 $self
2372}
2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2389sub size_request {
2390 my ($self) = @_;
2391
2392 ($self->{tex}{w}, $self->{tex}{h})
2393}
2394
2395sub _draw {
2396 my ($self) = @_;
2397
2398 my $tex = $self->{tex};
2399
2400 my ($w, $h) = ($self->{w}, $self->{h});
2401
2402 if ($self->{rot90}) {
2403 glRotate 90, 0, 0, 1;
2404 glTranslate 0, -$self->{w}, 0;
2405
2406 ($w, $h) = ($h, $w);
2407 }
2408
2409 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411
2412 $tex->draw_quad (0, 0, $w, $h);
2413
2414 glDisable GL_TEXTURE_2D;
2415}
2416
2417#############################################################################
2418
1994package CFClient::UI::ImageButton; 2419package CFPlus::UI::ImageButton;
1995 2420
1996our @ISA = CFClient::UI::Image::; 2421our @ISA = CFPlus::UI::Image::;
1997 2422
1998use CFClient::OpenGL; 2423use CFPlus::OpenGL;
1999 2424
2000my %textures; 2425my %textures;
2001 2426
2002sub new { 2427sub new {
2003 my $class = shift; 2428 my $class = shift;
… …
2025 1 2450 1
2026} 2451}
2027 2452
2028############################################################################# 2453#############################################################################
2029 2454
2030package CFClient::UI::CheckBox;
2031
2032our @ISA = CFClient::UI::DrawBG::;
2033
2034my @tex =
2035 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2036 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2037
2038use CFClient::OpenGL;
2039
2040sub new {
2041 my $class = shift;
2042
2043 $class->SUPER::new (
2044 padding_x => 2,
2045 padding_y => 2,
2046 fg => [1, 1, 1],
2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
2050 state => 0,
2051 can_hover => 1,
2052 @_
2053 )
2054}
2055
2056sub size_request {
2057 my ($self) = @_;
2058
2059 (6) x 2
2060}
2061
2062sub invoke_button_down {
2063 my ($self, $ev, $x, $y) = @_;
2064
2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
2073 1
2074}
2075
2076sub _draw {
2077 my ($self) = @_;
2078
2079 $self->SUPER::_draw;
2080
2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2082
2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2086
2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2088
2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
2091 glEnable GL_TEXTURE_2D;
2092 $tex->draw_quad_alpha (0, 0, $s, $s);
2093 glDisable GL_TEXTURE_2D;
2094}
2095
2096#############################################################################
2097
2098package CFClient::UI::Image; 2455package CFPlus::UI::VGauge;
2099 2456
2100our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
2101
2102use CFClient::OpenGL;
2103
2104our %texture_cache;
2105
2106sub new {
2107 my $class = shift;
2108
2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2113
2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2116
2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2119
2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2121
2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2123
2124 $self
2125}
2126
2127sub size_request {
2128 my ($self) = @_;
2129
2130 ($self->{tex}{w}, $self->{tex}{h})
2131}
2132
2133sub _draw {
2134 my ($self) = @_;
2135
2136 my $tex = $self->{tex};
2137
2138 my ($w, $h) = ($self->{w}, $self->{h});
2139
2140 if ($self->{rot90}) {
2141 glRotate 90, 0, 0, 1;
2142 glTranslate 0, -$self->{w}, 0;
2143
2144 ($w, $h) = ($h, $w);
2145 }
2146
2147 glEnable GL_TEXTURE_2D;
2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2149
2150 $tex->draw_quad_alpha (0, 0, $w, $h);
2151
2152 glDisable GL_TEXTURE_2D;
2153}
2154
2155#############################################################################
2156
2157package CFClient::UI::VGauge;
2158
2159our @ISA = CFClient::UI::Base::;
2160 2458
2161use List::Util qw(min max); 2459use List::Util qw(min max);
2162 2460
2163use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2164 2462
2165my %tex = ( 2463my %tex = (
2166 food => [ 2464 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2467 ],
2170 grace => [ 2468 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2471 ],
2174 hp => [ 2472 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2475 ],
2178 mana => [ 2476 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2180 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2479 ],
2182); 2480);
2183 2481
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2544
2247 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2546 my $h2 = $self->{h} * (1 - $ycut2);
2547 my $h3 = $self->{h};
2548
2549 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2550
2250 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2552 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2553 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
… …
2272 2573
2273 if ($t3) { 2574 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2581 glEnd;
2281 } 2582 }
2282 2583
2283 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2285} 2586}
2286 2587
2287############################################################################# 2588#############################################################################
2288 2589
2289package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2290 2591
2291our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2292 2593
2293sub new { 2594sub new {
2294 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2295 2596
2296 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2599 can_hover => 1,
2299 can_events => 1, 2600 can_events => 1,
2300 %arg, 2601 %arg,
2301 ); 2602 );
2302 2603
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2605 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2607
2307 $self 2608 $self
2308} 2609}
2309 2610
2310sub set_fontsize { 2611sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2332} 2633}
2333 2634
2334############################################################################# 2635#############################################################################
2335 2636
2336package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2337 2638
2338use strict; 2639use strict;
2339 2640
2340use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2341 2642
2342our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2343 2644
2344my @tex = 2645my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2347 2648
2348sub new { 2649sub new {
2349 my $class = shift; 2650 my $class = shift;
2350 2651
… …
2439 } 2740 }
2440 2741
2441 1 2742 1
2442} 2743}
2443 2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2755}
2756
2444sub update { 2757sub update {
2445 my ($self) = @_; 2758 my ($self) = @_;
2446 2759
2447 delete $self->{knob_w}; 2760 delete $self->{knob_w};
2448 $self->SUPER::update; 2761 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2496} 2809}
2497 2810
2498############################################################################# 2811#############################################################################
2499 2812
2500package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2501 2814
2502our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2503 2816
2504sub new { 2817sub new {
2505 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2506 2819
2507 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2508 2821
2509 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2825 to_value => sub { shift },
2513 from_value => sub { shift }, 2826 from_value => sub { shift },
2514 %arg, 2827 %arg,
2515 ); 2828 );
2516 2829
… …
2536sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2538 2851
2539############################################################################# 2852#############################################################################
2540 2853
2541package CFClient::UI::TextScroller; 2854package CFPlus::UI::TextScroller;
2542 2855
2543our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2544 2857
2545use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2546 2859
2547sub new { 2860sub new {
2548 my $class = shift; 2861 my $class = shift;
2549 2862
2550 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2551 fontsize => 1, 2864 fontsize => 1,
2552 can_events => 0, 2865 can_events => 1,
2553 indent => 0, 2866 indent => 0,
2554 #font => default_font 2867 #font => default_font
2555 @_, 2868 @_,
2556 2869
2557 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2558 par => [], 2871 par => [],
2872 max_par => 0,
2559 height => 0, 2873 height => 0,
2560 children => [ 2874 children => [
2561 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2563 ], 2877 ],
2564 ); 2878 );
2565 2879
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2567 2881
… …
2597 2911
2598 $self->reflow; 2912 $self->reflow;
2599 2913
2600 local $self->{children} = [$empty, $slider]; 2914 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2602} 2926}
2603 2927
2604sub get_layout { 2928sub get_layout {
2605 my ($self, $para) = @_; 2929 my ($self, $para) = @_;
2606 2930
… …
2634 2958
2635 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2637} 2961}
2638 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2639sub clear { 2978sub clear {
2640 my ($self) = @_; 2979 my ($self) = @_;
2641 2980
2642 my (undef, undef, @other) = @{ $self->{children} }; 2981 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 2982 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 2985 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 2987}
2649 2988
2650sub add_paragraph { 2989sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 2990 my $self = shift;
2652 2991
2653 my ($text, @w) = ref $para ? @$para : $para; 2992 for my $para (@_) {
2654
2655 $para = { 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 2999 w => 1e10,
2657 wrapped => 1, 3000 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 3001 };
2663 3002
2664 $self->add (@w) if @w; 3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
2666 3010
2667 $self->{need_reflow}++; 3011 $self->{need_reflow}++;
2668 $self->update; 3012 $self->update;
2669} 3013}
2670 3014
2671sub scroll_to_bottom { 3015sub scroll_to_bottom {
2672 my ($self) = @_; 3016 my ($self) = @_;
2673 3017
2674 $self->{scroll_to_bottom} = 1; 3018 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3019 $self->update;
2676} 3020}
2677 3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
3044 $self->{height} = $height;
3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3046
3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
3053}
3054
2678sub update { 3055sub update {
2679 my ($self) = @_; 3056 my ($self) = @_;
2680 3057
2681 $self->SUPER::update; 3058 $self->SUPER::update;
2682 3059
2683 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2684 3061
2685 delete $self->{texture}; 3062 delete $self->{texture};
2686 3063
2687 $ROOT->on_post_alloc ($self => sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3068
2690 if (delete $self->{need_reflow}) {
2691 my $height = 0;
2692
2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2705
2706 $self->{height} = $height;
2707
2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2709
2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2720 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2722 3082
2723 my $y0 = $top; 3083 my $y0 = $top;
2724 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2725 3085
2726 my $y = 0;
2727
2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2731
2732 for my $para (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2734 3089
2735 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3091 my $layout = $self->get_layout ($para);
2738 3092
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3093 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3094
2744 if (my @w = @{ $para->{widget} }) { 3095 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3096 my @s = $layout->get_shapes;
2746 3097
2747 for (@w) { 3098 for (@w) {
… …
2753 $_->draw; 3104 $_->draw;
2754 } 3105 }
2755 } 3106 }
2756 } 3107 }
2757 3108
2758 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3111 }
2760 3112
2761 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2762 }; 3114 };
2763 }); 3115 });
2764} 3116}
2765 3117
2766sub reconfigure { 3118sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2785} 3137}
2786 3138
2787############################################################################# 3139#############################################################################
2788 3140
2789package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2790 3142
2791use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2792 3144
2793our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2794 3146
2795sub moveto { 3147sub moveto {
2796 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2797 3149
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3178 glPopMatrix;
2827} 3179}
2828 3180
2829############################################################################# 3181#############################################################################
2830 3182
2831package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2832 3184
2833our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2834 3186
2835sub new { 3187sub new {
2836 my $class = shift; 3188 my $class = shift;
2837 3189
2838 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2851} 3203}
2852 3204
2853############################################################################# 3205#############################################################################
2854 3206
2855package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2856 3208
2857our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2858 3210
2859use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2860 3212
2861sub new { 3213sub new {
2862 my $class = shift; 3214 my $class = shift;
2863 3215
2864 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2867 ) 3219 )
2868} 3220}
2869 3221
2870sub set_tooltip_from { 3222sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3227
2873 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2874 3229
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3235 }
2881 3236
2882 $tooltip =~ s/^\n+//; 3237 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3238 $tooltip =~ s/\n+$//;
2884 3239
2885 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3241 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3243 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3245 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3247 );
2893} 3248}
2894 3249
… …
2913 3268
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2916 or return; 3271 or return;
2917 3272
3273 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3275
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3277 if $x + $self->{w} > $self->{root}{w};
2922 3278
2923 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2924 }); 3283 });
2925} 3284}
2926 3285
2927sub _draw { 3286sub _draw {
2928 my ($self) = @_; 3287 my ($self) = @_;
… …
2952 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2953} 3312}
2954 3313
2955############################################################################# 3314#############################################################################
2956 3315
2957package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2958 3317
2959our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2960 3319
2961use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2962 3321
2963sub new { 3322sub new {
2964 my $class = shift; 3323 my $class = shift;
2965 3324
2966 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2968 can_events => 0, 3327 can_events => 0,
2969 @_, 3328 @_,
2970 ); 3329 );
2971 3330
2972 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2974 3333
2975 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3336 hard => 1,
2978 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
2979 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
2980 ++$widget->{frame}; 3340 ++$widget->{frame};
2981 $widget->update; 3341 $widget->update;
2982 }, 3342 },
2983 ); 3343 );
2984 } 3344 }
… …
3001sub _draw { 3361sub _draw {
3002 my ($self) = @_; 3362 my ($self) = @_;
3003 3363
3004 return unless $::CONN; 3364 return unless $::CONN;
3005 3365
3366 $self->SUPER::_draw;
3367
3006 my $face; 3368 my $face;
3007 3369
3008 if ($self->{frame}) { 3370 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
3010 3372
3011 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim; 3374 if $anim && @$anim;
3013 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3014 3379
3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
3016 3381
3017 if ($tex) { 3382 if ($tex) {
3018 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3022 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3023 } 3392 }
3024} 3393}
3025 3394
3026sub destroy { 3395sub destroy {
3027 my ($self) = @_; 3396 my ($self) = @_;
… …
3032 $self->SUPER::destroy; 3401 $self->SUPER::destroy;
3033} 3402}
3034 3403
3035############################################################################# 3404#############################################################################
3036 3405
3037package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
3038 3407
3039our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
3040 3409
3041# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
3042 3411
3043############################################################################# 3412#############################################################################
3044 3413
3045package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
3046 3415
3047our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
3048 3417
3049use CFClient::OpenGL; 3418use CFPlus::OpenGL;
3050 3419
3051sub new { 3420sub new {
3052 my $class = shift; 3421 my $class = shift;
3053 3422
3054 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
3055 items => [], 3424 items => [],
3056 z => 100, 3425 z => 100,
3057 @_, 3426 @_,
3058 ); 3427 );
3059 3428
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3430
3062 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
3064 3433
3065 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
3066 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
3067 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3440 can_hover => 1,
3069 can_events => 1, 3441 can_events => 1,
3442 tooltip => $tooltip,
3443 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ],
3447 ;
3448
3449 } else {
3450 $widget = new CFPlus::UI::Label
3451 can_hover => 1,
3452 can_events => 1,
3070 markup => $widget, 3453 markup => $widget,
3071 tooltip => $tooltip 3454 tooltip => $tooltip;
3455 }
3072 } 3456 }
3073 3457
3074 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
3075 3459
3076 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
3119 1 3503 1
3120} 3504}
3121 3505
3122############################################################################# 3506#############################################################################
3123 3507
3124package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
3125 3509
3126our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
3127 3511
3128sub new { 3512sub new {
3129 my $class = shift; 3513 my $class = shift;
3130 3514
3131 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
… …
3145 3529
3146 $self->{current} = $self->{children}[0] 3530 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3531 if @{ $self->{children} };
3148} 3532}
3149 3533
3534sub get_current_page {
3535 my ($self) = @_;
3536
3537 $self->{current}
3538}
3539
3150sub set_current_page { 3540sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3541 my ($self, $page_or_widget) = @_;
3152 3542
3153 my $widget = ref $page_or_widget 3543 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3544 ? $page_or_widget
… …
3186 $self->{current}->draw; 3576 $self->{current}->draw;
3187} 3577}
3188 3578
3189############################################################################# 3579#############################################################################
3190 3580
3191package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3192 3582
3193our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3194 3584
3195sub new { 3585sub new {
3196 my $class = shift; 3586 my $class = shift;
3197 3587
3198 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self 3591 # filter => # will be put between multiplexer and $self
3202 @_, 3592 @_,
3203 ); 3593 );
3204 3594
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3209} 3599}
3210 3600
3211sub add { 3601sub add {
3212 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3213 3603
3214 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3215 3605
3216 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3217 markup => $title, 3607 markup => $title,
3218 tooltip => $tooltip, 3608 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3220 ); 3610 );
3221 3611
3222 $self->{multiplexer}->add ($widget); 3612 $self->{multiplexer}->add ($widget);
3223} 3613}
3224 3614
3615sub get_current_page {
3616 my ($self) = @_;
3617
3618 $self->{multiplexer}->get_current_page
3619}
3620
3225sub set_current_page { 3621sub set_current_page {
3226 my ($self, $page) = @_; 3622 my ($self, $page) = @_;
3227 3623
3228 $self->{multiplexer}->set_current_page ($page); 3624 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 3626}
3231 3627
3232############################################################################# 3628#############################################################################
3233 3629
3234package CFClient::UI::Combobox; 3630package CFPlus::UI::Selector;
3235 3631
3236use utf8; 3632use utf8;
3237 3633
3238our @ISA = CFClient::UI::Button::; 3634our @ISA = CFPlus::UI::Button::;
3239 3635
3240sub new { 3636sub new {
3241 my $class = shift; 3637 my $class = shift;
3242 3638
3243 my $self = $class->SUPER::new ( 3639 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 3656 my ($value, $title, $tooltip) = @$_;
3261 3657
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 3659 }
3264 3660
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 3662}
3267 3663
3268sub _set_value { 3664sub _set_value {
3269 my ($self, $value) = @_; 3665 my ($self, $value) = @_;
3270 3666
… …
3285 $self->emit (changed => $value); 3681 $self->emit (changed => $value);
3286} 3682}
3287 3683
3288############################################################################# 3684#############################################################################
3289 3685
3290package CFClient::UI::Statusbox; 3686package CFPlus::UI::Statusbox;
3291 3687
3292our @ISA = CFClient::UI::VBox::; 3688our @ISA = CFPlus::UI::VBox::;
3293 3689
3294sub new { 3690sub new {
3295 my $class = shift; 3691 my $class = shift;
3296 3692
3297 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 3694 fontsize => 0.8,
3299 @_, 3695 @_,
3300 ); 3696 );
3301 3697
3302 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3303 3699
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305 3701
3306 $self 3702 $self
3307} 3703}
… …
3309sub reorder { 3705sub reorder {
3310 my ($self) = @_; 3706 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 3707 my $NOW = Time::HiRes::time;
3312 3708
3313 # freeze display when hovering over any label 3709 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 3710 return if $CFPlus::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 3712 values %{ $self->{item} };
3317 3713
3318 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 3716 }
… …
3341 for ($short) { 3737 for ($short) {
3342 s/^\s+//; 3738 s/^\s+//;
3343 s/\s+/ /g; 3739 s/\s+/ /g;
3344 } 3740 }
3345 3741
3346 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3347 markup => $short, 3743 markup => $short,
3348 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3405 count => 1, 3801 count => 1,
3406 %arg, 3802 %arg,
3407 }; 3803 };
3408 } 3804 }
3409 3805
3806 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 3807 $self->reorder;
3808 });
3411} 3809}
3412 3810
3413sub reconfigure { 3811sub reconfigure {
3414 my ($self) = @_; 3812 my ($self) = @_;
3415 3813
… …
3428 $self->SUPER::destroy; 3826 $self->SUPER::destroy;
3429} 3827}
3430 3828
3431############################################################################# 3829#############################################################################
3432 3830
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
3693 @_,
3694 )
3695}
3696
3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3698
3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3709
3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
3783 my ($self, $spell) = @_;
3784
3785 $self->{spell}->{$spell->{name}} = $spell;
3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root; 3831package CFPlus::UI::Root;
3806 3832
3807our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3808 3834
3809use List::Util qw(min max); 3835use List::Util qw(min max);
3810 3836
3811use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3812 3838
3813sub new { 3839sub new {
3814 my $class = shift; 3840 my $class = shift;
3815 3841
3816 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3817 visible => 1, 3843 visible => 1,
3818 @_, 3844 @_,
3819 ); 3845 );
3820 3846
3821 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3822 3848
3823 $self 3849 $self
3824} 3850}
3825 3851
3826sub size_request { 3852sub size_request {
… …
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 4019
3994 $w = 0 if $w < 0; 4020 $w = 0 if $w < 0;
3995 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
3996 4022
4023 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h;
4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031
3997 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
3999 4034
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 4036 $widget->{old_w} = $widget->{w};
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 4061 glLoadIdentity;
4027 4062
4028 { 4063 {
4029 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
4030 4065
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4068
4035 $self->_draw; 4069 $self->_draw;
4070 }
4036} 4071}
4037 4072
4038############################################################################# 4073#############################################################################
4039 4074
4040package CFClient::UI; 4075package CFPlus::UI;
4041 4076
4042$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044 4079
40451 40801
4046 4081

Diff Legend

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