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.311 by root, Fri Jun 23 22:35:16 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) = @_;
… …
539 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
540 607
541 # update screen rectangle 608 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 611
547 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 615
… …
573 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
576 glEnd; 641 glEnd;
577 glPopMatrix; 642 glPopMatrix;
578 #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;
579 } 644 }
580 645
581 $self->_draw; 646 $self->_draw;
582 glPopMatrix; 647 glPopMatrix;
583} 648}
… …
586 my ($self) = @_; 651 my ($self) = @_;
587 652
588 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
589} 654}
590 655
656my $cntx;#d#
591sub DESTROY { 657sub DESTROY {
592 my ($self) = @_; 658 my ($self) = @_;
593 659
594 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
595 661
596 eval { $self->destroy }; 662 eval { $self->destroy };
597 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};
598} 666}
599 667
600############################################################################# 668#############################################################################
601 669
602package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
603 671
604our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
605 673
606use strict; 674use strict;
607use CFClient::OpenGL; 675use CFPlus::OpenGL;
608 676
609sub new { 677sub new {
610 my $class = shift; 678 my $class = shift;
611 679
612 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
643 } 711 }
644} 712}
645 713
646############################################################################# 714#############################################################################
647 715
648package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
649 717
650our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
651 719
652sub new { 720sub new {
653 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
654 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
655} 723}
… …
662 730
663sub draw { } 731sub draw { }
664 732
665############################################################################# 733#############################################################################
666 734
667package CFClient::UI::Container; 735package CFPlus::UI::Container;
668 736
669our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
670 738
671sub new { 739sub new {
672 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
673 741
674 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
683 if $children; 751 if $children;
684 752
685 $self 753 $self
686} 754}
687 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
688sub add { 764sub add {
689 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
690 766
691 $_->set_parent ($self) 767 $_->set_parent ($self)
692 for @widgets; 768 for @widgets;
… …
752 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
753} 829}
754 830
755############################################################################# 831#############################################################################
756 832
757package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
758 834
759our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
760 836
761sub new { 837sub new {
762 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
763 839
764 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
765 841
766 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
767} 843}
768 844
769sub add { 845sub add {
… …
776sub remove { 852sub remove {
777 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
778 854
779 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
780 856
781 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 858 unless @{$self->{children}};
783} 859}
784 860
785sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
786 862
… …
798 874
799############################################################################# 875#############################################################################
800 876
801# back-buffered drawing area 877# back-buffered drawing area
802 878
803package CFClient::UI::Window; 879package CFPlus::UI::Window;
804 880
805our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
806 882
807use CFClient::OpenGL; 883use CFPlus::OpenGL;
808 884
809sub new { 885sub new {
810 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
811 887
812 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
834} 910}
835 911
836sub render_child { 912sub render_child {
837 my ($self) = @_; 913 my ($self) = @_;
838 914
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
842 918
843 { 919 {
844 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
845 921
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
848 } 926 }
849
850 $self->_render;
851 }; 927 };
852} 928}
853 929
854sub _draw { 930sub _draw {
855 my ($self) = @_; 931 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 932
859 my $tex = $self->{texture} 933 my $tex = $self->{texture}
860 or return; 934 or return;
861 935
862 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
865 939
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
867 941
868 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
869} 943}
870 944
871############################################################################# 945#############################################################################
872 946
873package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
874 948
949use List::Util qw(min max);
950
875our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
876 952
877sub new { 953sub new {
878 my $class = shift; 954 my $class = shift;
879 955
880 $class->SUPER::new ( 956 $class->SUPER::new (
… …
910} 986}
911 987
912sub set_offset { 988sub set_offset {
913 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
914 990
915 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
916 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
917 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
918 $self->update; 995 $self->update;
919} 996}
920 997
921# 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
922sub coord2local { 999sub coord2local {
… …
940 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
941 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
942 ) { 1019 ) {
943 $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})
944 } else { 1021 } else {
945 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
946 } 1023 }
947} 1024}
948 1025
949sub _render { 1026sub _render {
950 my ($self) = @_; 1027 my ($self) = @_;
951 1028
952 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};
953 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};
954 1031
955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
956 1033
957 $self->SUPER::_render; 1034 $self->SUPER::_render;
958} 1035}
959 1036
960############################################################################# 1037#############################################################################
961 1038
962package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
963 1040
964our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
965 1042
966sub new { 1043sub new {
967 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
968 1045
969 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
970 1047
971 my $self; 1048 my $self;
972 1049
973 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
974 vertical => 1, 1060 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub { 1062 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
978 }, 1065 },
979 ; 1066 ;
980 1067
981 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
983 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
984 %arg, 1076 %arg,
985 ); 1077 );
986 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
987 $self->SUPER::add ($self->{vp}, $self->{slider}); 1093 $self->SUPER::add (0, 0, $self->{vp});
1094
988 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
989 1096
990 $self 1097 $self
991} 1098}
1099
1100#TODO# update range on size_allocate depending on child
992 1101
993sub add { 1102sub add {
994 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
995 1104
996 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
997} 1106}
998 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
999sub update { 1132sub update {
1000 my ($self) = @_; 1133 my ($self) = @_;
1001 1134
1002 $self->SUPER::update; 1135 $self->SUPER::update;
1136 $self->update_slider;
1137}
1003 1138
1004 # todo: overwrite size_allocate of child 1139sub invoke_mouse_wheel {
1005 my $child = $self->{vp}->child; 1140 my ($self, $ev) = @_;
1006 $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
1007} 1190}
1008 1191
1009sub invoke_size_allocate { 1192sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1011 1194
1012 my $child = $self->{vp}->child; 1195 $self->update_slider;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1016} 1197}
1017 1198
1018#TODO# update range on size_allocate depending on child
1019# update viewport offset on scroll
1020
1021############################################################################# 1199#############################################################################
1022 1200
1023package CFClient::UI::Frame; 1201package CFPlus::UI::Frame;
1024 1202
1025our @ISA = CFClient::UI::Bin::; 1203our @ISA = CFPlus::UI::Bin::;
1026 1204
1027use CFClient::OpenGL; 1205use CFPlus::OpenGL;
1028 1206
1029sub new { 1207sub new {
1030 my $class = shift; 1208 my $class = shift;
1031 1209
1032 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1058 $self->SUPER::_draw; 1236 $self->SUPER::_draw;
1059} 1237}
1060 1238
1061############################################################################# 1239#############################################################################
1062 1240
1063package CFClient::UI::FancyFrame; 1241package CFPlus::UI::FancyFrame;
1064 1242
1065our @ISA = CFClient::UI::Bin::; 1243our @ISA = CFPlus::UI::Bin::;
1066 1244
1067use 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;
1068 1346
1069my $bg = 1347my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1348 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1349 mipmap => 1, wrap => 1;
1072 1350
1073my @border = 1351my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1352 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1075 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);
1076 1354
1077sub new { 1355sub new {
1078 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1079 1357
1080 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1361 border => 0.6,
1084 can_events => 1, 1362 can_events => 1,
1085 min_w => 16, 1363 min_w => 64,
1086 min_h => 16, 1364 min_h => 32,
1087 %arg, 1365 %arg,
1088 ); 1366 );
1089 1367
1090 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1091 align => 0, 1369 align => 0,
1092 valign => 1, 1370 valign => 1,
1093 text => $self->{title}, 1371 text => $self->{title},
1094 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1095 if exists $self->{title}; 1373 if exists $self->{title};
1096 1374
1097 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1376 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1100 path => 'x1_close.png', 1378 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1379 on_activate => sub { $self->emit ("delete") };
1102 1380
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1104 } 1382 }
1105 1383
1106 $self 1384 $self
1107} 1385}
1108 1386
1109sub add { 1387sub add {
1110 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1111 1389
1112 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1113 $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};
1114 $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};
1115} 1393}
1116 1394
1117sub border { 1395sub border {
1118 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1119} 1397}
… …
1152 $self->child->configure ($border, $border, $w, $h); 1430 $self->child->configure ($border, $border, $w, $h);
1153 1431
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1432 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1433 if $self->{close_button};
1156 1434
1435 1
1436}
1437
1438sub invoke_delete {
1439 my ($self) = @_;
1440
1441 $self->hide;
1442
1157 1 1443 1
1158} 1444}
1159 1445
1160sub invoke_button_down { 1446sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1447 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1506
1221 ! ! $self->{motion} 1507 ! ! $self->{motion}
1222} 1508}
1223 1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1516}
1517
1224sub _draw { 1518sub _draw {
1225 my ($self) = @_; 1519 my ($self) = @_;
1226 1520
1227 my $child = $self->{children}[0]; 1521 my $child = $self->{children}[0];
1228 1522
… …
1265 if $self->{close_button}; 1559 if $self->{close_button};
1266} 1560}
1267 1561
1268############################################################################# 1562#############################################################################
1269 1563
1270package CFClient::UI::Table; 1564package CFPlus::UI::Table;
1271 1565
1272our @ISA = CFClient::UI::Base::; 1566our @ISA = CFPlus::UI::Base::;
1273 1567
1274use List::Util qw(max sum); 1568use List::Util qw(max sum);
1275 1569
1276use CFClient::OpenGL; 1570use CFPlus::OpenGL;
1277 1571
1278sub new { 1572sub new {
1279 my $class = shift; 1573 my $class = shift;
1280 1574
1281 $class->SUPER::new ( 1575 $class->SUPER::new (
1576 children => [],
1282 col_expand => [], 1577 col_expand => [],
1578 row_expand => [],
1283 @_, 1579 @_,
1284 ) 1580 )
1285} 1581}
1286 1582
1287sub children { 1583sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1584 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289} 1585}
1290 1586
1587# TODO: store row/col info in child widget and use standard add/del
1291sub add { 1588sub add {
1292 my ($self, $x, $y, $child) = @_; 1589 my ($self) = shift;
1293 1590
1591 while (@_) {
1592 my ($x, $y, $child) = splice @_, 0, 3, ();
1294 $child->set_parent ($self); 1593 $child->set_parent ($self);
1295 $self->{children}[$y][$x] = $child; 1594 $self->{children}[$y][$x] = $child;
1595 }
1296 1596
1597 $self->{force_realloc} = 1;
1598 $self->{force_size_alloc} = 1;
1297 $self->realloc; 1599 $self->realloc;
1298} 1600}
1299 1601
1300sub remove { 1602sub remove {
1301 my ($self, $child) = @_; 1603 my ($self, $child) = @_;
1302 1604
1303 # TODO: not yet implemented 1605 for (@{ $self->{children} }) {
1606 for (@{ $_ || [] }) {
1607 $_ = undef if $_ == $child;
1608 }
1609 }
1304} 1610}
1305 1611
1306# 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?
1307sub clear { 1613sub clear {
1308 my ($self) = @_; 1614 my ($self) = @_;
… …
1357 my ($ws, $hs) = $self->get_wh; 1663 my ($ws, $hs) = $self->get_wh;
1358 1664
1359 my $req_w = (sum @$ws) || 1; 1665 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1666 my $req_h = (sum @$hs) || 1;
1361 1667
1362 # TODO: nicer code && do row_expand 1668 # TODO: nicer code
1363 my @col_expand = @{$self->{col_expand}}; 1669 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1670 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1671 my $col_expand = (sum @col_expand) || 1;
1366 1672
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1673 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1674
1371 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
1372 CFClient::UI::harmonize $hs; 1683 CFPlus::UI::harmonize $hs;
1373 1684
1374 my $y; 1685 my $y;
1375 1686
1376 for my $r (0 .. $#{$self->{children}}) { 1687 for my $r (0 .. $#{$self->{children}}) {
1377 my $row = $self->{children}[$r] 1688 my $row = $self->{children}[$r]
… …
1420 } 1731 }
1421} 1732}
1422 1733
1423############################################################################# 1734#############################################################################
1424 1735
1425package CFClient::UI::Box; 1736package CFPlus::UI::Fixed;
1426 1737
1738use List::Util qw(min max);
1739
1427our @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::;
1428 1821
1429sub size_request { 1822sub size_request {
1430 my ($self) = @_; 1823 my ($self) = @_;
1431 1824
1432 $self->{vertical} 1825 $self->{vertical}
… …
1465 $req[$_] += $space * $children[$_]{expand} 1858 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1859 for 0 .. $#children;
1467 } 1860 }
1468 } 1861 }
1469 1862
1470 CFClient::UI::harmonize \@req; 1863 CFPlus::UI::harmonize \@req;
1471 1864
1472 my $pos = 0; 1865 my $pos = 0;
1473 for (0 .. $#children) { 1866 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1867 my $alloc = $req[$_];
1475 $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));
… …
1480 1 1873 1
1481} 1874}
1482 1875
1483############################################################################# 1876#############################################################################
1484 1877
1485package CFClient::UI::HBox; 1878package CFPlus::UI::HBox;
1486 1879
1487our @ISA = CFClient::UI::Box::; 1880our @ISA = CFPlus::UI::Box::;
1488 1881
1489sub new { 1882sub new {
1490 my $class = shift; 1883 my $class = shift;
1491 1884
1492 $class->SUPER::new ( 1885 $class->SUPER::new (
… …
1495 ) 1888 )
1496} 1889}
1497 1890
1498############################################################################# 1891#############################################################################
1499 1892
1500package CFClient::UI::VBox; 1893package CFPlus::UI::VBox;
1501 1894
1502our @ISA = CFClient::UI::Box::; 1895our @ISA = CFPlus::UI::Box::;
1503 1896
1504sub new { 1897sub new {
1505 my $class = shift; 1898 my $class = shift;
1506 1899
1507 $class->SUPER::new ( 1900 $class->SUPER::new (
… …
1510 ) 1903 )
1511} 1904}
1512 1905
1513############################################################################# 1906#############################################################################
1514 1907
1515package CFClient::UI::Label; 1908package CFPlus::UI::Label;
1516 1909
1517our @ISA = CFClient::UI::DrawBG::; 1910our @ISA = CFPlus::UI::DrawBG::;
1518 1911
1519use CFClient::OpenGL; 1912use CFPlus::OpenGL;
1520 1913
1521sub new { 1914sub new {
1522 my ($class, %arg) = @_; 1915 my ($class, %arg) = @_;
1523 1916
1524 my $self = $class->SUPER::new ( 1917 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1920 #active_bg => none
1528 #font => default_font 1921 #font => default_font
1529 #text => initial text 1922 #text => initial text
1530 #markup => initial narkup 1923 #markup => initial narkup
1531 #max_w => maximum pixel width 1924 #max_w => maximum pixel width
1925 #style => 0, # render flags
1532 ellipsise => 3, # end 1926 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1927 layout => (new CFPlus::Layout),
1534 fontsize => 1, 1928 fontsize => 1,
1535 align => -1, 1929 align => -1,
1536 valign => -1, 1930 valign => -1,
1537 padding_x => 2, 1931 padding_x => 2,
1538 padding_y => 2, 1932 padding_y => 2,
1539 can_events => 0, 1933 can_events => 0,
1540 %arg 1934 %arg
1541 ); 1935 );
1542 1936
1543 if (exists $self->{template}) { 1937 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1938 my $layout = new CFPlus::Layout;
1545 $layout->set_text (delete $self->{template}); 1939 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1940 $self->{template} = $layout;
1547 } 1941 }
1548 1942
1549 if (exists $self->{markup}) { 1943 if (exists $self->{markup}) {
… …
1553 } 1947 }
1554 1948
1555 $self 1949 $self
1556} 1950}
1557 1951
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1952sub update {
1569 my ($self) = @_; 1953 my ($self) = @_;
1570 1954
1571 delete $self->{texture}; 1955 delete $self->{texture};
1572 $self->SUPER::update; 1956 $self->SUPER::update;
… …
1583 my ($self, $text) = @_; 1967 my ($self, $text) = @_;
1584 1968
1585 return if $self->{text} eq "T$text"; 1969 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1970 $self->{text} = "T$text";
1587 1971
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1972 $self->{layout}->set_text ($text);
1590 1973
1591 delete $self->{size_req}; 1974 delete $self->{size_req};
1592 $self->realloc; 1975 $self->realloc;
1593 $self->update; 1976 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1982 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1983 $self->{text} = "M$markup";
1601 1984
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1985 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1986
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1987 $self->{layout}->set_markup ($markup);
1606 1988
1607 delete $self->{size_req}; 1989 delete $self->{size_req};
1608 $self->realloc; 1990 $self->realloc;
1609 $self->update; 1991 $self->update;
… …
1621 2003
1622 my ($w, $h) = $self->{layout}->size; 2004 my ($w, $h) = $self->{layout}->size;
1623 2005
1624 if (exists $self->{template}) { 2006 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2009 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 2010
1628 my ($w2, $h2) = $self->{template}->size; 2011 my ($w2, $h2) = $self->{template}->size;
1629 2012
1630 $w = List::Util::max $w, $w2; 2013 $w = List::Util::max $w, $w2;
… …
1654 2037
1655sub set_fontsize { 2038sub set_fontsize {
1656 my ($self, $fontsize) = @_; 2039 my ($self, $fontsize) = @_;
1657 2040
1658 $self->{fontsize} = $fontsize; 2041 $self->{fontsize} = $fontsize;
2042 delete $self->{size_req};
1659 delete $self->{texture}; 2043 delete $self->{texture};
1660 2044
1661 $self->realloc; 2045 $self->realloc;
1662} 2046}
1663 2047
1664sub reconfigure { 2048sub reconfigure {
1665 my ($self) = @_; 2049 my ($self) = @_;
1666 2050
1667 delete $self->{size_req}; 2051 delete $self->{size_req};
2052 delete $self->{texture};
1668 2053
1669 $self->SUPER::reconfigure; 2054 $self->SUPER::reconfigure;
1670} 2055}
1671 2056
1672sub _draw { 2057sub _draw {
1673 my ($self) = @_; 2058 my ($self) = @_;
1674 2059
1675 $self->SUPER::_draw; # draw background, if applicable 2060 $self->SUPER::_draw; # draw background, if applicable
1676 2061
1677 my $tex = $self->{texture} ||= do { 2062 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 2063 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2064 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 2065 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2066 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2067 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2068 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 2069
1685 new_from_layout CFClient::Texture $self->{layout} 2070 [$self->{layout}->size]
1686 }; 2071 };
1687 2072
1688 unless (exists $self->{ox}) { 2073 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2074 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2075 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 2076 : ($self->{w} - $size->[0]) * 0.5);
1692 2077
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2078 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2079 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 2080 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 2081 };
1697 2082
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2083 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2084 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 2085
1703 if ($tex->{format} == GL_ALPHA) { 2086 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 2087}
1714 2088
1715############################################################################# 2089#############################################################################
1716 2090
1717package CFClient::UI::EntryBase; 2091package CFPlus::UI::EntryBase;
1718 2092
1719our @ISA = CFClient::UI::Label::; 2093our @ISA = CFPlus::UI::Label::;
1720 2094
1721use CFClient::OpenGL; 2095use CFPlus::OpenGL;
1722 2096
1723sub new { 2097sub new {
1724 my $class = shift; 2098 my $class = shift;
1725 2099
1726 $class->SUPER::new ( 2100 $class->SUPER::new (
… …
1730 active_fg => [0, 0, 0], 2104 active_fg => [0, 0, 0],
1731 can_hover => 1, 2105 can_hover => 1,
1732 can_focus => 1, 2106 can_focus => 1,
1733 valign => 0, 2107 valign => 0,
1734 can_events => 1, 2108 can_events => 1,
2109 ellipsise => 0,
1735 #text => ... 2110 #text => ...
1736 #hidden => "*", 2111 #hidden => "*",
1737 @_ 2112 @_
1738 ) 2113 )
1739} 2114}
… …
1784 my $sym = $ev->{sym}; 2159 my $sym = $ev->{sym};
1785 my $uni = $ev->{unicode}; 2160 my $uni = $ev->{unicode};
1786 2161
1787 my $text = $self->get_text; 2162 my $text = $self->get_text;
1788 2163
2164 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2165
1789 if ($uni == 8) { 2166 if ($uni == 8) {
1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2167 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1791 } elsif ($uni == 127) { 2168 } elsif ($uni == 127) {
1792 substr $text, $self->{cursor}, 1, ""; 2169 substr $text, $self->{cursor}, 1, "";
1793 } elsif ($sym == CFClient::SDLK_LEFT) { 2170 } elsif ($sym == CFPlus::SDLK_LEFT) {
1794 --$self->{cursor} if $self->{cursor}; 2171 --$self->{cursor} if $self->{cursor};
1795 } elsif ($sym == CFClient::SDLK_RIGHT) { 2172 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1796 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2173 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1797 } 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 = "";
1798 $self->{cursor} = 0; 2188 $self->{cursor} = 0;
1799 } elsif ($sym == CFClient::SDLK_END) {
1800 $self->{cursor} = length $text;
1801 } elsif ($uni == 27) { 2189 } elsif ($uni == 27) {
1802 $self->emit ('escape'); 2190 $self->emit ('escape');
1803 } elsif ($uni) { 2191 } elsif ($uni == 0x0d) {
2192 substr $text, $self->{cursor}++, 0, "\012";
2193 } elsif ($uni >= 0x20) {
1804 substr $text, $self->{cursor}++, 0, chr $uni; 2194 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else { 2195 } else {
1806 return 0; 2196 return 0;
1807 } 2197 }
1808 2198
1809 $self->_set_text ($text); 2199 $self->_set_text ($text);
1810 2200
1811 $self->realloc; 2201 $self->realloc;
2202 $self->update;
1812 2203
1813 1 2204 1
1814} 2205}
1815 2206
1816sub invoke_focus_in { 2207sub invoke_focus_in {
… …
1828 2219
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 2220 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 2221
1831 # byte-index to char-index 2222 # byte-index to char-index
1832 my $text = $self->{text}; 2223 my $text = $self->{text};
1833 utf8::encode $text; 2224 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 2225 $self->{cursor} = length $text;
1835 2226
1836 $self->_set_text ($self->{text}); 2227 $self->_set_text ($self->{text});
1837 $self->update; 2228 $self->update;
1838 2229
1839 1 2230 1
… …
1878 utf8::encode $text; 2269 utf8::encode $text;
1879 2270
1880 @$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)
1881 } 2272 }
1882 2273
1883 glColor @{$self->{fg}};
1884 glBegin GL_LINES; 2274 glBegin GL_LINES;
1885 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};
1886 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};
1887 glEnd; 2277 glEnd;
1888 } 2278 }
1889} 2279}
1890 2280
2281#############################################################################
2282
1891package CFClient::UI::Entry; 2283package CFPlus::UI::Entry;
1892 2284
1893our @ISA = CFClient::UI::EntryBase::; 2285our @ISA = CFPlus::UI::EntryBase::;
1894 2286
1895use CFClient::OpenGL; 2287use CFPlus::OpenGL;
1896 2288
1897sub invoke_key_down { 2289sub invoke_key_down {
1898 my ($self, $ev) = @_; 2290 my ($self, $ev) = @_;
1899 2291
1900 my $sym = $ev->{sym}; 2292 my $sym = $ev->{sym};
1901 2293
1902 if ($sym == 13) { 2294 if ($ev->{uni} == 0x0d || $sym == 13) {
1903 unshift @{$self->{history}}, 2295 unshift @{$self->{history}},
1904 my $txt = $self->get_text; 2296 my $txt = $self->get_text;
1905 2297
1906 $self->{history_pointer} = -1; 2298 $self->{history_pointer} = -1;
1907 $self->{history_saveback} = ''; 2299 $self->{history_saveback} = '';
1908 $self->emit (activate => $txt); 2300 $self->emit (activate => $txt);
1909 $self->update; 2301 $self->update;
1910 2302
1911 } elsif ($sym == CFClient::SDLK_UP) { 2303 } elsif ($sym == CFPlus::SDLK_UP) {
1912 if ($self->{history_pointer} < 0) { 2304 if ($self->{history_pointer} < 0) {
1913 $self->{history_saveback} = $self->get_text; 2305 $self->{history_saveback} = $self->get_text;
1914 } 2306 }
1915 if (@{$self->{history} || []} > 0) { 2307 if (@{$self->{history} || []} > 0) {
1916 $self->{history_pointer}++; 2308 $self->{history_pointer}++;
… …
1918 $self->{history_pointer} = @{$self->{history} || []} - 1; 2310 $self->{history_pointer} = @{$self->{history} || []} - 1;
1919 } 2311 }
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2312 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1921 } 2313 }
1922 2314
1923 } elsif ($sym == CFClient::SDLK_DOWN) { 2315 } elsif ($sym == CFPlus::SDLK_DOWN) {
1924 $self->{history_pointer}--; 2316 $self->{history_pointer}--;
1925 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2317 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1926 2318
1927 if ($self->{history_pointer} >= 0) { 2319 if ($self->{history_pointer} >= 0) {
1928 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2320 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1937 1 2329 1
1938} 2330}
1939 2331
1940############################################################################# 2332#############################################################################
1941 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
1942package CFClient::UI::Button; 2373package CFPlus::UI::Button;
1943 2374
1944our @ISA = CFClient::UI::Label::; 2375our @ISA = CFPlus::UI::Label::;
1945 2376
1946use CFClient::OpenGL; 2377use CFPlus::OpenGL;
1947 2378
1948my @tex = 2379my @tex =
1949 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1950 qw(b1_button_active.png); 2381 qw(b1_button_active.png);
1951 2382
1952sub new { 2383sub new {
1953 my $class = shift; 2384 my $class = shift;
1954 2385
… …
1991 $self->SUPER::_draw; 2422 $self->SUPER::_draw;
1992} 2423}
1993 2424
1994############################################################################# 2425#############################################################################
1995 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
1996package CFClient::UI::ImageButton; 2576package CFPlus::UI::ImageButton;
1997 2577
1998our @ISA = CFClient::UI::Image::; 2578our @ISA = CFPlus::UI::Image::;
1999 2579
2000use CFClient::OpenGL; 2580use CFPlus::OpenGL;
2001 2581
2002my %textures; 2582my %textures;
2003 2583
2004sub new { 2584sub new {
2005 my $class = shift; 2585 my $class = shift;
… …
2027 1 2607 1
2028} 2608}
2029 2609
2030############################################################################# 2610#############################################################################
2031 2611
2032package CFClient::UI::CheckBox;
2033
2034our @ISA = CFClient::UI::DrawBG::;
2035
2036my @tex =
2037 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2038 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2039
2040use CFClient::OpenGL;
2041
2042sub new {
2043 my $class = shift;
2044
2045 $class->SUPER::new (
2046 padding_x => 2,
2047 padding_y => 2,
2048 fg => [1, 1, 1],
2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
2052 state => 0,
2053 can_hover => 1,
2054 @_
2055 )
2056}
2057
2058sub size_request {
2059 my ($self) = @_;
2060
2061 (6) x 2
2062}
2063
2064sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_;
2066
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state};
2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
2075 1
2076}
2077
2078sub _draw {
2079 my ($self) = @_;
2080
2081 $self->SUPER::_draw;
2082
2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2084
2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2088
2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2090
2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
2092
2093 glEnable GL_TEXTURE_2D;
2094 $tex->draw_quad_alpha (0, 0, $s, $s);
2095 glDisable GL_TEXTURE_2D;
2096}
2097
2098#############################################################################
2099
2100package CFClient::UI::Image; 2612package CFPlus::UI::VGauge;
2101 2613
2102our @ISA = CFClient::UI::Base::; 2614our @ISA = CFPlus::UI::Base::;
2103
2104use CFClient::OpenGL;
2105
2106our %texture_cache;
2107
2108sub new {
2109 my $class = shift;
2110
2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2115
2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2118
2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121
2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2123
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2125
2126 $self
2127}
2128
2129sub size_request {
2130 my ($self) = @_;
2131
2132 ($self->{tex}{w}, $self->{tex}{h})
2133}
2134
2135sub _draw {
2136 my ($self) = @_;
2137
2138 my $tex = $self->{tex};
2139
2140 my ($w, $h) = ($self->{w}, $self->{h});
2141
2142 if ($self->{rot90}) {
2143 glRotate 90, 0, 0, 1;
2144 glTranslate 0, -$self->{w}, 0;
2145
2146 ($w, $h) = ($h, $w);
2147 }
2148
2149 glEnable GL_TEXTURE_2D;
2150 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2151
2152 $tex->draw_quad_alpha (0, 0, $w, $h);
2153
2154 glDisable GL_TEXTURE_2D;
2155}
2156
2157#############################################################################
2158
2159package CFClient::UI::VGauge;
2160
2161our @ISA = CFClient::UI::Base::;
2162 2615
2163use List::Util qw(min max); 2616use List::Util qw(min max);
2164 2617
2165use CFClient::OpenGL; 2618use CFPlus::OpenGL;
2166 2619
2167my %tex = ( 2620my %tex = (
2168 food => [ 2621 food => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2622 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2623 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2171 ], 2624 ],
2172 grace => [ 2625 grace => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2626 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 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/
2175 ], 2628 ],
2176 hp => [ 2629 hp => [
2177 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2630 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2178 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2631 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2179 ], 2632 ],
2180 mana => [ 2633 mana => [
2181 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2634 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2182 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/
2183 ], 2636 ],
2184); 2637);
2185 2638
2186# eg. VGauge->new (gauge => 'food'), default gauge: food 2639# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2699 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2700 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2701
2249 my $h1 = $self->{h} * (1 - $ycut1); 2702 my $h1 = $self->{h} * (1 - $ycut1);
2250 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);
2251 2707
2252 glEnable GL_BLEND; 2708 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2709 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2710 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2711 glEnable GL_TEXTURE_2D;
… …
2274 2730
2275 if ($t3) { 2731 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2732 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2733 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2734 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2735 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2736 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2737 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2738 glEnd;
2283 } 2739 }
2284 2740
2285 glDisable GL_BLEND; 2741 glDisable GL_BLEND;
2286 glDisable GL_TEXTURE_2D; 2742 glDisable GL_TEXTURE_2D;
2287} 2743}
2288 2744
2289############################################################################# 2745#############################################################################
2290 2746
2291package CFClient::UI::Gauge; 2747package CFPlus::UI::Gauge;
2292 2748
2293our @ISA = CFClient::UI::VBox::; 2749our @ISA = CFPlus::UI::VBox::;
2294 2750
2295sub new { 2751sub new {
2296 my ($class, %arg) = @_; 2752 my ($class, %arg) = @_;
2297 2753
2298 my $self = $class->SUPER::new ( 2754 my $self = $class->SUPER::new (
… …
2300 can_hover => 1, 2756 can_hover => 1,
2301 can_events => 1, 2757 can_events => 1,
2302 %arg, 2758 %arg,
2303 ); 2759 );
2304 2760
2305 $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");
2306 $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);
2307 $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");
2308 2764
2309 $self 2765 $self
2310} 2766}
2311 2767
2312sub set_fontsize { 2768sub set_fontsize {
… …
2333 $self->{value}->set_text ($val); 2789 $self->{value}->set_text ($val);
2334} 2790}
2335 2791
2336############################################################################# 2792#############################################################################
2337 2793
2338package CFClient::UI::Slider; 2794package CFPlus::UI::Slider;
2339 2795
2340use strict; 2796use strict;
2341 2797
2342use CFClient::OpenGL; 2798use CFPlus::OpenGL;
2343 2799
2344our @ISA = CFClient::UI::DrawBG::; 2800our @ISA = CFPlus::UI::DrawBG::;
2345 2801
2346my @tex = 2802my @tex =
2347 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2803 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2348 qw(s1_slider.png s1_slider_bg.png); 2804 qw(s1_slider.png s1_slider_bg.png);
2349 2805
2350sub new { 2806sub new {
2351 my $class = shift; 2807 my $class = shift;
2352 2808
… …
2441 } 2897 }
2442 2898
2443 1 2899 1
2444} 2900}
2445 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
2446sub update { 2914sub update {
2447 my ($self) = @_; 2915 my ($self) = @_;
2448 2916
2449 delete $self->{knob_w}; 2917 delete $self->{knob_w};
2450 $self->SUPER::update; 2918 $self->SUPER::update;
… …
2497 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2498} 2966}
2499 2967
2500############################################################################# 2968#############################################################################
2501 2969
2502package CFClient::UI::ValSlider; 2970package CFPlus::UI::ValSlider;
2503 2971
2504our @ISA = CFClient::UI::HBox::; 2972our @ISA = CFPlus::UI::HBox::;
2505 2973
2506sub new { 2974sub new {
2507 my ($class, %arg) = @_; 2975 my ($class, %arg) = @_;
2508 2976
2509 my $range = delete $arg{range}; 2977 my $range = delete $arg{range};
2510 2978
2511 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2980 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2981 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift }, 2982 to_value => sub { shift },
2515 from_value => sub { shift }, 2983 from_value => sub { shift },
2516 %arg, 2984 %arg,
2517 ); 2985 );
2518 2986
… …
2538sub set_range { shift->{slider}->set_range (@_) } 3006sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) } 3007sub set_value { shift->{slider}->set_value (@_) }
2540 3008
2541############################################################################# 3009#############################################################################
2542 3010
2543package CFClient::UI::TextScroller; 3011package CFPlus::UI::TextScroller;
2544 3012
2545our @ISA = CFClient::UI::HBox::; 3013our @ISA = CFPlus::UI::HBox::;
2546 3014
2547use CFClient::OpenGL; 3015use CFPlus::OpenGL;
2548 3016
2549sub new { 3017sub new {
2550 my $class = shift; 3018 my $class = shift;
2551 3019
2552 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
2553 fontsize => 1, 3021 fontsize => 1,
2554 can_events => 0, 3022 can_events => 1,
2555 indent => 0, 3023 indent => 0,
2556 #font => default_font 3024 #font => default_font
2557 @_, 3025 @_,
2558 3026
2559 layout => (new CFClient::Layout 1), 3027 layout => (new CFPlus::Layout),
2560 par => [], 3028 par => [],
3029 max_par => 0,
2561 height => 0, 3030 height => 0,
2562 children => [ 3031 children => [
2563 (new CFClient::UI::Empty expand => 1), 3032 (new CFPlus::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 3033 (new CFPlus::UI::Slider vertical => 1),
2565 ], 3034 ],
2566 ); 3035 );
2567 3036
2568 $self->{children}[1]->connect (changed => sub { $self->update }); 3037 $self->{children}[1]->connect (changed => sub { $self->update });
2569 3038
… …
2575 3044
2576 $self->{fontsize} = $fontsize; 3045 $self->{fontsize} = $fontsize;
2577 $self->reflow; 3046 $self->reflow;
2578} 3047}
2579 3048
2580sub visible_children { 3049sub size_request {
2581 my ($self) = @_; 3050 my ($self) = @_;
2582 3051
2583 @{$self->{children}}[0,1] 3052 my ($empty, $slider) = @{ $self->{children} };
3053
3054 local $self->{children} = [$empty, $slider];
3055 $self->SUPER::size_request
2584} 3056}
2585 3057
2586sub invoke_size_allocate { 3058sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_; 3059 my ($self, $w, $h) = @_;
2588 3060
… …
2594 $self->{layout}->set_width ($empty->{w}); 3066 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3067 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596 3068
2597 $self->reflow; 3069 $self->reflow;
2598 3070
3071 local $self->{children} = [$empty, $slider];
2599 $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
2600} 3083}
2601 3084
2602sub get_layout { 3085sub get_layout {
2603 my ($self, $para) = @_; 3086 my ($self, $para) = @_;
2604 3087
… …
2632 3115
2633 # todo: base offset on lines or so, not on pixels 3116 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset); 3117 $self->{children}[1]->set_value ($offset);
2635} 3118}
2636 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
2637sub clear { 3135sub clear {
2638 my ($self) = @_; 3136 my ($self) = @_;
2639 3137
2640 my (undef, undef, @other) = @{ $self->{children} }; 3138 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other; 3139 $self->remove ($_) for @other;
… …
2644 $self->{height} = 0; 3142 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3143 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646} 3144}
2647 3145
2648sub add_paragraph { 3146sub add_paragraph {
2649 my ($self, $color, $para, $indent) = @_; 3147 my $self = shift;
2650 3148
2651 my ($text, @w) = ref $para ? @$para : $para; 3149 for my $para (@_) {
2652
2653 $para = { 3150 $para = {
3151 fg => [1, 1, 1, 1],
3152 indent => 0,
3153 markup => "",
3154 widget => [],
3155 ref $para ? %$para : (markup => $para),
2654 w => 1e10, 3156 w => 1e10,
2655 wrapped => 1, 3157 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 }; 3158 };
2661 3159
2662 $self->add (@w) if @w; 3160 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2663 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 }
2664 3167
2665 $self->{need_reflow}++; 3168 $self->{need_reflow}++;
2666 $self->update; 3169 $self->update;
2667} 3170}
2668 3171
2669sub scroll_to_bottom { 3172sub scroll_to_bottom {
2670 my ($self) = @_; 3173 my ($self) = @_;
2671 3174
2672 $self->{scroll_to_bottom} = 1; 3175 $self->{scroll_to} = $#{$self->{par}};
2673 $self->update; 3176 $self->update;
2674} 3177}
2675 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
2676sub update { 3212sub update {
2677 my ($self) = @_; 3213 my ($self) = @_;
2678 3214
2679 $self->SUPER::update; 3215 $self->SUPER::update;
2680 3216
2681 return unless $self->{h} > 0; 3217 return unless $self->{h} > 0;
2682 3218
2683 delete $self->{texture}; 3219 delete $self->{texture};
2684 3220
2685 $ROOT->on_post_alloc ($self => sub { 3221 $ROOT->on_post_alloc ($self => sub {
3222 $self->force_uptodate;
3223
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3224 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687 3225
2688 if (delete $self->{need_reflow}) {
2689 my $height = 0;
2690
2691 for my $para (@{$self->{par}}) {
2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693 my $layout = $self->get_layout ($para);
2694 my ($w, $h) = $layout->size;
2695
2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2699 }
2700
2701 $height += $para->{h};
2702 }
2703
2704 $self->{height} = $height;
2705
2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2707
2708 delete $self->{texture};
2709 }
2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3226 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2716 glClearColor 0, 0, 0, 0; 3227 glClearColor 0, 0, 0, 0;
2717 glClear GL_COLOR_BUFFER_BIT; 3228 glClear GL_COLOR_BUFFER_BIT;
2718 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;
2719 my $top = int $self->{children}[1]{range}[0]; 3238 my $top = int $self->{children}[1]{range}[0];
2720 3239
2721 my $y0 = $top; 3240 my $y0 = $top;
2722 my $y1 = $top + $H; 3241 my $y1 = $top + $H;
2723 3242
2724 my $y = 0;
2725
2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2729
2730 for my $para (@{$self->{par}}) { 3243 for my $para (@{$self->{par}}) {
2731 my $h = $para->{h}; 3244 my $h = $para->{h};
3245 my $y = $para->{y};
2732 3246
2733 if ($y0 < $y + $h && $y < $y1) { 3247 if ($y0 < $y + $h && $y < $y1) {
2734
2735 my $layout = $self->get_layout ($para); 3248 my $layout = $self->get_layout ($para);
2736 3249
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0; 3250 $layout->render ($para->{indent}, $y - $y0);
2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741 3251
2742 if (my @w = @{ $para->{widget} }) { 3252 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes; 3253 my @s = $layout->get_shapes;
2744 3254
2745 for (@w) { 3255 for (@w) {
… …
2751 $_->draw; 3261 $_->draw;
2752 } 3262 }
2753 } 3263 }
2754 } 3264 }
2755 3265
2756 $y += $h; 3266 $paridx++;
3267 $top_paragraph ||= $paridx if $y >= $top;
2757 } 3268 }
2758 3269
2759 glDisable GL_BLEND; 3270 $self->{top_paragraph} = $top_paragraph;
2760 }; 3271 };
2761 }); 3272 });
2762} 3273}
2763 3274
2764sub reconfigure { 3275sub reconfigure {
… …
2782 $self->{children}[1]->draw; 3293 $self->{children}[1]->draw;
2783} 3294}
2784 3295
2785############################################################################# 3296#############################################################################
2786 3297
2787package CFClient::UI::Animator; 3298package CFPlus::UI::Animator;
2788 3299
2789use CFClient::OpenGL; 3300use CFPlus::OpenGL;
2790 3301
2791our @ISA = CFClient::UI::Bin::; 3302our @ISA = CFPlus::UI::Bin::;
2792 3303
2793sub moveto { 3304sub moveto {
2794 my ($self, $x, $y) = @_; 3305 my ($self, $x, $y) = @_;
2795 3306
2796 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3307 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2824 glPopMatrix; 3335 glPopMatrix;
2825} 3336}
2826 3337
2827############################################################################# 3338#############################################################################
2828 3339
2829package CFClient::UI::Flopper; 3340package CFPlus::UI::Flopper;
2830 3341
2831our @ISA = CFClient::UI::Button::; 3342our @ISA = CFPlus::UI::Button::;
2832 3343
2833sub new { 3344sub new {
2834 my $class = shift; 3345 my $class = shift;
2835 3346
2836 my $self = $class->SUPER::new ( 3347 my $self = $class->SUPER::new (
… …
2848 $self->{other}->toggle_visibility; 3359 $self->{other}->toggle_visibility;
2849} 3360}
2850 3361
2851############################################################################# 3362#############################################################################
2852 3363
2853package CFClient::UI::Tooltip; 3364package CFPlus::UI::Tooltip;
2854 3365
2855our @ISA = CFClient::UI::Bin::; 3366our @ISA = CFPlus::UI::Bin::;
2856 3367
2857use CFClient::OpenGL; 3368use CFPlus::OpenGL;
2858 3369
2859sub new { 3370sub new {
2860 my $class = shift; 3371 my $class = shift;
2861 3372
2862 $class->SUPER::new ( 3373 $class->SUPER::new (
… …
2865 ) 3376 )
2866} 3377}
2867 3378
2868sub set_tooltip_from { 3379sub set_tooltip_from {
2869 my ($self, $widget) = @_; 3380 my ($self, $widget) = @_;
3381
3382 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3383 if $widget->{tooltip} =~ /^#(.*)$/;
2870 3384
2871 my $tooltip = $widget->{tooltip}; 3385 my $tooltip = $widget->{tooltip};
2872 3386
2873 if ($ENV{CFPLUS_DEBUG} & 2) { 3387 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n" 3388 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2878 } 3392 }
2879 3393
2880 $tooltip =~ s/^\n+//; 3394 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//; 3395 $tooltip =~ s/\n+$//;
2882 3396
2883 $self->add (new CFClient::UI::Label 3397 $self->add (new CFPlus::UI::Label
2884 markup => $tooltip, 3398 markup => $tooltip,
2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3399 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2886 fontsize => 0.8, 3400 fontsize => 0.8,
2887 fg => [0, 0, 0, 1], 3401 style => 1, # FLAG_INVERSE
2888 ellipsise => 0, 3402 ellipsise => 0,
2889 font => ($widget->{tooltip_font} || $::FONT_PROP), 3403 font => ($widget->{tooltip_font} || $::FONT_PROP),
2890 ); 3404 );
2891} 3405}
2892 3406
… …
2911 3425
2912 $self->{root}->on_post_alloc ("move_$self" => sub { 3426 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner} 3427 my $widget = $self->{owner}
2914 or return; 3428 or return;
2915 3429
3430 if ($widget->{visible}) {
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3431 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917 3432
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3433 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w}; 3434 if $x + $self->{w} > $self->{root}{w};
2920 3435
2921 $self->move_abs ($x, $y); 3436 $self->move_abs ($x, $y);
3437 } else {
3438 $self->hide;
3439 }
2922 }); 3440 });
2923} 3441}
2924 3442
2925sub _draw { 3443sub _draw {
2926 my ($self) = @_; 3444 my ($self) = @_;
… …
2950 $self->SUPER::_draw; 3468 $self->SUPER::_draw;
2951} 3469}
2952 3470
2953############################################################################# 3471#############################################################################
2954 3472
2955package CFClient::UI::Face; 3473package CFPlus::UI::Face;
2956 3474
2957our @ISA = CFClient::UI::Base::; 3475our @ISA = CFPlus::UI::DrawBG::;
2958 3476
2959use CFClient::OpenGL; 3477use CFPlus::OpenGL;
2960 3478
2961sub new { 3479sub new {
2962 my $class = shift; 3480 my $class = shift;
2963 3481
2964 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3483 size_w => 32,
3484 size_h => 8,
2965 aspect => 1, 3485 aspect => 1,
2966 can_events => 0, 3486 can_events => 0,
2967 @_, 3487 @_,
2968 ); 3488 );
2969 3489
2970 if ($self->{anim} && $self->{animspeed}) { 3490 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self); 3491 CFPlus::weaken (my $widget = $self);
2972 3492
2973 $self->{timer} = Event->timer ( 3493 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3494 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1, 3495 hard => 1,
2976 interval => $self->{animspeed}, 3496 interval => $self->{animspeed},
2977 cb => sub { 3497 cb => sub {
3498 return unless $::CONN;
3499
2978 ++$widget->{frame}; 3500 ++$widget->{frame};
3501 $self->update_face;
2979 $widget->update; 3502 $self->update;
2980 }, 3503 },
2981 ); 3504 );
3505
3506 $self->update_face;
2982 } 3507 }
2983 3508
2984 $self 3509 $self
2985} 3510}
2986 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
2987sub size_request { 3525sub size_request {
2988 (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)
2989} 3541}
2990 3542
2991sub update { 3543sub update {
2992 my ($self) = @_; 3544 my ($self) = @_;
2993 3545
… …
2999sub _draw { 3551sub _draw {
3000 my ($self) = @_; 3552 my ($self) = @_;
3001 3553
3002 return unless $::CONN; 3554 return unless $::CONN;
3003 3555
3004 my $face; 3556 $self->SUPER::_draw;
3005 3557
3006 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}]; 3558 my $faceid = $::CONN->{faceid}[$self->{face}]
3008 3559 or return;
3009 $face = $anim->[ $self->{frame} % @$anim ]
3010 if $anim && @$anim;
3011 }
3012 3560
3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3561 my $tex = $::CONN->{texture}[$faceid];
3014 3562
3015 if ($tex) { 3563 if ($tex) {
3016 glEnable GL_TEXTURE_2D; 3564 glEnable GL_TEXTURE_2D;
3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3565 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3018 glColor 0, 0, 0, 1; 3566 glColor 0, 0, 0, 1;
… …
3030 $self->SUPER::destroy; 3578 $self->SUPER::destroy;
3031} 3579}
3032 3580
3033############################################################################# 3581#############################################################################
3034 3582
3035package CFClient::UI::Buttonbar; 3583package CFPlus::UI::Buttonbar;
3036 3584
3037our @ISA = CFClient::UI::HBox::; 3585our @ISA = CFPlus::UI::HBox::;
3038 3586
3039# TODO: should actualyl wrap buttons and other goodies. 3587# TODO: should actually wrap buttons and other goodies.
3040 3588
3041############################################################################# 3589#############################################################################
3042 3590
3043package CFClient::UI::Menu; 3591package CFPlus::UI::Menu;
3044 3592
3045our @ISA = CFClient::UI::FancyFrame::; 3593our @ISA = CFPlus::UI::Toplevel::;
3046 3594
3047use CFClient::OpenGL; 3595use CFPlus::OpenGL;
3048 3596
3049sub new { 3597sub new {
3050 my $class = shift; 3598 my $class = shift;
3051 3599
3052 my $self = $class->SUPER::new ( 3600 my $self = $class->SUPER::new (
3053 items => [], 3601 items => [],
3054 z => 100, 3602 z => 100,
3055 @_, 3603 @_,
3056 ); 3604 );
3057 3605
3058 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3606 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3059 3607
3060 for my $item (@{ $self->{items} }) { 3608 for my $item (@{ $self->{items} }) {
3061 my ($widget, $cb, $tooltip) = @$item; 3609 my ($widget, $cb, $tooltip) = @$item;
3062 3610
3063 # handle various types of items, only text for now 3611 # handle various types of items, only text for now
3064 if (!ref $widget) { 3612 if (!ref $widget) {
3613 if ($widget =~ /\t/) {
3614 my ($left, $right) = split /\t/, $widget, 2;
3615
3065 $widget = new CFClient::UI::Label 3616 $widget = new CFPlus::UI::HBox
3066 can_hover => 1, 3617 can_hover => 1,
3067 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,
3068 markup => $widget, 3630 markup => $widget,
3069 tooltip => $tooltip 3631 tooltip => $tooltip;
3632 }
3070 } 3633 }
3071 3634
3072 $self->{item}{$widget} = $item; 3635 $self->{item}{$widget} = $item;
3073 3636
3074 $self->{vbox}->add ($widget); 3637 $self->{vbox}->add ($widget);
… …
3117 1 3680 1
3118} 3681}
3119 3682
3120############################################################################# 3683#############################################################################
3121 3684
3122package CFClient::UI::Multiplexer; 3685package CFPlus::UI::Multiplexer;
3123 3686
3124our @ISA = CFClient::UI::Container::; 3687our @ISA = CFPlus::UI::Container::;
3125 3688
3126sub new { 3689sub new {
3127 my $class = shift; 3690 my $class = shift;
3128 3691
3129 my $self = $class->SUPER::new ( 3692 my $self = $class->SUPER::new (
… …
3143 3706
3144 $self->{current} = $self->{children}[0] 3707 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} }; 3708 if @{ $self->{children} };
3146} 3709}
3147 3710
3711sub get_current_page {
3712 my ($self) = @_;
3713
3714 $self->{current}
3715}
3716
3148sub set_current_page { 3717sub set_current_page {
3149 my ($self, $page_or_widget) = @_; 3718 my ($self, $page_or_widget) = @_;
3150 3719
3151 my $widget = ref $page_or_widget 3720 my $widget = ref $page_or_widget
3152 ? $page_or_widget 3721 ? $page_or_widget
… …
3184 $self->{current}->draw; 3753 $self->{current}->draw;
3185} 3754}
3186 3755
3187############################################################################# 3756#############################################################################
3188 3757
3189package CFClient::UI::Notebook; 3758package CFPlus::UI::Notebook;
3190 3759
3191our @ISA = CFClient::UI::VBox::; 3760our @ISA = CFPlus::UI::VBox::;
3192 3761
3193sub new { 3762sub new {
3194 my $class = shift; 3763 my $class = shift;
3195 3764
3196 my $self = $class->SUPER::new ( 3765 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar), 3766 buttonbar => (new CFPlus::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3767 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self 3768 # filter => # will be put between multiplexer and $self
3200 @_, 3769 @_,
3201 ); 3770 );
3202 3771
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3772 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3207} 3776}
3208 3777
3209sub add { 3778sub add {
3210 my ($self, $title, $widget, $tooltip) = @_; 3779 my ($self, $title, $widget, $tooltip) = @_;
3211 3780
3212 Scalar::Util::weaken $self; 3781 CFPlus::weaken $self;
3213 3782
3214 $self->{buttonbar}->add (new CFClient::UI::Button 3783 $self->{buttonbar}->add (new CFPlus::UI::Button
3215 markup => $title, 3784 markup => $title,
3216 tooltip => $tooltip, 3785 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) }, 3786 on_activate => sub { $self->set_current_page ($widget) },
3218 ); 3787 );
3219 3788
3220 $self->{multiplexer}->add ($widget); 3789 $self->{multiplexer}->add ($widget);
3221} 3790}
3222 3791
3792sub get_current_page {
3793 my ($self) = @_;
3794
3795 $self->{multiplexer}->get_current_page
3796}
3797
3223sub set_current_page { 3798sub set_current_page {
3224 my ($self, $page) = @_; 3799 my ($self, $page) = @_;
3225 3800
3226 $self->{multiplexer}->set_current_page ($page); 3801 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current}); 3802 $self->emit (page_changed => $self->{multiplexer}{current});
3228} 3803}
3229 3804
3230############################################################################# 3805#############################################################################
3231 3806
3232package CFClient::UI::Combobox; 3807package CFPlus::UI::Selector;
3233 3808
3234use utf8; 3809use utf8;
3235 3810
3236our @ISA = CFClient::UI::Button::; 3811our @ISA = CFPlus::UI::Button::;
3237 3812
3238sub new { 3813sub new {
3239 my $class = shift; 3814 my $class = shift;
3240 3815
3241 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
… …
3258 my ($value, $title, $tooltip) = @$_; 3833 my ($value, $title, $tooltip) = @$_;
3259 3834
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3835 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 } 3836 }
3262 3837
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3838 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264} 3839}
3265 3840
3266sub _set_value { 3841sub _set_value {
3267 my ($self, $value) = @_; 3842 my ($self, $value) = @_;
3268 3843
… …
3283 $self->emit (changed => $value); 3858 $self->emit (changed => $value);
3284} 3859}
3285 3860
3286############################################################################# 3861#############################################################################
3287 3862
3288package CFClient::UI::Statusbox; 3863package CFPlus::UI::Statusbox;
3289 3864
3290our @ISA = CFClient::UI::VBox::; 3865our @ISA = CFPlus::UI::VBox::;
3291 3866
3292sub new { 3867sub new {
3293 my $class = shift; 3868 my $class = shift;
3294 3869
3295 my $self = $class->SUPER::new ( 3870 my $self = $class->SUPER::new (
3296 fontsize => 0.8, 3871 fontsize => 0.8,
3297 @_, 3872 @_,
3298 ); 3873 );
3299 3874
3300 Scalar::Util::weaken (my $this = $self); 3875 CFPlus::weaken (my $this = $self);
3301 3876
3302 $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 });
3303 3878
3304 $self 3879 $self
3305} 3880}
… …
3307sub reorder { 3882sub reorder {
3308 my ($self) = @_; 3883 my ($self) = @_;
3309 my $NOW = Time::HiRes::time; 3884 my $NOW = Time::HiRes::time;
3310 3885
3311 # freeze display when hovering over any label 3886 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner} 3887 return if $CFPlus::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3888 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} }; 3889 values %{ $self->{item} };
3315 3890
3316 while (my ($k, $v) = each %{ $self->{item} }) { 3891 while (my ($k, $v) = each %{ $self->{item} }) {
3317 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3892 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3318 } 3893 }
… …
3339 for ($short) { 3914 for ($short) {
3340 s/^\s+//; 3915 s/^\s+//;
3341 s/\s+/ /g; 3916 s/\s+/ /g;
3342 } 3917 }
3343 3918
3344 new CFClient::UI::Label 3919 new CFPlus::UI::Label
3345 markup => $short, 3920 markup => $short,
3346 tooltip => $item->{tooltip}, 3921 tooltip => $item->{tooltip},
3347 tooltip_font => $::FONT_PROP, 3922 tooltip_font => $::FONT_PROP,
3348 tooltip_width => 0.67, 3923 tooltip_width => 0.67,
3349 fontsize => $item->{fontsize} || $self->{fontsize}, 3924 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3403 count => 1, 3978 count => 1,
3404 %arg, 3979 %arg,
3405 }; 3980 };
3406 } 3981 }
3407 3982
3983 $ROOT->on_refresh (reorder => sub {
3408 $self->reorder; 3984 $self->reorder;
3985 });
3409} 3986}
3410 3987
3411sub reconfigure { 3988sub reconfigure {
3412 my ($self) = @_; 3989 my ($self) = @_;
3413 3990
… …
3426 $self->SUPER::destroy; 4003 $self->SUPER::destroy;
3427} 4004}
3428 4005
3429############################################################################# 4006#############################################################################
3430 4007
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
3803package CFClient::UI::Root; 4008package CFPlus::UI::Root;
3804 4009
3805our @ISA = CFClient::UI::Container::; 4010our @ISA = CFPlus::UI::Container::;
3806 4011
3807use List::Util qw(min max); 4012use List::Util qw(min max);
3808 4013
3809use CFClient::OpenGL; 4014use CFPlus::OpenGL;
3810 4015
3811sub new { 4016sub new {
3812 my $class = shift; 4017 my $class = shift;
3813 4018
3814 my $self = $class->SUPER::new ( 4019 my $self = $class->SUPER::new (
3815 visible => 1, 4020 visible => 1,
3816 @_, 4021 @_,
3817 ); 4022 );
3818 4023
3819 Scalar::Util::weaken ($self->{root} = $self); 4024 CFPlus::weaken ($self->{root} = $self);
3820 4025
3821 $self 4026 $self
3822} 4027}
3823 4028
3824sub size_request { 4029sub size_request {
… …
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4195 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3991 4196
3992 $w = 0 if $w < 0; 4197 $w = 0 if $w < 0;
3993 $h = 0 if $h < 0; 4198 $h = 0 if $h < 0;
3994 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
3995 $w = int $w + 0.5; 4209 $w = int $w + 0.5;
3996 $h = int $h + 0.5; 4210 $h = int $h + 0.5;
3997 4211
3998 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}) {
3999 $widget->{old_w} = $widget->{w}; 4213 $widget->{old_w} = $widget->{w};
… …
4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4236 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4023 glMatrixMode GL_MODELVIEW; 4237 glMatrixMode GL_MODELVIEW;
4024 glLoadIdentity; 4238 glLoadIdentity;
4025 4239
4026 { 4240 {
4027 package CFClient::UI::Base; 4241 package CFPlus::UI::Base;
4028 4242
4029 ($draw_x, $draw_y, $draw_w, $draw_h) = 4243 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h}); 4244 (0, 0, $self->{w}, $self->{h});
4031 }
4032 4245
4033 $self->_draw; 4246 $self->_draw;
4247 }
4034} 4248}
4035 4249
4036############################################################################# 4250#############################################################################
4037 4251
4038package CFClient::UI; 4252package CFPlus::UI;
4039 4253
4040$ROOT = new CFClient::UI::Root; 4254$ROOT = new CFPlus::UI::Root;
4041$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4255$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4042 4256
40431 42571
4044 4258

Diff Legend

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