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.370 by root, Sun Jul 15 21:02:20 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 ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1112}
1113
997sub update { 1114sub update {
998 my ($self) = @_; 1115 my ($self) = @_;
999 1116
1000 $self->SUPER::update; 1117 $self->SUPER::update;
1001 1118 $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} 1119}
1006 1120
1007sub invoke_size_allocate { 1121sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1009 1123
1010 my $child = $self->{vp}->child; 1124 $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) 1125 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1126}
1015 1127
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1128#############################################################################
1020 1129
1021package CFClient::UI::Frame; 1130package CFPlus::UI::Frame;
1022 1131
1023our @ISA = CFClient::UI::Bin::; 1132our @ISA = CFPlus::UI::Bin::;
1024 1133
1025use CFClient::OpenGL; 1134use CFPlus::OpenGL;
1026 1135
1027sub new { 1136sub new {
1028 my $class = shift; 1137 my $class = shift;
1029 1138
1030 $class->SUPER::new ( 1139 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1165 $self->SUPER::_draw;
1057} 1166}
1058 1167
1059############################################################################# 1168#############################################################################
1060 1169
1061package CFClient::UI::FancyFrame; 1170package CFPlus::UI::FancyFrame;
1062 1171
1063our @ISA = CFClient::UI::Bin::; 1172our @ISA = CFPlus::UI::Bin::;
1064 1173
1065use CFClient::OpenGL; 1174use CFPlus::OpenGL;
1175
1176sub new {
1177 my ($class, %arg) = @_;
1178
1179 if ((exists $arg{label}) && !ref $arg{label}) {
1180 $arg{label} = new CFPlus::UI::Label
1181 align => 1,
1182 valign => 0,
1183 text => $arg{label},
1184 fontsize => ($arg{border} || 0.8) * 0.75;
1185 }
1186
1187 my $self = $class->SUPER::new (
1188 # label => "",
1189 fg => [0.6, 0.3, 0.1],
1190 border => 0.8,
1191 style => 'single',
1192 %arg,
1193 );
1194
1195 $self
1196}
1197
1198sub add {
1199 my ($self, @widgets) = @_;
1200
1201 $self->SUPER::add (@widgets);
1202 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1203}
1204
1205sub border {
1206 int $_[0]{border} * $::FONTSIZE
1207}
1208
1209sub size_request {
1210 my ($self) = @_;
1211
1212 ($self->{label_w}, undef) = $self->{label}->size_request
1213 if $self->{label};
1214
1215 my ($w, $h) = $self->SUPER::size_request;
1216
1217 (
1218 $w + $self->border * 2,
1219 $h + $self->border * 2,
1220 )
1221}
1222
1223sub invoke_size_allocate {
1224 my ($self, $w, $h) = @_;
1225
1226 my $border = $self->border;
1227
1228 $w -= List::Util::max 0, $border * 2;
1229 $h -= List::Util::max 0, $border * 2;
1230
1231 if (my $label = $self->{label}) {
1232 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1233 $label->{h} = List::Util::min $h, $border;
1234 $label->invoke_size_allocate ($label->{w}, $label->{h});
1235 }
1236
1237 $self->child->configure ($border, $border, $w, $h);
1238
1239 1
1240}
1241
1242sub _draw {
1243 my ($self) = @_;
1244
1245 my $child = $self->{children}[0];
1246
1247 my $border = $self->border;
1248 my ($w, $h) = ($self->{w}, $self->{h});
1249
1250 $child->draw;
1251
1252 glColor @{$self->{fg}};
1253 glBegin GL_LINE_STRIP;
1254 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1255 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1256 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1257 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1258 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1259 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1260 glEnd;
1261
1262 if ($self->{label}) {
1263 glTranslate $border * 2, 0;
1264 $self->{label}->_draw;
1265 }
1266}
1267
1268#############################################################################
1269
1270package CFPlus::UI::Toplevel;
1271
1272our @ISA = CFPlus::UI::Bin::;
1273
1274use CFPlus::OpenGL;
1066 1275
1067my $bg = 1276my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1277 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1278 mipmap => 1, wrap => 1;
1070 1279
1071my @border = 1280my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1281 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); 1282 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1283
1075sub new { 1284sub new {
1076 my ($class, %arg) = @_; 1285 my ($class, %arg) = @_;
1077 1286
1078 my $self = $class->SUPER::new ( 1287 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1288 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1289 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1290 border => 0.6,
1082 can_events => 1, 1291 can_events => 1,
1083 min_w => 16, 1292 min_w => 64,
1084 min_h => 16, 1293 min_h => 32,
1085 %arg, 1294 %arg,
1086 ); 1295 );
1087 1296
1088 $self->{title_widget} = new CFClient::UI::Label 1297 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1298 align => 0,
1090 valign => 1, 1299 valign => 1,
1091 text => $self->{title}, 1300 text => $self->{title},
1092 fontsize => $self->{border}, 1301 fontsize => $self->{border},
1093 if exists $self->{title}; 1302 if exists $self->{title};
1094 1303
1095 if ($self->{has_close_button}) { 1304 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1305 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1306 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1307 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1308 on_activate => sub { $self->emit ("delete") };
1100 1309
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1310 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1311 }
1103 1312
1104 $self 1313 $self
1105} 1314}
1106 1315
1107sub add { 1316sub add {
1108 my ($self, @widgets) = @_; 1317 my ($self, @widgets) = @_;
1109 1318
1110 $self->SUPER::add (@widgets); 1319 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1320 $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}; 1321 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1322}
1114 1323
1115sub border { 1324sub border {
1116 int $_[0]{border} * $::FONTSIZE 1325 int $_[0]{border} * $::FONTSIZE
1117} 1326}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1359 $self->child->configure ($border, $border, $w, $h);
1151 1360
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1361 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1362 if $self->{close_button};
1154 1363
1364 1
1365}
1366
1367sub invoke_delete {
1368 my ($self) = @_;
1369
1370 $self->hide;
1371
1155 1 1372 1
1156} 1373}
1157 1374
1158sub invoke_button_down { 1375sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1376 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1434 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1435
1219 ! ! $self->{motion} 1436 ! ! $self->{motion}
1220} 1437}
1221 1438
1439sub invoke_visibility_change {
1440 my ($self, $visible) = @_;
1441
1442 delete $self->{motion} unless $visible;
1443
1444 0
1445}
1446
1222sub _draw { 1447sub _draw {
1223 my ($self) = @_; 1448 my ($self) = @_;
1224 1449
1225 my $child = $self->{children}[0]; 1450 my $child = $self->{children}[0];
1226 1451
… …
1263 if $self->{close_button}; 1488 if $self->{close_button};
1264} 1489}
1265 1490
1266############################################################################# 1491#############################################################################
1267 1492
1268package CFClient::UI::Table; 1493package CFPlus::UI::Table;
1269 1494
1270our @ISA = CFClient::UI::Base::; 1495our @ISA = CFPlus::UI::Base::;
1271 1496
1272use List::Util qw(max sum); 1497use List::Util qw(max sum);
1273 1498
1274use CFClient::OpenGL; 1499use CFPlus::OpenGL;
1275 1500
1276sub new { 1501sub new {
1277 my $class = shift; 1502 my $class = shift;
1278 1503
1279 $class->SUPER::new ( 1504 $class->SUPER::new (
1280 col_expand => [], 1505 col_expand => [],
1506 row_expand => [],
1281 @_, 1507 @_,
1282 ) 1508 )
1283} 1509}
1284 1510
1285sub children { 1511sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1512 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287} 1513}
1288 1514
1289sub add { 1515sub add {
1290 my ($self, $x, $y, $child) = @_; 1516 my ($self) = shift;
1291 1517
1518 while (@_) {
1519 my ($x, $y, $child) = splice @_, 0, 3, ();
1292 $child->set_parent ($self); 1520 $child->set_parent ($self);
1293 $self->{children}[$y][$x] = $child; 1521 $self->{children}[$y][$x] = $child;
1522 }
1294 1523
1524 $self->{force_realloc} = 1;
1525 $self->{force_size_alloc} = 1;
1295 $self->realloc; 1526 $self->realloc;
1296} 1527}
1297 1528
1298sub remove { 1529sub remove {
1299 my ($self, $child) = @_; 1530 my ($self, $child) = @_;
… …
1355 my ($ws, $hs) = $self->get_wh; 1586 my ($ws, $hs) = $self->get_wh;
1356 1587
1357 my $req_w = (sum @$ws) || 1; 1588 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1589 my $req_h = (sum @$hs) || 1;
1359 1590
1360 # TODO: nicer code && do row_expand 1591 # TODO: nicer code
1361 my @col_expand = @{$self->{col_expand}}; 1592 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1593 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1594 my $col_expand = (sum @col_expand) || 1;
1364 1595
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1597
1369 CFClient::UI::harmonize $ws; 1598 CFPlus::UI::harmonize $ws;
1599
1600 my @row_expand = @{$self->{row_expand}};
1601 @row_expand = (1) x @$ws unless @row_expand;
1602 my $row_expand = (sum @row_expand) || 1;
1603
1604 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605
1370 CFClient::UI::harmonize $hs; 1606 CFPlus::UI::harmonize $hs;
1371 1607
1372 my $y; 1608 my $y;
1373 1609
1374 for my $r (0 .. $#{$self->{children}}) { 1610 for my $r (0 .. $#{$self->{children}}) {
1375 my $row = $self->{children}[$r] 1611 my $row = $self->{children}[$r]
… …
1418 } 1654 }
1419} 1655}
1420 1656
1421############################################################################# 1657#############################################################################
1422 1658
1423package CFClient::UI::Box; 1659package CFPlus::UI::Box;
1424 1660
1425our @ISA = CFClient::UI::Container::; 1661our @ISA = CFPlus::UI::Container::;
1426 1662
1427sub size_request { 1663sub size_request {
1428 my ($self) = @_; 1664 my ($self) = @_;
1429 1665
1430 $self->{vertical} 1666 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1699 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1700 for 0 .. $#children;
1465 } 1701 }
1466 } 1702 }
1467 1703
1468 CFClient::UI::harmonize \@req; 1704 CFPlus::UI::harmonize \@req;
1469 1705
1470 my $pos = 0; 1706 my $pos = 0;
1471 for (0 .. $#children) { 1707 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1708 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1709 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1714 1
1479} 1715}
1480 1716
1481############################################################################# 1717#############################################################################
1482 1718
1483package CFClient::UI::HBox; 1719package CFPlus::UI::HBox;
1484 1720
1485our @ISA = CFClient::UI::Box::; 1721our @ISA = CFPlus::UI::Box::;
1486 1722
1487sub new { 1723sub new {
1488 my $class = shift; 1724 my $class = shift;
1489 1725
1490 $class->SUPER::new ( 1726 $class->SUPER::new (
… …
1493 ) 1729 )
1494} 1730}
1495 1731
1496############################################################################# 1732#############################################################################
1497 1733
1498package CFClient::UI::VBox; 1734package CFPlus::UI::VBox;
1499 1735
1500our @ISA = CFClient::UI::Box::; 1736our @ISA = CFPlus::UI::Box::;
1501 1737
1502sub new { 1738sub new {
1503 my $class = shift; 1739 my $class = shift;
1504 1740
1505 $class->SUPER::new ( 1741 $class->SUPER::new (
… …
1508 ) 1744 )
1509} 1745}
1510 1746
1511############################################################################# 1747#############################################################################
1512 1748
1513package CFClient::UI::Label; 1749package CFPlus::UI::Label;
1514 1750
1515our @ISA = CFClient::UI::DrawBG::; 1751our @ISA = CFPlus::UI::DrawBG::;
1516 1752
1517use CFClient::OpenGL; 1753use CFPlus::OpenGL;
1518 1754
1519sub new { 1755sub new {
1520 my ($class, %arg) = @_; 1756 my ($class, %arg) = @_;
1521 1757
1522 my $self = $class->SUPER::new ( 1758 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1761 #active_bg => none
1526 #font => default_font 1762 #font => default_font
1527 #text => initial text 1763 #text => initial text
1528 #markup => initial narkup 1764 #markup => initial narkup
1529 #max_w => maximum pixel width 1765 #max_w => maximum pixel width
1766 #style => 0, # render flags
1530 ellipsise => 3, # end 1767 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1768 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1769 fontsize => 1,
1533 align => -1, 1770 align => -1,
1534 valign => -1, 1771 valign => -1,
1535 padding_x => 2, 1772 padding_x => 2,
1536 padding_y => 2, 1773 padding_y => 2,
1537 can_events => 0, 1774 can_events => 0,
1538 %arg 1775 %arg
1539 ); 1776 );
1540 1777
1541 if (exists $self->{template}) { 1778 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1779 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1780 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1781 $self->{template} = $layout;
1545 } 1782 }
1546 1783
1547 if (exists $self->{markup}) { 1784 if (exists $self->{markup}) {
… …
1551 } 1788 }
1552 1789
1553 $self 1790 $self
1554} 1791}
1555 1792
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1793sub update {
1567 my ($self) = @_; 1794 my ($self) = @_;
1568 1795
1569 delete $self->{texture}; 1796 delete $self->{texture};
1570 $self->SUPER::update; 1797 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1808 my ($self, $text) = @_;
1582 1809
1583 return if $self->{text} eq "T$text"; 1810 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1811 $self->{text} = "T$text";
1585 1812
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1813 $self->{layout}->set_text ($text);
1588 1814
1589 delete $self->{size_req}; 1815 delete $self->{size_req};
1590 $self->realloc; 1816 $self->realloc;
1591 $self->update; 1817 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1823 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1824 $self->{text} = "M$markup";
1599 1825
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1826 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1827
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1828 $self->{layout}->set_markup ($markup);
1604 1829
1605 delete $self->{size_req}; 1830 delete $self->{size_req};
1606 $self->realloc; 1831 $self->realloc;
1607 $self->update; 1832 $self->update;
… …
1619 1844
1620 my ($w, $h) = $self->{layout}->size; 1845 my ($w, $h) = $self->{layout}->size;
1621 1846
1622 if (exists $self->{template}) { 1847 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1848 $self->{template}->set_font ($self->{font}) if $self->{font};
1849 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1850 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1851
1626 my ($w2, $h2) = $self->{template}->size; 1852 my ($w2, $h2) = $self->{template}->size;
1627 1853
1628 $w = List::Util::max $w, $w2; 1854 $w = List::Util::max $w, $w2;
… …
1652 1878
1653sub set_fontsize { 1879sub set_fontsize {
1654 my ($self, $fontsize) = @_; 1880 my ($self, $fontsize) = @_;
1655 1881
1656 $self->{fontsize} = $fontsize; 1882 $self->{fontsize} = $fontsize;
1883 delete $self->{size_req};
1657 delete $self->{texture}; 1884 delete $self->{texture};
1658 1885
1659 $self->realloc; 1886 $self->realloc;
1660} 1887}
1661 1888
1662sub reconfigure { 1889sub reconfigure {
1663 my ($self) = @_; 1890 my ($self) = @_;
1664 1891
1665 delete $self->{size_req}; 1892 delete $self->{size_req};
1893 delete $self->{texture};
1666 1894
1667 $self->SUPER::reconfigure; 1895 $self->SUPER::reconfigure;
1668} 1896}
1669 1897
1670sub _draw { 1898sub _draw {
1671 my ($self) = @_; 1899 my ($self) = @_;
1672 1900
1673 $self->SUPER::_draw; # draw background, if applicable 1901 $self->SUPER::_draw; # draw background, if applicable
1674 1902
1675 my $tex = $self->{texture} ||= do { 1903 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 1904 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1905 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 1906 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1907 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1908 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 1910
1683 new_from_layout CFClient::Texture $self->{layout} 1911 [$self->{layout}->size]
1684 }; 1912 };
1685 1913
1686 unless (exists $self->{ox}) { 1914 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1915 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1916 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 1917 : ($self->{w} - $size->[0]) * 0.5);
1690 1918
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1919 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1920 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 1921 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 1922 };
1695 1923
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1924 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1925 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 1926
1701 if ($tex->{format} == GL_ALPHA) { 1927 $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} 1928}
1712 1929
1713############################################################################# 1930#############################################################################
1714 1931
1715package CFClient::UI::EntryBase; 1932package CFPlus::UI::EntryBase;
1716 1933
1717our @ISA = CFClient::UI::Label::; 1934our @ISA = CFPlus::UI::Label::;
1718 1935
1719use CFClient::OpenGL; 1936use CFPlus::OpenGL;
1720 1937
1721sub new { 1938sub new {
1722 my $class = shift; 1939 my $class = shift;
1723 1940
1724 $class->SUPER::new ( 1941 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 1945 active_fg => [0, 0, 0],
1729 can_hover => 1, 1946 can_hover => 1,
1730 can_focus => 1, 1947 can_focus => 1,
1731 valign => 0, 1948 valign => 0,
1732 can_events => 1, 1949 can_events => 1,
1950 ellipsise => 0,
1733 #text => ... 1951 #text => ...
1734 #hidden => "*", 1952 #hidden => "*",
1735 @_ 1953 @_
1736 ) 1954 )
1737} 1955}
… …
1782 my $sym = $ev->{sym}; 2000 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2001 my $uni = $ev->{unicode};
1784 2002
1785 my $text = $self->get_text; 2003 my $text = $self->get_text;
1786 2004
2005 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2006
1787 if ($uni == 8) { 2007 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2009 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2010 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2011 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2012 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2013 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2014 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2015 } elsif ($sym == CFPlus::SDLK_HOME) {
2016 # what a hack
2017 $self->{cursor} =
2018 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2019 ? length $1
2020 : 0;
2021 } elsif ($sym == CFPlus::SDLK_END) {
2022 # uh, again
2023 $self->{cursor} =
2024 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2025 ? $self->{cursor} + length $1
2026 : length $self->{text};
2027 } elsif ($uni == 21) { # ctrl-u
2028 $text = "";
1796 $self->{cursor} = 0; 2029 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2030 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2031 $self->emit ('escape');
1801 } elsif ($uni) { 2032 } elsif ($uni == 0x0d) {
2033 substr $text, $self->{cursor}++, 0, "\012";
2034 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2035 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2036 } else {
1804 return 0; 2037 return 0;
1805 } 2038 }
1806 2039
1807 $self->_set_text ($text); 2040 $self->_set_text ($text);
1808 2041
1809 $self->realloc; 2042 $self->realloc;
2043 $self->update;
1810 2044
1811 1 2045 1
1812} 2046}
1813 2047
1814sub invoke_focus_in { 2048sub invoke_focus_in {
… …
1826 2060
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2061 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2062
1829 # byte-index to char-index 2063 # byte-index to char-index
1830 my $text = $self->{text}; 2064 my $text = $self->{text};
1831 utf8::encode $text; 2065 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2066 $self->{cursor} = length $text;
1833 2067
1834 $self->_set_text ($self->{text}); 2068 $self->_set_text ($self->{text});
1835 $self->update; 2069 $self->update;
1836 2070
1837 1 2071 1
… …
1876 utf8::encode $text; 2110 utf8::encode $text;
1877 2111
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2112 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2113 }
1880 2114
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2115 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2116 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}; 2117 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2118 glEnd;
1886 } 2119 }
1887} 2120}
1888 2121
2122#############################################################################
2123
1889package CFClient::UI::Entry; 2124package CFPlus::UI::Entry;
1890 2125
1891our @ISA = CFClient::UI::EntryBase::; 2126our @ISA = CFPlus::UI::EntryBase::;
1892 2127
1893use CFClient::OpenGL; 2128use CFPlus::OpenGL;
1894 2129
1895sub invoke_key_down { 2130sub invoke_key_down {
1896 my ($self, $ev) = @_; 2131 my ($self, $ev) = @_;
1897 2132
1898 my $sym = $ev->{sym}; 2133 my $sym = $ev->{sym};
1899 2134
1900 if ($sym == 13) { 2135 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2136 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2137 my $txt = $self->get_text;
1903 2138
1904 $self->{history_pointer} = -1; 2139 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2140 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2141 $self->emit (activate => $txt);
1907 $self->update; 2142 $self->update;
1908 2143
1909 } elsif ($sym == CFClient::SDLK_UP) { 2144 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2145 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2146 $self->{history_saveback} = $self->get_text;
1912 } 2147 }
1913 if (@{$self->{history} || []} > 0) { 2148 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2149 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2151 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2152 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2153 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2154 }
1920 2155
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2156 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2157 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2158 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2159
1925 if ($self->{history_pointer} >= 0) { 2160 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2161 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2170 1
1936} 2171}
1937 2172
1938############################################################################# 2173#############################################################################
1939 2174
2175package CFPlus::UI::TextEdit;
2176
2177our @ISA = CFPlus::UI::EntryBase::;
2178
2179use CFPlus::OpenGL;
2180
2181sub move_cursor_ver {
2182 my ($self, $dy) = @_;
2183
2184 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2185
2186 $y += $dy;
2187
2188 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2189 $self->{cursor} = $index;
2190 delete $self->{cur_h};
2191 $self->update;
2192 return;
2193 }
2194}
2195
2196sub invoke_key_down {
2197 my ($self, $ev) = @_;
2198
2199 my $sym = $ev->{sym};
2200
2201 if ($sym == CFPlus::SDLK_UP) {
2202 $self->move_cursor_ver (-1);
2203 } elsif ($sym == CFPlus::SDLK_DOWN) {
2204 $self->move_cursor_ver (+1);
2205 } else {
2206 return $self->SUPER::invoke_key_down ($ev)
2207 }
2208
2209 1
2210}
2211
2212#############################################################################
2213
1940package CFClient::UI::Button; 2214package CFPlus::UI::Button;
1941 2215
1942our @ISA = CFClient::UI::Label::; 2216our @ISA = CFPlus::UI::Label::;
1943 2217
1944use CFClient::OpenGL; 2218use CFPlus::OpenGL;
1945 2219
1946my @tex = 2220my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2221 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2222 qw(b1_button_active.png);
1949 2223
1950sub new { 2224sub new {
1951 my $class = shift; 2225 my $class = shift;
1952 2226
… …
1989 $self->SUPER::_draw; 2263 $self->SUPER::_draw;
1990} 2264}
1991 2265
1992############################################################################# 2266#############################################################################
1993 2267
2268package CFPlus::UI::CheckBox;
2269
2270our @ISA = CFPlus::UI::DrawBG::;
2271
2272my @tex =
2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2275
2276use CFPlus::OpenGL;
2277
2278sub new {
2279 my $class = shift;
2280
2281 $class->SUPER::new (
2282 padding_x => 2,
2283 padding_y => 2,
2284 fg => [1, 1, 1],
2285 active_fg => [1, 1, 0],
2286 bg => [0, 0, 0, 0.2],
2287 active_bg => [1, 1, 1, 0.5],
2288 state => 0,
2289 can_hover => 1,
2290 @_
2291 )
2292}
2293
2294sub size_request {
2295 my ($self) = @_;
2296
2297 (6) x 2
2298}
2299
2300sub toggle {
2301 my ($self) = @_;
2302
2303 $self->{state} = !$self->{state};
2304 $self->emit (changed => $self->{state});
2305 $self->update;
2306}
2307
2308sub invoke_button_down {
2309 my ($self, $ev, $x, $y) = @_;
2310
2311 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2312 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2313 $self->toggle;
2314 } else {
2315 return 0
2316 }
2317
2318 1
2319}
2320
2321sub _draw {
2322 my ($self) = @_;
2323
2324 $self->SUPER::_draw;
2325
2326 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2327
2328 my ($w, $h) = @$self{qw(w h)};
2329
2330 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2331
2332 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2333
2334 my $tex = $self->{state} ? $tex[1] : $tex[0];
2335
2336 glEnable GL_TEXTURE_2D;
2337 $tex->draw_quad_alpha (0, 0, $s, $s);
2338 glDisable GL_TEXTURE_2D;
2339}
2340
2341#############################################################################
2342
2343package CFPlus::UI::Image;
2344
2345our @ISA = CFPlus::UI::Base::;
2346
2347use CFPlus::OpenGL;
2348
2349our %texture_cache;
2350
2351sub new {
2352 my $class = shift;
2353
2354 my $self = $class->SUPER::new (
2355 can_events => 0,
2356 @_,
2357 );
2358
2359 $self->{path} || $self->{tex}
2360 or Carp::croak "'path' or 'tex' attributes required";
2361
2362 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2363 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2364
2365 CFPlus::weaken $texture_cache{$self->{path}};
2366
2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2368
2369 $self
2370}
2371
2372sub STORABLE_freeze {
2373 my ($self, $cloning) = @_;
2374
2375 $self->{path}
2376 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2377
2378 $self->{path}
2379}
2380
2381sub STORABLE_attach {
2382 my ($self, $cloning, $path) = @_;
2383
2384 $self->new (path => $path)
2385}
2386
2387sub size_request {
2388 my ($self) = @_;
2389
2390 ($self->{tex}{w}, $self->{tex}{h})
2391}
2392
2393sub _draw {
2394 my ($self) = @_;
2395
2396 my $tex = $self->{tex};
2397
2398 my ($w, $h) = ($self->{w}, $self->{h});
2399
2400 if ($self->{rot90}) {
2401 glRotate 90, 0, 0, 1;
2402 glTranslate 0, -$self->{w}, 0;
2403
2404 ($w, $h) = ($h, $w);
2405 }
2406
2407 glEnable GL_TEXTURE_2D;
2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2409
2410 $tex->draw_quad (0, 0, $w, $h);
2411
2412 glDisable GL_TEXTURE_2D;
2413}
2414
2415#############################################################################
2416
1994package CFClient::UI::ImageButton; 2417package CFPlus::UI::ImageButton;
1995 2418
1996our @ISA = CFClient::UI::Image::; 2419our @ISA = CFPlus::UI::Image::;
1997 2420
1998use CFClient::OpenGL; 2421use CFPlus::OpenGL;
1999 2422
2000my %textures; 2423my %textures;
2001 2424
2002sub new { 2425sub new {
2003 my $class = shift; 2426 my $class = shift;
… …
2025 1 2448 1
2026} 2449}
2027 2450
2028############################################################################# 2451#############################################################################
2029 2452
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; 2453package CFPlus::UI::VGauge;
2099 2454
2100our @ISA = CFClient::UI::Base::; 2455our @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 2456
2161use List::Util qw(min max); 2457use List::Util qw(min max);
2162 2458
2163use CFClient::OpenGL; 2459use CFPlus::OpenGL;
2164 2460
2165my %tex = ( 2461my %tex = (
2166 food => [ 2462 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2463 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2464 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2465 ],
2170 grace => [ 2466 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2467 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/ 2468 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2469 ],
2174 hp => [ 2470 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2472 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2473 ],
2178 mana => [ 2474 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2475 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/ 2476 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2477 ],
2182); 2478);
2183 2479
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2480# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2540 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2541 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2542
2247 my $h1 = $self->{h} * (1 - $ycut1); 2543 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2544 my $h2 = $self->{h} * (1 - $ycut2);
2545 my $h3 = $self->{h};
2546
2547 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2548
2250 glEnable GL_BLEND; 2549 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2550 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2551 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2552 glEnable GL_TEXTURE_2D;
… …
2272 2571
2273 if ($t3) { 2572 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2573 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2574 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2575 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2576 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2577 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2578 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2579 glEnd;
2281 } 2580 }
2282 2581
2283 glDisable GL_BLEND; 2582 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2583 glDisable GL_TEXTURE_2D;
2285} 2584}
2286 2585
2287############################################################################# 2586#############################################################################
2288 2587
2289package CFClient::UI::Gauge; 2588package CFPlus::UI::Gauge;
2290 2589
2291our @ISA = CFClient::UI::VBox::; 2590our @ISA = CFPlus::UI::VBox::;
2292 2591
2293sub new { 2592sub new {
2294 my ($class, %arg) = @_; 2593 my ($class, %arg) = @_;
2295 2594
2296 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2597 can_hover => 1,
2299 can_events => 1, 2598 can_events => 1,
2300 %arg, 2599 %arg,
2301 ); 2600 );
2302 2601
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2602 $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); 2603 $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"); 2604 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2605
2307 $self 2606 $self
2308} 2607}
2309 2608
2310sub set_fontsize { 2609sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2630 $self->{value}->set_text ($val);
2332} 2631}
2333 2632
2334############################################################################# 2633#############################################################################
2335 2634
2336package CFClient::UI::Slider; 2635package CFPlus::UI::Slider;
2337 2636
2338use strict; 2637use strict;
2339 2638
2340use CFClient::OpenGL; 2639use CFPlus::OpenGL;
2341 2640
2342our @ISA = CFClient::UI::DrawBG::; 2641our @ISA = CFPlus::UI::DrawBG::;
2343 2642
2344my @tex = 2643my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2644 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2645 qw(s1_slider.png s1_slider_bg.png);
2347 2646
2348sub new { 2647sub new {
2349 my $class = shift; 2648 my $class = shift;
2350 2649
… …
2439 } 2738 }
2440 2739
2441 1 2740 1
2442} 2741}
2443 2742
2743sub invoke_mouse_wheel {
2744 my ($self, $ev) = @_;
2745
2746 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2747
2748 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2749
2750 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2751
2752 ! ! $delta
2753}
2754
2444sub update { 2755sub update {
2445 my ($self) = @_; 2756 my ($self) = @_;
2446 2757
2447 delete $self->{knob_w}; 2758 delete $self->{knob_w};
2448 $self->SUPER::update; 2759 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2496} 2807}
2497 2808
2498############################################################################# 2809#############################################################################
2499 2810
2500package CFClient::UI::ValSlider; 2811package CFPlus::UI::ValSlider;
2501 2812
2502our @ISA = CFClient::UI::HBox::; 2813our @ISA = CFPlus::UI::HBox::;
2503 2814
2504sub new { 2815sub new {
2505 my ($class, %arg) = @_; 2816 my ($class, %arg) = @_;
2506 2817
2507 my $range = delete $arg{range}; 2818 my $range = delete $arg{range};
2508 2819
2509 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2821 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2822 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2823 to_value => sub { shift },
2513 from_value => sub { shift }, 2824 from_value => sub { shift },
2514 %arg, 2825 %arg,
2515 ); 2826 );
2516 2827
… …
2536sub set_range { shift->{slider}->set_range (@_) } 2847sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 2848sub set_value { shift->{slider}->set_value (@_) }
2538 2849
2539############################################################################# 2850#############################################################################
2540 2851
2541package CFClient::UI::TextScroller; 2852package CFPlus::UI::TextScroller;
2542 2853
2543our @ISA = CFClient::UI::HBox::; 2854our @ISA = CFPlus::UI::HBox::;
2544 2855
2545use CFClient::OpenGL; 2856use CFPlus::OpenGL;
2546 2857
2547sub new { 2858sub new {
2548 my $class = shift; 2859 my $class = shift;
2549 2860
2550 my $self = $class->SUPER::new ( 2861 my $self = $class->SUPER::new (
2551 fontsize => 1, 2862 fontsize => 1,
2552 can_events => 0, 2863 can_events => 1,
2553 indent => 0, 2864 indent => 0,
2554 #font => default_font 2865 #font => default_font
2555 @_, 2866 @_,
2556 2867
2557 layout => (new CFClient::Layout 1), 2868 layout => (new CFPlus::Layout),
2558 par => [], 2869 par => [],
2870 max_par => 0,
2559 height => 0, 2871 height => 0,
2560 children => [ 2872 children => [
2561 (new CFClient::UI::Empty expand => 1), 2873 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 2874 (new CFPlus::UI::Slider vertical => 1),
2563 ], 2875 ],
2564 ); 2876 );
2565 2877
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 2878 $self->{children}[1]->connect (changed => sub { $self->update });
2567 2879
… …
2597 2909
2598 $self->reflow; 2910 $self->reflow;
2599 2911
2600 local $self->{children} = [$empty, $slider]; 2912 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 2913 $self->SUPER::invoke_size_allocate ($w, $h)
2914}
2915
2916sub invoke_mouse_wheel {
2917 my ($self, $ev) = @_;
2918
2919 return 0 unless $ev->{dy}; # only vertical movements
2920
2921 $self->{children}[1]->emit (mouse_wheel => $ev);
2922
2923 1
2602} 2924}
2603 2925
2604sub get_layout { 2926sub get_layout {
2605 my ($self, $para) = @_; 2927 my ($self, $para) = @_;
2606 2928
… …
2634 2956
2635 # todo: base offset on lines or so, not on pixels 2957 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 2958 $self->{children}[1]->set_value ($offset);
2637} 2959}
2638 2960
2961sub current_paragraph {
2962 my ($self) = @_;
2963
2964 $self->{top_paragraph} - 1
2965}
2966
2967sub scroll_to {
2968 my ($self, $para) = @_;
2969
2970 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2971
2972 $self->{scroll_to} = $para;
2973 $self->update;
2974}
2975
2639sub clear { 2976sub clear {
2640 my ($self) = @_; 2977 my ($self) = @_;
2641 2978
2642 my (undef, undef, @other) = @{ $self->{children} }; 2979 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 2980 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 2983 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2984 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 2985}
2649 2986
2650sub add_paragraph { 2987sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 2988 my $self = shift;
2652 2989
2653 my ($text, @w) = ref $para ? @$para : $para; 2990 for my $para (@_) {
2654
2655 $para = { 2991 $para = {
2992 fg => [1, 1, 1, 1],
2993 indent => 0,
2994 markup => "",
2995 widget => [],
2996 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 2997 w => 1e10,
2657 wrapped => 1, 2998 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 2999 };
2663 3000
2664 $self->add (@w) if @w; 3001 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 3002 push @{$self->{par}}, $para;
3003 }
3004
3005 if (my $max = $self->{max_par}) {
3006 shift @{$self->{par}} while @{$self->{par}} > $max;
3007 }
2666 3008
2667 $self->{need_reflow}++; 3009 $self->{need_reflow}++;
2668 $self->update; 3010 $self->update;
2669} 3011}
2670 3012
2671sub scroll_to_bottom { 3013sub scroll_to_bottom {
2672 my ($self) = @_; 3014 my ($self) = @_;
2673 3015
2674 $self->{scroll_to_bottom} = 1; 3016 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3017 $self->update;
2676} 3018}
2677 3019
3020sub force_uptodate {
3021 my ($self) = @_;
3022
3023 if (delete $self->{need_reflow}) {
3024 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3025
3026 my $height = 0;
3027
3028 for my $para (@{$self->{par}}) {
3029 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3030 my $layout = $self->get_layout ($para);
3031 my ($w, $h) = $layout->size;
3032
3033 $para->{w} = $w + $para->{indent};
3034 $para->{h} = $h;
3035 $para->{wrapped} = $layout->has_wrapped;
3036 }
3037
3038 $para->{y} = $height;
3039 $height += $para->{h};
3040 }
3041
3042 $self->{height} = $height;
3043 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3044
3045 delete $self->{texture};
3046 }
3047
3048 if (my $paridx = delete $self->{scroll_to}) {
3049 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3050 }
3051}
3052
2678sub update { 3053sub update {
2679 my ($self) = @_; 3054 my ($self) = @_;
2680 3055
2681 $self->SUPER::update; 3056 $self->SUPER::update;
2682 3057
2683 return unless $self->{h} > 0; 3058 return unless $self->{h} > 0;
2684 3059
2685 delete $self->{texture}; 3060 delete $self->{texture};
2686 3061
2687 $ROOT->on_post_alloc ($self => sub { 3062 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate;
3064
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3066
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 { 3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3068 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3069 glClear GL_COLOR_BUFFER_BIT;
2720 3070
3071 package CFPlus::UI::Base;
3072 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3073 (0, 0, $self->{w}, $self->{h});
3074
3075 my $top = int $self->{children}[1]{range}[0];
3076
3077 my $paridx = 0;
3078 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3079 my $top = int $self->{children}[1]{range}[0];
2722 3080
2723 my $y0 = $top; 3081 my $y0 = $top;
2724 my $y1 = $top + $H; 3082 my $y1 = $top + $H;
2725 3083
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}}) { 3084 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3085 my $h = $para->{h};
3086 my $y = $para->{y};
2734 3087
2735 if ($y0 < $y + $h && $y < $y1) { 3088 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3089 my $layout = $self->get_layout ($para);
2738 3090
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3091 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3092
2744 if (my @w = @{ $para->{widget} }) { 3093 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3094 my @s = $layout->get_shapes;
2746 3095
2747 for (@w) { 3096 for (@w) {
… …
2753 $_->draw; 3102 $_->draw;
2754 } 3103 }
2755 } 3104 }
2756 } 3105 }
2757 3106
2758 $y += $h; 3107 $paridx++;
3108 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3109 }
2760 3110
2761 glDisable GL_BLEND; 3111 $self->{top_paragraph} = $top_paragraph;
2762 }; 3112 };
2763 }); 3113 });
2764} 3114}
2765 3115
2766sub reconfigure { 3116sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3134 $self->{children}[1]->draw;
2785} 3135}
2786 3136
2787############################################################################# 3137#############################################################################
2788 3138
2789package CFClient::UI::Animator; 3139package CFPlus::UI::Animator;
2790 3140
2791use CFClient::OpenGL; 3141use CFPlus::OpenGL;
2792 3142
2793our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2794 3144
2795sub moveto { 3145sub moveto {
2796 my ($self, $x, $y) = @_; 3146 my ($self, $x, $y) = @_;
2797 3147
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3148 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3176 glPopMatrix;
2827} 3177}
2828 3178
2829############################################################################# 3179#############################################################################
2830 3180
2831package CFClient::UI::Flopper; 3181package CFPlus::UI::Flopper;
2832 3182
2833our @ISA = CFClient::UI::Button::; 3183our @ISA = CFPlus::UI::Button::;
2834 3184
2835sub new { 3185sub new {
2836 my $class = shift; 3186 my $class = shift;
2837 3187
2838 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3200 $self->{other}->toggle_visibility;
2851} 3201}
2852 3202
2853############################################################################# 3203#############################################################################
2854 3204
2855package CFClient::UI::Tooltip; 3205package CFPlus::UI::Tooltip;
2856 3206
2857our @ISA = CFClient::UI::Bin::; 3207our @ISA = CFPlus::UI::Bin::;
2858 3208
2859use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2860 3210
2861sub new { 3211sub new {
2862 my $class = shift; 3212 my $class = shift;
2863 3213
2864 $class->SUPER::new ( 3214 $class->SUPER::new (
… …
2867 ) 3217 )
2868} 3218}
2869 3219
2870sub set_tooltip_from { 3220sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3221 my ($self, $widget) = @_;
3222
3223 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3225
2873 my $tooltip = $widget->{tooltip}; 3226 my $tooltip = $widget->{tooltip};
2874 3227
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3228 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3229 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3233 }
2881 3234
2882 $tooltip =~ s/^\n+//; 3235 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3236 $tooltip =~ s/\n+$//;
2884 3237
2885 $self->add (new CFClient::UI::Label 3238 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3239 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3240 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3241 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3242 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3243 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3244 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3245 );
2893} 3246}
2894 3247
… …
2913 3266
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3267 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3268 my $widget = $self->{owner}
2916 or return; 3269 or return;
2917 3270
3271 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3272 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3273
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3274 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3275 if $x + $self->{w} > $self->{root}{w};
2922 3276
2923 $self->move_abs ($x, $y); 3277 $self->move_abs ($x, $y);
3278 } else {
3279 $self->hide;
3280 }
2924 }); 3281 });
2925} 3282}
2926 3283
2927sub _draw { 3284sub _draw {
2928 my ($self) = @_; 3285 my ($self) = @_;
… …
2952 $self->SUPER::_draw; 3309 $self->SUPER::_draw;
2953} 3310}
2954 3311
2955############################################################################# 3312#############################################################################
2956 3313
2957package CFClient::UI::Face; 3314package CFPlus::UI::Face;
2958 3315
2959our @ISA = CFClient::UI::Base::; 3316our @ISA = CFPlus::UI::DrawBG::;
2960 3317
2961use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2962 3319
2963sub new { 3320sub new {
2964 my $class = shift; 3321 my $class = shift;
2965 3322
2966 my $self = $class->SUPER::new ( 3323 my $self = $class->SUPER::new (
… …
2968 can_events => 0, 3325 can_events => 0,
2969 @_, 3326 @_,
2970 ); 3327 );
2971 3328
2972 if ($self->{anim} && $self->{animspeed}) { 3329 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3330 CFPlus::weaken (my $widget = $self);
2974 3331
2975 $self->{timer} = Event->timer ( 3332 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3334 hard => 1,
2978 interval => $self->{animspeed}, 3335 interval => $self->{animspeed},
… …
3001sub _draw { 3358sub _draw {
3002 my ($self) = @_; 3359 my ($self) = @_;
3003 3360
3004 return unless $::CONN; 3361 return unless $::CONN;
3005 3362
3363 $self->SUPER::_draw;
3364
3006 my $face; 3365 my $face;
3007 3366
3008 if ($self->{frame}) { 3367 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}]; 3368 my $anim = $::CONN->{anim}[$self->{anim}];
3010 3369
… …
3032 $self->SUPER::destroy; 3391 $self->SUPER::destroy;
3033} 3392}
3034 3393
3035############################################################################# 3394#############################################################################
3036 3395
3037package CFClient::UI::Buttonbar; 3396package CFPlus::UI::Buttonbar;
3038 3397
3039our @ISA = CFClient::UI::HBox::; 3398our @ISA = CFPlus::UI::HBox::;
3040 3399
3041# TODO: should actualyl wrap buttons and other goodies. 3400# TODO: should actually wrap buttons and other goodies.
3042 3401
3043############################################################################# 3402#############################################################################
3044 3403
3045package CFClient::UI::Menu; 3404package CFPlus::UI::Menu;
3046 3405
3047our @ISA = CFClient::UI::FancyFrame::; 3406our @ISA = CFPlus::UI::Toplevel::;
3048 3407
3049use CFClient::OpenGL; 3408use CFPlus::OpenGL;
3050 3409
3051sub new { 3410sub new {
3052 my $class = shift; 3411 my $class = shift;
3053 3412
3054 my $self = $class->SUPER::new ( 3413 my $self = $class->SUPER::new (
3055 items => [], 3414 items => [],
3056 z => 100, 3415 z => 100,
3057 @_, 3416 @_,
3058 ); 3417 );
3059 3418
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3419 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3420
3062 for my $item (@{ $self->{items} }) { 3421 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3422 my ($widget, $cb, $tooltip) = @$item;
3064 3423
3065 # handle various types of items, only text for now 3424 # handle various types of items, only text for now
3066 if (!ref $widget) { 3425 if (!ref $widget) {
3426 if ($widget =~ /\t/) {
3427 my ($left, $right) = split /\t/, $widget, 2;
3428
3067 $widget = new CFClient::UI::Label 3429 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3430 can_hover => 1,
3069 can_events => 1, 3431 can_events => 1,
3432 tooltip => $tooltip,
3433 children => [
3434 (new CFPlus::UI::Label markup => $left, expand => 1),
3435 (new CFPlus::UI::Label markup => $right, align => +1),
3436 ],
3437 ;
3438
3439 } else {
3440 $widget = new CFPlus::UI::Label
3441 can_hover => 1,
3442 can_events => 1,
3070 markup => $widget, 3443 markup => $widget,
3071 tooltip => $tooltip 3444 tooltip => $tooltip;
3445 }
3072 } 3446 }
3073 3447
3074 $self->{item}{$widget} = $item; 3448 $self->{item}{$widget} = $item;
3075 3449
3076 $self->{vbox}->add ($widget); 3450 $self->{vbox}->add ($widget);
… …
3119 1 3493 1
3120} 3494}
3121 3495
3122############################################################################# 3496#############################################################################
3123 3497
3124package CFClient::UI::Multiplexer; 3498package CFPlus::UI::Multiplexer;
3125 3499
3126our @ISA = CFClient::UI::Container::; 3500our @ISA = CFPlus::UI::Container::;
3127 3501
3128sub new { 3502sub new {
3129 my $class = shift; 3503 my $class = shift;
3130 3504
3131 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
… …
3145 3519
3146 $self->{current} = $self->{children}[0] 3520 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3521 if @{ $self->{children} };
3148} 3522}
3149 3523
3524sub get_current_page {
3525 my ($self) = @_;
3526
3527 $self->{current}
3528}
3529
3150sub set_current_page { 3530sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3531 my ($self, $page_or_widget) = @_;
3152 3532
3153 my $widget = ref $page_or_widget 3533 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3534 ? $page_or_widget
… …
3186 $self->{current}->draw; 3566 $self->{current}->draw;
3187} 3567}
3188 3568
3189############################################################################# 3569#############################################################################
3190 3570
3191package CFClient::UI::Notebook; 3571package CFPlus::UI::Notebook;
3192 3572
3193our @ISA = CFClient::UI::VBox::; 3573our @ISA = CFPlus::UI::VBox::;
3194 3574
3195sub new { 3575sub new {
3196 my $class = shift; 3576 my $class = shift;
3197 3577
3198 my $self = $class->SUPER::new ( 3578 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3579 buttonbar => (new CFPlus::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3580 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self 3581 # filter => # will be put between multiplexer and $self
3202 @_, 3582 @_,
3203 ); 3583 );
3204 3584
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3585 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3209} 3589}
3210 3590
3211sub add { 3591sub add {
3212 my ($self, $title, $widget, $tooltip) = @_; 3592 my ($self, $title, $widget, $tooltip) = @_;
3213 3593
3214 Scalar::Util::weaken $self; 3594 CFPlus::weaken $self;
3215 3595
3216 $self->{buttonbar}->add (new CFClient::UI::Button 3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3217 markup => $title, 3597 markup => $title,
3218 tooltip => $tooltip, 3598 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) }, 3599 on_activate => sub { $self->set_current_page ($widget) },
3220 ); 3600 );
3221 3601
3222 $self->{multiplexer}->add ($widget); 3602 $self->{multiplexer}->add ($widget);
3223} 3603}
3224 3604
3605sub get_current_page {
3606 my ($self) = @_;
3607
3608 $self->{multiplexer}->get_current_page
3609}
3610
3225sub set_current_page { 3611sub set_current_page {
3226 my ($self, $page) = @_; 3612 my ($self, $page) = @_;
3227 3613
3228 $self->{multiplexer}->set_current_page ($page); 3614 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 3615 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 3616}
3231 3617
3232############################################################################# 3618#############################################################################
3233 3619
3234package CFClient::UI::Combobox; 3620package CFPlus::UI::Selector;
3235 3621
3236use utf8; 3622use utf8;
3237 3623
3238our @ISA = CFClient::UI::Button::; 3624our @ISA = CFPlus::UI::Button::;
3239 3625
3240sub new { 3626sub new {
3241 my $class = shift; 3627 my $class = shift;
3242 3628
3243 my $self = $class->SUPER::new ( 3629 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 3646 my ($value, $title, $tooltip) = @$_;
3261 3647
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3648 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 3649 }
3264 3650
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3651 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 3652}
3267 3653
3268sub _set_value { 3654sub _set_value {
3269 my ($self, $value) = @_; 3655 my ($self, $value) = @_;
3270 3656
… …
3285 $self->emit (changed => $value); 3671 $self->emit (changed => $value);
3286} 3672}
3287 3673
3288############################################################################# 3674#############################################################################
3289 3675
3290package CFClient::UI::Statusbox; 3676package CFPlus::UI::Statusbox;
3291 3677
3292our @ISA = CFClient::UI::VBox::; 3678our @ISA = CFPlus::UI::VBox::;
3293 3679
3294sub new { 3680sub new {
3295 my $class = shift; 3681 my $class = shift;
3296 3682
3297 my $self = $class->SUPER::new ( 3683 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 3684 fontsize => 0.8,
3299 @_, 3685 @_,
3300 ); 3686 );
3301 3687
3302 Scalar::Util::weaken (my $this = $self); 3688 CFPlus::weaken (my $this = $self);
3303 3689
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305 3691
3306 $self 3692 $self
3307} 3693}
… …
3309sub reorder { 3695sub reorder {
3310 my ($self) = @_; 3696 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 3697 my $NOW = Time::HiRes::time;
3312 3698
3313 # freeze display when hovering over any label 3699 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 3700 return if $CFPlus::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3701 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 3702 values %{ $self->{item} };
3317 3703
3318 while (my ($k, $v) = each %{ $self->{item} }) { 3704 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3705 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 3706 }
… …
3341 for ($short) { 3727 for ($short) {
3342 s/^\s+//; 3728 s/^\s+//;
3343 s/\s+/ /g; 3729 s/\s+/ /g;
3344 } 3730 }
3345 3731
3346 new CFClient::UI::Label 3732 new CFPlus::UI::Label
3347 markup => $short, 3733 markup => $short,
3348 tooltip => $item->{tooltip}, 3734 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 3735 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 3736 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 3737 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3405 count => 1, 3791 count => 1,
3406 %arg, 3792 %arg,
3407 }; 3793 };
3408 } 3794 }
3409 3795
3796 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 3797 $self->reorder;
3798 });
3411} 3799}
3412 3800
3413sub reconfigure { 3801sub reconfigure {
3414 my ($self) = @_; 3802 my ($self) = @_;
3415 3803
… …
3428 $self->SUPER::destroy; 3816 $self->SUPER::destroy;
3429} 3817}
3430 3818
3431############################################################################# 3819#############################################################################
3432 3820
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; 3821package CFPlus::UI::Root;
3806 3822
3807our @ISA = CFClient::UI::Container::; 3823our @ISA = CFPlus::UI::Container::;
3808 3824
3809use List::Util qw(min max); 3825use List::Util qw(min max);
3810 3826
3811use CFClient::OpenGL; 3827use CFPlus::OpenGL;
3812 3828
3813sub new { 3829sub new {
3814 my $class = shift; 3830 my $class = shift;
3815 3831
3816 my $self = $class->SUPER::new ( 3832 my $self = $class->SUPER::new (
3817 visible => 1, 3833 visible => 1,
3818 @_, 3834 @_,
3819 ); 3835 );
3820 3836
3821 Scalar::Util::weaken ($self->{root} = $self); 3837 CFPlus::weaken ($self->{root} = $self);
3822 3838
3823 $self 3839 $self
3824} 3840}
3825 3841
3826sub size_request { 3842sub size_request {
… …
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4008 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 4009
3994 $w = 0 if $w < 0; 4010 $w = 0 if $w < 0;
3995 $h = 0 if $h < 0; 4011 $h = 0 if $h < 0;
3996 4012
4013 $w = max $widget->{min_w}, $w;
4014 $h = max $widget->{min_h}, $h;
4015
4016# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4017# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4018
4019 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4020 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4021
3997 $w = int $w + 0.5; 4022 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 4023 $h = int $h + 0.5;
3999 4024
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4025 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 4026 $widget->{old_w} = $widget->{w};
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4049 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 4050 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 4051 glLoadIdentity;
4027 4052
4028 { 4053 {
4029 package CFClient::UI::Base; 4054 package CFPlus::UI::Base;
4030 4055
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4056 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4057 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4058
4035 $self->_draw; 4059 $self->_draw;
4060 }
4036} 4061}
4037 4062
4038############################################################################# 4063#############################################################################
4039 4064
4040package CFClient::UI; 4065package CFPlus::UI;
4041 4066
4042$ROOT = new CFClient::UI::Root; 4067$ROOT = new CFPlus::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4068$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044 4069
40451 40701
4046 4071

Diff Legend

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