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

Diff Legend

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