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.376 by root, Mon Jul 16 20:20:23 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->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
949use List::Util qw(min max);
950
873our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
874 952
875sub new { 953sub new {
876 my $class = shift; 954 my $class = shift;
877 955
878 $class->SUPER::new ( 956 $class->SUPER::new (
… …
908} 986}
909 987
910sub set_offset { 988sub set_offset {
911 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
912 990
913 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
914 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
915 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
916 $self->update; 995 $self->update;
917} 996}
918 997
919# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
920sub coord2local { 999sub coord2local {
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1019 ) {
941 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
942 } else { 1021 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1023 }
945} 1024}
946 1025
947sub _render { 1026sub _render {
948 my ($self) = @_; 1027 my ($self) = @_;
949 1028
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
952 1031
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1033
955 $self->SUPER::_render; 1034 $self->SUPER::_render;
956} 1035}
957 1036
958############################################################################# 1037#############################################################################
959 1038
960package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
961 1040
962our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
963 1042
964sub new { 1043sub new {
965 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
966 1045
967 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
968 1047
969 my $self; 1048 my $self;
970 1049
971 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1060 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1062 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1065 },
977 ; 1066 ;
978 1067
979 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
981 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
982 %arg, 1076 %arg,
983 ); 1077 );
984 1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1092 $self->SUPER::add (0, 0, $self->{vp});
1093
986 $self->add ($child) if $child; 1094 $self->add ($child) if $child;
987 1095
988 $self 1096 $self
989} 1097}
1098
1099#TODO# update range on size_allocate depending on child
990 1100
991sub add { 1101sub add {
992 my ($self, $widget) = @_; 1102 my ($self, $widget) = @_;
993 1103
994 $self->{vp}->add ($self->{child} = $widget); 1104 $self->{vp}->add ($self->{child} = $widget);
995} 1105}
996 1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
997sub update { 1131sub update {
998 my ($self) = @_; 1132 my ($self) = @_;
999 1133
1000 $self->SUPER::update; 1134 $self->SUPER::update;
1135 $self->update_slider;
1136}
1001 1137
1002 # todo: overwrite size_allocate of child 1138sub invoke_mouse_wheel {
1003 my $child = $self->{vp}->child; 1139 my ($self, $ev) = @_;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1140
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev);
1144
1145 1
1146}
1147
1148sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_;
1150
1151 if ($ev->{button} == 2) {
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1005} 1189}
1006 1190
1007sub invoke_size_allocate { 1191sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1009 1193
1010 my $child = $self->{vp}->child; 1194 $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) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1196}
1015 1197
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019############################################################################# 1198#############################################################################
1020 1199
1021package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
1022 1201
1023our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
1024 1203
1025use CFClient::OpenGL; 1204use CFPlus::OpenGL;
1026 1205
1027sub new { 1206sub new {
1028 my $class = shift; 1207 my $class = shift;
1029 1208
1030 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
1057} 1236}
1058 1237
1059############################################################################# 1238#############################################################################
1060 1239
1061package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
1062 1241
1063our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
1064 1243
1065use CFClient::OpenGL; 1244use CFPlus::OpenGL;
1245
1246sub new {
1247 my ($class, %arg) = @_;
1248
1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1066 1345
1067my $bg = 1346my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1348 mipmap => 1, wrap => 1;
1070 1349
1071my @border = 1350my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1353
1075sub new { 1354sub new {
1076 my ($class, %arg) = @_; 1355 my ($class, %arg) = @_;
1077 1356
1078 my $self = $class->SUPER::new ( 1357 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1358 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1359 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1360 border => 0.6,
1082 can_events => 1, 1361 can_events => 1,
1083 min_w => 16, 1362 min_w => 64,
1084 min_h => 16, 1363 min_h => 32,
1085 %arg, 1364 %arg,
1086 ); 1365 );
1087 1366
1088 $self->{title_widget} = new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1368 align => 0,
1090 valign => 1, 1369 valign => 1,
1091 text => $self->{title}, 1370 text => $self->{title},
1092 fontsize => $self->{border}, 1371 fontsize => $self->{border},
1093 if exists $self->{title}; 1372 if exists $self->{title};
1094 1373
1095 if ($self->{has_close_button}) { 1374 if ($self->{has_close_button}) {
1096 $self->{close_button} = 1375 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1376 new CFPlus::UI::ImageButton
1098 path => 'x1_close.png', 1377 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1378 on_activate => sub { $self->emit ("delete") };
1100 1379
1101 $self->CFClient::UI::Container::add ($self->{close_button}); 1380 $self->CFPlus::UI::Container::add ($self->{close_button});
1102 } 1381 }
1103 1382
1104 $self 1383 $self
1105} 1384}
1106 1385
1107sub add { 1386sub add {
1108 my ($self, @widgets) = @_; 1387 my ($self, @widgets) = @_;
1109 1388
1110 $self->SUPER::add (@widgets); 1389 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1390 $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}; 1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1392}
1114 1393
1115sub border { 1394sub border {
1116 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
1117} 1396}
… …
1150 $self->child->configure ($border, $border, $w, $h); 1429 $self->child->configure ($border, $border, $w, $h);
1151 1430
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1431 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button}; 1432 if $self->{close_button};
1154 1433
1434 1
1435}
1436
1437sub invoke_delete {
1438 my ($self) = @_;
1439
1440 $self->hide;
1441
1155 1 1442 1
1156} 1443}
1157 1444
1158sub invoke_button_down { 1445sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1446 my ($self, $ev, $x, $y) = @_;
… …
1217 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1504 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218 1505
1219 ! ! $self->{motion} 1506 ! ! $self->{motion}
1220} 1507}
1221 1508
1509sub invoke_visibility_change {
1510 my ($self, $visible) = @_;
1511
1512 delete $self->{motion} unless $visible;
1513
1514 0
1515}
1516
1222sub _draw { 1517sub _draw {
1223 my ($self) = @_; 1518 my ($self) = @_;
1224 1519
1225 my $child = $self->{children}[0]; 1520 my $child = $self->{children}[0];
1226 1521
… …
1263 if $self->{close_button}; 1558 if $self->{close_button};
1264} 1559}
1265 1560
1266############################################################################# 1561#############################################################################
1267 1562
1268package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1269 1564
1270our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1271 1566
1272use List::Util qw(max sum); 1567use List::Util qw(max sum);
1273 1568
1274use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1275 1570
1276sub new { 1571sub new {
1277 my $class = shift; 1572 my $class = shift;
1278 1573
1279 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1280 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1281 @_, 1578 @_,
1282 ) 1579 )
1283} 1580}
1284 1581
1285sub children { 1582sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1287} 1584}
1288 1585
1586# TODO: store row/col info in child widget and use standard add/del
1289sub add { 1587sub add {
1290 my ($self, $x, $y, $child) = @_; 1588 my ($self) = shift;
1291 1589
1590 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1292 $child->set_parent ($self); 1592 $child->set_parent ($self);
1293 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1594 }
1294 1595
1596 $self->{force_realloc} = 1;
1597 $self->{force_size_alloc} = 1;
1295 $self->realloc; 1598 $self->realloc;
1296} 1599}
1297 1600
1298sub remove { 1601sub remove {
1299 my ($self, $child) = @_; 1602 my ($self, $child) = @_;
1300 1603
1301 # TODO: not yet implemented 1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1302} 1609}
1303 1610
1304# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1305sub clear { 1612sub clear {
1306 my ($self) = @_; 1613 my ($self) = @_;
… …
1355 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1356 1663
1357 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1358 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1359 1666
1360 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1361 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1362 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1363 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1364 1671
1365 # linearly scale sizes
1366 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1367 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1368 1673
1369 CFClient::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1370 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1371 1683
1372 my $y; 1684 my $y;
1373 1685
1374 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1375 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1418 } 1730 }
1419} 1731}
1420 1732
1421############################################################################# 1733#############################################################################
1422 1734
1423package CFClient::UI::Box; 1735package CFPlus::UI::Fixed;
1424 1736
1737use List::Util qw(min max);
1738
1425our @ISA = CFClient::UI::Container::; 1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1755
1756sub size_request {
1757 my ($self) = @_;
1758
1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1813}
1814
1815#############################################################################
1816
1817package CFPlus::UI::Box;
1818
1819our @ISA = CFPlus::UI::Container::;
1426 1820
1427sub size_request { 1821sub size_request {
1428 my ($self) = @_; 1822 my ($self) = @_;
1429 1823
1430 $self->{vertical} 1824 $self->{vertical}
… …
1463 $req[$_] += $space * $children[$_]{expand} 1857 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children; 1858 for 0 .. $#children;
1465 } 1859 }
1466 } 1860 }
1467 1861
1468 CFClient::UI::harmonize \@req; 1862 CFPlus::UI::harmonize \@req;
1469 1863
1470 my $pos = 0; 1864 my $pos = 0;
1471 for (0 .. $#children) { 1865 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1866 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1478 1 1872 1
1479} 1873}
1480 1874
1481############################################################################# 1875#############################################################################
1482 1876
1483package CFClient::UI::HBox; 1877package CFPlus::UI::HBox;
1484 1878
1485our @ISA = CFClient::UI::Box::; 1879our @ISA = CFPlus::UI::Box::;
1486 1880
1487sub new { 1881sub new {
1488 my $class = shift; 1882 my $class = shift;
1489 1883
1490 $class->SUPER::new ( 1884 $class->SUPER::new (
… …
1493 ) 1887 )
1494} 1888}
1495 1889
1496############################################################################# 1890#############################################################################
1497 1891
1498package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1499 1893
1500our @ISA = CFClient::UI::Box::; 1894our @ISA = CFPlus::UI::Box::;
1501 1895
1502sub new { 1896sub new {
1503 my $class = shift; 1897 my $class = shift;
1504 1898
1505 $class->SUPER::new ( 1899 $class->SUPER::new (
… …
1508 ) 1902 )
1509} 1903}
1510 1904
1511############################################################################# 1905#############################################################################
1512 1906
1513package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1514 1908
1515our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1516 1910
1517use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1518 1912
1519sub new { 1913sub new {
1520 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1521 1915
1522 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1525 #active_bg => none 1919 #active_bg => none
1526 #font => default_font 1920 #font => default_font
1527 #text => initial text 1921 #text => initial text
1528 #markup => initial narkup 1922 #markup => initial narkup
1529 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1530 ellipsise => 3, # end 1925 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1532 fontsize => 1, 1927 fontsize => 1,
1533 align => -1, 1928 align => -1,
1534 valign => -1, 1929 valign => -1,
1535 padding_x => 2, 1930 padding_x => 2,
1536 padding_y => 2, 1931 padding_y => 2,
1537 can_events => 0, 1932 can_events => 0,
1538 %arg 1933 %arg
1539 ); 1934 );
1540 1935
1541 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1543 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1939 $self->{template} = $layout;
1545 } 1940 }
1546 1941
1547 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1551 } 1946 }
1552 1947
1553 $self 1948 $self
1554} 1949}
1555 1950
1556sub escape($) {
1557 local $_ = $_[0];
1558
1559 s/&/&amp;/g;
1560 s/>/&gt;/g;
1561 s/</&lt;/g;
1562
1563 $_
1564}
1565
1566sub update { 1951sub update {
1567 my ($self) = @_; 1952 my ($self) = @_;
1568 1953
1569 delete $self->{texture}; 1954 delete $self->{texture};
1570 $self->SUPER::update; 1955 $self->SUPER::update;
… …
1581 my ($self, $text) = @_; 1966 my ($self, $text) = @_;
1582 1967
1583 return if $self->{text} eq "T$text"; 1968 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1969 $self->{text} = "T$text";
1585 1970
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1971 $self->{layout}->set_text ($text);
1588 1972
1589 delete $self->{size_req}; 1973 delete $self->{size_req};
1590 $self->realloc; 1974 $self->realloc;
1591 $self->update; 1975 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1981 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1982 $self->{text} = "M$markup";
1599 1983
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1984 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1985
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1986 $self->{layout}->set_markup ($markup);
1604 1987
1605 delete $self->{size_req}; 1988 delete $self->{size_req};
1606 $self->realloc; 1989 $self->realloc;
1607 $self->update; 1990 $self->update;
… …
1619 2002
1620 my ($w, $h) = $self->{layout}->size; 2003 my ($w, $h) = $self->{layout}->size;
1621 2004
1622 if (exists $self->{template}) { 2005 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 2006 $self->{template}->set_font ($self->{font}) if $self->{font};
2007 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2008 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 2009
1626 my ($w2, $h2) = $self->{template}->size; 2010 my ($w2, $h2) = $self->{template}->size;
1627 2011
1628 $w = List::Util::max $w, $w2; 2012 $w = List::Util::max $w, $w2;
… …
1652 2036
1653sub set_fontsize { 2037sub set_fontsize {
1654 my ($self, $fontsize) = @_; 2038 my ($self, $fontsize) = @_;
1655 2039
1656 $self->{fontsize} = $fontsize; 2040 $self->{fontsize} = $fontsize;
2041 delete $self->{size_req};
1657 delete $self->{texture}; 2042 delete $self->{texture};
1658 2043
1659 $self->realloc; 2044 $self->realloc;
1660} 2045}
1661 2046
1662sub reconfigure { 2047sub reconfigure {
1663 my ($self) = @_; 2048 my ($self) = @_;
1664 2049
1665 delete $self->{size_req}; 2050 delete $self->{size_req};
2051 delete $self->{texture};
1666 2052
1667 $self->SUPER::reconfigure; 2053 $self->SUPER::reconfigure;
1668} 2054}
1669 2055
1670sub _draw { 2056sub _draw {
1671 my ($self) = @_; 2057 my ($self) = @_;
1672 2058
1673 $self->SUPER::_draw; # draw background, if applicable 2059 $self->SUPER::_draw; # draw background, if applicable
1674 2060
1675 my $tex = $self->{texture} ||= do { 2061 my $size = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}}); 2062 $self->{layout}->set_foreground (@{$self->{fg}});
1677 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2063 $self->{layout}->set_font ($self->{font}) if $self->{font};
1678 $self->{layout}->set_width ($self->{w}); 2064 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2065 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2066 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2067 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682 2068
1683 new_from_layout CFClient::Texture $self->{layout} 2069 [$self->{layout}->size]
1684 }; 2070 };
1685 2071
1686 unless (exists $self->{ox}) { 2072 unless (exists $self->{ox}) {
1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2073 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2074 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5); 2075 : ($self->{w} - $size->[0]) * 0.5);
1690 2076
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5); 2079 : ($self->{h} - $size->[1]) * 0.5);
1694 }; 2080 };
1695 2081
1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2082 my $w = List::Util::min $self->{w} + 4, $size->[0];
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2083 my $h = List::Util::min $self->{h} + 2, $size->[1];
1700 2084
1701 if ($tex->{format} == GL_ALPHA) { 2085 $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} 2086}
1712 2087
1713############################################################################# 2088#############################################################################
1714 2089
1715package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1716 2091
1717our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1718 2093
1719use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1720 2095
1721sub new { 2096sub new {
1722 my $class = shift; 2097 my $class = shift;
1723 2098
1724 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1728 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1729 can_hover => 1, 2104 can_hover => 1,
1730 can_focus => 1, 2105 can_focus => 1,
1731 valign => 0, 2106 valign => 0,
1732 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1733 #text => ... 2109 #text => ...
1734 #hidden => "*", 2110 #hidden => "*",
1735 @_ 2111 @_
1736 ) 2112 )
1737} 2113}
… …
1782 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1783 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1784 2160
1785 my $text = $self->get_text; 2161 my $text = $self->get_text;
1786 2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2164
1787 if ($uni == 8) { 2165 if ($uni == 8) {
1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1789 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1790 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1791 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1792 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1793 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1794 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1795 } elsif ($sym == CFClient::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
2185 } elsif ($uni == 21) { # ctrl-u
2186 $text = "";
1796 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1797 } elsif ($sym == CFClient::SDLK_END) {
1798 $self->{cursor} = length $text;
1799 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1800 $self->emit ('escape'); 2189 $self->emit ('escape');
1801 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1802 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else { 2194 } else {
1804 return 0; 2195 return 0;
1805 } 2196 }
1806 2197
1807 $self->_set_text ($text); 2198 $self->_set_text ($text);
1808 2199
1809 $self->realloc; 2200 $self->realloc;
2201 $self->update;
1810 2202
1811 1 2203 1
1812} 2204}
1813 2205
1814sub invoke_focus_in { 2206sub invoke_focus_in {
… …
1826 2218
1827 my $idx = $self->{layout}->xy_to_index ($x, $y); 2219 my $idx = $self->{layout}->xy_to_index ($x, $y);
1828 2220
1829 # byte-index to char-index 2221 # byte-index to char-index
1830 my $text = $self->{text}; 2222 my $text = $self->{text};
1831 utf8::encode $text; 2223 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1832 $self->{cursor} = length substr $text, 0, $idx; 2224 $self->{cursor} = length $text;
1833 2225
1834 $self->_set_text ($self->{text}); 2226 $self->_set_text ($self->{text});
1835 $self->update; 2227 $self->update;
1836 2228
1837 1 2229 1
… …
1876 utf8::encode $text; 2268 utf8::encode $text;
1877 2269
1878 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1879 } 2271 }
1880 2272
1881 glColor @{$self->{fg}};
1882 glBegin GL_LINES; 2273 glBegin GL_LINES;
1883 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2274 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1884 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1885 glEnd; 2276 glEnd;
1886 } 2277 }
1887} 2278}
1888 2279
2280#############################################################################
2281
1889package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1890 2283
1891our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1892 2285
1893use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1894 2287
1895sub invoke_key_down { 2288sub invoke_key_down {
1896 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1897 2290
1898 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1899 2292
1900 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1901 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1902 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
1903 2296
1904 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1905 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1906 $self->emit (activate => $txt); 2299 $self->emit (activate => $txt);
1907 $self->update; 2300 $self->update;
1908 2301
1909 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1910 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1911 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1912 } 2305 }
1913 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1914 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1916 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1917 } 2310 }
1918 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1919 } 2312 }
1920 2313
1921 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1922 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1923 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1924 2317
1925 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1926 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1935 1 2328 1
1936} 2329}
1937 2330
1938############################################################################# 2331#############################################################################
1939 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1940package CFClient::UI::Button; 2372package CFPlus::UI::Button;
1941 2373
1942our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
1943 2375
1944use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1945 2377
1946my @tex = 2378my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1948 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
1949 2381
1950sub new { 2382sub new {
1951 my $class = shift; 2383 my $class = shift;
1952 2384
… …
1989 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
1990} 2422}
1991 2423
1992############################################################################# 2424#############################################################################
1993 2425
2426package CFPlus::UI::CheckBox;
2427
2428our @ISA = CFPlus::UI::DrawBG::;
2429
2430my @tex =
2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2433
2434use CFPlus::OpenGL;
2435
2436sub new {
2437 my $class = shift;
2438
2439 $class->SUPER::new (
2440 padding_x => 2,
2441 padding_y => 2,
2442 fg => [1, 1, 1],
2443 active_fg => [1, 1, 0],
2444 bg => [0, 0, 0, 0.2],
2445 active_bg => [1, 1, 1, 0.5],
2446 state => 0,
2447 can_hover => 1,
2448 @_
2449 )
2450}
2451
2452sub size_request {
2453 my ($self) = @_;
2454
2455 (6) x 2
2456}
2457
2458sub toggle {
2459 my ($self) = @_;
2460
2461 $self->{state} = !$self->{state};
2462 $self->emit (changed => $self->{state});
2463 $self->update;
2464}
2465
2466sub invoke_button_down {
2467 my ($self, $ev, $x, $y) = @_;
2468
2469 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2470 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2471 $self->toggle;
2472 } else {
2473 return 0
2474 }
2475
2476 1
2477}
2478
2479sub _draw {
2480 my ($self) = @_;
2481
2482 $self->SUPER::_draw;
2483
2484 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2485
2486 my ($w, $h) = @$self{qw(w h)};
2487
2488 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2489
2490 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2491
2492 my $tex = $self->{state} ? $tex[1] : $tex[0];
2493
2494 glEnable GL_TEXTURE_2D;
2495 $tex->draw_quad_alpha (0, 0, $s, $s);
2496 glDisable GL_TEXTURE_2D;
2497}
2498
2499#############################################################################
2500
2501package CFPlus::UI::Image;
2502
2503our @ISA = CFPlus::UI::Base::;
2504
2505use CFPlus::OpenGL;
2506
2507our %texture_cache;
2508
2509sub new {
2510 my $class = shift;
2511
2512 my $self = $class->SUPER::new (
2513 can_events => 0,
2514 @_,
2515 );
2516
2517 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required";
2519
2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2522
2523 CFPlus::weaken $texture_cache{$self->{path}};
2524
2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2526
2527 $self
2528}
2529
2530sub STORABLE_freeze {
2531 my ($self, $cloning) = @_;
2532
2533 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2535
2536 $self->{path}
2537}
2538
2539sub STORABLE_attach {
2540 my ($self, $cloning, $path) = @_;
2541
2542 $self->new (path => $path)
2543}
2544
2545sub size_request {
2546 my ($self) = @_;
2547
2548 ($self->{tex}{w}, $self->{tex}{h})
2549}
2550
2551sub _draw {
2552 my ($self) = @_;
2553
2554 my $tex = $self->{tex};
2555
2556 my ($w, $h) = ($self->{w}, $self->{h});
2557
2558 if ($self->{rot90}) {
2559 glRotate 90, 0, 0, 1;
2560 glTranslate 0, -$self->{w}, 0;
2561
2562 ($w, $h) = ($h, $w);
2563 }
2564
2565 glEnable GL_TEXTURE_2D;
2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2567
2568 $tex->draw_quad (0, 0, $w, $h);
2569
2570 glDisable GL_TEXTURE_2D;
2571}
2572
2573#############################################################################
2574
1994package CFClient::UI::ImageButton; 2575package CFPlus::UI::ImageButton;
1995 2576
1996our @ISA = CFClient::UI::Image::; 2577our @ISA = CFPlus::UI::Image::;
1997 2578
1998use CFClient::OpenGL; 2579use CFPlus::OpenGL;
1999 2580
2000my %textures; 2581my %textures;
2001 2582
2002sub new { 2583sub new {
2003 my $class = shift; 2584 my $class = shift;
… …
2025 1 2606 1
2026} 2607}
2027 2608
2028############################################################################# 2609#############################################################################
2029 2610
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; 2611package CFPlus::UI::VGauge;
2099 2612
2100our @ISA = CFClient::UI::Base::; 2613our @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 2614
2161use List::Util qw(min max); 2615use List::Util qw(min max);
2162 2616
2163use CFClient::OpenGL; 2617use CFPlus::OpenGL;
2164 2618
2165my %tex = ( 2619my %tex = (
2166 food => [ 2620 food => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2169 ], 2623 ],
2170 grace => [ 2624 grace => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 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/ 2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2173 ], 2627 ],
2174 hp => [ 2628 hp => [
2175 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2176 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2177 ], 2631 ],
2178 mana => [ 2632 mana => [
2179 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 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/ 2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2181 ], 2635 ],
2182); 2636);
2183 2637
2184# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2244 my $ycut1 = max 0, min 1, $ycut; 2698 my $ycut1 = max 0, min 1, $ycut;
2245 my $ycut2 = max 0, min 1, $ycut - 1; 2699 my $ycut2 = max 0, min 1, $ycut - 1;
2246 2700
2247 my $h1 = $self->{h} * (1 - $ycut1); 2701 my $h1 = $self->{h} * (1 - $ycut1);
2248 my $h2 = $self->{h} * (1 - $ycut2); 2702 my $h2 = $self->{h} * (1 - $ycut2);
2703 my $h3 = $self->{h};
2704
2705 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2249 2706
2250 glEnable GL_BLEND; 2707 glEnable GL_BLEND;
2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2708 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2709 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2253 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
… …
2272 2729
2273 if ($t3) { 2730 if ($t3) {
2274 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2731 glBindTexture GL_TEXTURE_2D, $t3->{name};
2275 glBegin GL_QUADS; 2732 glBegin GL_QUADS;
2276 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2733 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2277 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2734 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2278 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2735 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2279 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2736 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2280 glEnd; 2737 glEnd;
2281 } 2738 }
2282 2739
2283 glDisable GL_BLEND; 2740 glDisable GL_BLEND;
2284 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2285} 2742}
2286 2743
2287############################################################################# 2744#############################################################################
2288 2745
2289package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2290 2747
2291our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2292 2749
2293sub new { 2750sub new {
2294 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2295 2752
2296 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2298 can_hover => 1, 2755 can_hover => 1,
2299 can_events => 1, 2756 can_events => 1,
2300 %arg, 2757 %arg,
2301 ); 2758 );
2302 2759
2303 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2760 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2304 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2761 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2305 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2306 2763
2307 $self 2764 $self
2308} 2765}
2309 2766
2310sub set_fontsize { 2767sub set_fontsize {
… …
2331 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2332} 2789}
2333 2790
2334############################################################################# 2791#############################################################################
2335 2792
2336package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2337 2794
2338use strict; 2795use strict;
2339 2796
2340use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2341 2798
2342our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2343 2800
2344my @tex = 2801my @tex =
2345 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2346 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2347 2804
2348sub new { 2805sub new {
2349 my $class = shift; 2806 my $class = shift;
2350 2807
… …
2439 } 2896 }
2440 2897
2441 1 2898 1
2442} 2899}
2443 2900
2901sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_;
2903
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909
2910 ! ! $delta
2911}
2912
2444sub update { 2913sub update {
2445 my ($self) = @_; 2914 my ($self) = @_;
2446 2915
2447 delete $self->{knob_w}; 2916 delete $self->{knob_w};
2448 $self->SUPER::update; 2917 $self->SUPER::update;
… …
2495 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2496} 2965}
2497 2966
2498############################################################################# 2967#############################################################################
2499 2968
2500package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2501 2970
2502our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2503 2972
2504sub new { 2973sub new {
2505 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2506 2975
2507 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2508 2977
2509 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift }, 2981 to_value => sub { shift },
2513 from_value => sub { shift }, 2982 from_value => sub { shift },
2514 %arg, 2983 %arg,
2515 ); 2984 );
2516 2985
… …
2536sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2538 3007
2539############################################################################# 3008#############################################################################
2540 3009
2541package CFClient::UI::TextScroller; 3010package CFPlus::UI::TextScroller;
2542 3011
2543our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2544 3013
2545use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2546 3015
2547sub new { 3016sub new {
2548 my $class = shift; 3017 my $class = shift;
2549 3018
2550 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
2551 fontsize => 1, 3020 fontsize => 1,
2552 can_events => 0, 3021 can_events => 1,
2553 indent => 0, 3022 indent => 0,
2554 #font => default_font 3023 #font => default_font
2555 @_, 3024 @_,
2556 3025
2557 layout => (new CFClient::Layout 1), 3026 layout => (new CFPlus::Layout),
2558 par => [], 3027 par => [],
3028 max_par => 0,
2559 height => 0, 3029 height => 0,
2560 children => [ 3030 children => [
2561 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2562 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2563 ], 3033 ],
2564 ); 3034 );
2565 3035
2566 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2567 3037
… …
2597 3067
2598 $self->reflow; 3068 $self->reflow;
2599 3069
2600 local $self->{children} = [$empty, $slider]; 3070 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h) 3071 $self->SUPER::invoke_size_allocate ($w, $h)
3072}
3073
3074sub invoke_mouse_wheel {
3075 my ($self, $ev) = @_;
3076
3077 return 0 unless $ev->{dy}; # only vertical movements
3078
3079 $self->{children}[1]->emit (mouse_wheel => $ev);
3080
3081 1
2602} 3082}
2603 3083
2604sub get_layout { 3084sub get_layout {
2605 my ($self, $para) = @_; 3085 my ($self, $para) = @_;
2606 3086
… …
2634 3114
2635 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
2637} 3117}
2638 3118
3119sub current_paragraph {
3120 my ($self) = @_;
3121
3122 $self->{top_paragraph} - 1
3123}
3124
3125sub scroll_to {
3126 my ($self, $para) = @_;
3127
3128 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3129
3130 $self->{scroll_to} = $para;
3131 $self->update;
3132}
3133
2639sub clear { 3134sub clear {
2640 my ($self) = @_; 3135 my ($self) = @_;
2641 3136
2642 my (undef, undef, @other) = @{ $self->{children} }; 3137 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other; 3138 $self->remove ($_) for @other;
… …
2646 $self->{height} = 0; 3141 $self->{height} = 0;
2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3142 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2648} 3143}
2649 3144
2650sub add_paragraph { 3145sub add_paragraph {
2651 my ($self, $color, $para, $indent) = @_; 3146 my $self = shift;
2652 3147
2653 my ($text, @w) = ref $para ? @$para : $para; 3148 for my $para (@_) {
2654
2655 $para = { 3149 $para = {
3150 fg => [1, 1, 1, 1],
3151 indent => 0,
3152 markup => "",
3153 widget => [],
3154 ref $para ? %$para : (markup => $para),
2656 w => 1e10, 3155 w => 1e10,
2657 wrapped => 1, 3156 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 }; 3157 };
2663 3158
2664 $self->add (@w) if @w; 3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2665 push @{$self->{par}}, $para; 3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
3165 }
2666 3166
2667 $self->{need_reflow}++; 3167 $self->{need_reflow}++;
2668 $self->update; 3168 $self->update;
2669} 3169}
2670 3170
2671sub scroll_to_bottom { 3171sub scroll_to_bottom {
2672 my ($self) = @_; 3172 my ($self) = @_;
2673 3173
2674 $self->{scroll_to_bottom} = 1; 3174 $self->{scroll_to} = $#{$self->{par}};
2675 $self->update; 3175 $self->update;
2676} 3176}
2677 3177
3178sub force_uptodate {
3179 my ($self) = @_;
3180
3181 if (delete $self->{need_reflow}) {
3182 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3183
3184 my $height = 0;
3185
3186 for my $para (@{$self->{par}}) {
3187 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3188 my $layout = $self->get_layout ($para);
3189 my ($w, $h) = $layout->size;
3190
3191 $para->{w} = $w + $para->{indent};
3192 $para->{h} = $h;
3193 $para->{wrapped} = $layout->has_wrapped;
3194 }
3195
3196 $para->{y} = $height;
3197 $height += $para->{h};
3198 }
3199
3200 $self->{height} = $height;
3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3202
3203 delete $self->{texture};
3204 }
3205
3206 if (my $paridx = delete $self->{scroll_to}) {
3207 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3208 }
3209}
3210
2678sub update { 3211sub update {
2679 my ($self) = @_; 3212 my ($self) = @_;
2680 3213
2681 $self->SUPER::update; 3214 $self->SUPER::update;
2682 3215
2683 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2684 3217
2685 delete $self->{texture}; 3218 delete $self->{texture};
2686 3219
2687 $ROOT->on_post_alloc ($self => sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689 3224
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 { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2718 glClearColor 0, 0, 0, 0; 3226 glClearColor 0, 0, 0, 0;
2719 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2720 3228
3229 package CFPlus::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h});
3232
3233 my $top = int $self->{children}[1]{range}[0];
3234
3235 my $paridx = 0;
3236 my $top_paragraph;
2721 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2722 3238
2723 my $y0 = $top; 3239 my $y0 = $top;
2724 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2725 3241
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}}) { 3242 for my $para (@{$self->{par}}) {
2733 my $h = $para->{h}; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2734 3245
2735 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2736
2737 my $layout = $self->get_layout ($para); 3247 my $layout = $self->get_layout ($para);
2738 3248
2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0; 3249 $layout->render ($para->{indent}, $y - $y0);
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743 3250
2744 if (my @w = @{ $para->{widget} }) { 3251 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes; 3252 my @s = $layout->get_shapes;
2746 3253
2747 for (@w) { 3254 for (@w) {
… …
2753 $_->draw; 3260 $_->draw;
2754 } 3261 }
2755 } 3262 }
2756 } 3263 }
2757 3264
2758 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2759 } 3267 }
2760 3268
2761 glDisable GL_BLEND; 3269 $self->{top_paragraph} = $top_paragraph;
2762 }; 3270 };
2763 }); 3271 });
2764} 3272}
2765 3273
2766sub reconfigure { 3274sub reconfigure {
… …
2784 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2785} 3293}
2786 3294
2787############################################################################# 3295#############################################################################
2788 3296
2789package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2790 3298
2791use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2792 3300
2793our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2794 3302
2795sub moveto { 3303sub moveto {
2796 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2797 3305
2798 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2826 glPopMatrix; 3334 glPopMatrix;
2827} 3335}
2828 3336
2829############################################################################# 3337#############################################################################
2830 3338
2831package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2832 3340
2833our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2834 3342
2835sub new { 3343sub new {
2836 my $class = shift; 3344 my $class = shift;
2837 3345
2838 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
… …
2850 $self->{other}->toggle_visibility; 3358 $self->{other}->toggle_visibility;
2851} 3359}
2852 3360
2853############################################################################# 3361#############################################################################
2854 3362
2855package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2856 3364
2857our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2858 3366
2859use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2860 3368
2861sub new { 3369sub new {
2862 my $class = shift; 3370 my $class = shift;
2863 3371
2864 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2867 ) 3375 )
2868} 3376}
2869 3377
2870sub set_tooltip_from { 3378sub set_tooltip_from {
2871 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
3380
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
2872 3383
2873 my $tooltip = $widget->{tooltip}; 3384 my $tooltip = $widget->{tooltip};
2874 3385
2875 if ($ENV{CFPLUS_DEBUG} & 2) { 3386 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n" 3387 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2880 } 3391 }
2881 3392
2882 $tooltip =~ s/^\n+//; 3393 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//; 3394 $tooltip =~ s/\n+$//;
2884 3395
2885 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2886 markup => $tooltip, 3397 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8, 3399 fontsize => 0.8,
2889 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2890 ellipsise => 0, 3401 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 ); 3403 );
2893} 3404}
2894 3405
… …
2913 3424
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3425 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3426 my $widget = $self->{owner}
2916 or return; 3427 or return;
2917 3428
3429 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3430 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3431
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3432 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3433 if $x + $self->{w} > $self->{root}{w};
2922 3434
2923 $self->move_abs ($x, $y); 3435 $self->move_abs ($x, $y);
3436 } else {
3437 $self->hide;
3438 }
2924 }); 3439 });
2925} 3440}
2926 3441
2927sub _draw { 3442sub _draw {
2928 my ($self) = @_; 3443 my ($self) = @_;
… …
2952 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
2953} 3468}
2954 3469
2955############################################################################# 3470#############################################################################
2956 3471
2957package CFClient::UI::Face; 3472package CFPlus::UI::Face;
2958 3473
2959our @ISA = CFClient::UI::Base::; 3474our @ISA = CFPlus::UI::DrawBG::;
2960 3475
2961use CFClient::OpenGL; 3476use CFPlus::OpenGL;
2962 3477
2963sub new { 3478sub new {
2964 my $class = shift; 3479 my $class = shift;
2965 3480
2966 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
2967 aspect => 1, 3484 aspect => 1,
2968 can_events => 0, 3485 can_events => 0,
2969 @_, 3486 @_,
2970 ); 3487 );
2971 3488
2972 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
2974 3491
2975 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1, 3494 hard => 1,
2978 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
2979 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
2980 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
2981 $widget->update; 3501 $self->update;
2982 }, 3502 },
2983 ); 3503 );
3504
3505 $self->update_face;
2984 } 3506 }
2985 3507
2986 $self 3508 $self
2987} 3509}
2988 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
2989sub size_request { 3524sub size_request {
2990 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
2991} 3540}
2992 3541
2993sub update { 3542sub update {
2994 my ($self) = @_; 3543 my ($self) = @_;
2995 3544
… …
3001sub _draw { 3550sub _draw {
3002 my ($self) = @_; 3551 my ($self) = @_;
3003 3552
3004 return unless $::CONN; 3553 return unless $::CONN;
3005 3554
3006 my $face; 3555 $self->SUPER::_draw;
3007 3556
3008 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
3010 3558 or return;
3011 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim;
3013 }
3014 3559
3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
3016 3561
3017 if ($tex) { 3562 if ($tex) {
3018 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3020 glColor 0, 0, 0, 1; 3565 glColor 0, 0, 0, 1;
… …
3032 $self->SUPER::destroy; 3577 $self->SUPER::destroy;
3033} 3578}
3034 3579
3035############################################################################# 3580#############################################################################
3036 3581
3037package CFClient::UI::Buttonbar; 3582package CFPlus::UI::Buttonbar;
3038 3583
3039our @ISA = CFClient::UI::HBox::; 3584our @ISA = CFPlus::UI::HBox::;
3040 3585
3041# TODO: should actualyl wrap buttons and other goodies. 3586# TODO: should actually wrap buttons and other goodies.
3042 3587
3043############################################################################# 3588#############################################################################
3044 3589
3045package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
3046 3591
3047our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
3048 3593
3049use CFClient::OpenGL; 3594use CFPlus::OpenGL;
3050 3595
3051sub new { 3596sub new {
3052 my $class = shift; 3597 my $class = shift;
3053 3598
3054 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
3055 items => [], 3600 items => [],
3056 z => 100, 3601 z => 100,
3057 @_, 3602 @_,
3058 ); 3603 );
3059 3604
3060 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3061 3606
3062 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
3064 3609
3065 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
3066 if (!ref $widget) { 3611 if (!ref $widget) {
3612 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2;
3614
3067 $widget = new CFClient::UI::Label 3615 $widget = new CFPlus::UI::HBox
3068 can_hover => 1, 3616 can_hover => 1,
3069 can_events => 1, 3617 can_events => 1,
3618 tooltip => $tooltip,
3619 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1),
3622 ],
3623 ;
3624
3625 } else {
3626 $widget = new CFPlus::UI::Label
3627 can_hover => 1,
3628 can_events => 1,
3070 markup => $widget, 3629 markup => $widget,
3071 tooltip => $tooltip 3630 tooltip => $tooltip;
3631 }
3072 } 3632 }
3073 3633
3074 $self->{item}{$widget} = $item; 3634 $self->{item}{$widget} = $item;
3075 3635
3076 $self->{vbox}->add ($widget); 3636 $self->{vbox}->add ($widget);
… …
3119 1 3679 1
3120} 3680}
3121 3681
3122############################################################################# 3682#############################################################################
3123 3683
3124package CFClient::UI::Multiplexer; 3684package CFPlus::UI::Multiplexer;
3125 3685
3126our @ISA = CFClient::UI::Container::; 3686our @ISA = CFPlus::UI::Container::;
3127 3687
3128sub new { 3688sub new {
3129 my $class = shift; 3689 my $class = shift;
3130 3690
3131 my $self = $class->SUPER::new ( 3691 my $self = $class->SUPER::new (
… …
3145 3705
3146 $self->{current} = $self->{children}[0] 3706 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} }; 3707 if @{ $self->{children} };
3148} 3708}
3149 3709
3710sub get_current_page {
3711 my ($self) = @_;
3712
3713 $self->{current}
3714}
3715
3150sub set_current_page { 3716sub set_current_page {
3151 my ($self, $page_or_widget) = @_; 3717 my ($self, $page_or_widget) = @_;
3152 3718
3153 my $widget = ref $page_or_widget 3719 my $widget = ref $page_or_widget
3154 ? $page_or_widget 3720 ? $page_or_widget
… …
3186 $self->{current}->draw; 3752 $self->{current}->draw;
3187} 3753}
3188 3754
3189############################################################################# 3755#############################################################################
3190 3756
3191package CFClient::UI::Notebook; 3757package CFPlus::UI::Notebook;
3192 3758
3193our @ISA = CFClient::UI::VBox::; 3759our @ISA = CFPlus::UI::VBox::;
3194 3760
3195sub new { 3761sub new {
3196 my $class = shift; 3762 my $class = shift;
3197 3763
3198 my $self = $class->SUPER::new ( 3764 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar), 3765 buttonbar => (new CFPlus::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self 3767 # filter => # will be put between multiplexer and $self
3202 @_, 3768 @_,
3203 ); 3769 );
3204 3770
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3209} 3775}
3210 3776
3211sub add { 3777sub add {
3212 my ($self, $title, $widget, $tooltip) = @_; 3778 my ($self, $title, $widget, $tooltip) = @_;
3213 3779
3214 Scalar::Util::weaken $self; 3780 CFPlus::weaken $self;
3215 3781
3216 $self->{buttonbar}->add (new CFClient::UI::Button 3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3217 markup => $title, 3783 markup => $title,
3218 tooltip => $tooltip, 3784 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) }, 3785 on_activate => sub { $self->set_current_page ($widget) },
3220 ); 3786 );
3221 3787
3222 $self->{multiplexer}->add ($widget); 3788 $self->{multiplexer}->add ($widget);
3223} 3789}
3224 3790
3791sub get_current_page {
3792 my ($self) = @_;
3793
3794 $self->{multiplexer}->get_current_page
3795}
3796
3225sub set_current_page { 3797sub set_current_page {
3226 my ($self, $page) = @_; 3798 my ($self, $page) = @_;
3227 3799
3228 $self->{multiplexer}->set_current_page ($page); 3800 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current}); 3801 $self->emit (page_changed => $self->{multiplexer}{current});
3230} 3802}
3231 3803
3232############################################################################# 3804#############################################################################
3233 3805
3234package CFClient::UI::Combobox; 3806package CFPlus::UI::Selector;
3235 3807
3236use utf8; 3808use utf8;
3237 3809
3238our @ISA = CFClient::UI::Button::; 3810our @ISA = CFPlus::UI::Button::;
3239 3811
3240sub new { 3812sub new {
3241 my $class = shift; 3813 my $class = shift;
3242 3814
3243 my $self = $class->SUPER::new ( 3815 my $self = $class->SUPER::new (
… …
3260 my ($value, $title, $tooltip) = @$_; 3832 my ($value, $title, $tooltip) = @$_;
3261 3833
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 } 3835 }
3264 3836
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266} 3838}
3267 3839
3268sub _set_value { 3840sub _set_value {
3269 my ($self, $value) = @_; 3841 my ($self, $value) = @_;
3270 3842
… …
3285 $self->emit (changed => $value); 3857 $self->emit (changed => $value);
3286} 3858}
3287 3859
3288############################################################################# 3860#############################################################################
3289 3861
3290package CFClient::UI::Statusbox; 3862package CFPlus::UI::Statusbox;
3291 3863
3292our @ISA = CFClient::UI::VBox::; 3864our @ISA = CFPlus::UI::VBox::;
3293 3865
3294sub new { 3866sub new {
3295 my $class = shift; 3867 my $class = shift;
3296 3868
3297 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3298 fontsize => 0.8, 3870 fontsize => 0.8,
3299 @_, 3871 @_,
3300 ); 3872 );
3301 3873
3302 Scalar::Util::weaken (my $this = $self); 3874 CFPlus::weaken (my $this = $self);
3303 3875
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305 3877
3306 $self 3878 $self
3307} 3879}
… …
3309sub reorder { 3881sub reorder {
3310 my ($self) = @_; 3882 my ($self) = @_;
3311 my $NOW = Time::HiRes::time; 3883 my $NOW = Time::HiRes::time;
3312 3884
3313 # freeze display when hovering over any label 3885 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner} 3886 return if $CFPlus::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} }; 3888 values %{ $self->{item} };
3317 3889
3318 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 } 3892 }
… …
3341 for ($short) { 3913 for ($short) {
3342 s/^\s+//; 3914 s/^\s+//;
3343 s/\s+/ /g; 3915 s/\s+/ /g;
3344 } 3916 }
3345 3917
3346 new CFClient::UI::Label 3918 new CFPlus::UI::Label
3347 markup => $short, 3919 markup => $short,
3348 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3405 count => 1, 3977 count => 1,
3406 %arg, 3978 %arg,
3407 }; 3979 };
3408 } 3980 }
3409 3981
3982 $ROOT->on_refresh (reorder => sub {
3410 $self->reorder; 3983 $self->reorder;
3984 });
3411} 3985}
3412 3986
3413sub reconfigure { 3987sub reconfigure {
3414 my ($self) = @_; 3988 my ($self) = @_;
3415 3989
… …
3428 $self->SUPER::destroy; 4002 $self->SUPER::destroy;
3429} 4003}
3430 4004
3431############################################################################# 4005#############################################################################
3432 4006
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; 4007package CFPlus::UI::Root;
3806 4008
3807our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
3808 4010
3809use List::Util qw(min max); 4011use List::Util qw(min max);
3810 4012
3811use CFClient::OpenGL; 4013use CFPlus::OpenGL;
3812 4014
3813sub new { 4015sub new {
3814 my $class = shift; 4016 my $class = shift;
3815 4017
3816 my $self = $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
3817 visible => 1, 4019 visible => 1,
3818 @_, 4020 @_,
3819 ); 4021 );
3820 4022
3821 Scalar::Util::weaken ($self->{root} = $self); 4023 CFPlus::weaken ($self->{root} = $self);
3822 4024
3823 $self 4025 $self
3824} 4026}
3825 4027
3826sub size_request { 4028sub size_request {
… …
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993 4195
3994 $w = 0 if $w < 0; 4196 $w = 0 if $w < 0;
3995 $h = 0 if $h < 0; 4197 $h = 0 if $h < 0;
3996 4198
4199 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h;
4201
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207
3997 $w = int $w + 0.5; 4208 $w = int $w + 0.5;
3998 $h = int $h + 0.5; 4209 $h = int $h + 0.5;
3999 4210
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w}; 4212 $widget->{old_w} = $widget->{w};
… …
4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4025 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
4026 glLoadIdentity; 4237 glLoadIdentity;
4027 4238
4028 { 4239 {
4029 package CFClient::UI::Base; 4240 package CFPlus::UI::Base;
4030 4241
4031 ($draw_x, $draw_y, $draw_w, $draw_h) = 4242 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h}); 4243 (0, 0, $self->{w}, $self->{h});
4033 }
4034 4244
4035 $self->_draw; 4245 $self->_draw;
4246 }
4036} 4247}
4037 4248
4038############################################################################# 4249#############################################################################
4039 4250
4040package CFClient::UI; 4251package CFPlus::UI;
4041 4252
4042$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
4043$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4044 4255
40451 42561
4046 4257

Diff Legend

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