ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

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

Diff Legend

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