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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 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->focus_out; 316 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
289} 318}
290 319
291sub set_visibility { 320sub set_visibility {
292 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
293 322
294 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
295 324
296 $visible ? $self->hide 325 $visible ? $self->show
297 : $self->show; 326 : $self->hide;
298} 327}
299 328
300sub toggle_visibility { 329sub toggle_visibility {
301 my ($self) = @_; 330 my ($self) = @_;
302 331
… …
336sub size_request { 365sub size_request {
337 require Carp; 366 require Carp;
338 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
339} 368}
340 369
370sub baseline_shift {
371 0
372}
373
341sub configure { 374sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
343 376
344 if ($self->{aspect}) { 377 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
346 379
347 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 382
350 # use alignment to adjust x, y 383 # use alignment to adjust x, y
351 384
352 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
367 400
368 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
369 } 402 }
370} 403}
371 404
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 405sub children {
377 # nop 406 # nop
378} 407}
379 408
380sub visible_children { 409sub visible_children {
… …
398 427
399 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
400 429
401 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
402 431
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 435 }
407} 436}
408 437
409# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
410sub coord2local { 439sub coord2local {
411 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
412 441
442 Carp::confess unless $self->{parent};#d#
443
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 445}
415 446
416# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
417sub coord2global { 448sub coord2global {
418 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
419 450
451 Carp::confess unless $self->{parent};#d#
452
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 454}
422 455
423sub focus_in { 456sub invoke_focus_in {
424 my ($self) = @_; 457 my ($self) = @_;
425 458
426 return if $FOCUS == $self; 459 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
428 461
429 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
430 463
431 $self->_emit (focus_in => $focus); 464 $self->update;
432 465
433 $focus->update if $focus; 466 0
434 $FOCUS->update;
435} 467}
436 468
437sub focus_out { 469sub invoke_focus_out {
438 my ($self) = @_; 470 my ($self) = @_;
439 471
440 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
441 473
442 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
443 475
444 $self->_emit (focus_out => $focus); 476 $self->update;
445 477
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 478 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 479 unless $FOCUS;
450}
451 480
481 0
482}
483
484sub grab_focus {
485 my ($self) = @_;
486
487 $FOCUS->emit ("focus_out") if $FOCUS;
488 $self->emit ("focus_in");
489}
490
452sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 492sub invoke_button_up { 0 }
454sub key_down { 0 } 493sub invoke_key_down { 0 }
455sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
456 496
457sub button_down { 497sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
459 499
460 $self->focus_in; 500 $self->grab_focus;
461 501
462 0 502 0
503}
504
505sub connect {
506 my ($self, $signal, $cb) = @_;
507
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 }
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);
528
529sub emit {
530 my ($self, $signal, @args) = @_;
531
532 # I do not really like this solution, but I do not like duplication
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
543 ($self->can ("invoke_$signal") || sub { 1 }), # closure
544 ) {
545 return $cb->($self, @args, @append) || next;
546 }
547
548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args)
463} 550}
464 551
465sub find_widget { 552sub find_widget {
466 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
467 554
… …
475} 562}
476 563
477sub set_parent { 564sub set_parent {
478 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
479 566
480 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 569}
506 570
507sub realloc { 571sub realloc {
508 my ($self) = @_; 572 my ($self) = @_;
509 573
… …
542 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
543 607
544 # update screen rectangle 608 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 611
550 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 615
… …
576 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
579 glEnd; 641 glEnd;
580 glPopMatrix; 642 glPopMatrix;
581 #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;
582 } 644 }
583 645
584 $self->_draw; 646 $self->_draw;
585 glPopMatrix; 647 glPopMatrix;
586} 648}
… …
589 my ($self) = @_; 651 my ($self) = @_;
590 652
591 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
592} 654}
593 655
656my $cntx;#d#
594sub DESTROY { 657sub DESTROY {
595 my ($self) = @_; 658 my ($self) = @_;
596 659
597 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
598 661
599 eval { $self->destroy }; 662 eval { $self->destroy };
600 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};
601} 666}
602 667
603############################################################################# 668#############################################################################
604 669
605package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
606 671
607our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
608 673
609use strict; 674use strict;
610use CFClient::OpenGL; 675use CFPlus::OpenGL;
611 676
612sub new { 677sub new {
613 my $class = shift; 678 my $class = shift;
614 679
615 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
646 } 711 }
647} 712}
648 713
649############################################################################# 714#############################################################################
650 715
651package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
652 717
653our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
654 719
655sub new { 720sub new {
656 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
657 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
658} 723}
… …
665 730
666sub draw { } 731sub draw { }
667 732
668############################################################################# 733#############################################################################
669 734
670package CFClient::UI::Container; 735package CFPlus::UI::Container;
671 736
672our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
673 738
674sub new { 739sub new {
675 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
676 741
677 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
686 if $children; 751 if $children;
687 752
688 $self 753 $self
689} 754}
690 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
691sub add { 764sub add {
692 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
693 766
694 $_->set_parent ($self) 767 $_->set_parent ($self)
695 for @widgets; 768 for @widgets;
… …
755 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
756} 829}
757 830
758############################################################################# 831#############################################################################
759 832
760package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
761 834
762our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
763 836
764sub new { 837sub new {
765 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
766 839
767 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
768 841
769 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
770} 843}
771 844
772sub add { 845sub add {
… …
779sub remove { 852sub remove {
780 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
781 854
782 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
783 856
784 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
785 unless @{$self->{children}}; 858 unless @{$self->{children}};
786} 859}
787 860
788sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
789 862
790sub size_request { 863sub size_request {
791 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
792} 865}
793 866
794sub size_allocate { 867sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
796 869
797 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
798} 873}
799 874
800############################################################################# 875#############################################################################
801 876
802# back-buffered drawing area 877# back-buffered drawing area
803 878
804package CFClient::UI::Window; 879package CFPlus::UI::Window;
805 880
806our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
807 882
808use CFClient::OpenGL; 883use CFPlus::OpenGL;
809 884
810sub new { 885sub new {
811 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
812 887
813 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
818 893
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 895 $self->SUPER::update;
821} 896}
822 897
823sub size_allocate { 898sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
825 900
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
828} 904}
829 905
830sub _render { 906sub _render {
831 my ($self) = @_; 907 my ($self) = @_;
832 908
… …
834} 910}
835 911
836sub render_child { 912sub render_child {
837 my ($self) = @_; 913 my ($self) = @_;
838 914
839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 915 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
840 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
841 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
842 918
843 { 919 {
844 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
845 921
846 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
848 } 926 }
849
850 $self->_render;
851 }; 927 };
852} 928}
853 929
854sub _draw { 930sub _draw {
855 my ($self) = @_; 931 my ($self) = @_;
856
857 my ($w, $h) = @$self{qw(w h)};
858 932
859 my $tex = $self->{texture} 933 my $tex = $self->{texture}
860 or return; 934 or return;
861 935
862 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
864 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
865 939
866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
867 941
868 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
869} 943}
870 944
871############################################################################# 945#############################################################################
872 946
873package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
874 948
875our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
876 950
877sub new { 951sub new {
878 my $class = shift; 952 my $class = shift;
879 953
880 $class->SUPER::new ( 954 $class->SUPER::new (
… …
893 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
894 968
895 ($w, $h) 969 ($w, $h)
896} 970}
897 971
898sub size_allocate { 972sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
900 974
901 my $child = $self->child; 975 my $child = $self->child;
902 976
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 979
906 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
907 $self->update; 981 $self->update;
982
983 1
908} 984}
909 985
910sub set_offset { 986sub set_offset {
911 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
912 988
… …
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1016 ) {
941 $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})
942 } else { 1018 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
944 } 1020 }
945} 1021}
946 1022
947sub _render { 1023sub _render {
948 my ($self) = @_; 1024 my ($self) = @_;
949 1025
950 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};
951 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};
952 1028
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1030
955 $self->SUPER::_render; 1031 $self->SUPER::_render;
956} 1032}
957 1033
958############################################################################# 1034#############################################################################
959 1035
960package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
961 1037
962our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
963 1039
964sub new { 1040sub new {
965 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
966 1042
967 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
968 1044
969 my $self; 1045 my $self;
970 1046
971 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
972 vertical => 1, 1057 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1059 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1062 },
977 ; 1063 ;
978 1064
979 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
981 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
982 %arg, 1072 %arg,
983 ); 1073 );
984 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
986 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
987 1080
988 $self 1081 $self
989} 1082}
1083
1084#TODO# update range on size_allocate depending on child
990 1085
991sub add { 1086sub add {
992 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
993 1088
994 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
995} 1090}
996 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114}
1115
997sub update { 1116sub update {
998 my ($self) = @_; 1117 my ($self) = @_;
999 1118
1000 $self->SUPER::update; 1119 $self->SUPER::update;
1001 1120 $self->update_slider;
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1121}
1006 1122
1007sub size_allocate { 1123sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1009 1125
1126 $self->update_slider;
1010 $self->SUPER::size_allocate ($w, $h); 1127 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1128}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1129
1019############################################################################# 1130#############################################################################
1020 1131
1021package CFClient::UI::Frame; 1132package CFPlus::UI::Frame;
1022 1133
1023our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFPlus::UI::Bin::;
1024 1135
1025use CFClient::OpenGL; 1136use CFPlus::OpenGL;
1026 1137
1027sub new { 1138sub new {
1028 my $class = shift; 1139 my $class = shift;
1029 1140
1030 $class->SUPER::new ( 1141 $class->SUPER::new (
… …
1056 $self->SUPER::_draw; 1167 $self->SUPER::_draw;
1057} 1168}
1058 1169
1059############################################################################# 1170#############################################################################
1060 1171
1061package CFClient::UI::FancyFrame; 1172package CFPlus::UI::FancyFrame;
1062 1173
1063our @ISA = CFClient::UI::Bin::; 1174our @ISA = CFPlus::UI::Bin::;
1064 1175
1065use CFClient::OpenGL; 1176use CFPlus::OpenGL;
1177
1178sub new {
1179 my ($class, %arg) = @_;
1180
1181 if ((exists $arg{label}) && !ref $arg{label}) {
1182 $arg{label} = new CFPlus::UI::Label
1183 align => 1,
1184 valign => 0,
1185 text => $arg{label},
1186 fontsize => ($arg{border} || 0.8) * 0.75;
1187 }
1188
1189 my $self = $class->SUPER::new (
1190 # label => "",
1191 fg => [0.6, 0.3, 0.1],
1192 border => 0.8,
1193 style => 'single',
1194 %arg,
1195 );
1196
1197 $self
1198}
1199
1200sub add {
1201 my ($self, @widgets) = @_;
1202
1203 $self->SUPER::add (@widgets);
1204 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1205}
1206
1207sub border {
1208 int $_[0]{border} * $::FONTSIZE
1209}
1210
1211sub size_request {
1212 my ($self) = @_;
1213
1214 ($self->{label_w}, undef) = $self->{label}->size_request
1215 if $self->{label};
1216
1217 my ($w, $h) = $self->SUPER::size_request;
1218
1219 (
1220 $w + $self->border * 2,
1221 $h + $self->border * 2,
1222 )
1223}
1224
1225sub invoke_size_allocate {
1226 my ($self, $w, $h) = @_;
1227
1228 my $border = $self->border;
1229
1230 $w -= List::Util::max 0, $border * 2;
1231 $h -= List::Util::max 0, $border * 2;
1232
1233 if (my $label = $self->{label}) {
1234 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1235 $label->{h} = List::Util::min $h, $border;
1236 $label->invoke_size_allocate ($label->{w}, $label->{h});
1237 }
1238
1239 $self->child->configure ($border, $border, $w, $h);
1240
1241 1
1242}
1243
1244sub _draw {
1245 my ($self) = @_;
1246
1247 my $child = $self->{children}[0];
1248
1249 my $border = $self->border;
1250 my ($w, $h) = ($self->{w}, $self->{h});
1251
1252 $child->draw;
1253
1254 glColor @{$self->{fg}};
1255 glBegin GL_LINE_STRIP;
1256 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1257 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1258 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1259 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1260 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1261 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1262 glEnd;
1263
1264 if ($self->{label}) {
1265 glTranslate $border * 2, 0;
1266 $self->{label}->_draw;
1267 }
1268}
1269
1270#############################################################################
1271
1272package CFPlus::UI::Toplevel;
1273
1274our @ISA = CFPlus::UI::Bin::;
1275
1276use CFPlus::OpenGL;
1066 1277
1067my $bg = 1278my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1279 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1; 1280 mipmap => 1, wrap => 1;
1070 1281
1071my @border = 1282my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074 1285
1075sub new { 1286sub new {
1076 my ($class, %arg) = @_; 1287 my ($class, %arg) = @_;
1077 1288
1078 my $self = $class->SUPER::new ( 1289 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1290 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1291 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1292 border => 0.6,
1082 can_events => 1, 1293 can_events => 1,
1083 min_w => 16, 1294 min_w => 64,
1084 min_h => 16, 1295 min_h => 32,
1085 %arg, 1296 %arg,
1086 ); 1297 );
1087 1298
1088 $self->{title_widget} = new CFClient::UI::Label 1299 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1300 align => 0,
1090 valign => 1, 1301 valign => 1,
1091 text => $self->{title}, 1302 text => $self->{title},
1092 fontsize => $self->{border}, 1303 fontsize => $self->{border},
1093 if exists $self->{title}; 1304 if exists $self->{title};
1094 1305
1306 if ($self->{has_close_button}) {
1307 $self->{close_button} =
1308 new CFPlus::UI::ImageButton
1309 path => 'x1_close.png',
1310 on_activate => sub { $self->emit ("delete") };
1311
1312 $self->CFPlus::UI::Container::add ($self->{close_button});
1313 }
1314
1095 $self 1315 $self
1096} 1316}
1097 1317
1098sub add { 1318sub add {
1099 my ($self, @widgets) = @_; 1319 my ($self, @widgets) = @_;
1100 1320
1101 $self->SUPER::add (@widgets); 1321 $self->SUPER::add (@widgets);
1322 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1323 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1324}
1104 1325
1105sub border { 1326sub border {
1106 int $_[0]{border} * $::FONTSIZE 1327 int $_[0]{border} * $::FONTSIZE
1107} 1328}
… …
1109sub size_request { 1330sub size_request {
1110 my ($self) = @_; 1331 my ($self) = @_;
1111 1332
1112 $self->{title_widget}->size_request 1333 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1334 if $self->{title_widget};
1335
1336 $self->{close_button}->size_request
1337 if $self->{close_button};
1114 1338
1115 my ($w, $h) = $self->SUPER::size_request; 1339 my ($w, $h) = $self->SUPER::size_request;
1116 1340
1117 ( 1341 (
1118 $w + $self->border * 2, 1342 $w + $self->border * 2,
1119 $h + $self->border * 2, 1343 $h + $self->border * 2,
1120 ) 1344 )
1121} 1345}
1122 1346
1123sub size_allocate { 1347sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1348 my ($self, $w, $h) = @_;
1125 1349
1126 if ($self->{title_widget}) { 1350 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1351 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1352 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1353 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1354 }
1131 1355
1132 my $border = $self->border; 1356 my $border = $self->border;
1133 1357
1134 $h -= List::Util::max 0, $border * 2; 1358 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1359 $w -= List::Util::max 0, $border * 2;
1360
1361 $self->child->configure ($border, $border, $w, $h);
1362
1363 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1364 if $self->{close_button};
1365
1366 1
1367}
1368
1369sub invoke_delete {
1370 my ($self) = @_;
1371
1372 $self->hide;
1136 1373
1137 $self->child->configure ($border, $border, $w, $h); 1374 1
1138} 1375}
1139 1376
1140sub button_down { 1377sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1378 my ($self, $ev, $x, $y) = @_;
1142 1379
1143 my ($w, $h) = @$self{qw(w h)}; 1380 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1381 my $border = $self->border;
1145 1382
… …
1176 1413
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1414 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1415
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1416 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1417 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1418 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1419 };
1183 } else { 1420 } else {
1184 return 0; 1421 return 0;
1185 } 1422 }
1186 1423
1187 1 1424 1
1188} 1425}
1189 1426
1190sub button_up { 1427sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1428 my ($self, $ev, $x, $y) = @_;
1192 1429
1193 !!delete $self->{motion} 1430 ! ! delete $self->{motion}
1194} 1431}
1195 1432
1196sub mouse_motion { 1433sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1434 my ($self, $ev, $x, $y) = @_;
1198 1435
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1436 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1437
1201 !!$self->{motion} 1438 ! ! $self->{motion}
1439}
1440
1441sub invoke_visibility_change {
1442 my ($self, $visible) = @_;
1443
1444 delete $self->{motion} unless $visible;
1445
1446 0
1202} 1447}
1203 1448
1204sub _draw { 1449sub _draw {
1205 my ($self) = @_; 1450 my ($self) = @_;
1206 1451
… …
1235 $child->draw; 1480 $child->draw;
1236 1481
1237 if ($self->{title_widget}) { 1482 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1483 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1484 $self->{title_widget}->_draw;
1485
1486 glTranslate 0, - ($border - $self->{h});
1240 } 1487 }
1488
1489 $self->{close_button}->draw
1490 if $self->{close_button};
1241} 1491}
1242 1492
1243############################################################################# 1493#############################################################################
1244 1494
1245package CFClient::UI::Table; 1495package CFPlus::UI::Table;
1246 1496
1247our @ISA = CFClient::UI::Base::; 1497our @ISA = CFPlus::UI::Base::;
1248 1498
1249use List::Util qw(max sum); 1499use List::Util qw(max sum);
1250 1500
1251use CFClient::OpenGL; 1501use CFPlus::OpenGL;
1252 1502
1253sub new { 1503sub new {
1254 my $class = shift; 1504 my $class = shift;
1255 1505
1256 $class->SUPER::new ( 1506 $class->SUPER::new (
1257 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1258 @_, 1509 @_,
1259 ) 1510 )
1260} 1511}
1261 1512
1262sub children { 1513sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1515}
1265 1516
1266sub add { 1517sub add {
1267 my ($self, $x, $y, $child) = @_; 1518 my ($self) = shift;
1268 1519
1520 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1522 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1523 $self->{children}[$y][$x] = $child;
1524 }
1271 1525
1526 $self->{force_realloc} = 1;
1527 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1528 $self->realloc;
1273} 1529}
1274 1530
1275sub remove { 1531sub remove {
1276 my ($self, $child) = @_; 1532 my ($self, $child) = @_;
… …
1324 (sum @$ws), 1580 (sum @$ws),
1325 (sum @$hs), 1581 (sum @$hs),
1326 ) 1582 )
1327} 1583}
1328 1584
1329sub size_allocate { 1585sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1586 my ($self, $w, $h) = @_;
1331 1587
1332 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1333 1589
1334 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1335 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1336 1592
1337 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1338 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1339 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1340 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1341 1597
1342 # linearly scale sizes
1343 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1344 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1345 1599
1346 CFClient::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1347 CFClient::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1348 1609
1349 my $y; 1610 my $y;
1350 1611
1351 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {
1352 my $row = $self->{children}[$r] 1613 my $row = $self->{children}[$r]
… …
1366 } 1627 }
1367 1628
1368 $y += $row_h; 1629 $y += $row_h;
1369 } 1630 }
1370 1631
1632 1
1371} 1633}
1372 1634
1373sub find_widget { 1635sub find_widget {
1374 my ($self, $x, $y) = @_; 1636 my ($self, $x, $y) = @_;
1375 1637
… …
1394 } 1656 }
1395} 1657}
1396 1658
1397############################################################################# 1659#############################################################################
1398 1660
1399package CFClient::UI::Box; 1661package CFPlus::UI::Box;
1400 1662
1401our @ISA = CFClient::UI::Container::; 1663our @ISA = CFPlus::UI::Container::;
1402 1664
1403sub size_request { 1665sub size_request {
1404 my ($self) = @_; 1666 my ($self) = @_;
1405 1667
1406 $self->{vertical} 1668 $self->{vertical}
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1675 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1676 )
1415} 1677}
1416 1678
1417sub size_allocate { 1679sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1419 1681
1420 my $space = $self->{vertical} ? $h : $w; 1682 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1683 my @children = $self->visible_children;
1422 1684
1423 my @req; 1685 my @req;
1424 1686
1425 if ($self->{homogeneous}) { 1687 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1688 @req = ($space / (@children || 1)) x @children;
1427 } else { 1689 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1690 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1691 my $req = List::Util::sum @req;
1430 1692
1431 if ($req > $space) { 1693 if ($req > $space) {
1432 # ah well, not enough space 1694 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1695 $_ *= $space / $req for @req;
1434 } else { 1696 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1697 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1698
1437 $space = ($space - $req) / $expand; # remaining space to give away 1699 $space = ($space - $req) / $expand; # remaining space to give away
1438 1700
1439 $req[$_] += $space * $children->[$_]{expand} 1701 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1702 for 0 .. $#children;
1441 } 1703 }
1442 } 1704 }
1443 1705
1444 CFClient::UI::harmonize \@req; 1706 CFPlus::UI::harmonize \@req;
1445 1707
1446 my $pos = 0; 1708 my $pos = 0;
1447 for (0 .. $#$children) { 1709 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1710 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1711 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1712
1451 $pos += $alloc; 1713 $pos += $alloc;
1452 } 1714 }
1453 1715
1454 1 1716 1
1455} 1717}
1456 1718
1457############################################################################# 1719#############################################################################
1458 1720
1459package CFClient::UI::HBox; 1721package CFPlus::UI::HBox;
1460 1722
1461our @ISA = CFClient::UI::Box::; 1723our @ISA = CFPlus::UI::Box::;
1462 1724
1463sub new { 1725sub new {
1464 my $class = shift; 1726 my $class = shift;
1465 1727
1466 $class->SUPER::new ( 1728 $class->SUPER::new (
… …
1469 ) 1731 )
1470} 1732}
1471 1733
1472############################################################################# 1734#############################################################################
1473 1735
1474package CFClient::UI::VBox; 1736package CFPlus::UI::VBox;
1475 1737
1476our @ISA = CFClient::UI::Box::; 1738our @ISA = CFPlus::UI::Box::;
1477 1739
1478sub new { 1740sub new {
1479 my $class = shift; 1741 my $class = shift;
1480 1742
1481 $class->SUPER::new ( 1743 $class->SUPER::new (
… …
1484 ) 1746 )
1485} 1747}
1486 1748
1487############################################################################# 1749#############################################################################
1488 1750
1489package CFClient::UI::Label; 1751package CFPlus::UI::Label;
1490 1752
1491our @ISA = CFClient::UI::DrawBG::; 1753our @ISA = CFPlus::UI::DrawBG::;
1492 1754
1493use CFClient::OpenGL; 1755use CFPlus::OpenGL;
1494 1756
1495sub new { 1757sub new {
1496 my ($class, %arg) = @_; 1758 my ($class, %arg) = @_;
1497 1759
1498 my $self = $class->SUPER::new ( 1760 my $self = $class->SUPER::new (
… …
1501 #active_bg => none 1763 #active_bg => none
1502 #font => default_font 1764 #font => default_font
1503 #text => initial text 1765 #text => initial text
1504 #markup => initial narkup 1766 #markup => initial narkup
1505 #max_w => maximum pixel width 1767 #max_w => maximum pixel width
1768 #style => 0, # render flags
1506 ellipsise => 3, # end 1769 ellipsise => 3, # end
1507 layout => (new CFClient::Layout), 1770 layout => (new CFPlus::Layout),
1508 fontsize => 1, 1771 fontsize => 1,
1509 align => -1, 1772 align => -1,
1510 valign => -1, 1773 valign => -1,
1511 padding_x => 2, 1774 padding_x => 2,
1512 padding_y => 2, 1775 padding_y => 2,
1513 can_events => 0, 1776 can_events => 0,
1514 %arg 1777 %arg
1515 ); 1778 );
1516 1779
1517 if (exists $self->{template}) { 1780 if (exists $self->{template}) {
1518 my $layout = new CFClient::Layout; 1781 my $layout = new CFPlus::Layout;
1519 $layout->set_text (delete $self->{template}); 1782 $layout->set_text (delete $self->{template});
1520 $self->{template} = $layout; 1783 $self->{template} = $layout;
1521 } 1784 }
1522 1785
1523 if (exists $self->{markup}) { 1786 if (exists $self->{markup}) {
… …
1527 } 1790 }
1528 1791
1529 $self 1792 $self
1530} 1793}
1531 1794
1532sub escape($) {
1533 local $_ = $_[0];
1534
1535 s/&/&amp;/g;
1536 s/>/&gt;/g;
1537 s/</&lt;/g;
1538
1539 $_
1540}
1541
1542sub update { 1795sub update {
1543 my ($self) = @_; 1796 my ($self) = @_;
1544 1797
1545 delete $self->{texture}; 1798 delete $self->{texture};
1546 $self->SUPER::update; 1799 $self->SUPER::update;
… …
1557 my ($self, $text) = @_; 1810 my ($self, $text) = @_;
1558 1811
1559 return if $self->{text} eq "T$text"; 1812 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1813 $self->{text} = "T$text";
1561 1814
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1815 $self->{layout}->set_text ($text);
1564 1816
1565 delete $self->{size_req}; 1817 delete $self->{size_req};
1566 $self->realloc; 1818 $self->realloc;
1567 $self->update; 1819 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1825 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1826 $self->{text} = "M$markup";
1575 1827
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1828 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1829
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1830 $self->{layout}->set_markup ($markup);
1580 1831
1581 delete $self->{size_req}; 1832 delete $self->{size_req};
1582 $self->realloc; 1833 $self->realloc;
1583 $self->update; 1834 $self->update;
… …
1595 1846
1596 my ($w, $h) = $self->{layout}->size; 1847 my ($w, $h) = $self->{layout}->size;
1597 1848
1598 if (exists $self->{template}) { 1849 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1850 $self->{template}->set_font ($self->{font}) if $self->{font};
1851 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1853
1602 my ($w2, $h2) = $self->{template}->size; 1854 my ($w2, $h2) = $self->{template}->size;
1603 1855
1604 $w = List::Util::max $w, $w2; 1856 $w = List::Util::max $w, $w2;
… …
1609 }; 1861 };
1610 1862
1611 @{ $self->{size_req} } 1863 @{ $self->{size_req} }
1612} 1864}
1613 1865
1866sub baseline_shift {
1867 $_[0]{layout}->descent
1868}
1869
1614sub size_allocate { 1870sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1871 my ($self, $w, $h) = @_;
1616 1872
1617 delete $self->{ox}; 1873 delete $self->{ox};
1618 1874
1619 delete $self->{texture} 1875 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1876 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1877
1878 1
1621} 1879}
1622 1880
1623sub set_fontsize { 1881sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1882 my ($self, $fontsize) = @_;
1625 1883
1626 $self->{fontsize} = $fontsize; 1884 $self->{fontsize} = $fontsize;
1885 delete $self->{size_req};
1627 delete $self->{texture}; 1886 delete $self->{texture};
1628 1887
1629 $self->realloc; 1888 $self->realloc;
1630} 1889}
1631 1890
1632sub reconfigure { 1891sub reconfigure {
1633 my ($self) = @_; 1892 my ($self) = @_;
1634 1893
1635 delete $self->{size_req}; 1894 delete $self->{size_req};
1895 delete $self->{texture};
1636 1896
1637 $self->SUPER::reconfigure; 1897 $self->SUPER::reconfigure;
1638} 1898}
1639 1899
1640sub _draw { 1900sub _draw {
1641 my ($self) = @_; 1901 my ($self) = @_;
1642 1902
1643 $self->SUPER::_draw; # draw background, if applicable 1903 $self->SUPER::_draw; # draw background, if applicable
1644 1904
1645 my $tex = $self->{texture} ||= do { 1905 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1906 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1907 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1908 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1909 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1910 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1911 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1912
1653 new_from_layout CFClient::Texture $self->{layout} 1913 [$self->{layout}->size]
1654 }; 1914 };
1655 1915
1656 unless (exists $self->{ox}) { 1916 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1917 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1918 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1919 : ($self->{w} - $size->[0]) * 0.5);
1660 1920
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1923 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1924 };
1665 1925
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1926 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1927 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1928
1671 if ($tex->{format} == GL_ALPHA) { 1929 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 1930}
1682 1931
1683############################################################################# 1932#############################################################################
1684 1933
1685package CFClient::UI::EntryBase; 1934package CFPlus::UI::EntryBase;
1686 1935
1687our @ISA = CFClient::UI::Label::; 1936our @ISA = CFPlus::UI::Label::;
1688 1937
1689use CFClient::OpenGL; 1938use CFPlus::OpenGL;
1690 1939
1691sub new { 1940sub new {
1692 my $class = shift; 1941 my $class = shift;
1693 1942
1694 $class->SUPER::new ( 1943 $class->SUPER::new (
… …
1698 active_fg => [0, 0, 0], 1947 active_fg => [0, 0, 0],
1699 can_hover => 1, 1948 can_hover => 1,
1700 can_focus => 1, 1949 can_focus => 1,
1701 valign => 0, 1950 valign => 0,
1702 can_events => 1, 1951 can_events => 1,
1952 ellipsise => 0,
1703 #text => ... 1953 #text => ...
1704 #hidden => "*", 1954 #hidden => "*",
1705 @_ 1955 @_
1706 ) 1956 )
1707} 1957}
… …
1718 1968
1719 $text =~ s/./*/g if $self->{hidden}; 1969 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1970 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1971 delete $self->{size_req};
1722 1972
1723 $self->_emit (changed => $self->{text}); 1973 $self->emit (changed => $self->{text});
1724 1974
1725 $self->realloc; 1975 $self->realloc;
1726 $self->update; 1976 $self->update;
1727} 1977}
1728 1978
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1993 my ($w, $h) = $self->SUPER::size_request;
1744 1994
1745 ($w + 1, $h) # add 1 for cursor 1995 ($w + 1, $h) # add 1 for cursor
1746} 1996}
1747 1997
1748sub key_down { 1998sub invoke_key_down {
1749 my ($self, $ev) = @_; 1999 my ($self, $ev) = @_;
1750 2000
1751 my $mod = $ev->{mod}; 2001 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 2002 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 2003 my $uni = $ev->{unicode};
1754 2004
1755 my $text = $self->get_text; 2005 my $text = $self->get_text;
2006
2007 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1756 2008
1757 if ($uni == 8) { 2009 if ($uni == 8) {
1758 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2010 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1759 } elsif ($uni == 127) { 2011 } elsif ($uni == 127) {
1760 substr $text, $self->{cursor}, 1, ""; 2012 substr $text, $self->{cursor}, 1, "";
1761 } elsif ($sym == CFClient::SDLK_LEFT) { 2013 } elsif ($sym == CFPlus::SDLK_LEFT) {
1762 --$self->{cursor} if $self->{cursor}; 2014 --$self->{cursor} if $self->{cursor};
1763 } elsif ($sym == CFClient::SDLK_RIGHT) { 2015 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1764 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2016 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1765 } elsif ($sym == CFClient::SDLK_HOME) { 2017 } elsif ($sym == CFPlus::SDLK_HOME) {
2018 # what a hack
2019 $self->{cursor} =
2020 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2021 ? length $1
2022 : 0;
2023 } elsif ($sym == CFPlus::SDLK_END) {
2024 # uh, again
2025 $self->{cursor} =
2026 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2027 ? $self->{cursor} + length $1
2028 : length $self->{text};
2029 } elsif ($uni == 21) { # ctrl-u
2030 $text = "";
1766 $self->{cursor} = 0; 2031 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 2032 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 2033 $self->emit ('escape');
1771 } elsif ($uni) { 2034 } elsif ($uni == 0x0d) {
2035 substr $text, $self->{cursor}++, 0, "\012";
2036 } elsif ($uni >= 0x20) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 2037 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 2038 } else {
1774 return 0; 2039 return 0;
1775 } 2040 }
1776 2041
1777 $self->_set_text ($text); 2042 $self->_set_text ($text);
1778 2043
1779 $self->realloc; 2044 $self->realloc;
2045 $self->update;
1780 2046
1781 1 2047 1
1782} 2048}
1783 2049
1784sub focus_in { 2050sub invoke_focus_in {
1785 my ($self) = @_; 2051 my ($self) = @_;
1786 2052
1787 $self->{last_activity} = $::NOW; 2053 $self->{last_activity} = $::NOW;
1788 2054
1789 $self->SUPER::focus_in; 2055 $self->SUPER::invoke_focus_in
1790} 2056}
1791 2057
1792sub button_down { 2058sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 2059 my ($self, $ev, $x, $y) = @_;
1794 2060
1795 $self->SUPER::button_down ($ev, $x, $y); 2061 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 2062
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 2063 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 2064
1799 # byte-index to char-index 2065 # byte-index to char-index
1800 my $text = $self->{text}; 2066 my $text = $self->{text};
1801 utf8::encode $text; 2067 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 2068 $self->{cursor} = length $text;
1803 2069
1804 $self->_set_text ($self->{text}); 2070 $self->_set_text ($self->{text});
1805 $self->update; 2071 $self->update;
1806 2072
1807 1 2073 1
1808} 2074}
1809 2075
1810sub mouse_motion { 2076sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 2077 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2078# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 2079
1814 0 2080 1
1815} 2081}
1816 2082
1817sub _draw { 2083sub _draw {
1818 my ($self) = @_; 2084 my ($self) = @_;
1819 2085
… …
1846 utf8::encode $text; 2112 utf8::encode $text;
1847 2113
1848 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2114 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1849 } 2115 }
1850 2116
1851 glColor @{$self->{fg}};
1852 glBegin GL_LINES; 2117 glBegin GL_LINES;
1853 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1854 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1855 glEnd; 2120 glEnd;
1856 } 2121 }
1857} 2122}
1858 2123
2124#############################################################################
2125
1859package CFClient::UI::Entry; 2126package CFPlus::UI::Entry;
1860 2127
1861our @ISA = CFClient::UI::EntryBase::; 2128our @ISA = CFPlus::UI::EntryBase::;
1862 2129
1863use CFClient::OpenGL; 2130use CFPlus::OpenGL;
1864 2131
1865sub key_down { 2132sub invoke_key_down {
1866 my ($self, $ev) = @_; 2133 my ($self, $ev) = @_;
1867 2134
1868 my $sym = $ev->{sym}; 2135 my $sym = $ev->{sym};
1869 2136
1870 if ($sym == 13) { 2137 if ($ev->{uni} == 0x0d || $sym == 13) {
1871 unshift @{$self->{history}}, 2138 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 2139 my $txt = $self->get_text;
2140
1873 $self->{history_pointer} = -1; 2141 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 2142 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 2143 $self->emit (activate => $txt);
1876 $self->update; 2144 $self->update;
1877 2145
1878 } elsif ($sym == CFClient::SDLK_UP) { 2146 } elsif ($sym == CFPlus::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 2147 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 2148 $self->{history_saveback} = $self->get_text;
1881 } 2149 }
1882 if (@{$self->{history} || []} > 0) { 2150 if (@{$self->{history} || []} > 0) {
1883 $self->{history_pointer}++; 2151 $self->{history_pointer}++;
… …
1885 $self->{history_pointer} = @{$self->{history} || []} - 1; 2153 $self->{history_pointer} = @{$self->{history} || []} - 1;
1886 } 2154 }
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2155 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } 2156 }
1889 2157
1890 } elsif ($sym == CFClient::SDLK_DOWN) { 2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
1891 $self->{history_pointer}--; 2159 $self->{history_pointer}--;
1892 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2160 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1893 2161
1894 if ($self->{history_pointer} >= 0) { 2162 if ($self->{history_pointer} >= 0) {
1895 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2163 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1896 } else { 2164 } else {
1897 $self->set_text ($self->{history_saveback}); 2165 $self->set_text ($self->{history_saveback});
1898 } 2166 }
1899 2167
1900 } else { 2168 } else {
1901 return $self->SUPER::key_down ($ev) 2169 return $self->SUPER::invoke_key_down ($ev)
1902 } 2170 }
1903 2171
1904 1 2172 1
1905} 2173}
1906 2174
1907############################################################################# 2175#############################################################################
1908 2176
2177package CFPlus::UI::TextEdit;
2178
2179our @ISA = CFPlus::UI::EntryBase::;
2180
2181use CFPlus::OpenGL;
2182
2183sub move_cursor_ver {
2184 my ($self, $dy) = @_;
2185
2186 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2187
2188 $y += $dy;
2189
2190 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2191 $self->{cursor} = $index;
2192 delete $self->{cur_h};
2193 $self->update;
2194 return;
2195 }
2196}
2197
2198sub invoke_key_down {
2199 my ($self, $ev) = @_;
2200
2201 my $sym = $ev->{sym};
2202
2203 if ($sym == CFPlus::SDLK_UP) {
2204 $self->move_cursor_ver (-1);
2205 } elsif ($sym == CFPlus::SDLK_DOWN) {
2206 $self->move_cursor_ver (+1);
2207 } else {
2208 return $self->SUPER::invoke_key_down ($ev)
2209 }
2210
2211 1
2212}
2213
2214#############################################################################
2215
1909package CFClient::UI::Button; 2216package CFPlus::UI::Button;
1910 2217
1911our @ISA = CFClient::UI::Label::; 2218our @ISA = CFPlus::UI::Label::;
1912 2219
1913use CFClient::OpenGL; 2220use CFPlus::OpenGL;
1914 2221
1915my @tex = 2222my @tex =
1916 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1917 qw(b1_button_active.png); 2224 qw(b1_button_active.png);
1918 2225
1919sub new { 2226sub new {
1920 my $class = shift; 2227 my $class = shift;
1921 2228
… …
1930 can_events => 1, 2237 can_events => 1,
1931 @_ 2238 @_
1932 ) 2239 )
1933} 2240}
1934 2241
1935sub activate { }
1936
1937sub button_up { 2242sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1939 2244
1940 $self->emit ("activate") 2245 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 2246 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 2247 && $y >= 0 && $y < $self->{h};
… …
1960 $self->SUPER::_draw; 2265 $self->SUPER::_draw;
1961} 2266}
1962 2267
1963############################################################################# 2268#############################################################################
1964 2269
1965package CFClient::UI::CheckBox; 2270package CFPlus::UI::CheckBox;
1966 2271
1967our @ISA = CFClient::UI::DrawBG::; 2272our @ISA = CFPlus::UI::DrawBG::;
1968 2273
1969my @tex = 2274my @tex =
1970 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2275 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1971 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2276 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1972 2277
1973use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1974 2279
1975sub new { 2280sub new {
1976 my $class = shift; 2281 my $class = shift;
1977 2282
1978 $class->SUPER::new ( 2283 $class->SUPER::new (
… …
1992 my ($self) = @_; 2297 my ($self) = @_;
1993 2298
1994 (6) x 2 2299 (6) x 2
1995} 2300}
1996 2301
2302sub toggle {
2303 my ($self) = @_;
2304
2305 $self->{state} = !$self->{state};
2306 $self->emit (changed => $self->{state});
2307 $self->update;
2308}
2309
1997sub button_down { 2310sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2311 my ($self, $ev, $x, $y) = @_;
1999 2312
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2313 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2314 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2315 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2316 } else {
2005 return 0 2317 return 0
2006 } 2318 }
2007 2319
2008 1 2320 1
… …
2028 glDisable GL_TEXTURE_2D; 2340 glDisable GL_TEXTURE_2D;
2029} 2341}
2030 2342
2031############################################################################# 2343#############################################################################
2032 2344
2033package CFClient::UI::Image; 2345package CFPlus::UI::Image;
2034 2346
2035our @ISA = CFClient::UI::Base::; 2347our @ISA = CFPlus::UI::Base::;
2036 2348
2037use CFClient::OpenGL; 2349use CFPlus::OpenGL;
2038use Carp qw/confess/;
2039 2350
2040our %loaded_images; 2351our %texture_cache;
2041 2352
2042sub new { 2353sub new {
2043 my $class = shift; 2354 my $class = shift;
2044 2355
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2356 my $self = $class->SUPER::new (
2357 can_events => 0,
2358 @_,
2359 );
2046 2360
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2361 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required";
2048 2363
2049 $loaded_images{$self->{image}} ||= 2364 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2365 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2051 2366
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2367 CFPlus::weaken $texture_cache{$self->{path}};
2053 2368
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2369 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2370
2058 $self 2371 $self
2059} 2372}
2060 2373
2374sub STORABLE_freeze {
2375 my ($self, $cloning) = @_;
2376
2377 $self->{path}
2378 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2379
2380 $self->{path}
2381}
2382
2383sub STORABLE_attach {
2384 my ($self, $cloning, $path) = @_;
2385
2386 $self->new (path => $path)
2387}
2388
2061sub size_request { 2389sub size_request {
2062 my ($self) = @_; 2390 my ($self) = @_;
2063 2391
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2392 ($self->{tex}{w}, $self->{tex}{h})
2065} 2393}
2066 2394
2067sub _draw { 2395sub _draw {
2068 my ($self) = @_; 2396 my ($self) = @_;
2069 2397
… …
2079 } 2407 }
2080 2408
2081 glEnable GL_TEXTURE_2D; 2409 glEnable GL_TEXTURE_2D;
2082 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2083 2411
2084 $tex->draw_quad_alpha (0, 0, $w, $h); 2412 $tex->draw_quad (0, 0, $w, $h);
2085 2413
2086 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2087} 2415}
2088 2416
2089############################################################################# 2417#############################################################################
2090 2418
2419package CFPlus::UI::ImageButton;
2420
2421our @ISA = CFPlus::UI::Image::;
2422
2423use CFPlus::OpenGL;
2424
2425my %textures;
2426
2427sub new {
2428 my $class = shift;
2429
2430 my $self = $class->SUPER::new (
2431 padding_x => 4,
2432 padding_y => 4,
2433 fg => [1, 1, 1],
2434 active_fg => [0, 0, 1],
2435 can_hover => 1,
2436 align => 0,
2437 valign => 0,
2438 can_events => 1,
2439 @_
2440 );
2441}
2442
2443sub invoke_button_up {
2444 my ($self, $ev, $x, $y) = @_;
2445
2446 $self->emit ("activate")
2447 if $x >= 0 && $x < $self->{w}
2448 && $y >= 0 && $y < $self->{h};
2449
2450 1
2451}
2452
2453#############################################################################
2454
2091package CFClient::UI::VGauge; 2455package CFPlus::UI::VGauge;
2092 2456
2093our @ISA = CFClient::UI::Base::; 2457our @ISA = CFPlus::UI::Base::;
2094 2458
2095use List::Util qw(min max); 2459use List::Util qw(min max);
2096 2460
2097use CFClient::OpenGL; 2461use CFPlus::OpenGL;
2098 2462
2099my %tex = ( 2463my %tex = (
2100 food => [ 2464 food => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2465 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2466 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2103 ], 2467 ],
2104 grace => [ 2468 grace => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2469 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2470 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2107 ], 2471 ],
2108 hp => [ 2472 hp => [
2109 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2110 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2474 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2111 ], 2475 ],
2112 mana => [ 2476 mana => [
2113 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2477 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2114 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2478 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2115 ], 2479 ],
2116); 2480);
2117 2481
2118# eg. VGauge->new (gauge => 'food'), default gauge: food 2482# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2542 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2543 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2544
2181 my $h1 = $self->{h} * (1 - $ycut1); 2545 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2546 my $h2 = $self->{h} * (1 - $ycut2);
2547 my $h3 = $self->{h};
2548
2549 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2550
2184 glEnable GL_BLEND; 2551 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2552 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2553 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2554 glEnable GL_TEXTURE_2D;
… …
2206 2573
2207 if ($t3) { 2574 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2575 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2576 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2577 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2578 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2579 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2580 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2581 glEnd;
2215 } 2582 }
2216 2583
2217 glDisable GL_BLEND; 2584 glDisable GL_BLEND;
2218 glDisable GL_TEXTURE_2D; 2585 glDisable GL_TEXTURE_2D;
2219} 2586}
2220 2587
2221############################################################################# 2588#############################################################################
2222 2589
2223package CFClient::UI::Gauge; 2590package CFPlus::UI::Gauge;
2224 2591
2225our @ISA = CFClient::UI::VBox::; 2592our @ISA = CFPlus::UI::VBox::;
2226 2593
2227sub new { 2594sub new {
2228 my ($class, %arg) = @_; 2595 my ($class, %arg) = @_;
2229 2596
2230 my $self = $class->SUPER::new ( 2597 my $self = $class->SUPER::new (
… …
2232 can_hover => 1, 2599 can_hover => 1,
2233 can_events => 1, 2600 can_events => 1,
2234 %arg, 2601 %arg,
2235 ); 2602 );
2236 2603
2237 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2604 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2238 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2605 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2239 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2606 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2240 2607
2241 $self 2608 $self
2242} 2609}
2243 2610
2244sub set_fontsize { 2611sub set_fontsize {
… …
2265 $self->{value}->set_text ($val); 2632 $self->{value}->set_text ($val);
2266} 2633}
2267 2634
2268############################################################################# 2635#############################################################################
2269 2636
2270package CFClient::UI::Slider; 2637package CFPlus::UI::Slider;
2271 2638
2272use strict; 2639use strict;
2273 2640
2274use CFClient::OpenGL; 2641use CFPlus::OpenGL;
2275 2642
2276our @ISA = CFClient::UI::DrawBG::; 2643our @ISA = CFPlus::UI::DrawBG::;
2277 2644
2278my @tex = 2645my @tex =
2279 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2646 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2280 qw(s1_slider.png s1_slider_bg.png); 2647 qw(s1_slider.png s1_slider_bg.png);
2281 2648
2282sub new { 2649sub new {
2283 my $class = shift; 2650 my $class = shift;
2284 2651
… …
2305 $self->update; 2672 $self->update;
2306 2673
2307 $self 2674 $self
2308} 2675}
2309 2676
2310sub changed { }
2311
2312sub set_range { 2677sub set_range {
2313 my ($self, $range) = @_; 2678 my ($self, $range) = @_;
2314 2679
2315 ($range, $self->{range}) = ($self->{range}, $range); 2680 ($range, $self->{range}) = ($self->{range}, $range);
2316 2681
… …
2336 if $unit; 2701 if $unit;
2337 2702
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2703 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2704
2340 if ($value != $old_value) { 2705 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2706 $self->emit (changed => $value);
2342 $self->update; 2707 $self->update;
2343 } 2708 }
2344} 2709}
2345 2710
2346sub size_request { 2711sub size_request {
2347 my ($self) = @_; 2712 my ($self) = @_;
2348 2713
2349 ($self->{req_w}, $self->{req_h}) 2714 ($self->{req_w}, $self->{req_h})
2350} 2715}
2351 2716
2352sub button_down { 2717sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2718 my ($self, $ev, $x, $y) = @_;
2354 2719
2355 $self->SUPER::button_down ($ev, $x, $y); 2720 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2721
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2723
2359 $self->mouse_motion ($ev, $x, $y) 2724 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2725}
2361 2726
2362sub mouse_motion { 2727sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2728 my ($self, $ev, $x, $y) = @_;
2364 2729
2365 if ($GRAB == $self) { 2730 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2731 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2732
… …
2373 } else { 2738 } else {
2374 return 0; 2739 return 0;
2375 } 2740 }
2376 2741
2377 1 2742 1
2743}
2744
2745sub invoke_mouse_wheel {
2746 my ($self, $ev) = @_;
2747
2748 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2749
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753
2754 ! ! $delta
2378} 2755}
2379 2756
2380sub update { 2757sub update {
2381 my ($self) = @_; 2758 my ($self) = @_;
2382 2759
… …
2431 glDisable GL_TEXTURE_2D; 2808 glDisable GL_TEXTURE_2D;
2432} 2809}
2433 2810
2434############################################################################# 2811#############################################################################
2435 2812
2436package CFClient::UI::ValSlider; 2813package CFPlus::UI::ValSlider;
2437 2814
2438our @ISA = CFClient::UI::HBox::; 2815our @ISA = CFPlus::UI::HBox::;
2439 2816
2440sub new { 2817sub new {
2441 my ($class, %arg) = @_; 2818 my ($class, %arg) = @_;
2442 2819
2443 my $range = delete $arg{range}; 2820 my $range = delete $arg{range};
2444 2821
2445 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2446 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2823 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2447 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2824 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2448 to_value => sub { shift }, 2825 to_value => sub { shift },
2449 from_value => sub { shift }, 2826 from_value => sub { shift },
2450 %arg, 2827 %arg,
2451 ); 2828 );
2452 2829
… …
2472sub set_range { shift->{slider}->set_range (@_) } 2849sub set_range { shift->{slider}->set_range (@_) }
2473sub set_value { shift->{slider}->set_value (@_) } 2850sub set_value { shift->{slider}->set_value (@_) }
2474 2851
2475############################################################################# 2852#############################################################################
2476 2853
2477package CFClient::UI::TextScroller; 2854package CFPlus::UI::TextScroller;
2478 2855
2479our @ISA = CFClient::UI::HBox::; 2856our @ISA = CFPlus::UI::HBox::;
2480 2857
2481use CFClient::OpenGL; 2858use CFPlus::OpenGL;
2482 2859
2483sub new { 2860sub new {
2484 my $class = shift; 2861 my $class = shift;
2485 2862
2486 my $self = $class->SUPER::new ( 2863 my $self = $class->SUPER::new (
2487 fontsize => 1, 2864 fontsize => 1,
2488 can_events => 0, 2865 can_events => 1,
2489 indent => 0, 2866 indent => 0,
2490 #font => default_font 2867 #font => default_font
2491 @_, 2868 @_,
2492 2869
2493 layout => (new CFClient::Layout 1), 2870 layout => (new CFPlus::Layout),
2494 par => [], 2871 par => [],
2872 max_par => 0,
2495 height => 0, 2873 height => 0,
2496 children => [ 2874 children => [
2497 (new CFClient::UI::Empty expand => 1), 2875 (new CFPlus::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2876 (new CFPlus::UI::Slider vertical => 1),
2499 ], 2877 ],
2500 ); 2878 );
2501 2879
2502 $self->{children}[1]->connect (changed => sub { $self->update }); 2880 $self->{children}[1]->connect (changed => sub { $self->update });
2503 2881
… …
2509 2887
2510 $self->{fontsize} = $fontsize; 2888 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2889 $self->reflow;
2512} 2890}
2513 2891
2892sub size_request {
2893 my ($self) = @_;
2894
2895 my ($empty, $slider) = @{ $self->{children} };
2896
2897 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request
2899}
2900
2514sub size_allocate { 2901sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2516 2903
2517 $self->SUPER::size_allocate ($w, $h); 2904 my ($empty, $slider, @other) = @{ $self->{children} };
2905 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2906
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2907 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2908 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2909 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2910 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2911
2524 $self->reflow; 2912 $self->reflow;
2525}
2526 2913
2527sub text_size { 2914 local $self->{children} = [$empty, $slider];
2915 $self->SUPER::invoke_size_allocate ($w, $h)
2916}
2917
2918sub invoke_mouse_wheel {
2528 my ($self, $text, $indent) = @_; 2919 my ($self, $ev) = @_;
2920
2921 return 0 unless $ev->{dy}; # only vertical movements
2922
2923 $self->{children}[1]->emit (mouse_wheel => $ev);
2924
2925 1
2926}
2927
2928sub get_layout {
2929 my ($self, $para) = @_;
2529 2930
2530 my $layout = $self->{layout}; 2931 my $layout = $self->{layout};
2531 2932
2933 $layout->set_font ($self->{font}) if $self->{font};
2934 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2935 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2936 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2937 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2938 $layout->set_markup ($para->{markup});
2939
2940 $layout->set_shapes (
2941 map
2942 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2943 @{$para->{widget}}
2536 2944 );
2945
2537 $layout->size 2946 $layout
2538} 2947}
2539 2948
2540sub reflow { 2949sub reflow {
2541 my ($self) = @_; 2950 my ($self) = @_;
2542 2951
… …
2549 2958
2550 # todo: base offset on lines or so, not on pixels 2959 # todo: base offset on lines or so, not on pixels
2551 $self->{children}[1]->set_value ($offset); 2960 $self->{children}[1]->set_value ($offset);
2552} 2961}
2553 2962
2963sub current_paragraph {
2964 my ($self) = @_;
2965
2966 $self->{top_paragraph} - 1
2967}
2968
2969sub scroll_to {
2970 my ($self, $para) = @_;
2971
2972 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2973
2974 $self->{scroll_to} = $para;
2975 $self->update;
2976}
2977
2554sub clear { 2978sub clear {
2555 my ($self) = @_; 2979 my ($self) = @_;
2980
2981 my (undef, undef, @other) = @{ $self->{children} };
2982 $self->remove ($_) for @other;
2556 2983
2557 $self->{par} = []; 2984 $self->{par} = [];
2558 $self->{height} = 0; 2985 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2986 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2987}
2561 2988
2562sub add_paragraph { 2989sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2990 my $self = shift;
2564 2991
2565 for my $line (split /\n/, $text) { 2992 for my $para (@_) {
2566 my ($w, $h) = $self->text_size ($line); 2993 $para = {
2994 fg => [1, 1, 1, 1],
2995 indent => 0,
2996 markup => "",
2997 widget => [],
2998 ref $para ? %$para : (markup => $para),
2999 w => 1e10,
3000 wrapped => 1,
3001 };
3002
3003 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3004 push @{$self->{par}}, $para;
3005 }
3006
3007 if (my $max = $self->{max_par}) {
3008 shift @{$self->{par}} while @{$self->{par}} > $max;
3009 }
3010
3011 $self->{need_reflow}++;
3012 $self->update;
3013}
3014
3015sub scroll_to_bottom {
3016 my ($self) = @_;
3017
3018 $self->{scroll_to} = $#{$self->{par}};
3019 $self->update;
3020}
3021
3022sub force_uptodate {
3023 my ($self) = @_;
3024
3025 if (delete $self->{need_reflow}) {
3026 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3027
3028 my $height = 0;
3029
3030 for my $para (@{$self->{par}}) {
3031 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3032 my $layout = $self->get_layout ($para);
3033 my ($w, $h) = $layout->size;
3034
3035 $para->{w} = $w + $para->{indent};
3036 $para->{h} = $h;
3037 $para->{wrapped} = $layout->has_wrapped;
3038 }
3039
3040 $para->{y} = $height;
3041 $height += $para->{h};
3042 }
3043
2567 $self->{height} += $h; 3044 $self->{height} = $height;
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3045 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2569 }
2570 3046
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3047 delete $self->{texture};
3048 }
3049
3050 if (my $paridx = delete $self->{scroll_to}) {
3051 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3052 }
2572} 3053}
2573 3054
2574sub update { 3055sub update {
2575 my ($self) = @_; 3056 my ($self) = @_;
2576 3057
… …
2579 return unless $self->{h} > 0; 3060 return unless $self->{h} > 0;
2580 3061
2581 delete $self->{texture}; 3062 delete $self->{texture};
2582 3063
2583 $ROOT->on_post_alloc ($self => sub { 3064 $ROOT->on_post_alloc ($self => sub {
3065 $self->force_uptodate;
3066
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3067 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 3068
2586 if (delete $self->{need_reflow}) {
2587 my $height = 0;
2588
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3];
2600 $_->[1] = $h;
2601 }
2602
2603 $height += $_->[1];
2604 }
2605
2606 $self->{height} = $height;
2607
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2609
2610 delete $self->{texture};
2611 }
2612
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3069 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 3070 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 3071 glClear GL_COLOR_BUFFER_BIT;
2616 3072
3073 package CFPlus::UI::Base;
3074 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3075 (0, 0, $self->{w}, $self->{h});
3076
3077 my $top = int $self->{children}[1]{range}[0];
3078
3079 my $paridx = 0;
3080 my $top_paragraph;
2617 my $top = int $self->{children}[1]{range}[0]; 3081 my $top = int $self->{children}[1]{range}[0];
2618 3082
2619 my $y0 = $top; 3083 my $y0 = $top;
2620 my $y1 = $top + $H; 3084 my $y1 = $top + $H;
2621 3085
2622 my $y = 0;
2623
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 3086 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 3087 my $h = $para->{h};
3088 my $y = $para->{y};
2634 3089
2635 if ($y0 < $y + $h && $y < $y1) { 3090 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 3091 my $layout = $self->get_layout ($para);
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 3092
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3093 $layout->render ($para->{indent}, $y - $y0);
2642 3094
2643 glRasterPos $par->[3], $y - $y0; 3095 if (my @w = @{ $para->{widget} }) {
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3096 my @s = $layout->get_shapes;
3097
3098 for (@w) {
3099 my ($dx, $dy) = splice @s, 0, 2, ();
3100
3101 $_->{x} = $dx + $para->{indent};
3102 $_->{y} = $dy + $y - $y0;
3103
3104 $_->draw;
3105 }
3106 }
2645 } 3107 }
2646 3108
2647 $y += $h; 3109 $paridx++;
3110 $top_paragraph ||= $paridx if $y >= $top;
2648 } 3111 }
2649 3112
2650 glDisable GL_BLEND; 3113 $self->{top_paragraph} = $top_paragraph;
2651 }; 3114 };
2652 }); 3115 });
3116}
3117
3118sub reconfigure {
3119 my ($self) = @_;
3120
3121 $self->SUPER::reconfigure;
3122
3123 $_->{w} = 1e10 for @{ $self->{par} };
3124 $self->reflow;
2653} 3125}
2654 3126
2655sub _draw { 3127sub _draw {
2656 my ($self) = @_; 3128 my ($self) = @_;
2657 3129
… …
2660 glColor 0, 0, 0, 1; 3132 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3133 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 3134 glDisable GL_TEXTURE_2D;
2663 3135
2664 $self->{children}[1]->draw; 3136 $self->{children}[1]->draw;
2665
2666} 3137}
2667 3138
2668############################################################################# 3139#############################################################################
2669 3140
2670package CFClient::UI::Animator; 3141package CFPlus::UI::Animator;
2671 3142
2672use CFClient::OpenGL; 3143use CFPlus::OpenGL;
2673 3144
2674our @ISA = CFClient::UI::Bin::; 3145our @ISA = CFPlus::UI::Bin::;
2675 3146
2676sub moveto { 3147sub moveto {
2677 my ($self, $x, $y) = @_; 3148 my ($self, $x, $y) = @_;
2678 3149
2679 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3150 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2707 glPopMatrix; 3178 glPopMatrix;
2708} 3179}
2709 3180
2710############################################################################# 3181#############################################################################
2711 3182
2712package CFClient::UI::Flopper; 3183package CFPlus::UI::Flopper;
2713 3184
2714our @ISA = CFClient::UI::Button::; 3185our @ISA = CFPlus::UI::Button::;
2715 3186
2716sub new { 3187sub new {
2717 my $class = shift; 3188 my $class = shift;
2718 3189
2719 my $self = $class->SUPER::new ( 3190 my $self = $class->SUPER::new (
… …
2731 $self->{other}->toggle_visibility; 3202 $self->{other}->toggle_visibility;
2732} 3203}
2733 3204
2734############################################################################# 3205#############################################################################
2735 3206
2736package CFClient::UI::Tooltip; 3207package CFPlus::UI::Tooltip;
2737 3208
2738our @ISA = CFClient::UI::Bin::; 3209our @ISA = CFPlus::UI::Bin::;
2739 3210
2740use CFClient::OpenGL; 3211use CFPlus::OpenGL;
2741 3212
2742sub new { 3213sub new {
2743 my $class = shift; 3214 my $class = shift;
2744 3215
2745 $class->SUPER::new ( 3216 $class->SUPER::new (
… …
2748 ) 3219 )
2749} 3220}
2750 3221
2751sub set_tooltip_from { 3222sub set_tooltip_from {
2752 my ($self, $widget) = @_; 3223 my ($self, $widget) = @_;
3224
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
2753 3227
2754 my $tooltip = $widget->{tooltip}; 3228 my $tooltip = $widget->{tooltip};
2755 3229
2756 if ($ENV{CFPLUS_DEBUG} & 2) { 3230 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n" 3231 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2761 } 3235 }
2762 3236
2763 $tooltip =~ s/^\n+//; 3237 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//; 3238 $tooltip =~ s/\n+$//;
2765 3239
2766 $self->add (new CFClient::UI::Label 3240 $self->add (new CFPlus::UI::Label
2767 markup => $tooltip, 3241 markup => $tooltip,
2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2769 fontsize => 0.8, 3243 fontsize => 0.8,
2770 fg => [0, 0, 0, 1], 3244 style => 1, # FLAG_INVERSE
2771 ellipsise => 0, 3245 ellipsise => 0,
2772 font => ($widget->{tooltip_font} || $::FONT_PROP), 3246 font => ($widget->{tooltip_font} || $::FONT_PROP),
2773 ); 3247 );
2774} 3248}
2775 3249
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3253 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 3254
2781 ($w + 4, $h + 4) 3255 ($w + 4, $h + 4)
2782} 3256}
2783 3257
2784sub size_allocate { 3258sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 3259 my ($self, $w, $h) = @_;
2786 3260
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 3261 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 3262}
2789 3263
2790sub visibility_change { 3264sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 3265 my ($self, $visible) = @_;
2792 3266
2793 return unless $visible; 3267 return unless $visible;
2794 3268
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 3269 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner} 3270 my $widget = $self->{owner}
2797 or return; 3271 or return;
2798 3272
3273 if ($widget->{visible}) {
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3274 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800 3275
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3276 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w}; 3277 if $x + $self->{w} > $self->{root}{w};
2803 3278
2804 $self->move_abs ($x, $y); 3279 $self->move_abs ($x, $y);
3280 } else {
3281 $self->hide;
3282 }
2805 }); 3283 });
2806} 3284}
2807 3285
2808sub _draw { 3286sub _draw {
2809 my ($self) = @_; 3287 my ($self) = @_;
… …
2833 $self->SUPER::_draw; 3311 $self->SUPER::_draw;
2834} 3312}
2835 3313
2836############################################################################# 3314#############################################################################
2837 3315
2838package CFClient::UI::Face; 3316package CFPlus::UI::Face;
2839 3317
2840our @ISA = CFClient::UI::Base::; 3318our @ISA = CFPlus::UI::DrawBG::;
2841 3319
2842use CFClient::OpenGL; 3320use CFPlus::OpenGL;
2843 3321
2844sub new { 3322sub new {
2845 my $class = shift; 3323 my $class = shift;
2846 3324
2847 my $self = $class->SUPER::new ( 3325 my $self = $class->SUPER::new (
… …
2849 can_events => 0, 3327 can_events => 0,
2850 @_, 3328 @_,
2851 ); 3329 );
2852 3330
2853 if ($self->{anim} && $self->{animspeed}) { 3331 if ($self->{anim} && $self->{animspeed}) {
2854 Scalar::Util::weaken (my $widget = $self); 3332 CFPlus::weaken (my $widget = $self);
2855 3333
2856 $self->{timer} = Event->timer ( 3334 $self->{timer} = Event->timer (
2857 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2858 hard => 1, 3336 hard => 1,
2859 interval => $self->{animspeed}, 3337 interval => $self->{animspeed},
2860 cb => sub { 3338 cb => sub {
3339 delete $self->{wait_face};
2861 ++$widget->{frame}; 3340 ++$widget->{frame};
2862 $widget->update; 3341 $widget->update;
2863 }, 3342 },
2864 ); 3343 );
2865 } 3344 }
… …
2882sub _draw { 3361sub _draw {
2883 my ($self) = @_; 3362 my ($self) = @_;
2884 3363
2885 return unless $::CONN; 3364 return unless $::CONN;
2886 3365
3366 $self->SUPER::_draw;
3367
2887 my $face; 3368 my $face;
2888 3369
2889 if ($self->{frame}) { 3370 if ($self->{frame}) {
2890 my $anim = $::CONN->{anim}[$self->{anim}]; 3371 my $anim = $::CONN->{anim}[$self->{anim}];
2891 3372
2892 $face = $anim->[ $self->{frame} % @$anim ] 3373 $face = $anim->[ $self->{frame} % @$anim ]
2893 if $anim && @$anim; 3374 if $anim && @$anim;
2894 } 3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
2895 3379
2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3380 my $tex = $::CONN->{texture}[$faceid];
2897 3381
2898 if ($tex) { 3382 if ($tex) {
2899 glEnable GL_TEXTURE_2D; 3383 glEnable GL_TEXTURE_2D;
2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2901 glColor 0, 0, 0, 1; 3385 glColor 0, 0, 0, 1;
2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2903 glDisable GL_TEXTURE_2D; 3387 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
2904 } 3392 }
2905} 3393}
2906 3394
2907sub destroy { 3395sub destroy {
2908 my ($self) = @_; 3396 my ($self) = @_;
… …
2913 $self->SUPER::destroy; 3401 $self->SUPER::destroy;
2914} 3402}
2915 3403
2916############################################################################# 3404#############################################################################
2917 3405
2918package CFClient::UI::Buttonbar; 3406package CFPlus::UI::Buttonbar;
2919 3407
2920our @ISA = CFClient::UI::HBox::; 3408our @ISA = CFPlus::UI::HBox::;
2921 3409
2922# TODO: should actualyl wrap buttons and other goodies. 3410# TODO: should actually wrap buttons and other goodies.
2923 3411
2924############################################################################# 3412#############################################################################
2925 3413
2926package CFClient::UI::Menu; 3414package CFPlus::UI::Menu;
2927 3415
2928our @ISA = CFClient::UI::FancyFrame::; 3416our @ISA = CFPlus::UI::Toplevel::;
2929 3417
2930use CFClient::OpenGL; 3418use CFPlus::OpenGL;
2931 3419
2932sub new { 3420sub new {
2933 my $class = shift; 3421 my $class = shift;
2934 3422
2935 my $self = $class->SUPER::new ( 3423 my $self = $class->SUPER::new (
2936 items => [], 3424 items => [],
2937 z => 100, 3425 z => 100,
2938 @_, 3426 @_,
2939 ); 3427 );
2940 3428
2941 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3429 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2942 3430
2943 for my $item (@{ $self->{items} }) { 3431 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3432 my ($widget, $cb, $tooltip) = @$item;
2945 3433
2946 # handle various types of items, only text for now 3434 # handle various types of items, only text for now
2947 if (!ref $widget) { 3435 if (!ref $widget) {
3436 if ($widget =~ /\t/) {
3437 my ($left, $right) = split /\t/, $widget, 2;
3438
2948 $widget = new CFClient::UI::Label 3439 $widget = new CFPlus::UI::HBox
2949 can_hover => 1, 3440 can_hover => 1,
2950 can_events => 1, 3441 can_events => 1,
3442 tooltip => $tooltip,
3443 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ],
3447 ;
3448
3449 } else {
3450 $widget = new CFPlus::UI::Label
3451 can_hover => 1,
3452 can_events => 1,
2951 markup => $widget, 3453 markup => $widget,
2952 tooltip => $tooltip 3454 tooltip => $tooltip;
3455 }
2953 } 3456 }
2954 3457
2955 $self->{item}{$widget} = $item; 3458 $self->{item}{$widget} = $item;
2956 3459
2957 $self->{vbox}->add ($widget); 3460 $self->{vbox}->add ($widget);
… …
2962 3465
2963# popup given the event (must be a mouse button down event currently) 3466# popup given the event (must be a mouse button down event currently)
2964sub popup { 3467sub popup {
2965 my ($self, $ev) = @_; 3468 my ($self, $ev) = @_;
2966 3469
2967 $self->_emit ("popdown"); 3470 $self->emit ("popdown");
2968 3471
2969 # maybe save $GRAB? must be careful about events... 3472 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3473 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3474 $self->{button} = $ev->{button};
2972 3475
2973 $self->show; 3476 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3477 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3478}
2976 3479
2977sub mouse_motion { 3480sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2979 3482
2980 # TODO: should use vbox->find_widget or so 3483 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3484 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3485 $self->{hover} = $self->{item}{$HOVER};
2983 3486
2984 0 3487 0
2985} 3488}
2986 3489
2987sub button_up { 3490sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3491 my ($self, $ev, $x, $y) = @_;
2989 3492
2990 if ($ev->{button} == $self->{button}) { 3493 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3494 undef $GRAB;
2992 $self->hide; 3495 $self->hide;
2993 3496
2994 $self->_emit ("popdown"); 3497 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3498 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3499 } else {
2997 return 0 3500 return 0
2998 } 3501 }
2999 3502
3000 1 3503 1
3001} 3504}
3002 3505
3003############################################################################# 3506#############################################################################
3004 3507
3005package CFClient::UI::Multiplexer; 3508package CFPlus::UI::Multiplexer;
3006 3509
3007our @ISA = CFClient::UI::Container::; 3510our @ISA = CFPlus::UI::Container::;
3008 3511
3009sub new { 3512sub new {
3010 my $class = shift; 3513 my $class = shift;
3011 3514
3012 my $self = $class->SUPER::new ( 3515 my $self = $class->SUPER::new (
… …
3026 3529
3027 $self->{current} = $self->{children}[0] 3530 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3531 if @{ $self->{children} };
3029} 3532}
3030 3533
3534sub get_current_page {
3535 my ($self) = @_;
3536
3537 $self->{current}
3538}
3539
3031sub set_current_page { 3540sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3541 my ($self, $page_or_widget) = @_;
3033 3542
3034 my $widget = ref $page_or_widget 3543 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3544 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3545 : $self->{children}[$page_or_widget];
3037 3546
3038 $self->{current} = $widget; 3547 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3548 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3549
3041 $self->_emit (page_changed => $self->{current}); 3550 $self->emit (page_changed => $self->{current});
3042 3551
3043 $self->realloc; 3552 $self->realloc;
3044} 3553}
3045 3554
3046sub visible_children { 3555sub visible_children {
… …
3051 my ($self) = @_; 3560 my ($self) = @_;
3052 3561
3053 $self->{current}->size_request 3562 $self->{current}->size_request
3054} 3563}
3055 3564
3056sub size_allocate { 3565sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3566 my ($self, $w, $h) = @_;
3058 3567
3059 $self->{current}->configure (0, 0, $w, $h); 3568 $self->{current}->configure (0, 0, $w, $h);
3569
3570 1
3060} 3571}
3061 3572
3062sub _draw { 3573sub _draw {
3063 my ($self) = @_; 3574 my ($self) = @_;
3064 3575
3065 $self->{current}->draw; 3576 $self->{current}->draw;
3066} 3577}
3067 3578
3068############################################################################# 3579#############################################################################
3069 3580
3070package CFClient::UI::Notebook; 3581package CFPlus::UI::Notebook;
3071 3582
3072our @ISA = CFClient::UI::VBox::; 3583our @ISA = CFPlus::UI::VBox::;
3073 3584
3074sub new { 3585sub new {
3075 my $class = shift; 3586 my $class = shift;
3076 3587
3077 my $self = $class->SUPER::new ( 3588 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar), 3589 buttonbar => (new CFPlus::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self 3591 # filter => # will be put between multiplexer and $self
3081 @_, 3592 @_,
3082 ); 3593 );
3083 3594
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3088} 3599}
3089 3600
3090sub add { 3601sub add {
3091 my ($self, $title, $widget, $tooltip) = @_; 3602 my ($self, $title, $widget, $tooltip) = @_;
3092 3603
3093 Scalar::Util::weaken $self; 3604 CFPlus::weaken $self;
3094 3605
3095 $self->{buttonbar}->add (new CFClient::UI::Button 3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3096 markup => $title, 3607 markup => $title,
3097 tooltip => $tooltip, 3608 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) }, 3609 on_activate => sub { $self->set_current_page ($widget) },
3099 ); 3610 );
3100 3611
3101 $self->{multiplexer}->add ($widget); 3612 $self->{multiplexer}->add ($widget);
3102} 3613}
3103 3614
3615sub get_current_page {
3616 my ($self) = @_;
3617
3618 $self->{multiplexer}->get_current_page
3619}
3620
3104sub set_current_page { 3621sub set_current_page {
3105 my ($self, $page) = @_; 3622 my ($self, $page) = @_;
3106 3623
3107 $self->{multiplexer}->set_current_page ($page); 3624 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3625 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3626}
3110 3627
3111############################################################################# 3628#############################################################################
3112 3629
3113package CFClient::UI::Combobox; 3630package CFPlus::UI::Selector;
3114 3631
3115use utf8; 3632use utf8;
3116 3633
3117our @ISA = CFClient::UI::Button::; 3634our @ISA = CFPlus::UI::Button::;
3118 3635
3119sub new { 3636sub new {
3120 my $class = shift; 3637 my $class = shift;
3121 3638
3122 my $self = $class->SUPER::new ( 3639 my $self = $class->SUPER::new (
… …
3128 $self->_set_value ($self->{value}); 3645 $self->_set_value ($self->{value});
3129 3646
3130 $self 3647 $self
3131} 3648}
3132 3649
3133sub button_down { 3650sub invoke_button_down {
3134 my ($self, $ev) = @_; 3651 my ($self, $ev) = @_;
3135 3652
3136 my @menu_items; 3653 my @menu_items;
3137 3654
3138 for (@{ $self->{options} }) { 3655 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_; 3656 my ($value, $title, $tooltip) = @$_;
3140 3657
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3658 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 } 3659 }
3143 3660
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3661 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145} 3662}
3146 3663
3147sub _set_value { 3664sub _set_value {
3148 my ($self, $value) = @_; 3665 my ($self, $value) = @_;
3149 3666
… …
3159 my ($self, $value) = @_; 3676 my ($self, $value) = @_;
3160 3677
3161 return unless $self->{value} ne $value; 3678 return unless $self->{value} ne $value;
3162 3679
3163 $self->_set_value ($value); 3680 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3681 $self->emit (changed => $value);
3165} 3682}
3166 3683
3167############################################################################# 3684#############################################################################
3168 3685
3169package CFClient::UI::Statusbox; 3686package CFPlus::UI::Statusbox;
3170 3687
3171our @ISA = CFClient::UI::VBox::; 3688our @ISA = CFPlus::UI::VBox::;
3172 3689
3173sub new { 3690sub new {
3174 my $class = shift; 3691 my $class = shift;
3175 3692
3176 my $self = $class->SUPER::new ( 3693 my $self = $class->SUPER::new (
3177 fontsize => 0.8, 3694 fontsize => 0.8,
3178 @_, 3695 @_,
3179 ); 3696 );
3180 3697
3181 Scalar::Util::weaken (my $this = $self); 3698 CFPlus::weaken (my $this = $self);
3182 3699
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3700 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184 3701
3185 $self 3702 $self
3186} 3703}
… …
3188sub reorder { 3705sub reorder {
3189 my ($self) = @_; 3706 my ($self) = @_;
3190 my $NOW = Time::HiRes::time; 3707 my $NOW = Time::HiRes::time;
3191 3708
3192 # freeze display when hovering over any label 3709 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner} 3710 return if $CFPlus::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3711 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} }; 3712 values %{ $self->{item} };
3196 3713
3197 while (my ($k, $v) = each %{ $self->{item} }) { 3714 while (my ($k, $v) = each %{ $self->{item} }) {
3198 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3715 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3199 } 3716 }
… …
3220 for ($short) { 3737 for ($short) {
3221 s/^\s+//; 3738 s/^\s+//;
3222 s/\s+/ /g; 3739 s/\s+/ /g;
3223 } 3740 }
3224 3741
3225 new CFClient::UI::Label 3742 new CFPlus::UI::Label
3226 markup => $short, 3743 markup => $short,
3227 tooltip => $item->{tooltip}, 3744 tooltip => $item->{tooltip},
3228 tooltip_font => $::FONT_PROP, 3745 tooltip_font => $::FONT_PROP,
3229 tooltip_width => 0.67, 3746 tooltip_width => 0.67,
3230 fontsize => $item->{fontsize} || $self->{fontsize}, 3747 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3284 count => 1, 3801 count => 1,
3285 %arg, 3802 %arg,
3286 }; 3803 };
3287 } 3804 }
3288 3805
3806 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3807 $self->reorder;
3808 });
3290} 3809}
3291 3810
3292sub reconfigure { 3811sub reconfigure {
3293 my ($self) = @_; 3812 my ($self) = @_;
3294 3813
… …
3307 $self->SUPER::destroy; 3826 $self->SUPER::destroy;
3308} 3827}
3309 3828
3310############################################################################# 3829#############################################################################
3311 3830
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root; 3831package CFPlus::UI::Root;
3674 3832
3675our @ISA = CFClient::UI::Container::; 3833our @ISA = CFPlus::UI::Container::;
3676 3834
3677use List::Util qw(min max); 3835use List::Util qw(min max);
3678 3836
3679use CFClient::OpenGL; 3837use CFPlus::OpenGL;
3680 3838
3681sub new { 3839sub new {
3682 my $class = shift; 3840 my $class = shift;
3683 3841
3684 my $self = $class->SUPER::new ( 3842 my $self = $class->SUPER::new (
3685 visible => 1, 3843 visible => 1,
3686 @_, 3844 @_,
3687 ); 3845 );
3688 3846
3689 Scalar::Util::weaken ($self->{root} = $self); 3847 CFPlus::weaken ($self->{root} = $self);
3690 3848
3691 $self 3849 $self
3692} 3850}
3693 3851
3694sub size_request { 3852sub size_request {
… …
3709 $coord = $max - $size if $coord > $max - $size; 3867 $coord = $max - $size if $coord > $max - $size;
3710 3868
3711 int $coord + 0.5 3869 int $coord + 0.5
3712} 3870}
3713 3871
3714sub size_allocate { 3872sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3873 my ($self, $w, $h) = @_;
3716 3874
3717 for my $child ($self->children) { 3875 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3876 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3877
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3881 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3882 $Y = _to_pixel $Y, $H, $self->{h};
3725 3883
3726 $child->configure ($X, $Y, $W, $H); 3884 $child->configure ($X, $Y, $W, $H);
3727 } 3885 }
3886
3887 1
3728} 3888}
3729 3889
3730sub coord2local { 3890sub coord2local {
3731 my ($self, $x, $y) = @_; 3891 my ($self, $x, $y) = @_;
3732 3892
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 4019
3860 $w = 0 if $w < 0; 4020 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 4021 $h = 0 if $h < 0;
3862 4022
4023 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h;
4025
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031
3863 $w = int $w + 0.5; 4032 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 4033 $h = int $h + 0.5;
3865 4034
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 4036 $widget->{old_w} = $widget->{w};
… …
3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3891 glMatrixMode GL_MODELVIEW; 4060 glMatrixMode GL_MODELVIEW;
3892 glLoadIdentity; 4061 glLoadIdentity;
3893 4062
3894 { 4063 {
3895 package CFClient::UI::Base; 4064 package CFPlus::UI::Base;
3896 4065
3897 ($draw_x, $draw_y, $draw_w, $draw_h) = 4066 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h}); 4067 (0, 0, $self->{w}, $self->{h});
3899 }
3900 4068
3901 $self->_draw; 4069 $self->_draw;
4070 }
3902} 4071}
3903 4072
3904############################################################################# 4073#############################################################################
3905 4074
3906package CFClient::UI; 4075package CFPlus::UI;
3907 4076
3908$ROOT = new CFClient::UI::Root; 4077$ROOT = new CFPlus::UI::Root;
3909$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4078$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3910 4079
39111 40801
3912 4081

Diff Legend

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