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

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

Diff Legend

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