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

Diff Legend

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