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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 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
247sub show { 273sub show {
248 my ($self) = @_; 274 my ($self) = @_;
249 275
250 return if $self->{parent}; 276 return if $self->{parent};
251 277
252 $CFClient::UI::ROOT->add ($self); 278 $CFPlus::UI::ROOT->add ($self);
253} 279}
254 280
255sub set_visible { 281sub set_visible {
256 my ($self) = @_; 282 my ($self) = @_;
257 283
… …
278 delete $self->{root}; 304 delete $self->{root};
279 305
280 undef $GRAB if $GRAB == $self; 306 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 307 undef $HOVER if $HOVER == $self;
282 308
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 309 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 310 if $TOOLTIP->{owner} == $self;
285 311
286 $self->emit ("focus_out"); 312 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 313 $self->emit (visibility_change => 0);
288} 314}
… …
335sub size_request { 361sub size_request {
336 require Carp; 362 require Carp;
337 Carp::confess "size_request is abstract"; 363 Carp::confess "size_request is abstract";
338} 364}
339 365
366sub baseline_shift {
367 0
368}
369
340sub configure { 370sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 371 my ($self, $x, $y, $w, $h) = @_;
342 372
343 if ($self->{aspect}) { 373 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 374 my ($ow, $oh) = ($w, $h);
345 375
346 $w = List::Util::min $w, int $h * $self->{aspect}; 376 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 377 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 378
349 # use alignment to adjust x, y 379 # use alignment to adjust x, y
350 380
351 $x += int 0.5 * ($ow - $w); 381 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 382 $y += int 0.5 * ($oh - $h);
… …
393 423
394 return if $self->{tooltip} eq $tooltip; 424 return if $self->{tooltip} eq $tooltip;
395 425
396 $self->{tooltip} = $tooltip; 426 $self->{tooltip} = $tooltip;
397 427
398 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 428 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
399 delete $CFClient::UI::TOOLTIP->{owner}; 429 delete $CFPlus::UI::TOOLTIP->{owner};
400 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 430 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
401 } 431 }
402} 432}
403 433
404# translate global coordinates to local coordinate system 434# translate global coordinates to local coordinate system
405sub coord2local { 435sub coord2local {
406 my ($self, $x, $y) = @_; 436 my ($self, $x, $y) = @_;
407 437
438 Carp::confess unless $self->{parent};#d#
439
408 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 440 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
409} 441}
410 442
411# translate local coordinates to global coordinate system 443# translate local coordinates to global coordinate system
412sub coord2global { 444sub coord2global {
413 my ($self, $x, $y) = @_; 445 my ($self, $x, $y) = @_;
414 446
447 Carp::confess unless $self->{parent};#d#
448
415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 449 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
416} 450}
417 451
418sub invoke_focus_in { 452sub invoke_focus_in {
419 my ($self) = @_; 453 my ($self) = @_;
420 454
421 return if $FOCUS == $self; 455 return if $FOCUS == $self;
422 return unless $self->{can_focus}; 456 return unless $self->{can_focus};
423 457
424 my $focus = $FOCUS; $FOCUS = $self; 458 $FOCUS = $self;
425 459
426 $focus->update if $focus; 460 $self->update;
427 $FOCUS->update;
428 461
429 0 462 0
430} 463}
431 464
432sub invoke_focus_out { 465sub invoke_focus_out {
433 my ($self) = @_; 466 my ($self) = @_;
434 467
435 return unless $FOCUS == $self; 468 return unless $FOCUS == $self;
436 469
437 my $focus = $FOCUS; undef $FOCUS; 470 undef $FOCUS;
438 471
439 $focus->update if $focus; #? 472 $self->update;
440 473
441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 474 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
442 unless $FOCUS; 475 unless $FOCUS;
443 476
444 0 477 0
445} 478}
446 479
447sub grab_focus { 480sub grab_focus {
448 my ($self) = @_; 481 my ($self) = @_;
449 482
483 $FOCUS->emit ("focus_out") if $FOCUS;
450 $self->emit ("focus_in"); 484 $self->emit ("focus_in");
451} 485}
452 486
453sub invoke_mouse_motion { 1 } 487sub invoke_mouse_motion { 0 }
454sub invoke_button_up { 1 } 488sub invoke_button_up { 0 }
455sub invoke_key_down { 1 } 489sub invoke_key_down { 0 }
456sub invoke_key_up { 1 } 490sub invoke_key_up { 0 }
491sub invoke_mouse_wheel { 0 }
457 492
458sub invoke_button_down { 493sub invoke_button_down {
459 my ($self, $ev, $x, $y) = @_; 494 my ($self, $ev, $x, $y) = @_;
460 495
461 $self->grab_focus; 496 $self->grab_focus;
462 497
463 1 498 0
464} 499}
465 500
466sub connect { 501sub connect {
467 my ($self, $signal, $cb) = @_; 502 my ($self, $signal, $cb) = @_;
468 503
469 push @{ $self->{signal_cb}{$signal} }, $cb; 504 push @{ $self->{signal_cb}{$signal} }, $cb;
505
506 defined wantarray and CFPlus::guard {
507 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
508 @{ $self->{signal_cb}{$signal} };
509 }
470} 510}
511
512sub disconnect_all {
513 my ($self, $signal) = @_;
514
515 delete $self->{signal_cb}{$signal};
516}
517
518my %has_coords = (
519 button_down => 1,
520 button_up => 1,
521 mouse_motion => 1,
522 mouse_wheel => 1,
523);
471 524
472sub emit { 525sub emit {
473 my ($self, $signal, @args) = @_; 526 my ($self, $signal, @args) = @_;
474 527
475 #d##TODO# stop propagating at first true, do not use sum 528 # I do not really like this solution, but I do not like duplication
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 529 # and needlessly verbose code, either.
530 my @append
531 = $has_coords{$signal}
532 ? $args[0]->xy ($self)
533 : ();
534
535 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
536
537 for my $cb (
538 @{$self->{signal_cb}{$signal} || []}, # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 539 ($self->can ("invoke_$signal") || sub { 1 }), # closure
540 ) {
541 return $cb->($self, @args, @append) || next;
542 }
543
544 # parent
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 545 $self->{parent} && $self->{parent}->emit ($signal, @args)
479} 546}
480 547
481sub find_widget { 548sub find_widget {
482 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
483 550
… …
491} 558}
492 559
493sub set_parent { 560sub set_parent {
494 my ($self, $parent) = @_; 561 my ($self, $parent) = @_;
495 562
496 Scalar::Util::weaken ($self->{parent} = $parent); 563 CFPlus::weaken ($self->{parent} = $parent);
497 $self->set_visible if $parent->{visible}; 564 $self->set_visible if $parent->{visible};
498} 565}
499 566
500sub realloc { 567sub realloc {
501 my ($self) = @_; 568 my ($self) = @_;
… …
535 return unless $self->{h} && $self->{w}; 602 return unless $self->{h} && $self->{w};
536 603
537 # update screen rectangle 604 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 605 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 606 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 607
543 # skip widgets that are entirely outside the drawing area 608 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 609 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 610 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 611
… …
569 glVertex $self->{w} - 1, 0; 634 glVertex $self->{w} - 1, 0;
570 glVertex $self->{w} - 1, $self->{h} - 1; 635 glVertex $self->{w} - 1, $self->{h} - 1;
571 glVertex 0 , $self->{h} - 1; 636 glVertex 0 , $self->{h} - 1;
572 glEnd; 637 glEnd;
573 glPopMatrix; 638 glPopMatrix;
574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
575 } 640 }
576 641
577 $self->_draw; 642 $self->_draw;
578 glPopMatrix; 643 glPopMatrix;
579} 644}
… …
582 my ($self) = @_; 647 my ($self) = @_;
583 648
584 warn "no draw defined for $self\n"; 649 warn "no draw defined for $self\n";
585} 650}
586 651
652my $cntx;#d#
587sub DESTROY { 653sub DESTROY {
588 my ($self) = @_; 654 my ($self) = @_;
589 655
590 delete $WIDGET{$self+0}; 656 return if CFPlus::in_destruct;
591 657
592 eval { $self->destroy }; 658 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660
661 delete $WIDGET{$self+0};
594} 662}
595 663
596############################################################################# 664#############################################################################
597 665
598package CFClient::UI::DrawBG; 666package CFPlus::UI::DrawBG;
599 667
600our @ISA = CFClient::UI::Base::; 668our @ISA = CFPlus::UI::Base::;
601 669
602use strict; 670use strict;
603use CFClient::OpenGL; 671use CFPlus::OpenGL;
604 672
605sub new { 673sub new {
606 my $class = shift; 674 my $class = shift;
607 675
608 # range [value, low, high, page] 676 # range [value, low, high, page]
… …
639 } 707 }
640} 708}
641 709
642############################################################################# 710#############################################################################
643 711
644package CFClient::UI::Empty; 712package CFPlus::UI::Empty;
645 713
646our @ISA = CFClient::UI::Base::; 714our @ISA = CFPlus::UI::Base::;
647 715
648sub new { 716sub new {
649 my ($class, %arg) = @_; 717 my ($class, %arg) = @_;
650 $class->SUPER::new (can_events => 0, %arg); 718 $class->SUPER::new (can_events => 0, %arg);
651} 719}
… …
658 726
659sub draw { } 727sub draw { }
660 728
661############################################################################# 729#############################################################################
662 730
663package CFClient::UI::Container; 731package CFPlus::UI::Container;
664 732
665our @ISA = CFClient::UI::Base::; 733our @ISA = CFPlus::UI::Base::;
666 734
667sub new { 735sub new {
668 my ($class, %arg) = @_; 736 my ($class, %arg) = @_;
669 737
670 my $children = delete $arg{children}; 738 my $children = delete $arg{children};
… …
679 if $children; 747 if $children;
680 748
681 $self 749 $self
682} 750}
683 751
752sub realloc {
753 my ($self) = @_;
754
755 $self->{force_realloc} = 1;
756 $self->{force_size_alloc} = 1;
757 $self->SUPER::realloc;
758}
759
684sub add { 760sub add {
685 my ($self, @widgets) = @_; 761 my ($self, @widgets) = @_;
686 762
687 $_->set_parent ($self) 763 $_->set_parent ($self)
688 for @widgets; 764 for @widgets;
… …
748 $_->draw for @{$self->{children}}; 824 $_->draw for @{$self->{children}};
749} 825}
750 826
751############################################################################# 827#############################################################################
752 828
753package CFClient::UI::Bin; 829package CFPlus::UI::Bin;
754 830
755our @ISA = CFClient::UI::Container::; 831our @ISA = CFPlus::UI::Container::;
756 832
757sub new { 833sub new {
758 my ($class, %arg) = @_; 834 my ($class, %arg) = @_;
759 835
760 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761 837
762 $class->SUPER::new (children => [$child], %arg) 838 $class->SUPER::new (children => [$child], %arg)
763} 839}
764 840
765sub add { 841sub add {
… …
772sub remove { 848sub remove {
773 my ($self, $widget) = @_; 849 my ($self, $widget) = @_;
774 850
775 $self->SUPER::remove ($widget); 851 $self->SUPER::remove ($widget);
776 852
777 $self->{children} = [new CFClient::UI::Empty] 853 $self->{children} = [new CFPlus::UI::Empty]
778 unless @{$self->{children}}; 854 unless @{$self->{children}};
779} 855}
780 856
781sub child { $_[0]->{children}[0] } 857sub child { $_[0]->{children}[0] }
782 858
… …
794 870
795############################################################################# 871#############################################################################
796 872
797# back-buffered drawing area 873# back-buffered drawing area
798 874
799package CFClient::UI::Window; 875package CFPlus::UI::Window;
800 876
801our @ISA = CFClient::UI::Bin::; 877our @ISA = CFPlus::UI::Bin::;
802 878
803use CFClient::OpenGL; 879use CFPlus::OpenGL;
804 880
805sub new { 881sub new {
806 my ($class, %arg) = @_; 882 my ($class, %arg) = @_;
807 883
808 my $self = $class->SUPER::new (%arg); 884 my $self = $class->SUPER::new (%arg);
… …
830} 906}
831 907
832sub render_child { 908sub render_child {
833 my ($self) = @_; 909 my ($self) = @_;
834 910
835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
836 glClearColor 0, 0, 0, 0; 912 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
838 914
839 { 915 {
840 package CFClient::UI::Base; 916 package CFPlus::UI::Base;
841 917
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
844 } 922 }
845
846 $self->_render;
847 }; 923 };
848} 924}
849 925
850sub _draw { 926sub _draw {
851 my ($self) = @_; 927 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 928
855 my $tex = $self->{texture} 929 my $tex = $self->{texture}
856 or return; 930 or return;
857 931
858 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
861 935
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
863 937
864 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
865} 939}
866 940
867############################################################################# 941#############################################################################
868 942
869package CFClient::UI::ViewPort; 943package CFPlus::UI::ViewPort;
870 944
871our @ISA = CFClient::UI::Window::; 945our @ISA = CFPlus::UI::Window::;
872 946
873sub new { 947sub new {
874 my $class = shift; 948 my $class = shift;
875 949
876 $class->SUPER::new ( 950 $class->SUPER::new (
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1012 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1014 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1015 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1016 }
943} 1017}
944 1018
945sub _render { 1019sub _render {
946 my ($self) = @_; 1020 my ($self) = @_;
947 1021
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1022 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1023 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1024
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1025 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1026
953 $self->SUPER::_render; 1027 $self->SUPER::_render;
954} 1028}
955 1029
956############################################################################# 1030#############################################################################
957 1031
958package CFClient::UI::ScrolledWindow; 1032package CFPlus::UI::ScrolledWindow;
959 1033
960our @ISA = CFClient::UI::HBox::; 1034our @ISA = CFPlus::UI::HBox::;
961 1035
962sub new { 1036sub new {
963 my ($class, %arg) = @_; 1037 my ($class, %arg) = @_;
964 1038
965 my $child = delete $arg{child}; 1039 my $child = delete $arg{child};
966 1040
967 my $self; 1041 my $self;
968 1042
969 my $slider = new CFClient::UI::Slider 1043 my $slider = new CFPlus::UI::Slider
970 vertical => 1, 1044 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1045 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1046 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1047 $self->{vp}->set_offset (0, $_[1]);
974 }, 1048 },
975 ; 1049 ;
976 1050
977 $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1052 vp => (new CFPlus::UI::ViewPort expand => 1),
1053 can_events => 1,
979 slider => $slider, 1054 slider => $slider,
980 %arg, 1055 %arg,
981 ); 1056 );
982 1057
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1058 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child; 1059 $self->add ($child) if $child;
985 1060
986 $self 1061 $self
987} 1062}
988 1063
1064#TODO# update range on size_allocate depending on child
1065
989sub add { 1066sub add {
990 my ($self, $widget) = @_; 1067 my ($self, $widget) = @_;
991 1068
992 $self->{vp}->add ($self->{child} = $widget); 1069 $self->{vp}->add ($self->{child} = $widget);
993} 1070}
994 1071
1072sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_;
1074
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->emit (mouse_wheel => $ev);
1078
1079 1
1080}
1081
1082sub update_slider {
1083 my ($self) = @_;
1084
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1086}
1087
995sub update { 1088sub update {
996 my ($self) = @_; 1089 my ($self) = @_;
997 1090
998 $self->SUPER::update; 1091 $self->SUPER::update;
999 1092
1000 # todo: overwrite size_allocate of child 1093 $self->update_slider;
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1003} 1094}
1004 1095
1005sub invoke_size_allocate { 1096sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1097 my ($self, $w, $h) = @_;
1007 1098
1008 my $child = $self->{vp}->child; 1099 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010 1100
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1101 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1102}
1013 1103
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1104#############################################################################
1018 1105
1019package CFClient::UI::Frame; 1106package CFPlus::UI::Frame;
1020 1107
1021our @ISA = CFClient::UI::Bin::; 1108our @ISA = CFPlus::UI::Bin::;
1022 1109
1023use CFClient::OpenGL; 1110use CFPlus::OpenGL;
1024 1111
1025sub new { 1112sub new {
1026 my $class = shift; 1113 my $class = shift;
1027 1114
1028 $class->SUPER::new ( 1115 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1141 $self->SUPER::_draw;
1055} 1142}
1056 1143
1057############################################################################# 1144#############################################################################
1058 1145
1059package CFClient::UI::FancyFrame; 1146package CFPlus::UI::FancyFrame;
1060 1147
1061our @ISA = CFClient::UI::Bin::; 1148our @ISA = CFPlus::UI::Bin::;
1062 1149
1063use CFClient::OpenGL; 1150use CFPlus::OpenGL;
1151
1152sub new {
1153 my ($class, %arg) = @_;
1154
1155 if ((exists $arg{label}) && !ref $arg{label}) {
1156 $arg{label} = new CFPlus::UI::Label
1157 align => 1,
1158 valign => 0,
1159 text => $arg{label},
1160 fontsize => ($arg{border} || 0.8) * 0.75;
1161 }
1162
1163 my $self = $class->SUPER::new (
1164 # label => "",
1165 fg => [0.6, 0.3, 0.1],
1166 border => 0.8,
1167 style => 'single',
1168 %arg,
1169 );
1170
1171 $self
1172}
1173
1174sub add {
1175 my ($self, @widgets) = @_;
1176
1177 $self->SUPER::add (@widgets);
1178 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1179}
1180
1181sub border {
1182 int $_[0]{border} * $::FONTSIZE
1183}
1184
1185sub size_request {
1186 my ($self) = @_;
1187
1188 ($self->{label_w}, undef) = $self->{label}->size_request
1189 if $self->{label};
1190
1191 my ($w, $h) = $self->SUPER::size_request;
1192
1193 (
1194 $w + $self->border * 2,
1195 $h + $self->border * 2,
1196 )
1197}
1198
1199sub invoke_size_allocate {
1200 my ($self, $w, $h) = @_;
1201
1202 my $border = $self->border;
1203
1204 $w -= List::Util::max 0, $border * 2;
1205 $h -= List::Util::max 0, $border * 2;
1206
1207 if (my $label = $self->{label}) {
1208 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1209 $label->{h} = List::Util::min $h, $border;
1210 $label->invoke_size_allocate ($label->{w}, $label->{h});
1211 }
1212
1213 $self->child->configure ($border, $border, $w, $h);
1214
1215 1
1216}
1217
1218sub _draw {
1219 my ($self) = @_;
1220
1221 my $child = $self->{children}[0];
1222
1223 my $border = $self->border;
1224 my ($w, $h) = ($self->{w}, $self->{h});
1225
1226 $child->draw;
1227
1228 glColor @{$self->{fg}};
1229 glBegin GL_LINE_STRIP;
1230 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1231 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1233 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1234 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1235 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1236 glEnd;
1237
1238 if ($self->{label}) {
1239 glTranslate $border * 2, 0;
1240 $self->{label}->_draw;
1241 }
1242}
1243
1244#############################################################################
1245
1246package CFPlus::UI::Toplevel;
1247
1248our @ISA = CFPlus::UI::Bin::;
1249
1250use CFPlus::OpenGL;
1064 1251
1065my $bg = 1252my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1253 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1254 mipmap => 1, wrap => 1;
1068 1255
1069my @border = 1256my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1258 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1259
1073sub new { 1260sub new {
1074 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
1075 1262
1076 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1264 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1265 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1266 border => 0.6,
1080 can_events => 1, 1267 can_events => 1,
1081 min_w => 16, 1268 min_w => 64,
1082 min_h => 16, 1269 min_h => 32,
1083 %arg, 1270 %arg,
1084 ); 1271 );
1085 1272
1086 $self->{title_widget} = new CFClient::UI::Label 1273 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1274 align => 0,
1088 valign => 1, 1275 valign => 1,
1089 text => $self->{title}, 1276 text => $self->{title},
1090 fontsize => $self->{border}, 1277 fontsize => $self->{border},
1091 if exists $self->{title}; 1278 if exists $self->{title};
1092 1279
1093 if ($self->{has_close_button}) { 1280 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1281 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1282 new CFPlus::UI::ImageButton
1096 path => 'x1_close.png', 1283 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1284 on_activate => sub { $self->emit ("delete") };
1098 1285
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1286 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1287 }
1101 1288
1102 $self 1289 $self
1103} 1290}
1104 1291
1105sub add { 1292sub add {
1106 my ($self, @widgets) = @_; 1293 my ($self, @widgets) = @_;
1107 1294
1108 $self->SUPER::add (@widgets); 1295 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1296 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1297 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1298}
1112 1299
1113sub border { 1300sub border {
1114 int $_[0]{border} * $::FONTSIZE 1301 int $_[0]{border} * $::FONTSIZE
1115} 1302}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1335 $self->child->configure ($border, $border, $w, $h);
1149 1336
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1337 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1338 if $self->{close_button};
1152 1339
1340 1
1341}
1342
1343sub invoke_delete {
1344 my ($self) = @_;
1345
1346 $self->hide;
1347
1153 1 1348 1
1154} 1349}
1155 1350
1156sub invoke_button_down { 1351sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1352 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1410 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1411
1217 ! ! $self->{motion} 1412 ! ! $self->{motion}
1218} 1413}
1219 1414
1415sub invoke_visibility_change {
1416 my ($self, $visible) = @_;
1417
1418 delete $self->{motion} unless $visible;
1419
1420 0
1421}
1422
1220sub _draw { 1423sub _draw {
1221 my ($self) = @_; 1424 my ($self) = @_;
1222 1425
1223 my $child = $self->{children}[0]; 1426 my $child = $self->{children}[0];
1224 1427
… …
1261 if $self->{close_button}; 1464 if $self->{close_button};
1262} 1465}
1263 1466
1264############################################################################# 1467#############################################################################
1265 1468
1266package CFClient::UI::Table; 1469package CFPlus::UI::Table;
1267 1470
1268our @ISA = CFClient::UI::Base::; 1471our @ISA = CFPlus::UI::Base::;
1269 1472
1270use List::Util qw(max sum); 1473use List::Util qw(max sum);
1271 1474
1272use CFClient::OpenGL; 1475use CFPlus::OpenGL;
1273 1476
1274sub new { 1477sub new {
1275 my $class = shift; 1478 my $class = shift;
1276 1479
1277 $class->SUPER::new ( 1480 $class->SUPER::new (
… …
1283sub children { 1486sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285} 1488}
1286 1489
1287sub add { 1490sub add {
1288 my ($self, $x, $y, $child) = @_; 1491 my ($self) = shift;
1289 1492
1493 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, ();
1290 $child->set_parent ($self); 1495 $child->set_parent ($self);
1291 $self->{children}[$y][$x] = $child; 1496 $self->{children}[$y][$x] = $child;
1497 }
1292 1498
1499 $self->{force_realloc} = 1;
1500 $self->{force_size_alloc} = 1;
1293 $self->realloc; 1501 $self->realloc;
1294} 1502}
1295 1503
1296sub remove { 1504sub remove {
1297 my ($self, $child) = @_; 1505 my ($self, $child) = @_;
… …
1362 1570
1363 # linearly scale sizes 1571 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1574
1367 CFClient::UI::harmonize $ws; 1575 CFPlus::UI::harmonize $ws;
1368 CFClient::UI::harmonize $hs; 1576 CFPlus::UI::harmonize $hs;
1369 1577
1370 my $y; 1578 my $y;
1371 1579
1372 for my $r (0 .. $#{$self->{children}}) { 1580 for my $r (0 .. $#{$self->{children}}) {
1373 my $row = $self->{children}[$r] 1581 my $row = $self->{children}[$r]
… …
1416 } 1624 }
1417} 1625}
1418 1626
1419############################################################################# 1627#############################################################################
1420 1628
1421package CFClient::UI::Box; 1629package CFPlus::UI::Box;
1422 1630
1423our @ISA = CFClient::UI::Container::; 1631our @ISA = CFPlus::UI::Container::;
1424 1632
1425sub size_request { 1633sub size_request {
1426 my ($self) = @_; 1634 my ($self) = @_;
1427 1635
1428 $self->{vertical} 1636 $self->{vertical}
… …
1461 $req[$_] += $space * $children[$_]{expand} 1669 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#children; 1670 for 0 .. $#children;
1463 } 1671 }
1464 } 1672 }
1465 1673
1466 CFClient::UI::harmonize \@req; 1674 CFPlus::UI::harmonize \@req;
1467 1675
1468 my $pos = 0; 1676 my $pos = 0;
1469 for (0 .. $#children) { 1677 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1678 my $alloc = $req[$_];
1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1679 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1476 1 1684 1
1477} 1685}
1478 1686
1479############################################################################# 1687#############################################################################
1480 1688
1481package CFClient::UI::HBox; 1689package CFPlus::UI::HBox;
1482 1690
1483our @ISA = CFClient::UI::Box::; 1691our @ISA = CFPlus::UI::Box::;
1484 1692
1485sub new { 1693sub new {
1486 my $class = shift; 1694 my $class = shift;
1487 1695
1488 $class->SUPER::new ( 1696 $class->SUPER::new (
… …
1491 ) 1699 )
1492} 1700}
1493 1701
1494############################################################################# 1702#############################################################################
1495 1703
1496package CFClient::UI::VBox; 1704package CFPlus::UI::VBox;
1497 1705
1498our @ISA = CFClient::UI::Box::; 1706our @ISA = CFPlus::UI::Box::;
1499 1707
1500sub new { 1708sub new {
1501 my $class = shift; 1709 my $class = shift;
1502 1710
1503 $class->SUPER::new ( 1711 $class->SUPER::new (
… …
1506 ) 1714 )
1507} 1715}
1508 1716
1509############################################################################# 1717#############################################################################
1510 1718
1511package CFClient::UI::Label; 1719package CFPlus::UI::Label;
1512 1720
1513our @ISA = CFClient::UI::DrawBG::; 1721our @ISA = CFPlus::UI::DrawBG::;
1514 1722
1515use CFClient::OpenGL; 1723use CFPlus::OpenGL;
1516 1724
1517sub new { 1725sub new {
1518 my ($class, %arg) = @_; 1726 my ($class, %arg) = @_;
1519 1727
1520 my $self = $class->SUPER::new ( 1728 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1731 #active_bg => none
1524 #font => default_font 1732 #font => default_font
1525 #text => initial text 1733 #text => initial text
1526 #markup => initial narkup 1734 #markup => initial narkup
1527 #max_w => maximum pixel width 1735 #max_w => maximum pixel width
1736 #style => 0, # render flags
1528 ellipsise => 3, # end 1737 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1738 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1739 fontsize => 1,
1531 align => -1, 1740 align => -1,
1532 valign => -1, 1741 valign => -1,
1533 padding_x => 2, 1742 padding_x => 2,
1534 padding_y => 2, 1743 padding_y => 2,
1535 can_events => 0, 1744 can_events => 0,
1536 %arg 1745 %arg
1537 ); 1746 );
1538 1747
1539 if (exists $self->{template}) { 1748 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1749 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1750 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1751 $self->{template} = $layout;
1543 } 1752 }
1544 1753
1545 if (exists $self->{markup}) { 1754 if (exists $self->{markup}) {
… …
1549 } 1758 }
1550 1759
1551 $self 1760 $self
1552} 1761}
1553 1762
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1763sub update {
1565 my ($self) = @_; 1764 my ($self) = @_;
1566 1765
1567 delete $self->{texture}; 1766 delete $self->{texture};
1568 $self->SUPER::update; 1767 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1778 my ($self, $text) = @_;
1580 1779
1581 return if $self->{text} eq "T$text"; 1780 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1781 $self->{text} = "T$text";
1583 1782
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1783 $self->{layout}->set_text ($text);
1586 1784
1587 delete $self->{size_req}; 1785 delete $self->{size_req};
1588 $self->realloc; 1786 $self->realloc;
1589 $self->update; 1787 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1793 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1794 $self->{text} = "M$markup";
1597 1795
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1796 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1797
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1798 $self->{layout}->set_markup ($markup);
1602 1799
1603 delete $self->{size_req}; 1800 delete $self->{size_req};
1604 $self->realloc; 1801 $self->realloc;
1605 $self->update; 1802 $self->update;
… …
1617 1814
1618 my ($w, $h) = $self->{layout}->size; 1815 my ($w, $h) = $self->{layout}->size;
1619 1816
1620 if (exists $self->{template}) { 1817 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 1818 $self->{template}->set_font ($self->{font}) if $self->{font};
1819 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1820 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 1821
1624 my ($w2, $h2) = $self->{template}->size; 1822 my ($w2, $h2) = $self->{template}->size;
1625 1823
1626 $w = List::Util::max $w, $w2; 1824 $w = List::Util::max $w, $w2;
… …
1631 }; 1829 };
1632 1830
1633 @{ $self->{size_req} } 1831 @{ $self->{size_req} }
1634} 1832}
1635 1833
1834sub baseline_shift {
1835 $_[0]{layout}->descent
1836}
1837
1636sub invoke_size_allocate { 1838sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 1839 my ($self, $w, $h) = @_;
1638 1840
1639 delete $self->{ox}; 1841 delete $self->{ox};
1640 1842
… …
1646 1848
1647sub set_fontsize { 1849sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1850 my ($self, $fontsize) = @_;
1649 1851
1650 $self->{fontsize} = $fontsize; 1852 $self->{fontsize} = $fontsize;
1853 delete $self->{size_req};
1651 delete $self->{texture}; 1854 delete $self->{texture};
1652 1855
1653 $self->realloc; 1856 $self->realloc;
1654} 1857}
1655 1858
1656sub reconfigure { 1859sub reconfigure {
1657 my ($self) = @_; 1860 my ($self) = @_;
1658 1861
1659 delete $self->{size_req}; 1862 delete $self->{size_req};
1863 delete $self->{texture};
1660 1864
1661 $self->SUPER::reconfigure; 1865 $self->SUPER::reconfigure;
1662} 1866}
1663 1867
1664sub _draw { 1868sub _draw {
1665 my ($self) = @_; 1869 my ($self) = @_;
1666 1870
1667 $self->SUPER::_draw; # draw background, if applicable 1871 $self->SUPER::_draw; # draw background, if applicable
1668 1872
1669 my $tex = $self->{texture} ||= do { 1873 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1874 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1875 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1876 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1877 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1878 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1879 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1880
1677 new_from_layout CFClient::Texture $self->{layout} 1881 [$self->{layout}->size]
1678 }; 1882 };
1679 1883
1680 unless (exists $self->{ox}) { 1884 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1885 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1886 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1887 : ($self->{w} - $size->[0]) * 0.5);
1684 1888
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1891 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1892 };
1689 1893
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1894 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1895 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1896
1695 if ($tex->{format} == GL_ALPHA) { 1897 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1898}
1706 1899
1707############################################################################# 1900#############################################################################
1708 1901
1709package CFClient::UI::EntryBase; 1902package CFPlus::UI::EntryBase;
1710 1903
1711our @ISA = CFClient::UI::Label::; 1904our @ISA = CFPlus::UI::Label::;
1712 1905
1713use CFClient::OpenGL; 1906use CFPlus::OpenGL;
1714 1907
1715sub new { 1908sub new {
1716 my $class = shift; 1909 my $class = shift;
1717 1910
1718 $class->SUPER::new ( 1911 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 1915 active_fg => [0, 0, 0],
1723 can_hover => 1, 1916 can_hover => 1,
1724 can_focus => 1, 1917 can_focus => 1,
1725 valign => 0, 1918 valign => 0,
1726 can_events => 1, 1919 can_events => 1,
1920 ellipsise => 0,
1727 #text => ... 1921 #text => ...
1728 #hidden => "*", 1922 #hidden => "*",
1729 @_ 1923 @_
1730 ) 1924 )
1731} 1925}
… …
1776 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1971 my $uni = $ev->{unicode};
1778 1972
1779 my $text = $self->get_text; 1973 my $text = $self->get_text;
1780 1974
1975 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1976
1781 if ($uni == 8) { 1977 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1978 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 1979 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 1980 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 1981 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 1982 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 1983 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1984 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1985 } elsif ($sym == CFPlus::SDLK_HOME) {
1986 # what a hack
1987 $self->{cursor} =
1988 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1989 ? length $1
1990 : 0;
1991 } elsif ($sym == CFPlus::SDLK_END) {
1992 # uh, again
1993 $self->{cursor} =
1994 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1995 ? $self->{cursor} + length $1
1996 : length $self->{text};
1997 } elsif ($uni == 21) { # ctrl-u
1998 $text = "";
1790 $self->{cursor} = 0; 1999 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2000 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 2001 $self->emit ('escape');
1795 } elsif ($uni) { 2002 } elsif ($uni == 0x0d) {
2003 substr $text, $self->{cursor}++, 0, "\012";
2004 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2005 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2006 } else {
1798 return 0; 2007 return 0;
1799 } 2008 }
1800 2009
1801 $self->_set_text ($text); 2010 $self->_set_text ($text);
1802 2011
1803 $self->realloc; 2012 $self->realloc;
2013 $self->update;
1804 2014
1805 1 2015 1
1806} 2016}
1807 2017
1808sub invoke_focus_in { 2018sub invoke_focus_in {
… …
1820 2030
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2031 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2032
1823 # byte-index to char-index 2033 # byte-index to char-index
1824 my $text = $self->{text}; 2034 my $text = $self->{text};
1825 utf8::encode $text; 2035 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2036 $self->{cursor} = length $text;
1827 2037
1828 $self->_set_text ($self->{text}); 2038 $self->_set_text ($self->{text});
1829 $self->update; 2039 $self->update;
1830 2040
1831 1 2041 1
… …
1870 utf8::encode $text; 2080 utf8::encode $text;
1871 2081
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2082 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2083 }
1874 2084
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2085 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2086 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2087 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2088 glEnd;
1880 } 2089 }
1881} 2090}
1882 2091
2092#############################################################################
2093
1883package CFClient::UI::Entry; 2094package CFPlus::UI::Entry;
1884 2095
1885our @ISA = CFClient::UI::EntryBase::; 2096our @ISA = CFPlus::UI::EntryBase::;
1886 2097
1887use CFClient::OpenGL; 2098use CFPlus::OpenGL;
1888 2099
1889sub invoke_key_down { 2100sub invoke_key_down {
1890 my ($self, $ev) = @_; 2101 my ($self, $ev) = @_;
1891 2102
1892 my $sym = $ev->{sym}; 2103 my $sym = $ev->{sym};
1893 2104
1894 if ($sym == 13) { 2105 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2106 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2107 my $txt = $self->get_text;
1897 2108
1898 $self->{history_pointer} = -1; 2109 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2110 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2111 $self->emit (activate => $txt);
1901 $self->update; 2112 $self->update;
1902 2113
1903 } elsif ($sym == CFClient::SDLK_UP) { 2114 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2115 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2116 $self->{history_saveback} = $self->get_text;
1906 } 2117 }
1907 if (@{$self->{history} || []} > 0) { 2118 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2119 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2121 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2122 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2123 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2124 }
1914 2125
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2126 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2127 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2128 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2129
1919 if ($self->{history_pointer} >= 0) { 2130 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2131 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2140 1
1930} 2141}
1931 2142
1932############################################################################# 2143#############################################################################
1933 2144
2145package CFPlus::UI::TextEdit;
2146
2147our @ISA = CFPlus::UI::EntryBase::;
2148
2149use CFPlus::OpenGL;
2150
2151sub move_cursor_ver {
2152 my ($self, $dy) = @_;
2153
2154 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2155
2156 $y += $dy;
2157
2158 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2159 $self->{cursor} = $index;
2160 delete $self->{cur_h};
2161 $self->update;
2162 return;
2163 }
2164}
2165
2166sub invoke_key_down {
2167 my ($self, $ev) = @_;
2168
2169 my $sym = $ev->{sym};
2170
2171 if ($sym == CFPlus::SDLK_UP) {
2172 $self->move_cursor_ver (-1);
2173 } elsif ($sym == CFPlus::SDLK_DOWN) {
2174 $self->move_cursor_ver (+1);
2175 } else {
2176 return $self->SUPER::invoke_key_down ($ev)
2177 }
2178
2179 1
2180}
2181
2182#############################################################################
2183
1934package CFClient::UI::Button; 2184package CFPlus::UI::Button;
1935 2185
1936our @ISA = CFClient::UI::Label::; 2186our @ISA = CFPlus::UI::Label::;
1937 2187
1938use CFClient::OpenGL; 2188use CFPlus::OpenGL;
1939 2189
1940my @tex = 2190my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2191 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2192 qw(b1_button_active.png);
1943 2193
1944sub new { 2194sub new {
1945 my $class = shift; 2195 my $class = shift;
1946 2196
… …
1983 $self->SUPER::_draw; 2233 $self->SUPER::_draw;
1984} 2234}
1985 2235
1986############################################################################# 2236#############################################################################
1987 2237
2238package CFPlus::UI::CheckBox;
2239
2240our @ISA = CFPlus::UI::DrawBG::;
2241
2242my @tex =
2243 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2244 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2245
2246use CFPlus::OpenGL;
2247
2248sub new {
2249 my $class = shift;
2250
2251 $class->SUPER::new (
2252 padding_x => 2,
2253 padding_y => 2,
2254 fg => [1, 1, 1],
2255 active_fg => [1, 1, 0],
2256 bg => [0, 0, 0, 0.2],
2257 active_bg => [1, 1, 1, 0.5],
2258 state => 0,
2259 can_hover => 1,
2260 @_
2261 )
2262}
2263
2264sub size_request {
2265 my ($self) = @_;
2266
2267 (6) x 2
2268}
2269
2270sub toggle {
2271 my ($self) = @_;
2272
2273 $self->{state} = !$self->{state};
2274 $self->emit (changed => $self->{state});
2275 $self->update;
2276}
2277
2278sub invoke_button_down {
2279 my ($self, $ev, $x, $y) = @_;
2280
2281 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2282 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2283 $self->toggle;
2284 } else {
2285 return 0
2286 }
2287
2288 1
2289}
2290
2291sub _draw {
2292 my ($self) = @_;
2293
2294 $self->SUPER::_draw;
2295
2296 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2297
2298 my ($w, $h) = @$self{qw(w h)};
2299
2300 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2301
2302 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2303
2304 my $tex = $self->{state} ? $tex[1] : $tex[0];
2305
2306 glEnable GL_TEXTURE_2D;
2307 $tex->draw_quad_alpha (0, 0, $s, $s);
2308 glDisable GL_TEXTURE_2D;
2309}
2310
2311#############################################################################
2312
2313package CFPlus::UI::Image;
2314
2315our @ISA = CFPlus::UI::Base::;
2316
2317use CFPlus::OpenGL;
2318
2319our %texture_cache;
2320
2321sub new {
2322 my $class = shift;
2323
2324 my $self = $class->SUPER::new (
2325 can_events => 0,
2326 @_,
2327 );
2328
2329 $self->{path} || $self->{tex}
2330 or Carp::croak "'path' or 'tex' attributes required";
2331
2332 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2333 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2334
2335 CFPlus::weaken $texture_cache{$self->{path}};
2336
2337 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2338
2339 $self
2340}
2341
2342sub STORABLE_freeze {
2343 my ($self, $cloning) = @_;
2344
2345 $self->{path}
2346 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2347
2348 $self->{path}
2349}
2350
2351sub STORABLE_attach {
2352 my ($self, $cloning, $path) = @_;
2353
2354 $self->new (path => $path)
2355}
2356
2357sub size_request {
2358 my ($self) = @_;
2359
2360 ($self->{tex}{w}, $self->{tex}{h})
2361}
2362
2363sub _draw {
2364 my ($self) = @_;
2365
2366 my $tex = $self->{tex};
2367
2368 my ($w, $h) = ($self->{w}, $self->{h});
2369
2370 if ($self->{rot90}) {
2371 glRotate 90, 0, 0, 1;
2372 glTranslate 0, -$self->{w}, 0;
2373
2374 ($w, $h) = ($h, $w);
2375 }
2376
2377 glEnable GL_TEXTURE_2D;
2378 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2379
2380 $tex->draw_quad (0, 0, $w, $h);
2381
2382 glDisable GL_TEXTURE_2D;
2383}
2384
2385#############################################################################
2386
1988package CFClient::UI::ImageButton; 2387package CFPlus::UI::ImageButton;
1989 2388
1990our @ISA = CFClient::UI::Image::; 2389our @ISA = CFPlus::UI::Image::;
1991 2390
1992use CFClient::OpenGL; 2391use CFPlus::OpenGL;
1993 2392
1994my %textures; 2393my %textures;
1995 2394
1996sub new { 2395sub new {
1997 my $class = shift; 2396 my $class = shift;
… …
2019 1 2418 1
2020} 2419}
2021 2420
2022############################################################################# 2421#############################################################################
2023 2422
2024package CFClient::UI::CheckBox;
2025
2026our @ISA = CFClient::UI::DrawBG::;
2027
2028my @tex =
2029 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032use CFClient::OpenGL;
2033
2034sub new {
2035 my $class = shift;
2036
2037 $class->SUPER::new (
2038 padding_x => 2,
2039 padding_y => 2,
2040 fg => [1, 1, 1],
2041 active_fg => [1, 1, 0],
2042 bg => [0, 0, 0, 0.2],
2043 active_bg => [1, 1, 1, 0.5],
2044 state => 0,
2045 can_hover => 1,
2046 @_
2047 )
2048}
2049
2050sub size_request {
2051 my ($self) = @_;
2052
2053 (6) x 2
2054}
2055
2056sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_;
2058
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state};
2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
2067 1
2068}
2069
2070sub _draw {
2071 my ($self) = @_;
2072
2073 $self->SUPER::_draw;
2074
2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085 glEnable GL_TEXTURE_2D;
2086 $tex->draw_quad_alpha (0, 0, $s, $s);
2087 glDisable GL_TEXTURE_2D;
2088}
2089
2090#############################################################################
2091
2092package CFClient::UI::Image; 2423package CFPlus::UI::VGauge;
2093 2424
2094our @ISA = CFClient::UI::Base::; 2425our @ISA = CFPlus::UI::Base::;
2095
2096use CFClient::OpenGL;
2097
2098our %texture_cache;
2099
2100sub new {
2101 my $class = shift;
2102
2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2107
2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
2110
2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113
2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2115
2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self
2119}
2120
2121sub size_request {
2122 my ($self) = @_;
2123
2124 ($self->{tex}{w}, $self->{tex}{h})
2125}
2126
2127sub _draw {
2128 my ($self) = @_;
2129
2130 my $tex = $self->{tex};
2131
2132 my ($w, $h) = ($self->{w}, $self->{h});
2133
2134 if ($self->{rot90}) {
2135 glRotate 90, 0, 0, 1;
2136 glTranslate 0, -$self->{w}, 0;
2137
2138 ($w, $h) = ($h, $w);
2139 }
2140
2141 glEnable GL_TEXTURE_2D;
2142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2143
2144 $tex->draw_quad_alpha (0, 0, $w, $h);
2145
2146 glDisable GL_TEXTURE_2D;
2147}
2148
2149#############################################################################
2150
2151package CFClient::UI::VGauge;
2152
2153our @ISA = CFClient::UI::Base::;
2154 2426
2155use List::Util qw(min max); 2427use List::Util qw(min max);
2156 2428
2157use CFClient::OpenGL; 2429use CFPlus::OpenGL;
2158 2430
2159my %tex = ( 2431my %tex = (
2160 food => [ 2432 food => [
2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2433 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2162 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2434 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163 ], 2435 ],
2164 grace => [ 2436 grace => [
2165 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2166 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2438 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2167 ], 2439 ],
2168 hp => [ 2440 hp => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2442 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171 ], 2443 ],
2172 mana => [ 2444 mana => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2446 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2175 ], 2447 ],
2176); 2448);
2177 2449
2178# eg. VGauge->new (gauge => 'food'), default gauge: food 2450# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2510 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2511 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2512
2241 my $h1 = $self->{h} * (1 - $ycut1); 2513 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2514 my $h2 = $self->{h} * (1 - $ycut2);
2515 my $h3 = $self->{h};
2516
2517 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2518
2244 glEnable GL_BLEND; 2519 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2520 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2521 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2522 glEnable GL_TEXTURE_2D;
… …
2266 2541
2267 if ($t3) { 2542 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2543 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2544 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2545 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2546 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2547 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2548 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2549 glEnd;
2275 } 2550 }
2276 2551
2277 glDisable GL_BLEND; 2552 glDisable GL_BLEND;
2278 glDisable GL_TEXTURE_2D; 2553 glDisable GL_TEXTURE_2D;
2279} 2554}
2280 2555
2281############################################################################# 2556#############################################################################
2282 2557
2283package CFClient::UI::Gauge; 2558package CFPlus::UI::Gauge;
2284 2559
2285our @ISA = CFClient::UI::VBox::; 2560our @ISA = CFPlus::UI::VBox::;
2286 2561
2287sub new { 2562sub new {
2288 my ($class, %arg) = @_; 2563 my ($class, %arg) = @_;
2289 2564
2290 my $self = $class->SUPER::new ( 2565 my $self = $class->SUPER::new (
… …
2292 can_hover => 1, 2567 can_hover => 1,
2293 can_events => 1, 2568 can_events => 1,
2294 %arg, 2569 %arg,
2295 ); 2570 );
2296 2571
2297 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2572 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2298 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2573 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2299 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2574 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2300 2575
2301 $self 2576 $self
2302} 2577}
2303 2578
2304sub set_fontsize { 2579sub set_fontsize {
… …
2325 $self->{value}->set_text ($val); 2600 $self->{value}->set_text ($val);
2326} 2601}
2327 2602
2328############################################################################# 2603#############################################################################
2329 2604
2330package CFClient::UI::Slider; 2605package CFPlus::UI::Slider;
2331 2606
2332use strict; 2607use strict;
2333 2608
2334use CFClient::OpenGL; 2609use CFPlus::OpenGL;
2335 2610
2336our @ISA = CFClient::UI::DrawBG::; 2611our @ISA = CFPlus::UI::DrawBG::;
2337 2612
2338my @tex = 2613my @tex =
2339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2614 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2340 qw(s1_slider.png s1_slider_bg.png); 2615 qw(s1_slider.png s1_slider_bg.png);
2341 2616
2342sub new { 2617sub new {
2343 my $class = shift; 2618 my $class = shift;
2344 2619
… …
2433 } 2708 }
2434 2709
2435 1 2710 1
2436} 2711}
2437 2712
2713sub invoke_mouse_wheel {
2714 my ($self, $ev) = @_;
2715
2716 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2717
2718 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2719
2720 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2721
2722 ! ! $delta
2723}
2724
2438sub update { 2725sub update {
2439 my ($self) = @_; 2726 my ($self) = @_;
2440 2727
2441 delete $self->{knob_w}; 2728 delete $self->{knob_w};
2442 $self->SUPER::update; 2729 $self->SUPER::update;
… …
2489 glDisable GL_TEXTURE_2D; 2776 glDisable GL_TEXTURE_2D;
2490} 2777}
2491 2778
2492############################################################################# 2779#############################################################################
2493 2780
2494package CFClient::UI::ValSlider; 2781package CFPlus::UI::ValSlider;
2495 2782
2496our @ISA = CFClient::UI::HBox::; 2783our @ISA = CFPlus::UI::HBox::;
2497 2784
2498sub new { 2785sub new {
2499 my ($class, %arg) = @_; 2786 my ($class, %arg) = @_;
2500 2787
2501 my $range = delete $arg{range}; 2788 my $range = delete $arg{range};
2502 2789
2503 my $self = $class->SUPER::new ( 2790 my $self = $class->SUPER::new (
2504 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2791 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2505 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2792 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2506 to_value => sub { shift }, 2793 to_value => sub { shift },
2507 from_value => sub { shift }, 2794 from_value => sub { shift },
2508 %arg, 2795 %arg,
2509 ); 2796 );
2510 2797
… …
2530sub set_range { shift->{slider}->set_range (@_) } 2817sub set_range { shift->{slider}->set_range (@_) }
2531sub set_value { shift->{slider}->set_value (@_) } 2818sub set_value { shift->{slider}->set_value (@_) }
2532 2819
2533############################################################################# 2820#############################################################################
2534 2821
2535package CFClient::UI::TextScroller; 2822package CFPlus::UI::TextScroller;
2536 2823
2537our @ISA = CFClient::UI::HBox::; 2824our @ISA = CFPlus::UI::HBox::;
2538 2825
2539use CFClient::OpenGL; 2826use CFPlus::OpenGL;
2540 2827
2541sub new { 2828sub new {
2542 my $class = shift; 2829 my $class = shift;
2543 2830
2544 my $self = $class->SUPER::new ( 2831 my $self = $class->SUPER::new (
2545 fontsize => 1, 2832 fontsize => 1,
2546 can_events => 0, 2833 can_events => 1,
2547 indent => 0, 2834 indent => 0,
2548 #font => default_font 2835 #font => default_font
2549 @_, 2836 @_,
2550 2837
2551 layout => (new CFClient::Layout 1), 2838 layout => (new CFPlus::Layout),
2552 par => [], 2839 par => [],
2840 max_par => 0,
2553 height => 0, 2841 height => 0,
2554 children => [ 2842 children => [
2555 (new CFClient::UI::Empty expand => 1), 2843 (new CFPlus::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 2844 (new CFPlus::UI::Slider vertical => 1),
2557 ], 2845 ],
2558 ); 2846 );
2559 2847
2560 $self->{children}[1]->connect (changed => sub { $self->update }); 2848 $self->{children}[1]->connect (changed => sub { $self->update });
2561 2849
… …
2567 2855
2568 $self->{fontsize} = $fontsize; 2856 $self->{fontsize} = $fontsize;
2569 $self->reflow; 2857 $self->reflow;
2570} 2858}
2571 2859
2572sub visible_children { 2860sub size_request {
2573 my ($self) = @_; 2861 my ($self) = @_;
2574 2862
2575 @{$self->{children}}[0,1] 2863 my ($empty, $slider) = @{ $self->{children} };
2864
2865 local $self->{children} = [$empty, $slider];
2866 $self->SUPER::size_request
2576} 2867}
2577 2868
2578sub invoke_size_allocate { 2869sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 2870 my ($self, $w, $h) = @_;
2580 2871
2581 my (undef, undef, @other) = @{ $self->{children} }; 2872 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 2873 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 2874
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2875 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 2877 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2878 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 2879
2589 $self->reflow; 2880 $self->reflow;
2590 2881
2882 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 2883 $self->SUPER::invoke_size_allocate ($w, $h)
2884}
2885
2886sub invoke_mouse_wheel {
2887 my ($self, $ev) = @_;
2888
2889 return 0 unless $ev->{dy}; # only vertical movements
2890
2891 $self->{children}[1]->emit (mouse_wheel => $ev);
2892
2893 1
2592} 2894}
2593 2895
2594sub get_layout { 2896sub get_layout {
2595 my ($self, $para) = @_; 2897 my ($self, $para) = @_;
2596 2898
2597 my $layout = $self->{layout}; 2899 my $layout = $self->{layout};
2598 2900
2599 $layout->set_font ($self->{font}) if $self->{font}; 2901 $layout->set_font ($self->{font}) if $self->{font};
2902 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2903 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 2904 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2905 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 2906 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 2907
2908 $layout->set_shapes (
2909 map
2910 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2911 @{$para->{widget}}
2912 );
2605 2913
2606 $layout 2914 $layout
2607} 2915}
2608 2916
2609sub reflow { 2917sub reflow {
… …
2616sub set_offset { 2924sub set_offset {
2617 my ($self, $offset) = @_; 2925 my ($self, $offset) = @_;
2618 2926
2619 # todo: base offset on lines or so, not on pixels 2927 # todo: base offset on lines or so, not on pixels
2620 $self->{children}[1]->set_value ($offset); 2928 $self->{children}[1]->set_value ($offset);
2929}
2930
2931sub current_paragraph {
2932 my ($self) = @_;
2933
2934 $self->{top_paragraph} - 1
2935}
2936
2937sub scroll_to {
2938 my ($self, $para) = @_;
2939
2940 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2941
2942 $self->{scroll_to} = $para;
2943 $self->update;
2621} 2944}
2622 2945
2623sub clear { 2946sub clear {
2624 my ($self) = @_; 2947 my ($self) = @_;
2625 2948
… …
2630 $self->{height} = 0; 2953 $self->{height} = 0;
2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2954 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632} 2955}
2633 2956
2634sub add_paragraph { 2957sub add_paragraph {
2635 my ($self, $color, $para, $indent) = @_; 2958 my $self = shift;
2636 2959
2637 my ($text, @w) = ref $para ? @$para : $para; 2960 for my $para (@_) {
2638
2639 $para = { 2961 $para = {
2962 fg => [1, 1, 1, 1],
2963 indent => 0,
2964 markup => "",
2965 widget => [],
2966 ref $para ? %$para : (markup => $para),
2640 w => 1e10, 2967 w => 1e10,
2641 wrapped => 1, 2968 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2646 }; 2969 };
2647 2970
2648 $self->add (@w) if @w; 2971 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649 push @{$self->{par}}, $para; 2972 push @{$self->{par}}, $para;
2973 }
2974
2975 if (my $max = $self->{max_par}) {
2976 shift @{$self->{par}} while @{$self->{par}} > $max;
2977 }
2650 2978
2651 $self->{need_reflow}++; 2979 $self->{need_reflow}++;
2652 $self->update; 2980 $self->update;
2653} 2981}
2654 2982
2655sub scroll_to_bottom { 2983sub scroll_to_bottom {
2656 my ($self) = @_; 2984 my ($self) = @_;
2657 2985
2658 $self->{scroll_to_bottom} = 1; 2986 $self->{scroll_to} = $#{$self->{par}};
2659 $self->update; 2987 $self->update;
2660} 2988}
2661 2989
2990sub force_uptodate {
2991 my ($self) = @_;
2992
2993 if (delete $self->{need_reflow}) {
2994 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2995
2996 my $height = 0;
2997
2998 for my $para (@{$self->{par}}) {
2999 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3000 my $layout = $self->get_layout ($para);
3001 my ($w, $h) = $layout->size;
3002
3003 $para->{w} = $w + $para->{indent};
3004 $para->{h} = $h;
3005 $para->{wrapped} = $layout->has_wrapped;
3006 }
3007
3008 $para->{y} = $height;
3009 $height += $para->{h};
3010 }
3011
3012 $self->{height} = $height;
3013 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3014
3015 delete $self->{texture};
3016 }
3017
3018 if (my $paridx = delete $self->{scroll_to}) {
3019 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3020 }
3021}
3022
2662sub update { 3023sub update {
2663 my ($self) = @_; 3024 my ($self) = @_;
2664 3025
2665 $self->SUPER::update; 3026 $self->SUPER::update;
2666 3027
2667 return unless $self->{h} > 0; 3028 return unless $self->{h} > 0;
2668 3029
2669 delete $self->{texture}; 3030 delete $self->{texture};
2670 3031
2671 $ROOT->on_post_alloc ($self => sub { 3032 $ROOT->on_post_alloc ($self => sub {
3033 $self->force_uptodate;
3034
2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3035 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673 3036
2674 if (delete $self->{need_reflow}) {
2675 my $height = 0;
2676
2677 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size;
2681
2682 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2685 }
2686
2687 $height += $para->{h};
2688 }
2689
2690 $self->{height} = $height;
2691
2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2693
2694 delete $self->{texture};
2695 }
2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3037 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2702 glClearColor 0, 0, 0, 0; 3038 glClearColor 0, 0, 0, 0;
2703 glClear GL_COLOR_BUFFER_BIT; 3039 glClear GL_COLOR_BUFFER_BIT;
2704 3040
3041 package CFPlus::UI::Base;
3042 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3043 (0, 0, $self->{w}, $self->{h});
3044
3045 my $top = int $self->{children}[1]{range}[0];
3046
3047 my $paridx = 0;
3048 my $top_paragraph;
2705 my $top = int $self->{children}[1]{range}[0]; 3049 my $top = int $self->{children}[1]{range}[0];
2706 3050
2707 my $y0 = $top; 3051 my $y0 = $top;
2708 my $y1 = $top + $H; 3052 my $y1 = $top + $H;
2709 3053
2710 my $y = 0;
2711
2712 glEnable GL_BLEND;
2713 #TODO# not correct in windows where rgba is forced off
2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716 for my $para (@{$self->{par}}) { 3054 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 3055 my $h = $para->{h};
3056 my $y = $para->{y};
2718 3057
2719 if ($y0 < $y + $h && $y < $y1) { 3058 if ($y0 < $y + $h && $y < $y1) {
2720
2721 my $layout = $self->get_layout ($para); 3059 my $layout = $self->get_layout ($para);
2722 3060
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 3061 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 3062
2728 if (my @w = @{ $para->{widget} }) { 3063 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 3064 my @s = $layout->get_shapes;
2730 3065
2731 for (@w) { 3066 for (@w) {
… …
2737 $_->draw; 3072 $_->draw;
2738 } 3073 }
2739 } 3074 }
2740 } 3075 }
2741 3076
2742 $y += $h; 3077 $paridx++;
3078 $top_paragraph ||= $paridx if $y >= $top;
2743 } 3079 }
2744 3080
2745 glDisable GL_BLEND; 3081 $self->{top_paragraph} = $top_paragraph;
2746 }; 3082 };
2747 }); 3083 });
2748} 3084}
2749 3085
2750sub reconfigure { 3086sub reconfigure {
… …
2768 $self->{children}[1]->draw; 3104 $self->{children}[1]->draw;
2769} 3105}
2770 3106
2771############################################################################# 3107#############################################################################
2772 3108
2773package CFClient::UI::Animator; 3109package CFPlus::UI::Animator;
2774 3110
2775use CFClient::OpenGL; 3111use CFPlus::OpenGL;
2776 3112
2777our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2778 3114
2779sub moveto { 3115sub moveto {
2780 my ($self, $x, $y) = @_; 3116 my ($self, $x, $y) = @_;
2781 3117
2782 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3118 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2810 glPopMatrix; 3146 glPopMatrix;
2811} 3147}
2812 3148
2813############################################################################# 3149#############################################################################
2814 3150
2815package CFClient::UI::Flopper; 3151package CFPlus::UI::Flopper;
2816 3152
2817our @ISA = CFClient::UI::Button::; 3153our @ISA = CFPlus::UI::Button::;
2818 3154
2819sub new { 3155sub new {
2820 my $class = shift; 3156 my $class = shift;
2821 3157
2822 my $self = $class->SUPER::new ( 3158 my $self = $class->SUPER::new (
… …
2834 $self->{other}->toggle_visibility; 3170 $self->{other}->toggle_visibility;
2835} 3171}
2836 3172
2837############################################################################# 3173#############################################################################
2838 3174
2839package CFClient::UI::Tooltip; 3175package CFPlus::UI::Tooltip;
2840 3176
2841our @ISA = CFClient::UI::Bin::; 3177our @ISA = CFPlus::UI::Bin::;
2842 3178
2843use CFClient::OpenGL; 3179use CFPlus::OpenGL;
2844 3180
2845sub new { 3181sub new {
2846 my $class = shift; 3182 my $class = shift;
2847 3183
2848 $class->SUPER::new ( 3184 $class->SUPER::new (
… …
2851 ) 3187 )
2852} 3188}
2853 3189
2854sub set_tooltip_from { 3190sub set_tooltip_from {
2855 my ($self, $widget) = @_; 3191 my ($self, $widget) = @_;
3192
3193 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3194 if $widget->{tooltip} =~ /^#(.*)$/;
2856 3195
2857 my $tooltip = $widget->{tooltip}; 3196 my $tooltip = $widget->{tooltip};
2858 3197
2859 if ($ENV{CFPLUS_DEBUG} & 2) { 3198 if ($ENV{CFPLUS_DEBUG} & 2) {
2860 $tooltip .= "\n\n" . (ref $widget) . "\n" 3199 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2864 } 3203 }
2865 3204
2866 $tooltip =~ s/^\n+//; 3205 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//; 3206 $tooltip =~ s/\n+$//;
2868 3207
2869 $self->add (new CFClient::UI::Label 3208 $self->add (new CFPlus::UI::Label
2870 markup => $tooltip, 3209 markup => $tooltip,
2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3210 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872 fontsize => 0.8, 3211 fontsize => 0.8,
2873 fg => [0, 0, 0, 1], 3212 style => 1, # FLAG_INVERSE
2874 ellipsise => 0, 3213 ellipsise => 0,
2875 font => ($widget->{tooltip_font} || $::FONT_PROP), 3214 font => ($widget->{tooltip_font} || $::FONT_PROP),
2876 ); 3215 );
2877} 3216}
2878 3217
… …
2897 3236
2898 $self->{root}->on_post_alloc ("move_$self" => sub { 3237 $self->{root}->on_post_alloc ("move_$self" => sub {
2899 my $widget = $self->{owner} 3238 my $widget = $self->{owner}
2900 or return; 3239 or return;
2901 3240
3241 if ($widget->{visible}) {
2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3242 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903 3243
2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3244 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905 if $x + $self->{w} > $self->{root}{w}; 3245 if $x + $self->{w} > $self->{root}{w};
2906 3246
2907 $self->move_abs ($x, $y); 3247 $self->move_abs ($x, $y);
3248 } else {
3249 $self->hide;
3250 }
2908 }); 3251 });
2909} 3252}
2910 3253
2911sub _draw { 3254sub _draw {
2912 my ($self) = @_; 3255 my ($self) = @_;
… …
2936 $self->SUPER::_draw; 3279 $self->SUPER::_draw;
2937} 3280}
2938 3281
2939############################################################################# 3282#############################################################################
2940 3283
2941package CFClient::UI::Face; 3284package CFPlus::UI::Face;
2942 3285
2943our @ISA = CFClient::UI::Base::; 3286our @ISA = CFPlus::UI::DrawBG::;
2944 3287
2945use CFClient::OpenGL; 3288use CFPlus::OpenGL;
2946 3289
2947sub new { 3290sub new {
2948 my $class = shift; 3291 my $class = shift;
2949 3292
2950 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2952 can_events => 0, 3295 can_events => 0,
2953 @_, 3296 @_,
2954 ); 3297 );
2955 3298
2956 if ($self->{anim} && $self->{animspeed}) { 3299 if ($self->{anim} && $self->{animspeed}) {
2957 Scalar::Util::weaken (my $widget = $self); 3300 CFPlus::weaken (my $widget = $self);
2958 3301
2959 $self->{timer} = Event->timer ( 3302 $self->{timer} = Event->timer (
2960 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3303 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2961 hard => 1, 3304 hard => 1,
2962 interval => $self->{animspeed}, 3305 interval => $self->{animspeed},
… …
2985sub _draw { 3328sub _draw {
2986 my ($self) = @_; 3329 my ($self) = @_;
2987 3330
2988 return unless $::CONN; 3331 return unless $::CONN;
2989 3332
3333 $self->SUPER::_draw;
3334
2990 my $face; 3335 my $face;
2991 3336
2992 if ($self->{frame}) { 3337 if ($self->{frame}) {
2993 my $anim = $::CONN->{anim}[$self->{anim}]; 3338 my $anim = $::CONN->{anim}[$self->{anim}];
2994 3339
… …
3016 $self->SUPER::destroy; 3361 $self->SUPER::destroy;
3017} 3362}
3018 3363
3019############################################################################# 3364#############################################################################
3020 3365
3021package CFClient::UI::Buttonbar; 3366package CFPlus::UI::Buttonbar;
3022 3367
3023our @ISA = CFClient::UI::HBox::; 3368our @ISA = CFPlus::UI::HBox::;
3024 3369
3025# TODO: should actualyl wrap buttons and other goodies. 3370# TODO: should actually wrap buttons and other goodies.
3026 3371
3027############################################################################# 3372#############################################################################
3028 3373
3029package CFClient::UI::Menu; 3374package CFPlus::UI::Menu;
3030 3375
3031our @ISA = CFClient::UI::FancyFrame::; 3376our @ISA = CFPlus::UI::Toplevel::;
3032 3377
3033use CFClient::OpenGL; 3378use CFPlus::OpenGL;
3034 3379
3035sub new { 3380sub new {
3036 my $class = shift; 3381 my $class = shift;
3037 3382
3038 my $self = $class->SUPER::new ( 3383 my $self = $class->SUPER::new (
3039 items => [], 3384 items => [],
3040 z => 100, 3385 z => 100,
3041 @_, 3386 @_,
3042 ); 3387 );
3043 3388
3044 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3389 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3045 3390
3046 for my $item (@{ $self->{items} }) { 3391 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3392 my ($widget, $cb, $tooltip) = @$item;
3048 3393
3049 # handle various types of items, only text for now 3394 # handle various types of items, only text for now
3050 if (!ref $widget) { 3395 if (!ref $widget) {
3396 if ($widget =~ /\t/) {
3397 my ($left, $right) = split /\t/, $widget, 2;
3398
3051 $widget = new CFClient::UI::Label 3399 $widget = new CFPlus::UI::HBox
3052 can_hover => 1, 3400 can_hover => 1,
3053 can_events => 1, 3401 can_events => 1,
3402 tooltip => $tooltip,
3403 children => [
3404 (new CFPlus::UI::Label markup => $left, expand => 1),
3405 (new CFPlus::UI::Label markup => $right, align => +1),
3406 ],
3407 ;
3408
3409 } else {
3410 $widget = new CFPlus::UI::Label
3411 can_hover => 1,
3412 can_events => 1,
3054 markup => $widget, 3413 markup => $widget,
3055 tooltip => $tooltip 3414 tooltip => $tooltip;
3415 }
3056 } 3416 }
3057 3417
3058 $self->{item}{$widget} = $item; 3418 $self->{item}{$widget} = $item;
3059 3419
3060 $self->{vbox}->add ($widget); 3420 $self->{vbox}->add ($widget);
… …
3103 1 3463 1
3104} 3464}
3105 3465
3106############################################################################# 3466#############################################################################
3107 3467
3108package CFClient::UI::Multiplexer; 3468package CFPlus::UI::Multiplexer;
3109 3469
3110our @ISA = CFClient::UI::Container::; 3470our @ISA = CFPlus::UI::Container::;
3111 3471
3112sub new { 3472sub new {
3113 my $class = shift; 3473 my $class = shift;
3114 3474
3115 my $self = $class->SUPER::new ( 3475 my $self = $class->SUPER::new (
… …
3129 3489
3130 $self->{current} = $self->{children}[0] 3490 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3491 if @{ $self->{children} };
3132} 3492}
3133 3493
3494sub get_current_page {
3495 my ($self) = @_;
3496
3497 $self->{current}
3498}
3499
3134sub set_current_page { 3500sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3501 my ($self, $page_or_widget) = @_;
3136 3502
3137 my $widget = ref $page_or_widget 3503 my $widget = ref $page_or_widget
3138 ? $page_or_widget 3504 ? $page_or_widget
… …
3170 $self->{current}->draw; 3536 $self->{current}->draw;
3171} 3537}
3172 3538
3173############################################################################# 3539#############################################################################
3174 3540
3175package CFClient::UI::Notebook; 3541package CFPlus::UI::Notebook;
3176 3542
3177our @ISA = CFClient::UI::VBox::; 3543our @ISA = CFPlus::UI::VBox::;
3178 3544
3179sub new { 3545sub new {
3180 my $class = shift; 3546 my $class = shift;
3181 3547
3182 my $self = $class->SUPER::new ( 3548 my $self = $class->SUPER::new (
3183 buttonbar => (new CFClient::UI::Buttonbar), 3549 buttonbar => (new CFPlus::UI::Buttonbar),
3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3550 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3185 # filter => # will be put between multiplexer and $self 3551 # filter => # will be put between multiplexer and $self
3186 @_, 3552 @_,
3187 ); 3553 );
3188 3554
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3555 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3193} 3559}
3194 3560
3195sub add { 3561sub add {
3196 my ($self, $title, $widget, $tooltip) = @_; 3562 my ($self, $title, $widget, $tooltip) = @_;
3197 3563
3198 Scalar::Util::weaken $self; 3564 CFPlus::weaken $self;
3199 3565
3200 $self->{buttonbar}->add (new CFClient::UI::Button 3566 $self->{buttonbar}->add (new CFPlus::UI::Button
3201 markup => $title, 3567 markup => $title,
3202 tooltip => $tooltip, 3568 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3569 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3570 );
3205 3571
3206 $self->{multiplexer}->add ($widget); 3572 $self->{multiplexer}->add ($widget);
3207} 3573}
3208 3574
3575sub get_current_page {
3576 my ($self) = @_;
3577
3578 $self->{multiplexer}->get_current_page
3579}
3580
3209sub set_current_page { 3581sub set_current_page {
3210 my ($self, $page) = @_; 3582 my ($self, $page) = @_;
3211 3583
3212 $self->{multiplexer}->set_current_page ($page); 3584 $self->{multiplexer}->set_current_page ($page);
3213 $self->emit (page_changed => $self->{multiplexer}{current}); 3585 $self->emit (page_changed => $self->{multiplexer}{current});
3214} 3586}
3215 3587
3216############################################################################# 3588#############################################################################
3217 3589
3218package CFClient::UI::Combobox; 3590package CFPlus::UI::Selector;
3219 3591
3220use utf8; 3592use utf8;
3221 3593
3222our @ISA = CFClient::UI::Button::; 3594our @ISA = CFPlus::UI::Button::;
3223 3595
3224sub new { 3596sub new {
3225 my $class = shift; 3597 my $class = shift;
3226 3598
3227 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
… …
3244 my ($value, $title, $tooltip) = @$_; 3616 my ($value, $title, $tooltip) = @$_;
3245 3617
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3618 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 } 3619 }
3248 3620
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3621 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250} 3622}
3251 3623
3252sub _set_value { 3624sub _set_value {
3253 my ($self, $value) = @_; 3625 my ($self, $value) = @_;
3254 3626
… …
3269 $self->emit (changed => $value); 3641 $self->emit (changed => $value);
3270} 3642}
3271 3643
3272############################################################################# 3644#############################################################################
3273 3645
3274package CFClient::UI::Statusbox; 3646package CFPlus::UI::Statusbox;
3275 3647
3276our @ISA = CFClient::UI::VBox::; 3648our @ISA = CFPlus::UI::VBox::;
3277 3649
3278sub new { 3650sub new {
3279 my $class = shift; 3651 my $class = shift;
3280 3652
3281 my $self = $class->SUPER::new ( 3653 my $self = $class->SUPER::new (
3282 fontsize => 0.8, 3654 fontsize => 0.8,
3283 @_, 3655 @_,
3284 ); 3656 );
3285 3657
3286 Scalar::Util::weaken (my $this = $self); 3658 CFPlus::weaken (my $this = $self);
3287 3659
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3660 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289 3661
3290 $self 3662 $self
3291} 3663}
… …
3293sub reorder { 3665sub reorder {
3294 my ($self) = @_; 3666 my ($self) = @_;
3295 my $NOW = Time::HiRes::time; 3667 my $NOW = Time::HiRes::time;
3296 3668
3297 # freeze display when hovering over any label 3669 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner} 3670 return if $CFPlus::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3671 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} }; 3672 values %{ $self->{item} };
3301 3673
3302 while (my ($k, $v) = each %{ $self->{item} }) { 3674 while (my ($k, $v) = each %{ $self->{item} }) {
3303 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3675 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304 } 3676 }
… …
3325 for ($short) { 3697 for ($short) {
3326 s/^\s+//; 3698 s/^\s+//;
3327 s/\s+/ /g; 3699 s/\s+/ /g;
3328 } 3700 }
3329 3701
3330 new CFClient::UI::Label 3702 new CFPlus::UI::Label
3331 markup => $short, 3703 markup => $short,
3332 tooltip => $item->{tooltip}, 3704 tooltip => $item->{tooltip},
3333 tooltip_font => $::FONT_PROP, 3705 tooltip_font => $::FONT_PROP,
3334 tooltip_width => 0.67, 3706 tooltip_width => 0.67,
3335 fontsize => $item->{fontsize} || $self->{fontsize}, 3707 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3389 count => 1, 3761 count => 1,
3390 %arg, 3762 %arg,
3391 }; 3763 };
3392 } 3764 }
3393 3765
3766 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3767 $self->reorder;
3768 });
3395} 3769}
3396 3770
3397sub reconfigure { 3771sub reconfigure {
3398 my ($self) = @_; 3772 my ($self) = @_;
3399 3773
… …
3412 $self->SUPER::destroy; 3786 $self->SUPER::destroy;
3413} 3787}
3414 3788
3415############################################################################# 3789#############################################################################
3416 3790
3417package CFClient::UI::Inventory;
3418
3419our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421sub new {
3422 my $class = shift;
3423
3424 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426 @_,
3427 );
3428
3429 $self
3430}
3431
3432sub set_items {
3433 my ($self, $items) = @_;
3434
3435 $self->{child}->clear;
3436 return unless $items;
3437
3438 my @items = sort {
3439 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name})
3441 } @$items;
3442
3443 $self->{real_items} = \@items;
3444
3445 my $row = 0;
3446 for my $item (@items) {
3447 CFClient::Item::update_widgets $item;
3448
3449 $self->{child}->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget});
3452
3453 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 }
3663}
3664
3665#############################################################################
3666
3667package CFClient::UI::SpellList;
3668
3669our @ISA = CFClient::UI::Table::;
3670
3671sub new {
3672 my $class = shift;
3673
3674 my $self = $class->SUPER::new (
3675 binding => [],
3676 commands => [],
3677 @_,
3678 )
3679}
3680
3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3766sub add_spell {
3767 my ($self, $spell) = @_;
3768
3769 $self->{spell}->{$spell->{name}} = $spell;
3770 $self->rebuild_spell_list;
3771}
3772
3773sub remove_spell {
3774 my ($self, $spell) = @_;
3775
3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3784 $self->rebuild_spell_list;
3785}
3786
3787#############################################################################
3788
3789package CFClient::UI::Root; 3791package CFPlus::UI::Root;
3790 3792
3791our @ISA = CFClient::UI::Container::; 3793our @ISA = CFPlus::UI::Container::;
3792 3794
3793use List::Util qw(min max); 3795use List::Util qw(min max);
3794 3796
3795use CFClient::OpenGL; 3797use CFPlus::OpenGL;
3796 3798
3797sub new { 3799sub new {
3798 my $class = shift; 3800 my $class = shift;
3799 3801
3800 my $self = $class->SUPER::new ( 3802 my $self = $class->SUPER::new (
3801 visible => 1, 3803 visible => 1,
3802 @_, 3804 @_,
3803 ); 3805 );
3804 3806
3805 Scalar::Util::weaken ($self->{root} = $self); 3807 CFPlus::weaken ($self->{root} = $self);
3806 3808
3807 $self 3809 $self
3808} 3810}
3809 3811
3810sub size_request { 3812sub size_request {
… …
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3978 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 3979
3978 $w = 0 if $w < 0; 3980 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0; 3981 $h = 0 if $h < 0;
3980 3982
3983 $w = max $widget->{min_w}, $w;
3984 $h = max $widget->{min_h}, $h;
3985
3986# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3987# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3988
3989 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3990 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3991
3981 $w = int $w + 0.5; 3992 $w = int $w + 0.5;
3982 $h = int $h + 0.5; 3993 $h = int $h + 0.5;
3983 3994
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3995 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w}; 3996 $widget->{old_w} = $widget->{w};
… …
4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4019 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009 glMatrixMode GL_MODELVIEW; 4020 glMatrixMode GL_MODELVIEW;
4010 glLoadIdentity; 4021 glLoadIdentity;
4011 4022
4012 { 4023 {
4013 package CFClient::UI::Base; 4024 package CFPlus::UI::Base;
4014 4025
4015 ($draw_x, $draw_y, $draw_w, $draw_h) = 4026 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h}); 4027 (0, 0, $self->{w}, $self->{h});
4017 }
4018 4028
4019 $self->_draw; 4029 $self->_draw;
4030 }
4020} 4031}
4021 4032
4022############################################################################# 4033#############################################################################
4023 4034
4024package CFClient::UI; 4035package CFPlus::UI;
4025 4036
4026$ROOT = new CFClient::UI::Root; 4037$ROOT = new CFPlus::UI::Root;
4027$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4038$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4028 4039
40291 40401
4030 4041

Diff Legend

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