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.284 by root, Mon Jun 5 03:06:04 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event; 8use Event;
9 9
10use CFClient; 10use CFPlus;
11use CFPlus::Pod;
11use CFClient::Texture; 12use CFPlus::Texture;
12 13
13our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
14 15
15our $LAYOUT; 16our $LAYOUT;
16our $ROOT; 17our $ROOT;
… …
18our $BUTTON_STATE; 19our $BUTTON_STATE;
19 20
20our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
21 22
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 return if $ENV{CFPLUS_DEBUG} & 8;
24
25 if (!$GRAB) { 24 if (!$GRAB) {
26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
27 if (length $widget->{tooltip}) { 26 if (length $widget->{tooltip}) {
28 if ($TOOLTIP->{owner} != $widget) { 27 if ($TOOLTIP->{owner} != $widget) {
29 $TOOLTIP->hide; 28 $TOOLTIP->hide;
30 29
31 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31
32 return if $ENV{CFPLUS_DEBUG} & 8;
32 33
33 my $tip = $widget->{tooltip}; 34 my $tip = $widget->{tooltip};
34 35
35 $tip = $tip->($widget) if CODE:: eq ref $tip; 36 $tip = $tip->($widget) if CODE:: eq ref $tip;
36 37
… …
79sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 82 if $FOCUS;
82} 83}
83 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
84sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
85 my ($ev) = @_; 99 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
87 101
88 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
90 106
91 $GRAB = $widget; 107 $GRAB = $widget;
92 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
93 109
94 $TOOLTIP_WATCHER->cb->(); 110 $TOOLTIP_WATCHER->cb->();
95 } 111 }
96 112
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
98 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
100 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
101} 123}
102 124
103sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
104 my ($ev) = @_; 126 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 127
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 129
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 131
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
112 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 134
114 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 137 $grab->update if $grab;
117 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
118 139
140 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 141 $TOOLTIP_WATCHER->cb->();
120 } 142 }
121} 143}
122 144
123sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
124 my ($ev) = @_; 146 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
126 148
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 150
129 if ($widget != $HOVER) { 151 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 152
132 $hover->update if $hover && $hover->{can_hover}; 153 $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; 154 if $HOVER;
140} 155}
141 156
142# convert position array to integers 157# convert position array to integers
143sub harmonize { 158sub harmonize {
… …
193 reconfigure_widgets; 208 reconfigure_widgets;
194} 209}
195 210
196############################################################################# 211#############################################################################
197 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
198package CFClient::UI::Base; 221package CFPlus::UI::Base;
199 222
200use strict; 223use strict;
201 224
202use CFClient::OpenGL; 225use CFPlus::OpenGL;
203 226
204sub new { 227sub new {
205 my $class = shift; 228 my $class = shift;
206 229
207 my $self = bless { 230 my $self = bless {
… …
212 h => undef, 235 h => undef,
213 can_events => 1, 236 can_events => 1,
214 @_ 237 @_
215 }, $class; 238 }, $class;
216 239
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 241
219 for (keys %$self) { 242 for (keys %$self) {
220 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
222 } 245 }
223 } 246 }
224 247
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $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}; 250 $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}; 251 $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}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 253
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 256
234 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
247sub show { 270sub show {
248 my ($self) = @_; 271 my ($self) = @_;
249 272
250 return if $self->{parent}; 273 return if $self->{parent};
251 274
252 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
253} 276}
254 277
255sub set_visible { 278sub set_visible {
256 my ($self) = @_; 279 my ($self) = @_;
257 280
… …
272 295
273 return unless $self->{visible}; 296 return unless $self->{visible};
274 297
275 $_->set_invisible for $self->children; 298 $_->set_invisible for $self->children;
276 299
300 delete $self->{visible};
277 delete $self->{root}; 301 delete $self->{root};
278 delete $self->{visible};
279 302
280 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
282 305
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
285 308
286 $self->focus_out; 309 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
289} 311}
290 312
291sub set_visibility { 313sub set_visibility {
292 my ($self, $visible) = @_; 314 my ($self, $visible) = @_;
… …
315} 337}
316 338
317sub move_abs { 339sub move_abs {
318 my ($self, $x, $y, $z) = @_; 340 my ($self, $x, $y, $z) = @_;
319 341
320 $self->{x} = List::Util::max 0, int $x; 342 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 343 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 344 $self->{z} = $z if defined $z;
323 345
324 $self->update; 346 $self->update;
325} 347}
326 348
… …
336sub size_request { 358sub size_request {
337 require Carp; 359 require Carp;
338 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
339} 361}
340 362
363sub baseline_shift {
364 0
365}
366
341sub configure { 367sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
343 369
344 if ($self->{aspect}) { 370 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
346 372
347 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 375
350 # use alignment to adjust x, y 376 # use alignment to adjust x, y
351 377
352 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
367 393
368 $self->{root}{size_alloc}{$self+0} = $self; 394 $self->{root}{size_alloc}{$self+0} = $self;
369 } 395 }
370} 396}
371 397
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 398sub children {
377 # nop 399 # nop
378} 400}
379 401
380sub visible_children { 402sub visible_children {
… …
398 420
399 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
400 422
401 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
402 424
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 428 }
407} 429}
408 430
409# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
410sub coord2local { 432sub coord2local {
411 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
412 434
435 Carp::confess unless $self->{parent};#d#
436
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 438}
415 439
416# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
417sub coord2global { 441sub coord2global {
418 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
419 443
444 Carp::confess unless $self->{parent};#d#
445
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 447}
422 448
423sub focus_in { 449sub invoke_focus_in {
424 my ($self) = @_; 450 my ($self) = @_;
425 451
426 return if $FOCUS == $self; 452 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
428 454
429 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
430 456
431 $self->_emit (focus_in => $focus); 457 $self->update;
432 458
433 $focus->update if $focus; 459 0
434 $FOCUS->update;
435} 460}
436 461
437sub focus_out { 462sub invoke_focus_out {
438 my ($self) = @_; 463 my ($self) = @_;
439 464
440 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
441 466
442 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
443 468
444 $self->_emit (focus_out => $focus); 469 $self->update;
445 470
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 472 unless $FOCUS;
450}
451 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
452sub mouse_motion { 0 } 484sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 485sub invoke_button_up { 0 }
454sub key_down { 0 } 486sub invoke_key_down { 0 }
455sub key_up { 0 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
456 489
457sub button_down { 490sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
459 492
460 $self->focus_in; 493 $self->grab_focus;
461 494
462 0 495 0
496}
497
498sub connect {
499 my ($self, $signal, $cb) = @_;
500
501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
507}
508
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
515
516sub emit {
517 my ($self, $signal, @args) = @_;
518
519 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, either.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
528 if ($self->{tooltip} =~ /Apply.*audio/) {
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
530 warn "3 $self->{parent}\n";#d#
531 }
532
533 #d##TODO# stop propagating at first true, do not use sum
534 my $res =
535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
463} 545}
464 546
465sub find_widget { 547sub find_widget {
466 my ($self, $x, $y) = @_; 548 my ($self, $x, $y) = @_;
467 549
… …
477sub set_parent { 559sub set_parent {
478 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
479 561
480 Scalar::Util::weaken ($self->{parent} = $parent); 562 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 563 $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} 564}
506 565
507sub realloc { 566sub realloc {
508 my ($self) = @_; 567 my ($self) = @_;
509 568
… …
542 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
543 602
544 # update screen rectangle 603 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 606
550 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 610
… …
576 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
579 glEnd; 636 glEnd;
580 glPopMatrix; 637 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 639 }
583 640
584 $self->_draw; 641 $self->_draw;
585 glPopMatrix; 642 glPopMatrix;
586} 643}
… …
592} 649}
593 650
594sub DESTROY { 651sub DESTROY {
595 my ($self) = @_; 652 my ($self) = @_;
596 653
654 return if CFPlus::in_destruct;
655
597 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
598 #$self->deactivate; 657
658 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 660}
600 661
601############################################################################# 662#############################################################################
602 663
603package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
604 665
605our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
606 667
607use strict; 668use strict;
608use CFClient::OpenGL; 669use CFPlus::OpenGL;
609 670
610sub new { 671sub new {
611 my $class = shift; 672 my $class = shift;
612 673
613 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
644 } 705 }
645} 706}
646 707
647############################################################################# 708#############################################################################
648 709
649package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
650 711
651our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
652 713
653sub new { 714sub new {
654 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
656} 717}
… …
663 724
664sub draw { } 725sub draw { }
665 726
666############################################################################# 727#############################################################################
667 728
668package CFClient::UI::Container; 729package CFPlus::UI::Container;
669 730
670our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
671 732
672sub new { 733sub new {
673 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
674 735
675 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
684 if $children; 745 if $children;
685 746
686 $self 747 $self
687} 748}
688 749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
756}
757
689sub add { 758sub add {
690 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
691 760
692 $_->set_parent ($self) 761 $_->set_parent ($self)
693 for @widgets; 762 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 822 $_->draw for @{$self->{children}};
754} 823}
755 824
756############################################################################# 825#############################################################################
757 826
758package CFClient::UI::Bin; 827package CFPlus::UI::Bin;
759 828
760our @ISA = CFClient::UI::Container::; 829our @ISA = CFPlus::UI::Container::;
761 830
762sub new { 831sub new {
763 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
764 833
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 834 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 835
767 $class->SUPER::new (children => [$child], %arg) 836 $class->SUPER::new (children => [$child], %arg)
768} 837}
769 838
770sub add { 839sub add {
771 my ($self, $child) = @_; 840 my ($self, $child) = @_;
772 841
773 $self->{children} = []; 842 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 843 $self->SUPER::add ($child);
776} 844}
777 845
778sub remove { 846sub remove {
779 my ($self, $widget) = @_; 847 my ($self, $widget) = @_;
780 848
781 $self->SUPER::remove ($widget); 849 $self->SUPER::remove ($widget);
782 850
783 $self->{children} = [new CFClient::UI::Empty] 851 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 852 unless @{$self->{children}};
785} 853}
786 854
787sub child { $_[0]->{children}[0] } 855sub child { $_[0]->{children}[0] }
788 856
789sub size_request { 857sub size_request {
790 $_[0]{children}[0]->size_request 858 $_[0]{children}[0]->size_request
791} 859}
792 860
793sub size_allocate { 861sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
795 863
796 $self->{children}[0]->configure (0, 0, $w, $h); 864 $self->{children}[0]->configure (0, 0, $w, $h);
865
866 1
797} 867}
798 868
799############################################################################# 869#############################################################################
800 870
801# back-buffered drawing area 871# back-buffered drawing area
802 872
803package CFClient::UI::Window; 873package CFPlus::UI::Window;
804 874
805our @ISA = CFClient::UI::Bin::; 875our @ISA = CFPlus::UI::Bin::;
806 876
807use CFClient::OpenGL; 877use CFPlus::OpenGL;
808 878
809sub new { 879sub new {
810 my ($class, %arg) = @_; 880 my ($class, %arg) = @_;
811 881
812 my $self = $class->SUPER::new (%arg); 882 my $self = $class->SUPER::new (%arg);
… …
817 887
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 888 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 889 $self->SUPER::update;
820} 890}
821 891
822sub size_allocate { 892sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 893 my ($self, $w, $h) = @_;
824 894
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 895 $self->update;
896
897 $self->SUPER::invoke_size_allocate ($w, $h)
827} 898}
828 899
829sub _render { 900sub _render {
830 my ($self) = @_; 901 my ($self) = @_;
831 902
… …
833} 904}
834 905
835sub render_child { 906sub render_child {
836 my ($self) = @_; 907 my ($self) = @_;
837 908
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 909 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 910 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 911 glClear GL_COLOR_BUFFER_BIT;
841 912
842 { 913 {
843 package CFClient::UI::Base; 914 package CFPlus::UI::Base;
844 915
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 916 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 917 (0, 0, $self->{w}, $self->{h});
918
919 $self->_render;
847 } 920 }
848
849 $self->_render;
850 }; 921 };
851} 922}
852 923
853sub _draw { 924sub _draw {
854 my ($self) = @_; 925 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 926
858 my $tex = $self->{texture} 927 my $tex = $self->{texture}
859 or return; 928 or return;
860 929
861 glEnable GL_TEXTURE_2D; 930 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 932 glColor 0, 0, 0, 1;
864 933
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 934 $tex->draw_quad_alpha_premultiplied (0, 0);
866 935
867 glDisable GL_TEXTURE_2D; 936 glDisable GL_TEXTURE_2D;
868} 937}
869 938
870############################################################################# 939#############################################################################
871 940
872package CFClient::UI::ViewPort; 941package CFPlus::UI::ViewPort;
873 942
874our @ISA = CFClient::UI::Window::; 943our @ISA = CFPlus::UI::Window::;
875 944
876sub new { 945sub new {
877 my $class = shift; 946 my $class = shift;
878 947
879 $class->SUPER::new ( 948 $class->SUPER::new (
… …
892 $h = 10 if $self->{scroll_y}; 961 $h = 10 if $self->{scroll_y};
893 962
894 ($w, $h) 963 ($w, $h)
895} 964}
896 965
897sub size_allocate { 966sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 967 my ($self, $w, $h) = @_;
899 968
900 my $child = $self->child; 969 my $child = $self->child;
901 970
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 971 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 972 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 973
905 $self->child->configure (0, 0, $w, $h); 974 $self->child->configure (0, 0, $w, $h);
906 $self->update; 975 $self->update;
976
977 1
907} 978}
908 979
909sub set_offset { 980sub set_offset {
910 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
911 982
… …
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1010 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1011 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1012 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1013 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1014 }
944} 1015}
945 1016
946sub _render { 1017sub _render {
947 my ($self) = @_; 1018 my ($self) = @_;
948 1019
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1020 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1021 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1022
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1023 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1024
954 $self->SUPER::_render; 1025 $self->SUPER::_render;
955} 1026}
956 1027
957############################################################################# 1028#############################################################################
958 1029
959package CFClient::UI::ScrolledWindow; 1030package CFPlus::UI::ScrolledWindow;
960 1031
961our @ISA = CFClient::UI::HBox::; 1032our @ISA = CFPlus::UI::HBox::;
962 1033
963sub new { 1034sub new {
964 my ($class, %arg) = @_; 1035 my ($class, %arg) = @_;
965 1036
966 my $child = delete $arg{child}; 1037 my $child = delete $arg{child};
967 1038
968 my $self; 1039 my $self;
969 1040
970 my $slider = new CFClient::UI::Slider 1041 my $slider = new CFPlus::UI::Slider
971 vertical => 1, 1042 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1044 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vp}->set_offset (0, $_[1]);
975 }, 1046 },
976 ; 1047 ;
977 1048
978 $self = $class->SUPER::new ( 1049 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1050 vp => (new CFPlus::UI::ViewPort expand => 1),
1051 can_events => 1,
980 slider => $slider, 1052 slider => $slider,
981 %arg, 1053 %arg,
982 ); 1054 );
983 1055
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1056 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child; 1057 $self->add ($child) if $child;
986 1058
987 $self 1059 $self
988} 1060}
989 1061
1062#TODO# update range on size_allocate depending on child
1063
990sub add { 1064sub add {
991 my ($self, $widget) = @_; 1065 my ($self, $widget) = @_;
992 1066
993 $self->{vp}->add ($self->{child} = $widget); 1067 $self->{vp}->add ($self->{child} = $widget);
994} 1068}
995 1069
1070sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_;
1072
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev);
1076
1077 1
1078}
1079
1080sub update_slider {
1081 my ($self) = @_;
1082
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1084}
1085
996sub update { 1086sub update {
997 my ($self) = @_; 1087 my ($self) = @_;
998 1088
999 $self->SUPER::update; 1089 $self->SUPER::update;
1000 1090
1001 # todo: overwrite size_allocate of child 1091 $self->update_slider;
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1092}
1005 1093
1006sub size_allocate { 1094sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1095 my ($self, $w, $h) = @_;
1008 1096
1097 $self->update_slider;
1098
1009 $self->SUPER::size_allocate ($w, $h); 1099 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1100}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1101
1018############################################################################# 1102#############################################################################
1019 1103
1020package CFClient::UI::Frame; 1104package CFPlus::UI::Frame;
1021 1105
1022our @ISA = CFClient::UI::Bin::; 1106our @ISA = CFPlus::UI::Bin::;
1023 1107
1024use CFClient::OpenGL; 1108use CFPlus::OpenGL;
1025 1109
1026sub new { 1110sub new {
1027 my $class = shift; 1111 my $class = shift;
1028 1112
1029 $class->SUPER::new ( 1113 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1139 $self->SUPER::_draw;
1056} 1140}
1057 1141
1058############################################################################# 1142#############################################################################
1059 1143
1060package CFClient::UI::FancyFrame; 1144package CFPlus::UI::FancyFrame;
1061 1145
1062our @ISA = CFClient::UI::Bin::; 1146our @ISA = CFPlus::UI::Bin::;
1063 1147
1064use CFClient::OpenGL; 1148use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1149
1074sub new { 1150sub new {
1075 my ($class, %arg) = @_; 1151 my ($class, %arg) = @_;
1076 1152
1077 my $title = delete $arg{title}; 1153 if ((exists $arg{label}) && !ref $arg{label}) {
1154 $arg{label} = new CFPlus::UI::Label
1155 align => 1,
1156 valign => 0,
1157 text => $arg{label},
1158 fontsize => ($arg{border} || 0.8) * 0.75;
1159 }
1160
1161 my $self = $class->SUPER::new (
1162 # label => "",
1163 fg => [0.6, 0.3, 0.1],
1164 border => 0.8,
1165 style => 'single',
1166 %arg,
1167 );
1168
1169 $self
1170}
1171
1172sub add {
1173 my ($self, @widgets) = @_;
1174
1175 $self->SUPER::add (@widgets);
1176 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1177}
1178
1179sub border {
1180 int $_[0]{border} * $::FONTSIZE
1181}
1182
1183sub size_request {
1184 my ($self) = @_;
1185
1186 ($self->{label_w}, undef) = $self->{label}->size_request
1187 if $self->{label};
1188
1189 my ($w, $h) = $self->SUPER::size_request;
1190
1191 (
1192 $w + $self->border * 2,
1193 $h + $self->border * 2,
1194 )
1195}
1196
1197sub invoke_size_allocate {
1198 my ($self, $w, $h) = @_;
1199
1200 my $border = $self->border;
1201
1202 $w -= List::Util::max 0, $border * 2;
1203 $h -= List::Util::max 0, $border * 2;
1204
1205 if (my $label = $self->{label}) {
1206 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1207 $label->{h} = List::Util::min $h, $border;
1208 $label->invoke_size_allocate ($label->{w}, $label->{h});
1209 }
1210
1211 $self->child->configure ($border, $border, $w, $h);
1212
1213 1
1214}
1215
1216sub _draw {
1217 my ($self) = @_;
1218
1219 my $child = $self->{children}[0];
1220
1221 my $border = $self->border;
1222 my ($w, $h) = ($self->{w}, $self->{h});
1223
1224 $child->draw;
1225
1226 glColor @{$self->{fg}};
1227 glBegin GL_LINE_STRIP;
1228 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1230 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1232 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1233 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1234 glEnd;
1235
1236 if ($self->{label}) {
1237 glTranslate $border * 2, 0;
1238 $self->{label}->_draw;
1239 }
1240}
1241
1242#############################################################################
1243
1244package CFPlus::UI::Toplevel;
1245
1246our @ISA = CFPlus::UI::Bin::;
1247
1248use CFPlus::OpenGL;
1249
1250my $bg =
1251 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1252 mipmap => 1, wrap => 1;
1253
1254my @border =
1255 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1256 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257
1258sub new {
1259 my ($class, %arg) = @_;
1078 1260
1079 my $self = $class->SUPER::new ( 1261 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1262 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1263 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1264 border => 0.6,
1083 can_events => 1, 1265 can_events => 1,
1084 min_w => 16, 1266 min_w => 64,
1085 min_h => 16, 1267 min_h => 32,
1086 %arg, 1268 %arg,
1087 ); 1269 );
1088 1270
1089 $self->{title} = new CFClient::UI::Label 1271 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1272 align => 0,
1091 valign => 1, 1273 valign => 1,
1092 text => $title, 1274 text => $self->{title},
1093 fontsize => $self->{border} 1275 fontsize => $self->{border},
1094 if defined $title; 1276 if exists $self->{title};
1277
1278 if ($self->{has_close_button}) {
1279 $self->{close_button} =
1280 new CFPlus::UI::ImageButton
1281 path => 'x1_close.png',
1282 on_activate => sub { $self->emit ("delete") };
1283
1284 $self->CFPlus::UI::Container::add ($self->{close_button});
1285 }
1095 1286
1096 $self 1287 $self
1097} 1288}
1098 1289
1099sub add { 1290sub add {
1100 my ($self, @widgets) = @_; 1291 my ($self, @widgets) = @_;
1101 1292
1102 $self->SUPER::add (@widgets); 1293 $self->SUPER::add (@widgets);
1294 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1295 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1296}
1105 1297
1106sub border { 1298sub border {
1107 int $_[0]{border} * $::FONTSIZE 1299 int $_[0]{border} * $::FONTSIZE
1108} 1300}
1109 1301
1110sub size_request { 1302sub size_request {
1111 my ($self) = @_; 1303 my ($self) = @_;
1112 1304
1113 $self->{title}->size_request 1305 $self->{title_widget}->size_request
1114 if $self->{title}; 1306 if $self->{title_widget};
1307
1308 $self->{close_button}->size_request
1309 if $self->{close_button};
1115 1310
1116 my ($w, $h) = $self->SUPER::size_request; 1311 my ($w, $h) = $self->SUPER::size_request;
1117 1312
1118 ( 1313 (
1119 $w + $self->border * 2, 1314 $w + $self->border * 2,
1120 $h + $self->border * 2, 1315 $h + $self->border * 2,
1121 ) 1316 )
1122} 1317}
1123 1318
1124sub size_allocate { 1319sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1320 my ($self, $w, $h) = @_;
1126 1321
1127 if ($self->{title}) { 1322 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1323 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1324 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1325 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1326 }
1132 1327
1133 my $border = $self->border; 1328 my $border = $self->border;
1134 1329
1135 $h -= List::Util::max 0, $border * 2; 1330 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1331 $w -= List::Util::max 0, $border * 2;
1332
1333 $self->child->configure ($border, $border, $w, $h);
1334
1335 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1336 if $self->{close_button};
1337
1338 1
1339}
1340
1341sub invoke_delete {
1342 my ($self) = @_;
1343
1344 $self->hide;
1137 1345
1138 $self->child->configure ($border, $border, $w, $h); 1346 1
1139} 1347}
1140 1348
1141sub button_down { 1349sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1350 my ($self, $ev, $x, $y) = @_;
1143 1351
1144 my ($w, $h) = @$self{qw(w h)}; 1352 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1353 my $border = $self->border;
1146 1354
… …
1177 1385
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1386 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1387
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1388 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1389 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1390 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1391 };
1184 } else { 1392 } else {
1185 return 0; 1393 return 0;
1186 } 1394 }
1187 1395
1188 1 1396 1
1189} 1397}
1190 1398
1191sub button_up { 1399sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1400 my ($self, $ev, $x, $y) = @_;
1193 1401
1194 !!delete $self->{motion} 1402 ! ! delete $self->{motion}
1195} 1403}
1196 1404
1197sub mouse_motion { 1405sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
1199 1407
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1408 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1409
1202 !!$self->{motion} 1410 ! ! $self->{motion}
1411}
1412
1413sub invoke_visibility_change {
1414 my ($self, $visible) = @_;
1415
1416 delete $self->{motion} unless $visible;
1417
1418 0
1203} 1419}
1204 1420
1205sub _draw { 1421sub _draw {
1206 my ($self) = @_; 1422 my ($self) = @_;
1207 1423
… …
1233 1449
1234 glDisable GL_TEXTURE_2D; 1450 glDisable GL_TEXTURE_2D;
1235 1451
1236 $child->draw; 1452 $child->draw;
1237 1453
1238 if ($self->{title}) { 1454 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1455 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1456 $self->{title_widget}->_draw;
1457
1458 glTranslate 0, - ($border - $self->{h});
1241 } 1459 }
1460
1461 $self->{close_button}->draw
1462 if $self->{close_button};
1242} 1463}
1243 1464
1244############################################################################# 1465#############################################################################
1245 1466
1246package CFClient::UI::Table; 1467package CFPlus::UI::Table;
1247 1468
1248our @ISA = CFClient::UI::Base::; 1469our @ISA = CFPlus::UI::Base::;
1249 1470
1250use List::Util qw(max sum); 1471use List::Util qw(max sum);
1251 1472
1252use CFClient::OpenGL; 1473use CFPlus::OpenGL;
1253 1474
1254sub new { 1475sub new {
1255 my $class = shift; 1476 my $class = shift;
1256 1477
1257 $class->SUPER::new ( 1478 $class->SUPER::new (
… …
1263sub children { 1484sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1486}
1266 1487
1267sub add { 1488sub add {
1268 my ($self, $x, $y, $child) = @_; 1489 my ($self) = shift;
1269 1490
1491 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1493 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1494 $self->{children}[$y][$x] = $child;
1495 }
1272 1496
1497 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1499 $self->realloc;
1500}
1501
1502sub remove {
1503 my ($self, $child) = @_;
1504
1505 # TODO: not yet implemented
1274} 1506}
1275 1507
1276# TODO: move to container class maybe? send children a signal on removal? 1508# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1509sub clear {
1278 my ($self) = @_; 1510 my ($self) = @_;
… …
1319 (sum @$ws), 1551 (sum @$ws),
1320 (sum @$hs), 1552 (sum @$hs),
1321 ) 1553 )
1322} 1554}
1323 1555
1324sub size_allocate { 1556sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1557 my ($self, $w, $h) = @_;
1326 1558
1327 my ($ws, $hs) = $self->get_wh; 1559 my ($ws, $hs) = $self->get_wh;
1328 1560
1329 my $req_w = (sum @$ws) || 1; 1561 my $req_w = (sum @$ws) || 1;
… …
1336 1568
1337 # linearly scale sizes 1569 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1572
1341 CFClient::UI::harmonize $ws; 1573 CFPlus::UI::harmonize $ws;
1342 CFClient::UI::harmonize $hs; 1574 CFPlus::UI::harmonize $hs;
1343 1575
1344 my $y; 1576 my $y;
1345 1577
1346 for my $r (0 .. $#{$self->{children}}) { 1578 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1579 my $row = $self->{children}[$r]
… …
1361 } 1593 }
1362 1594
1363 $y += $row_h; 1595 $y += $row_h;
1364 } 1596 }
1365 1597
1598 1
1366} 1599}
1367 1600
1368sub find_widget { 1601sub find_widget {
1369 my ($self, $x, $y) = @_; 1602 my ($self, $x, $y) = @_;
1370 1603
… …
1389 } 1622 }
1390} 1623}
1391 1624
1392############################################################################# 1625#############################################################################
1393 1626
1394package CFClient::UI::Box; 1627package CFPlus::UI::Box;
1395 1628
1396our @ISA = CFClient::UI::Container::; 1629our @ISA = CFPlus::UI::Container::;
1397 1630
1398sub size_request { 1631sub size_request {
1399 my ($self) = @_; 1632 my ($self) = @_;
1400 1633
1401 $self->{vertical} 1634 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1640 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1641 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1642 )
1410} 1643}
1411 1644
1412sub size_allocate { 1645sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1646 my ($self, $w, $h) = @_;
1414 1647
1415 my $space = $self->{vertical} ? $h : $w; 1648 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1649 my @children = $self->visible_children;
1417 1650
1418 my @req; 1651 my @req;
1419 1652
1420 if ($self->{homogeneous}) { 1653 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1654 @req = ($space / (@children || 1)) x @children;
1422 } else { 1655 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1656 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1657 my $req = List::Util::sum @req;
1425 1658
1426 if ($req > $space) { 1659 if ($req > $space) {
1427 # ah well, not enough space 1660 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1661 $_ *= $space / $req for @req;
1429 } else { 1662 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1663 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1664
1432 $space = ($space - $req) / $expand; # remaining space to give away 1665 $space = ($space - $req) / $expand; # remaining space to give away
1433 1666
1434 $req[$_] += $space * $children->[$_]{expand} 1667 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1668 for 0 .. $#children;
1436 } 1669 }
1437 } 1670 }
1438 1671
1439 CFClient::UI::harmonize \@req; 1672 CFPlus::UI::harmonize \@req;
1440 1673
1441 my $pos = 0; 1674 my $pos = 0;
1442 for (0 .. $#$children) { 1675 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1676 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1677 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1678
1446 $pos += $alloc; 1679 $pos += $alloc;
1447 } 1680 }
1448 1681
1449 1 1682 1
1450} 1683}
1451 1684
1452############################################################################# 1685#############################################################################
1453 1686
1454package CFClient::UI::HBox; 1687package CFPlus::UI::HBox;
1455 1688
1456our @ISA = CFClient::UI::Box::; 1689our @ISA = CFPlus::UI::Box::;
1457 1690
1458sub new { 1691sub new {
1459 my $class = shift; 1692 my $class = shift;
1460 1693
1461 $class->SUPER::new ( 1694 $class->SUPER::new (
… …
1464 ) 1697 )
1465} 1698}
1466 1699
1467############################################################################# 1700#############################################################################
1468 1701
1469package CFClient::UI::VBox; 1702package CFPlus::UI::VBox;
1470 1703
1471our @ISA = CFClient::UI::Box::; 1704our @ISA = CFPlus::UI::Box::;
1472 1705
1473sub new { 1706sub new {
1474 my $class = shift; 1707 my $class = shift;
1475 1708
1476 $class->SUPER::new ( 1709 $class->SUPER::new (
… …
1479 ) 1712 )
1480} 1713}
1481 1714
1482############################################################################# 1715#############################################################################
1483 1716
1484package CFClient::UI::Label; 1717package CFPlus::UI::Label;
1485 1718
1486our @ISA = CFClient::UI::DrawBG::; 1719our @ISA = CFPlus::UI::DrawBG::;
1487 1720
1488use CFClient::OpenGL; 1721use CFPlus::OpenGL;
1489 1722
1490sub new { 1723sub new {
1491 my ($class, %arg) = @_; 1724 my ($class, %arg) = @_;
1492 1725
1493 my $self = $class->SUPER::new ( 1726 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1729 #active_bg => none
1497 #font => default_font 1730 #font => default_font
1498 #text => initial text 1731 #text => initial text
1499 #markup => initial narkup 1732 #markup => initial narkup
1500 #max_w => maximum pixel width 1733 #max_w => maximum pixel width
1734 #style => 0, # render flags
1501 ellipsise => 3, # end 1735 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1736 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1737 fontsize => 1,
1504 align => -1, 1738 align => -1,
1505 valign => -1, 1739 valign => -1,
1506 padding_x => 2, 1740 padding_x => 2,
1507 padding_y => 2, 1741 padding_y => 2,
1508 can_events => 0, 1742 can_events => 0,
1509 %arg 1743 %arg
1510 ); 1744 );
1511 1745
1512 if (exists $self->{template}) { 1746 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1747 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1748 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1749 $self->{template} = $layout;
1516 } 1750 }
1517 1751
1518 if (exists $self->{markup}) { 1752 if (exists $self->{markup}) {
… …
1522 } 1756 }
1523 1757
1524 $self 1758 $self
1525} 1759}
1526 1760
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1761sub update {
1538 my ($self) = @_; 1762 my ($self) = @_;
1539 1763
1540 delete $self->{texture}; 1764 delete $self->{texture};
1541 $self->SUPER::update; 1765 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1776 my ($self, $text) = @_;
1553 1777
1554 return if $self->{text} eq "T$text"; 1778 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1779 $self->{text} = "T$text";
1556 1780
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1781 $self->{layout}->set_text ($text);
1782
1559 delete $self->{req_h}; 1783 delete $self->{size_req};
1560
1561 $self->realloc; 1784 $self->realloc;
1562 $self->update; 1785 $self->update;
1563} 1786}
1564 1787
1565sub set_markup { 1788sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1791 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1792 $self->{text} = "M$markup";
1570 1793
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1794 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1795
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1796 $self->{layout}->set_markup ($markup);
1797
1575 delete $self->{req_h}; 1798 delete $self->{size_req};
1576
1577 $self->realloc; 1799 $self->realloc;
1578 $self->update; 1800 $self->update;
1579} 1801}
1580 1802
1581sub size_request { 1803sub size_request {
1582 my ($self) = @_; 1804 my ($self) = @_;
1583 1805
1584 if (exists $self->{req_h}) { 1806 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1807 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1808 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1809 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1810 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1811 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1812
1593 my ($w, $h) = $self->{layout}->size; 1813 my ($w, $h) = $self->{layout}->size;
1594 1814
1595 if (exists $self->{template}) { 1815 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1816 $self->{template}->set_font ($self->{font}) if $self->{font};
1817 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1818 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1819
1599 my ($w2, $h2) = $self->{template}->size; 1820 my ($w2, $h2) = $self->{template}->size;
1600 1821
1601 $w = List::Util::max $w, $w2; 1822 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1823 $h = List::Util::max $h, $h2;
1603 } 1824 }
1604 1825
1605 ($w, $h) 1826 [$w, $h]
1606 } 1827 };
1607}
1608 1828
1829 @{ $self->{size_req} }
1830}
1831
1832sub baseline_shift {
1833 $_[0]{layout}->descent
1834}
1835
1609sub size_allocate { 1836sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1837 my ($self, $w, $h) = @_;
1611 1838
1612 delete $self->{ox}; 1839 delete $self->{ox};
1613 1840
1614 delete $self->{texture} 1841 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1842 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1843
1844 1
1616} 1845}
1617 1846
1618sub set_fontsize { 1847sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1848 my ($self, $fontsize) = @_;
1620 1849
1621 $self->{fontsize} = $fontsize; 1850 $self->{fontsize} = $fontsize;
1851 delete $self->{size_req};
1622 delete $self->{texture}; 1852 delete $self->{texture};
1623 1853
1624 $self->realloc; 1854 $self->realloc;
1625} 1855}
1626 1856
1857sub reconfigure {
1858 my ($self) = @_;
1859
1860 delete $self->{size_req};
1861 delete $self->{texture};
1862
1863 $self->SUPER::reconfigure;
1864}
1865
1627sub _draw { 1866sub _draw {
1628 my ($self) = @_; 1867 my ($self) = @_;
1629 1868
1630 $self->SUPER::_draw; # draw background, if applicable 1869 $self->SUPER::_draw; # draw background, if applicable
1631 1870
1632 my $tex = $self->{texture} ||= do { 1871 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1872 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1873 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1874 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1875 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1876 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1877 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1878
1640 new_from_layout CFClient::Texture $self->{layout} 1879 [$self->{layout}->size]
1641 }; 1880 };
1642 1881
1643 unless (exists $self->{ox}) { 1882 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1883 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1884 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1885 : ($self->{w} - $size->[0]) * 0.5);
1647 1886
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1887 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1888 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1889 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1890 };
1652 1891
1653 glEnable GL_TEXTURE_2D; 1892 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1893 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 1894
1656 glColor_premultiply @{$self->{fg}} 1895 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 if $tex->{format} == GL_ALPHA;
1658
1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1660
1661 glDisable GL_TEXTURE_2D;
1662} 1896}
1663 1897
1664############################################################################# 1898#############################################################################
1665 1899
1666package CFClient::UI::EntryBase; 1900package CFPlus::UI::EntryBase;
1667 1901
1668our @ISA = CFClient::UI::Label::; 1902our @ISA = CFPlus::UI::Label::;
1669 1903
1670use CFClient::OpenGL; 1904use CFPlus::OpenGL;
1671 1905
1672sub new { 1906sub new {
1673 my $class = shift; 1907 my $class = shift;
1674 1908
1675 $class->SUPER::new ( 1909 $class->SUPER::new (
… …
1680 can_hover => 1, 1914 can_hover => 1,
1681 can_focus => 1, 1915 can_focus => 1,
1682 valign => 0, 1916 valign => 0,
1683 can_events => 1, 1917 can_events => 1,
1684 #text => ... 1918 #text => ...
1919 #hidden => "*",
1685 @_ 1920 @_
1686 ) 1921 )
1687} 1922}
1688 1923
1689sub _set_text { 1924sub _set_text {
… …
1696 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1697 $self->{text} = $text; 1932 $self->{text} = $text;
1698 1933
1699 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1700 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h}; 1936 delete $self->{size_req};
1702 1937
1703 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1704 1939
1705 $self->realloc; 1940 $self->realloc;
1706 $self->update; 1941 $self->update;
1707} 1942}
1708 1943
… …
1723 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1724 1959
1725 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1726} 1961}
1727 1962
1728sub key_down { 1963sub invoke_key_down {
1729 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1730 1965
1731 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1732 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1733 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1736 1971
1737 if ($uni == 8) { 1972 if ($uni == 8) {
1738 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1739 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1740 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1741 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1742 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1743 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1744 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1745 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1746 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1747 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1748 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1749 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1750 $self->_emit ('escape'); 1988 $self->emit ('escape');
1751 } elsif ($uni) { 1989 } elsif ($uni) {
1752 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else { 1991 } else {
1754 return 0; 1992 return 0;
1755 } 1993 }
… …
1759 $self->realloc; 1997 $self->realloc;
1760 1998
1761 1 1999 1
1762} 2000}
1763 2001
1764sub focus_in { 2002sub invoke_focus_in {
1765 my ($self) = @_; 2003 my ($self) = @_;
1766 2004
1767 $self->{last_activity} = $::NOW; 2005 $self->{last_activity} = $::NOW;
1768 2006
1769 $self->SUPER::focus_in; 2007 $self->SUPER::invoke_focus_in
1770} 2008}
1771 2009
1772sub button_down { 2010sub invoke_button_down {
1773 my ($self, $ev, $x, $y) = @_; 2011 my ($self, $ev, $x, $y) = @_;
1774 2012
1775 $self->SUPER::button_down ($ev, $x, $y); 2013 $self->SUPER::invoke_button_down ($ev, $x, $y);
1776 2014
1777 my $idx = $self->{layout}->xy_to_index ($x, $y); 2015 my $idx = $self->{layout}->xy_to_index ($x, $y);
1778 2016
1779 # byte-index to char-index 2017 # byte-index to char-index
1780 my $text = $self->{text}; 2018 my $text = $self->{text};
1781 utf8::encode $text; 2019 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782 $self->{cursor} = length substr $text, 0, $idx; 2020 $self->{cursor} = length $text;
1783 2021
1784 $self->_set_text ($self->{text}); 2022 $self->_set_text ($self->{text});
1785 $self->update; 2023 $self->update;
1786 2024
1787 1 2025 1
1788} 2026}
1789 2027
1790sub mouse_motion { 2028sub invoke_mouse_motion {
1791 my ($self, $ev, $x, $y) = @_; 2029 my ($self, $ev, $x, $y) = @_;
1792# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2030# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793 2031
1794 0 2032 1
1795} 2033}
1796 2034
1797sub _draw { 2035sub _draw {
1798 my ($self) = @_; 2036 my ($self) = @_;
1799 2037
… …
1826 utf8::encode $text; 2064 utf8::encode $text;
1827 2065
1828 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2066 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1829 } 2067 }
1830 2068
1831 glColor @{$self->{fg}};
1832 glBegin GL_LINES; 2069 glBegin GL_LINES;
1833 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2070 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1834 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1835 glEnd; 2072 glEnd;
1836 } 2073 }
1837} 2074}
1838 2075
1839package CFClient::UI::Entry; 2076package CFPlus::UI::Entry;
1840 2077
1841our @ISA = CFClient::UI::EntryBase::; 2078our @ISA = CFPlus::UI::EntryBase::;
1842 2079
1843use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1844 2081
1845sub key_down { 2082sub invoke_key_down {
1846 my ($self, $ev) = @_; 2083 my ($self, $ev) = @_;
1847 2084
1848 my $sym = $ev->{sym}; 2085 my $sym = $ev->{sym};
1849 2086
1850 if ($sym == 13) { 2087 if ($sym == 13) {
1851 unshift @{$self->{history}}, 2088 unshift @{$self->{history}},
1852 my $txt = $self->get_text; 2089 my $txt = $self->get_text;
2090
1853 $self->{history_pointer} = -1; 2091 $self->{history_pointer} = -1;
1854 $self->{history_saveback} = ''; 2092 $self->{history_saveback} = '';
1855 $self->_emit (activate => $txt); 2093 $self->emit (activate => $txt);
1856 $self->update; 2094 $self->update;
1857 2095
1858 } elsif ($sym == CFClient::SDLK_UP) { 2096 } elsif ($sym == CFPlus::SDLK_UP) {
1859 if ($self->{history_pointer} < 0) { 2097 if ($self->{history_pointer} < 0) {
1860 $self->{history_saveback} = $self->get_text; 2098 $self->{history_saveback} = $self->get_text;
1861 } 2099 }
1862 if (@{$self->{history} || []} > 0) { 2100 if (@{$self->{history} || []} > 0) {
1863 $self->{history_pointer}++; 2101 $self->{history_pointer}++;
… …
1865 $self->{history_pointer} = @{$self->{history} || []} - 1; 2103 $self->{history_pointer} = @{$self->{history} || []} - 1;
1866 } 2104 }
1867 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2105 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1868 } 2106 }
1869 2107
1870 } elsif ($sym == CFClient::SDLK_DOWN) { 2108 } elsif ($sym == CFPlus::SDLK_DOWN) {
1871 $self->{history_pointer}--; 2109 $self->{history_pointer}--;
1872 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2110 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873 2111
1874 if ($self->{history_pointer} >= 0) { 2112 if ($self->{history_pointer} >= 0) {
1875 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2113 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1876 } else { 2114 } else {
1877 $self->set_text ($self->{history_saveback}); 2115 $self->set_text ($self->{history_saveback});
1878 } 2116 }
1879 2117
1880 } else { 2118 } else {
1881 return $self->SUPER::key_down ($ev) 2119 return $self->SUPER::invoke_key_down ($ev)
1882 } 2120 }
1883 2121
1884 1 2122 1
1885} 2123}
1886 2124
1887############################################################################# 2125#############################################################################
1888 2126
1889package CFClient::UI::Button; 2127package CFPlus::UI::Button;
1890 2128
1891our @ISA = CFClient::UI::Label::; 2129our @ISA = CFPlus::UI::Label::;
1892 2130
1893use CFClient::OpenGL; 2131use CFPlus::OpenGL;
1894 2132
1895my @tex = 2133my @tex =
1896 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1897 qw(b1_button_active.png); 2135 qw(b1_button_active.png);
1898 2136
1899sub new { 2137sub new {
1900 my $class = shift; 2138 my $class = shift;
1901 2139
… …
1910 can_events => 1, 2148 can_events => 1,
1911 @_ 2149 @_
1912 ) 2150 )
1913} 2151}
1914 2152
1915sub activate { }
1916
1917sub button_up { 2153sub invoke_button_up {
1918 my ($self, $ev, $x, $y) = @_; 2154 my ($self, $ev, $x, $y) = @_;
1919 2155
1920 $self->emit ("activate") 2156 $self->emit ("activate")
1921 if $x >= 0 && $x < $self->{w} 2157 if $x >= 0 && $x < $self->{w}
1922 && $y >= 0 && $y < $self->{h}; 2158 && $y >= 0 && $y < $self->{h};
… …
1940 $self->SUPER::_draw; 2176 $self->SUPER::_draw;
1941} 2177}
1942 2178
1943############################################################################# 2179#############################################################################
1944 2180
1945package CFClient::UI::CheckBox; 2181package CFPlus::UI::CheckBox;
1946 2182
1947our @ISA = CFClient::UI::DrawBG::; 2183our @ISA = CFPlus::UI::DrawBG::;
1948 2184
1949my @tex = 2185my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2187 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1952 2188
1953use CFClient::OpenGL; 2189use CFPlus::OpenGL;
1954 2190
1955sub new { 2191sub new {
1956 my $class = shift; 2192 my $class = shift;
1957 2193
1958 $class->SUPER::new ( 2194 $class->SUPER::new (
… …
1972 my ($self) = @_; 2208 my ($self) = @_;
1973 2209
1974 (6) x 2 2210 (6) x 2
1975} 2211}
1976 2212
2213sub toggle {
2214 my ($self) = @_;
2215
2216 $self->{state} = !$self->{state};
2217 $self->emit (changed => $self->{state});
2218 $self->update;
2219}
2220
1977sub button_down { 2221sub invoke_button_down {
1978 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1979 2223
1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2224 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2225 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982 $self->{state} = !$self->{state}; 2226 $self->toggle;
1983 $self->_emit (changed => $self->{state});
1984 } else { 2227 } else {
1985 return 0 2228 return 0
1986 } 2229 }
1987 2230
1988 1 2231 1
… …
2008 glDisable GL_TEXTURE_2D; 2251 glDisable GL_TEXTURE_2D;
2009} 2252}
2010 2253
2011############################################################################# 2254#############################################################################
2012 2255
2013package CFClient::UI::Image; 2256package CFPlus::UI::Image;
2014 2257
2015our @ISA = CFClient::UI::Base::; 2258our @ISA = CFPlus::UI::Base::;
2016 2259
2017use CFClient::OpenGL; 2260use CFPlus::OpenGL;
2018use Carp qw/confess/;
2019 2261
2020our %loaded_images; 2262our %texture_cache;
2021 2263
2022sub new { 2264sub new {
2023 my $class = shift; 2265 my $class = shift;
2024 2266
2025 my $self = $class->SUPER::new (can_events => 0, @_); 2267 my $self = $class->SUPER::new (
2268 can_events => 0,
2269 @_,
2270 );
2026 2271
2027 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2272 $self->{path} || $self->{tex}
2273 or Carp::croak "'path' or 'tex' attributes required";
2028 2274
2029 $loaded_images{$self->{image}} ||= 2275 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2030 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2031 2277
2032 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2278 Scalar::Util::weaken $texture_cache{$self->{path}};
2033 2279
2034 Scalar::Util::weaken $loaded_images{$self->{image}}; 2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036 $self->{aspect} = $tex->{w} / $tex->{h};
2037 2281
2038 $self 2282 $self
2039} 2283}
2040 2284
2285sub STORABLE_freeze {
2286 my ($self, $cloning) = @_;
2287
2288 $self->{path}
2289 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2290
2291 $self->{path}
2292}
2293
2294sub STORABLE_attach {
2295 my ($self, $cloning, $path) = @_;
2296
2297 $self->new (path => $path)
2298}
2299
2041sub size_request { 2300sub size_request {
2042 my ($self) = @_; 2301 my ($self) = @_;
2043 2302
2044 ($self->{tex}->{w}, $self->{tex}->{h}) 2303 ($self->{tex}{w}, $self->{tex}{h})
2045} 2304}
2046 2305
2047sub _draw { 2306sub _draw {
2048 my ($self) = @_; 2307 my ($self) = @_;
2049 2308
… …
2059 } 2318 }
2060 2319
2061 glEnable GL_TEXTURE_2D; 2320 glEnable GL_TEXTURE_2D;
2062 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2063 2322
2064 $tex->draw_quad_alpha (0, 0, $w, $h); 2323 $tex->draw_quad (0, 0, $w, $h);
2065 2324
2066 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2067} 2326}
2068 2327
2069############################################################################# 2328#############################################################################
2070 2329
2330package CFPlus::UI::ImageButton;
2331
2332our @ISA = CFPlus::UI::Image::;
2333
2334use CFPlus::OpenGL;
2335
2336my %textures;
2337
2338sub new {
2339 my $class = shift;
2340
2341 my $self = $class->SUPER::new (
2342 padding_x => 4,
2343 padding_y => 4,
2344 fg => [1, 1, 1],
2345 active_fg => [0, 0, 1],
2346 can_hover => 1,
2347 align => 0,
2348 valign => 0,
2349 can_events => 1,
2350 @_
2351 );
2352}
2353
2354sub invoke_button_up {
2355 my ($self, $ev, $x, $y) = @_;
2356
2357 $self->emit ("activate")
2358 if $x >= 0 && $x < $self->{w}
2359 && $y >= 0 && $y < $self->{h};
2360
2361 1
2362}
2363
2364#############################################################################
2365
2071package CFClient::UI::VGauge; 2366package CFPlus::UI::VGauge;
2072 2367
2073our @ISA = CFClient::UI::Base::; 2368our @ISA = CFPlus::UI::Base::;
2074 2369
2075use List::Util qw(min max); 2370use List::Util qw(min max);
2076 2371
2077use CFClient::OpenGL; 2372use CFPlus::OpenGL;
2078 2373
2079my %tex = ( 2374my %tex = (
2080 food => [ 2375 food => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2376 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2377 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2083 ], 2378 ],
2084 grace => [ 2379 grace => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2381 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2087 ], 2382 ],
2088 hp => [ 2383 hp => [
2089 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2384 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2090 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2385 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2091 ], 2386 ],
2092 mana => [ 2387 mana => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2388 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2389 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2095 ], 2390 ],
2096); 2391);
2097 2392
2098# eg. VGauge->new (gauge => 'food'), default gauge: food 2393# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2158 my $ycut1 = max 0, min 1, $ycut; 2453 my $ycut1 = max 0, min 1, $ycut;
2159 my $ycut2 = max 0, min 1, $ycut - 1; 2454 my $ycut2 = max 0, min 1, $ycut - 1;
2160 2455
2161 my $h1 = $self->{h} * (1 - $ycut1); 2456 my $h1 = $self->{h} * (1 - $ycut1);
2162 my $h2 = $self->{h} * (1 - $ycut2); 2457 my $h2 = $self->{h} * (1 - $ycut2);
2458 my $h3 = $self->{h};
2459
2460 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2163 2461
2164 glEnable GL_BLEND; 2462 glEnable GL_BLEND;
2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2463 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2464 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2465 glEnable GL_TEXTURE_2D;
… …
2186 2484
2187 if ($t3) { 2485 if ($t3) {
2188 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2486 glBindTexture GL_TEXTURE_2D, $t3->{name};
2189 glBegin GL_QUADS; 2487 glBegin GL_QUADS;
2190 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2488 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2489 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2490 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2491 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194 glEnd; 2492 glEnd;
2195 } 2493 }
2196 2494
2197 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2198 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2199} 2497}
2200 2498
2201############################################################################# 2499#############################################################################
2202 2500
2203package CFClient::UI::Gauge; 2501package CFPlus::UI::Gauge;
2204 2502
2205our @ISA = CFClient::UI::VBox::; 2503our @ISA = CFPlus::UI::VBox::;
2206 2504
2207sub new { 2505sub new {
2208 my ($class, %arg) = @_; 2506 my ($class, %arg) = @_;
2209 2507
2210 my $self = $class->SUPER::new ( 2508 my $self = $class->SUPER::new (
… …
2212 can_hover => 1, 2510 can_hover => 1,
2213 can_events => 1, 2511 can_events => 1,
2214 %arg, 2512 %arg,
2215 ); 2513 );
2216 2514
2217 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2515 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2218 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2516 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2219 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2517 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2220 2518
2221 $self 2519 $self
2222} 2520}
2223 2521
2224sub set_fontsize { 2522sub set_fontsize {
… …
2245 $self->{value}->set_text ($val); 2543 $self->{value}->set_text ($val);
2246} 2544}
2247 2545
2248############################################################################# 2546#############################################################################
2249 2547
2250package CFClient::UI::Slider; 2548package CFPlus::UI::Slider;
2251 2549
2252use strict; 2550use strict;
2253 2551
2254use CFClient::OpenGL; 2552use CFPlus::OpenGL;
2255 2553
2256our @ISA = CFClient::UI::DrawBG::; 2554our @ISA = CFPlus::UI::DrawBG::;
2257 2555
2258my @tex = 2556my @tex =
2259 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2557 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2260 qw(s1_slider.png s1_slider_bg.png); 2558 qw(s1_slider.png s1_slider_bg.png);
2261 2559
2262sub new { 2560sub new {
2263 my $class = shift; 2561 my $class = shift;
2264 2562
… …
2285 $self->update; 2583 $self->update;
2286 2584
2287 $self 2585 $self
2288} 2586}
2289 2587
2290sub changed { }
2291
2292sub set_range { 2588sub set_range {
2293 my ($self, $range) = @_; 2589 my ($self, $range) = @_;
2294 2590
2295 ($range, $self->{range}) = ($self->{range}, $range); 2591 ($range, $self->{range}) = ($self->{range}, $range);
2296 2592
2297 $self->update
2298 if "@$range" ne "@{$self->{range}}"; 2593 if ("@$range" ne "@{$self->{range}}") {
2594 $self->update;
2595 $self->set_value ($self->{range}[0]);
2596 }
2299} 2597}
2300 2598
2301sub set_value { 2599sub set_value {
2302 my ($self, $value) = @_; 2600 my ($self, $value) = @_;
2303 2601
… …
2314 if $unit; 2612 if $unit;
2315 2613
2316 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2614 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317 2615
2318 if ($value != $old_value) { 2616 if ($value != $old_value) {
2319 $self->_emit (changed => $value); 2617 $self->emit (changed => $value);
2320 $self->update; 2618 $self->update;
2321 } 2619 }
2322} 2620}
2323 2621
2324sub size_request { 2622sub size_request {
2325 my ($self) = @_; 2623 my ($self) = @_;
2326 2624
2327 ($self->{req_w}, $self->{req_h}) 2625 ($self->{req_w}, $self->{req_h})
2328} 2626}
2329 2627
2330sub button_down { 2628sub invoke_button_down {
2331 my ($self, $ev, $x, $y) = @_; 2629 my ($self, $ev, $x, $y) = @_;
2332 2630
2333 $self->SUPER::button_down ($ev, $x, $y); 2631 $self->SUPER::invoke_button_down ($ev, $x, $y);
2334 2632
2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2633 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336 2634
2337 $self->mouse_motion ($ev, $x, $y) 2635 $self->invoke_mouse_motion ($ev, $x, $y)
2338} 2636}
2339 2637
2340sub mouse_motion { 2638sub invoke_mouse_motion {
2341 my ($self, $ev, $x, $y) = @_; 2639 my ($self, $ev, $x, $y) = @_;
2342 2640
2343 if ($GRAB == $self) { 2641 if ($GRAB == $self) {
2344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2642 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345 2643
… …
2351 } else { 2649 } else {
2352 return 0; 2650 return 0;
2353 } 2651 }
2354 2652
2355 1 2653 1
2654}
2655
2656sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_;
2658
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2662
2663 ! ! $delta
2356} 2664}
2357 2665
2358sub update { 2666sub update {
2359 my ($self) = @_; 2667 my ($self) = @_;
2360 2668
… …
2409 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2410} 2718}
2411 2719
2412############################################################################# 2720#############################################################################
2413 2721
2414package CFClient::UI::ValSlider; 2722package CFPlus::UI::ValSlider;
2415 2723
2416our @ISA = CFClient::UI::HBox::; 2724our @ISA = CFPlus::UI::HBox::;
2417 2725
2418sub new { 2726sub new {
2419 my ($class, %arg) = @_; 2727 my ($class, %arg) = @_;
2420 2728
2421 my $range = delete $arg{range}; 2729 my $range = delete $arg{range};
2422 2730
2423 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
2424 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2732 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2425 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2733 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2426 to_value => sub { shift }, 2734 to_value => sub { shift },
2427 from_value => sub { shift }, 2735 from_value => sub { shift },
2428 %arg, 2736 %arg,
2429 ); 2737 );
2430 2738
… …
2450sub set_range { shift->{slider}->set_range (@_) } 2758sub set_range { shift->{slider}->set_range (@_) }
2451sub set_value { shift->{slider}->set_value (@_) } 2759sub set_value { shift->{slider}->set_value (@_) }
2452 2760
2453############################################################################# 2761#############################################################################
2454 2762
2455package CFClient::UI::TextView; 2763package CFPlus::UI::TextScroller;
2456 2764
2457our @ISA = CFClient::UI::HBox::; 2765our @ISA = CFPlus::UI::HBox::;
2458 2766
2459use CFClient::OpenGL; 2767use CFPlus::OpenGL;
2460 2768
2461sub new { 2769sub new {
2462 my $class = shift; 2770 my $class = shift;
2463 2771
2464 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2465 fontsize => 1, 2773 fontsize => 1,
2466 can_events => 0, 2774 can_events => 1,
2775 indent => 0,
2467 #font => default_font 2776 #font => default_font
2468 @_, 2777 @_,
2469 2778
2470 layout => (new CFClient::Layout 1), 2779 layout => (new CFPlus::Layout),
2471 par => [], 2780 par => [],
2472 height => 0, 2781 height => 0,
2473 children => [ 2782 children => [
2474 (new CFClient::UI::Empty expand => 1), 2783 (new CFPlus::UI::Empty expand => 1),
2475 (new CFClient::UI::Slider vertical => 1), 2784 (new CFPlus::UI::Slider vertical => 1),
2476 ], 2785 ],
2477 ); 2786 );
2478 2787
2479 $self->{children}[1]->connect (changed => sub { $self->update }); 2788 $self->{children}[1]->connect (changed => sub { $self->update });
2480 2789
… …
2486 2795
2487 $self->{fontsize} = $fontsize; 2796 $self->{fontsize} = $fontsize;
2488 $self->reflow; 2797 $self->reflow;
2489} 2798}
2490 2799
2800sub size_request {
2801 my ($self) = @_;
2802
2803 my ($empty, $slider) = @{ $self->{children} };
2804
2805 local $self->{children} = [$empty, $slider];
2806 $self->SUPER::size_request
2807}
2808
2491sub size_allocate { 2809sub invoke_size_allocate {
2492 my ($self, $w, $h) = @_; 2810 my ($self, $w, $h) = @_;
2493 2811
2494 $self->SUPER::size_allocate ($w, $h); 2812 my ($empty, $slider, @other) = @{ $self->{children} };
2813 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495 2814
2496 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2815 $self->{layout}->set_font ($self->{font}) if $self->{font};
2497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2816 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $self->{layout}->set_width ($self->{children}[0]{w}); 2817 $self->{layout}->set_width ($empty->{w});
2818 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 2819
2500 $self->reflow; 2820 $self->reflow;
2501}
2502 2821
2503sub text_size { 2822 local $self->{children} = [$empty, $slider];
2823 $self->SUPER::invoke_size_allocate ($w, $h)
2824}
2825
2826sub invoke_mouse_wheel {
2504 my ($self, $text, $indent) = @_; 2827 my ($self, $ev) = @_;
2828
2829 return 0 unless $ev->{dy}; # only vertical movements
2830
2831 $self->{children}[1]->emit (mouse_wheel => $ev);
2832
2833 1
2834}
2835
2836sub get_layout {
2837 my ($self, $para) = @_;
2505 2838
2506 my $layout = $self->{layout}; 2839 my $layout = $self->{layout};
2507 2840
2841 $layout->set_font ($self->{font}) if $self->{font};
2842 $layout->set_foreground (@{$para->{fg}});
2508 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2843 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $layout->set_width ($self->{children}[0]{w} - $indent); 2844 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2845 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 $layout->set_markup ($text); 2846 $layout->set_markup ($para->{markup});
2847
2848 $layout->set_shapes (
2849 map
2850 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2851 @{$para->{widget}}
2511 2852 );
2853
2512 $layout->size 2854 $layout
2513} 2855}
2514 2856
2515sub reflow { 2857sub reflow {
2516 my ($self) = @_; 2858 my ($self) = @_;
2517 2859
… …
2524 2866
2525 # todo: base offset on lines or so, not on pixels 2867 # todo: base offset on lines or so, not on pixels
2526 $self->{children}[1]->set_value ($offset); 2868 $self->{children}[1]->set_value ($offset);
2527} 2869}
2528 2870
2871sub current_paragraph {
2872 my ($self) = @_;
2873
2874 $self->{top_paragraph} - 1
2875}
2876
2877sub scroll_to {
2878 my ($self, $para) = @_;
2879
2880 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2881
2882 $self->{scroll_to} = $para;
2883 $self->update;
2884}
2885
2529sub clear { 2886sub clear {
2530 my ($self) = @_; 2887 my ($self) = @_;
2888
2889 my (undef, undef, @other) = @{ $self->{children} };
2890 $self->remove ($_) for @other;
2531 2891
2532 $self->{par} = []; 2892 $self->{par} = [];
2533 $self->{height} = 0; 2893 $self->{height} = 0;
2534 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2894 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535} 2895}
2536 2896
2537sub add_paragraph { 2897sub add_paragraph {
2538 my ($self, $color, $text, $indent) = @_; 2898 my $self = shift;
2539 2899
2540 for my $line (split /\n/, $text) { 2900 for my $para (@_) {
2541 my ($w, $h) = $self->text_size ($line); 2901 $para = {
2902 fg => [1, 1, 1, 1],
2903 indent => 0,
2904 markup => "",
2905 widget => [],
2906 ref $para ? %$para : (markup => $para),
2907 w => 1e10,
2908 wrapped => 1,
2909 };
2910
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para;
2913 }
2914
2915 $self->{need_reflow}++;
2916 $self->update;
2917}
2918
2919sub scroll_to_bottom {
2920 my ($self) = @_;
2921
2922 $self->{scroll_to} = $#{$self->{par}};
2923 $self->update;
2924}
2925
2926sub force_uptodate {
2927 my ($self) = @_;
2928
2929 if (delete $self->{need_reflow}) {
2930 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2931
2932 my $height = 0;
2933
2934 for my $para (@{$self->{par}}) {
2935 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2936 my $layout = $self->get_layout ($para);
2937 my ($w, $h) = $layout->size;
2938
2939 $para->{w} = $w + $para->{indent};
2940 $para->{h} = $h;
2941 $para->{wrapped} = $layout->has_wrapped;
2942 }
2943
2944 $para->{y} = $height;
2945 $height += $para->{h};
2946 }
2947
2542 $self->{height} += $h; 2948 $self->{height} = $height;
2543 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2949 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2544 }
2545 2950
2546 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2951 delete $self->{texture};
2952 }
2953
2954 if (my $paridx = delete $self->{scroll_to}) {
2955 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2956 }
2547} 2957}
2548 2958
2549sub update { 2959sub update {
2550 my ($self) = @_; 2960 my ($self) = @_;
2551 2961
… …
2553 2963
2554 return unless $self->{h} > 0; 2964 return unless $self->{h} > 0;
2555 2965
2556 delete $self->{texture}; 2966 delete $self->{texture};
2557 2967
2558 $ROOT->on_post_alloc ($self, sub { 2968 $ROOT->on_post_alloc ($self => sub {
2969 $self->force_uptodate;
2970
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2971 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560 2972
2561 if (delete $self->{need_reflow}) {
2562 my $height = 0;
2563
2564 my $layout = $self->{layout};
2565
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568 for (@{$self->{par}}) {
2569 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570 $layout->set_width ($W - $_->[3]);
2571 $layout->set_markup ($_->[4]);
2572 my ($w, $h) = $layout->size;
2573 $_->[0] = $w + $_->[3];
2574 $_->[1] = $h;
2575 }
2576
2577 $height += $_->[1];
2578 }
2579
2580 $self->{height} = $height;
2581
2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2583
2584 delete $self->{texture};
2585 }
2586
2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2973 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2588 glClearColor 0, 0, 0, 0; 2974 glClearColor 0, 0, 0, 0;
2589 glClear GL_COLOR_BUFFER_BIT; 2975 glClear GL_COLOR_BUFFER_BIT;
2590 2976
2977 package CFPlus::UI::Base;
2978 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2979 (0, 0, $self->{w}, $self->{h});
2980
2981 my $top = int $self->{children}[1]{range}[0];
2982
2983 my $paridx = 0;
2984 my $top_paragraph;
2591 my $top = int $self->{children}[1]{range}[0]; 2985 my $top = int $self->{children}[1]{range}[0];
2592 2986
2593 my $y0 = $top; 2987 my $y0 = $top;
2594 my $y1 = $top + $H; 2988 my $y1 = $top + $H;
2595 2989
2596 my $y = 0;
2597
2598 my $layout = $self->{layout};
2599
2600 $layout->set_font ($self->{font}) if $self->{font};
2601
2602 glEnable GL_BLEND;
2603 #TODO# not correct in windows where rgba is forced off
2604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2605
2606 for my $par (@{$self->{par}}) { 2990 for my $para (@{$self->{par}}) {
2607 my $h = $par->[1]; 2991 my $h = $para->{h};
2992 my $y = $para->{y};
2608 2993
2609 if ($y0 < $y + $h && $y < $y1) { 2994 if ($y0 < $y + $h && $y < $y1) {
2610 $layout->set_foreground (@{ $par->[2] }); 2995 my $layout = $self->get_layout ($para);
2611 $layout->set_width ($W - $par->[3]);
2612 $layout->set_markup ($par->[4]);
2613 2996
2614 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2997 $layout->render ($para->{indent}, $y - $y0);
2615 2998
2616 glRasterPos $par->[3], $y - $y0; 2999 if (my @w = @{ $para->{widget} }) {
2617 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3000 my @s = $layout->get_shapes;
3001
3002 for (@w) {
3003 my ($dx, $dy) = splice @s, 0, 2, ();
3004
3005 $_->{x} = $dx + $para->{indent};
3006 $_->{y} = $dy + $y - $y0;
3007
3008 $_->draw;
3009 }
3010 }
2618 } 3011 }
2619 3012
2620 $y += $h; 3013 $paridx++;
3014 $top_paragraph ||= $paridx if $y >= $top;
2621 } 3015 }
2622 3016
2623 glDisable GL_BLEND; 3017 $self->{top_paragraph} = $top_paragraph;
2624 }; 3018 };
2625 }); 3019 });
3020}
3021
3022sub reconfigure {
3023 my ($self) = @_;
3024
3025 $self->SUPER::reconfigure;
3026
3027 $_->{w} = 1e10 for @{ $self->{par} };
3028 $self->reflow;
2626} 3029}
2627 3030
2628sub _draw { 3031sub _draw {
2629 my ($self) = @_; 3032 my ($self) = @_;
2630 3033
… …
2633 glColor 0, 0, 0, 1; 3036 glColor 0, 0, 0, 1;
2634 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3037 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2635 glDisable GL_TEXTURE_2D; 3038 glDisable GL_TEXTURE_2D;
2636 3039
2637 $self->{children}[1]->draw; 3040 $self->{children}[1]->draw;
2638
2639} 3041}
2640 3042
2641############################################################################# 3043#############################################################################
2642 3044
2643package CFClient::UI::Animator; 3045package CFPlus::UI::Animator;
2644 3046
2645use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2646 3048
2647our @ISA = CFClient::UI::Bin::; 3049our @ISA = CFPlus::UI::Bin::;
2648 3050
2649sub moveto { 3051sub moveto {
2650 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2651 3053
2652 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3054 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2680 glPopMatrix; 3082 glPopMatrix;
2681} 3083}
2682 3084
2683############################################################################# 3085#############################################################################
2684 3086
2685package CFClient::UI::Flopper; 3087package CFPlus::UI::Flopper;
2686 3088
2687our @ISA = CFClient::UI::Button::; 3089our @ISA = CFPlus::UI::Button::;
2688 3090
2689sub new { 3091sub new {
2690 my $class = shift; 3092 my $class = shift;
2691 3093
2692 my $self = $class->SUPER::new ( 3094 my $self = $class->SUPER::new (
… …
2704 $self->{other}->toggle_visibility; 3106 $self->{other}->toggle_visibility;
2705} 3107}
2706 3108
2707############################################################################# 3109#############################################################################
2708 3110
2709package CFClient::UI::Tooltip; 3111package CFPlus::UI::Tooltip;
2710 3112
2711our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2712 3114
2713use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2714 3116
2715sub new { 3117sub new {
2716 my $class = shift; 3118 my $class = shift;
2717 3119
2718 $class->SUPER::new ( 3120 $class->SUPER::new (
… …
2721 ) 3123 )
2722} 3124}
2723 3125
2724sub set_tooltip_from { 3126sub set_tooltip_from {
2725 my ($self, $widget) = @_; 3127 my ($self, $widget) = @_;
3128
3129 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130 if $widget->{tooltip} =~ /^#(.*)$/;
2726 3131
2727 my $tooltip = $widget->{tooltip}; 3132 my $tooltip = $widget->{tooltip};
2728 3133
2729 if ($ENV{CFPLUS_DEBUG} & 2) { 3134 if ($ENV{CFPLUS_DEBUG} & 2) {
2730 $tooltip .= "\n\n" . (ref $widget) . "\n" 3135 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3136 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n" 3137 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}"; 3138 . "visible $widget->{visible}";
2734 } 3139 }
2735 3140
3141 $tooltip =~ s/^\n+//;
3142 $tooltip =~ s/\n+$//;
3143
2736 $self->add (new CFClient::UI::Label 3144 $self->add (new CFPlus::UI::Label
2737 markup => $tooltip, 3145 markup => $tooltip,
2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3146 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739 fontsize => 0.8, 3147 fontsize => 0.8,
2740 fg => [0, 0, 0, 1], 3148 style => 1, # FLAG_INVERSE
2741 ellipsise => 0, 3149 ellipsise => 0,
2742 font => ($widget->{tooltip_font} || $::FONT_PROP), 3150 font => ($widget->{tooltip_font} || $::FONT_PROP),
2743 ); 3151 );
2744} 3152}
2745 3153
… …
2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3157 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750 3158
2751 ($w + 4, $h + 4) 3159 ($w + 4, $h + 4)
2752} 3160}
2753 3161
2754sub size_allocate { 3162sub invoke_size_allocate {
2755 my ($self, $w, $h) = @_; 3163 my ($self, $w, $h) = @_;
2756 3164
2757 $self->SUPER::size_allocate ($w - 4, $h - 4); 3165 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758} 3166}
2759 3167
2760sub visibility_change { 3168sub invoke_visibility_change {
2761 my ($self, $visible) = @_; 3169 my ($self, $visible) = @_;
2762 3170
2763 return unless $visible; 3171 return unless $visible;
2764 3172
2765 $self->{root}->on_post_alloc ("move_$self" => sub { 3173 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 my $widget = $self->{owner} 3174 my $widget = $self->{owner}
2767 or return; 3175 or return;
2768 3176
3177 if ($widget->{visible}) {
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3178 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770 3179
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3180 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH; 3181 if $x + $self->{w} > $self->{root}{w};
2773 3182
2774 $self->move_abs ($x, $y); 3183 $self->move_abs ($x, $y);
3184 } else {
3185 $self->hide;
3186 }
2775 }); 3187 });
2776} 3188}
2777 3189
2778sub _draw { 3190sub _draw {
2779 my ($self) = @_; 3191 my ($self) = @_;
… …
2803 $self->SUPER::_draw; 3215 $self->SUPER::_draw;
2804} 3216}
2805 3217
2806############################################################################# 3218#############################################################################
2807 3219
2808package CFClient::UI::Face; 3220package CFPlus::UI::Face;
2809 3221
2810our @ISA = CFClient::UI::Base::; 3222our @ISA = CFPlus::UI::DrawBG::;
2811 3223
2812use CFClient::OpenGL; 3224use CFPlus::OpenGL;
2813 3225
2814sub new { 3226sub new {
2815 my $class = shift; 3227 my $class = shift;
2816 3228
2817 my $self = $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
… …
2852sub _draw { 3264sub _draw {
2853 my ($self) = @_; 3265 my ($self) = @_;
2854 3266
2855 return unless $::CONN; 3267 return unless $::CONN;
2856 3268
3269 $self->SUPER::_draw;
3270
2857 my $face; 3271 my $face;
2858 3272
2859 if ($self->{frame}) { 3273 if ($self->{frame}) {
2860 my $anim = $::CONN->{anim}[$self->{anim}]; 3274 my $anim = $::CONN->{anim}[$self->{anim}];
2861 3275
… …
2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3286 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873 glDisable GL_TEXTURE_2D; 3287 glDisable GL_TEXTURE_2D;
2874 } 3288 }
2875} 3289}
2876 3290
2877sub DESTROY { 3291sub destroy {
2878 my ($self) = @_; 3292 my ($self) = @_;
2879 3293
2880 $self->{timer}->cancel 3294 $self->{timer}->cancel
2881 if $self->{timer}; 3295 if $self->{timer};
2882 3296
2883 $self->SUPER::DESTROY; 3297 $self->SUPER::destroy;
2884} 3298}
2885 3299
2886############################################################################# 3300#############################################################################
2887 3301
2888package CFClient::UI::Buttonbar; 3302package CFPlus::UI::Buttonbar;
2889 3303
2890our @ISA = CFClient::UI::HBox::; 3304our @ISA = CFPlus::UI::HBox::;
2891 3305
2892# TODO: should actualyl wrap buttons and other goodies. 3306# TODO: should actually wrap buttons and other goodies.
2893 3307
2894############################################################################# 3308#############################################################################
2895 3309
2896package CFClient::UI::Menu; 3310package CFPlus::UI::Menu;
2897 3311
2898our @ISA = CFClient::UI::FancyFrame::; 3312our @ISA = CFPlus::UI::Toplevel::;
2899 3313
2900use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2901 3315
2902sub new { 3316sub new {
2903 my $class = shift; 3317 my $class = shift;
2904 3318
2905 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
2906 items => [], 3320 items => [],
2907 z => 100, 3321 z => 100,
2908 @_, 3322 @_,
2909 ); 3323 );
2910 3324
2911 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3325 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2912 3326
2913 for my $item (@{ $self->{items} }) { 3327 for my $item (@{ $self->{items} }) {
2914 my ($widget, $cb) = @$item; 3328 my ($widget, $cb, $tooltip) = @$item;
2915 3329
2916 # handle various types of items, only text for now 3330 # handle various types of items, only text for now
2917 if (!ref $widget) { 3331 if (!ref $widget) {
3332 if ($widget =~ /\t/) {
3333 my ($left, $right) = split /\t/, $widget, 2;
3334
2918 $widget = new CFClient::UI::Label 3335 $widget = new CFPlus::UI::HBox
2919 can_hover => 1, 3336 can_hover => 1,
2920 can_events => 1, 3337 can_events => 1,
3338 tooltip => $tooltip,
3339 children => [
3340 (new CFPlus::UI::Label markup => $left, expand => 1),
3341 (new CFPlus::UI::Label markup => $right, align => +1),
3342 ],
3343 ;
3344
3345 } else {
3346 $widget = new CFPlus::UI::Label
3347 can_hover => 1,
3348 can_events => 1,
2921 text => $widget; 3349 markup => $widget,
3350 tooltip => $tooltip;
3351 }
2922 } 3352 }
2923 3353
2924 $self->{item}{$widget} = $item; 3354 $self->{item}{$widget} = $item;
2925 3355
2926 $self->{vbox}->add ($widget); 3356 $self->{vbox}->add ($widget);
… …
2931 3361
2932# popup given the event (must be a mouse button down event currently) 3362# popup given the event (must be a mouse button down event currently)
2933sub popup { 3363sub popup {
2934 my ($self, $ev) = @_; 3364 my ($self, $ev) = @_;
2935 3365
2936 $self->_emit ("popdown"); 3366 $self->emit ("popdown");
2937 3367
2938 # maybe save $GRAB? must be careful about events... 3368 # maybe save $GRAB? must be careful about events...
2939 $GRAB = $self; 3369 $GRAB = $self;
2940 $self->{button} = $ev->{button}; 3370 $self->{button} = $ev->{button};
2941 3371
2942 $self->show; 3372 $self->show;
2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3373 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944} 3374}
2945 3375
2946sub mouse_motion { 3376sub invoke_mouse_motion {
2947 my ($self, $ev, $x, $y) = @_; 3377 my ($self, $ev, $x, $y) = @_;
2948 3378
2949 # TODO: should use vbox->find_widget or so 3379 # TODO: should use vbox->find_widget or so
2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3380 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951 $self->{hover} = $self->{item}{$HOVER}; 3381 $self->{hover} = $self->{item}{$HOVER};
2952 3382
2953 0 3383 0
2954} 3384}
2955 3385
2956sub button_up { 3386sub invoke_button_up {
2957 my ($self, $ev, $x, $y) = @_; 3387 my ($self, $ev, $x, $y) = @_;
2958 3388
2959 if ($ev->{button} == $self->{button}) { 3389 if ($ev->{button} == $self->{button}) {
2960 undef $GRAB; 3390 undef $GRAB;
2961 $self->hide; 3391 $self->hide;
2962 3392
2963 $self->_emit ("popdown"); 3393 $self->emit ("popdown");
2964 $self->{hover}[1]->() if $self->{hover}; 3394 $self->{hover}[1]->() if $self->{hover};
2965 } else { 3395 } else {
2966 return 0 3396 return 0
2967 } 3397 }
2968 3398
2969 1 3399 1
2970} 3400}
2971 3401
2972############################################################################# 3402#############################################################################
2973 3403
2974package CFClient::UI::Multiplexer; 3404package CFPlus::UI::Multiplexer;
2975 3405
2976our @ISA = CFClient::UI::Container::; 3406our @ISA = CFPlus::UI::Container::;
2977 3407
2978sub new { 3408sub new {
2979 my $class = shift; 3409 my $class = shift;
2980 3410
2981 my $self = $class->SUPER::new ( 3411 my $self = $class->SUPER::new (
… …
2995 3425
2996 $self->{current} = $self->{children}[0] 3426 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} }; 3427 if @{ $self->{children} };
2998} 3428}
2999 3429
3430sub get_current_page {
3431 my ($self) = @_;
3432
3433 $self->{current}
3434}
3435
3000sub set_current_page { 3436sub set_current_page {
3001 my ($self, $page_or_widget) = @_; 3437 my ($self, $page_or_widget) = @_;
3002 3438
3003 my $widget = ref $page_or_widget 3439 my $widget = ref $page_or_widget
3004 ? $page_or_widget 3440 ? $page_or_widget
3005 : $self->{children}[$page_or_widget]; 3441 : $self->{children}[$page_or_widget];
3006 3442
3007 $self->{current} = $widget; 3443 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3444 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009 3445
3010 $self->_emit (page_changed => $self->{current}); 3446 $self->emit (page_changed => $self->{current});
3011 3447
3012 $self->realloc; 3448 $self->realloc;
3013} 3449}
3014 3450
3015sub visible_children { 3451sub visible_children {
… …
3020 my ($self) = @_; 3456 my ($self) = @_;
3021 3457
3022 $self->{current}->size_request 3458 $self->{current}->size_request
3023} 3459}
3024 3460
3025sub size_allocate { 3461sub invoke_size_allocate {
3026 my ($self, $w, $h) = @_; 3462 my ($self, $w, $h) = @_;
3027 3463
3028 $self->{current}->configure (0, 0, $w, $h); 3464 $self->{current}->configure (0, 0, $w, $h);
3465
3466 1
3029} 3467}
3030 3468
3031sub _draw { 3469sub _draw {
3032 my ($self) = @_; 3470 my ($self) = @_;
3033 3471
3034 $self->{current}->draw; 3472 $self->{current}->draw;
3035} 3473}
3036 3474
3037############################################################################# 3475#############################################################################
3038 3476
3039package CFClient::UI::Notebook; 3477package CFPlus::UI::Notebook;
3040 3478
3041our @ISA = CFClient::UI::VBox::; 3479our @ISA = CFPlus::UI::VBox::;
3042 3480
3043sub new { 3481sub new {
3044 my $class = shift; 3482 my $class = shift;
3045 3483
3046 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3047 buttonbar => (new CFClient::UI::Buttonbar), 3485 buttonbar => (new CFPlus::UI::Buttonbar),
3048 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3486 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3049 # filter => # will be put between multiplexer and $self 3487 # filter => # will be put between multiplexer and $self
3050 @_, 3488 @_,
3051 ); 3489 );
3052 3490
3053 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3491 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3059sub add { 3497sub add {
3060 my ($self, $title, $widget, $tooltip) = @_; 3498 my ($self, $title, $widget, $tooltip) = @_;
3061 3499
3062 Scalar::Util::weaken $self; 3500 Scalar::Util::weaken $self;
3063 3501
3064 $self->{buttonbar}->add (new CFClient::UI::Button 3502 $self->{buttonbar}->add (new CFPlus::UI::Button
3065 markup => $title, 3503 markup => $title,
3066 tooltip => $tooltip, 3504 tooltip => $tooltip,
3067 on_activate => sub { $self->set_current_page ($widget) }, 3505 on_activate => sub { $self->set_current_page ($widget) },
3068 ); 3506 );
3069 3507
3070 $self->{multiplexer}->add ($widget); 3508 $self->{multiplexer}->add ($widget);
3071} 3509}
3072 3510
3511sub get_current_page {
3512 my ($self) = @_;
3513
3514 $self->{multiplexer}->get_current_page
3515}
3516
3073sub set_current_page { 3517sub set_current_page {
3074 my ($self, $page) = @_; 3518 my ($self, $page) = @_;
3075 3519
3076 $self->{multiplexer}->set_current_page ($page); 3520 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current}); 3521 $self->emit (page_changed => $self->{multiplexer}{current});
3078} 3522}
3079 3523
3080############################################################################# 3524#############################################################################
3081 3525
3526package CFPlus::UI::Selector;
3527
3528use utf8;
3529
3530our @ISA = CFPlus::UI::Button::;
3531
3532sub new {
3533 my $class = shift;
3534
3535 my $self = $class->SUPER::new (
3536 options => [], # [value, title, longdesc], ...
3537 value => undef,
3538 @_,
3539 );
3540
3541 $self->_set_value ($self->{value});
3542
3543 $self
3544}
3545
3546sub invoke_button_down {
3547 my ($self, $ev) = @_;
3548
3549 my @menu_items;
3550
3551 for (@{ $self->{options} }) {
3552 my ($value, $title, $tooltip) = @$_;
3553
3554 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3555 }
3556
3557 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3558}
3559
3560sub _set_value {
3561 my ($self, $value) = @_;
3562
3563 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3564 or return;
3565
3566 $self->{value} = $item->[0];
3567 $self->set_markup ("$item->[1] ⇓");
3568 $self->set_tooltip ($item->[2]);
3569}
3570
3571sub set_value {
3572 my ($self, $value) = @_;
3573
3574 return unless $self->{value} ne $value;
3575
3576 $self->_set_value ($value);
3577 $self->emit (changed => $value);
3578}
3579
3580#############################################################################
3581
3082package CFClient::UI::Statusbox; 3582package CFPlus::UI::Statusbox;
3083 3583
3084our @ISA = CFClient::UI::VBox::; 3584our @ISA = CFPlus::UI::VBox::;
3085 3585
3086sub new { 3586sub new {
3087 my $class = shift; 3587 my $class = shift;
3088 3588
3089 my $self = $class->SUPER::new ( 3589 my $self = $class->SUPER::new (
… …
3101sub reorder { 3601sub reorder {
3102 my ($self) = @_; 3602 my ($self) = @_;
3103 my $NOW = Time::HiRes::time; 3603 my $NOW = Time::HiRes::time;
3104 3604
3105 # freeze display when hovering over any label 3605 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner} 3606 return if $CFPlus::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3607 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} }; 3608 values %{ $self->{item} };
3109 3609
3110 while (my ($k, $v) = each %{ $self->{item} }) { 3610 while (my ($k, $v) = each %{ $self->{item} }) {
3111 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3611 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112 } 3612 }
… …
3133 for ($short) { 3633 for ($short) {
3134 s/^\s+//; 3634 s/^\s+//;
3135 s/\s+/ /g; 3635 s/\s+/ /g;
3136 } 3636 }
3137 3637
3138 new CFClient::UI::Label 3638 new CFPlus::UI::Label
3139 markup => $short, 3639 markup => $short,
3140 tooltip => $item->{tooltip}, 3640 tooltip => $item->{tooltip},
3141 tooltip_font => $::FONT_PROP, 3641 tooltip_font => $::FONT_PROP,
3142 tooltip_width => 0.67, 3642 tooltip_width => 0.67,
3143 fontsize => $item->{fontsize} || $self->{fontsize}, 3643 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3181 $item->{count}++; 3681 $item->{count}++;
3182 } else { 3682 } else {
3183 $item->{count} = 1; 3683 $item->{count} = 1;
3184 $item->{text} = $item->{tooltip} = $text; 3684 $item->{text} = $item->{tooltip} = $text;
3185 } 3685 }
3186 $item->{id} = ++$self->{id}; 3686 $item->{id} += 0.2;#d#
3187 $item->{timeout} = $timeout; 3687 $item->{timeout} = $timeout;
3188 delete $item->{label}; 3688 delete $item->{label};
3189 } else { 3689 } else {
3190 $self->{item}{$group} = { 3690 $self->{item}{$group} = {
3191 id => ++$self->{id}, 3691 id => ++$self->{id},
… …
3197 count => 1, 3697 count => 1,
3198 %arg, 3698 %arg,
3199 }; 3699 };
3200 } 3700 }
3201 3701
3702 $ROOT->on_refresh (reorder => sub {
3202 $self->reorder; 3703 $self->reorder;
3704 });
3203} 3705}
3204 3706
3205sub reconfigure { 3707sub reconfigure {
3206 my ($self) = @_; 3708 my ($self) = @_;
3207 3709
… …
3210 3712
3211 $self->reorder; 3713 $self->reorder;
3212 $self->SUPER::reconfigure; 3714 $self->SUPER::reconfigure;
3213} 3715}
3214 3716
3215sub DESTROY { 3717sub destroy {
3216 my ($self) = @_; 3718 my ($self) = @_;
3217 3719
3218 $self->{timer}->cancel; 3720 $self->{timer}->cancel;
3219 3721
3220 $self->SUPER::DESTROY; 3722 $self->SUPER::destroy;
3221} 3723}
3222 3724
3223############################################################################# 3725#############################################################################
3224 3726
3225package CFClient::UI::Inventory; 3727package CFPlus::UI::Inventory;
3226 3728
3227our @ISA = CFClient::UI::ScrolledWindow::; 3729our @ISA = CFPlus::UI::Table::;
3228 3730
3229sub new { 3731sub new {
3230 my $class = shift; 3732 my $class = shift;
3231 3733
3232 my $self = $class->SUPER::new ( 3734 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3735 col_expand => [0, 1, 0],
3736 items => [],
3234 @_, 3737 @_,
3235 ); 3738 );
3236 3739
3740 $self->set_sort_order (undef);
3741
3237 $self 3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3238} 3778}
3239 3779
3240sub set_items { 3780sub set_items {
3241 my ($self, $items) = @_; 3781 my ($self, $items) = @_;
3242 3782
3243 $self->{child}->clear; 3783 $self->{items} = [$items ? values %$items : ()];
3244 return unless $items; 3784 $self->update_items;
3245
3246 my @items = sort {
3247 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name})
3249 } @$items;
3250
3251 $self->{real_items} = \@items;
3252
3253 my $row = 0;
3254 for my $item (@items) {
3255 CFClient::Item::update_widgets $item;
3256
3257 $self->{child}->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget});
3260
3261 $row++;
3262 }
3263} 3785}
3264 3786
3265############################################################################# 3787#############################################################################
3266 3788
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 }
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::SpellList; 3789package CFPlus::UI::SpellList;
3465 3790
3466our @ISA = CFClient::UI::Table::; 3791our @ISA = CFPlus::UI::Table::;
3467 3792
3468sub new { 3793sub new {
3469 my $class = shift; 3794 my $class = shift;
3470 3795
3471 my $self = $class->SUPER::new ( 3796 my $self = $class->SUPER::new (
… …
3473 commands => [], 3798 commands => [],
3474 @_, 3799 @_,
3475 ) 3800 )
3476} 3801}
3477 3802
3478# XXX: Do sorting? Argl... 3803my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816sub rebuild_spell_list {
3817 my ($self) = @_;
3818
3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3820 $self->clear;
3821
3822 return unless $::CONN;
3823
3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830 my $row = 0;
3831
3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833 my $spell = $self->{spell}{$_};
3834
3835 $row++;
3836
3837 my $spell_cb = sub {
3838 my ($widget, $ev) = @_;
3839
3840 if ($ev->{button} == 1) {
3841 $::CONN->user_send ("cast $spell->{name}");
3842 } elsif ($ev->{button} == 2) {
3843 $::CONN->user_send ("invoke $spell->{name}");
3844 } elsif ($ev->{button} == 3) {
3845 (new CFPlus::UI::Menu
3846 items => [
3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849 ],
3850 )->popup ($ev);
3851 } else {
3852 return 0;
3853 }
3854
3855 1
3856 };
3857
3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860 #TODO: add path info to tooltip
3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863 $self->add (0, $row, new CFPlus::UI::Face
3864 face => $spell->{face},
3865 can_hover => 1,
3866 can_events => 1,
3867 tooltip => $tooltip,
3868 on_button_down => $spell_cb,
3869 );
3870
3871 $self->add (1, $row, new CFPlus::UI::Label
3872 expand => 1,
3873 text => $spell->{name},
3874 can_hover => 1,
3875 can_events => 1,
3876 tooltip => $tooltip,
3877 on_button_down => $spell_cb,
3878 );
3879
3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884 }
3885 });
3886}
3887
3479sub add_spell { 3888sub add_spell {
3480 my ($self, $spell) = @_; 3889 my ($self, $spell) = @_;
3890
3481 $self->{spells}->{$spell->{name}} = $spell; 3891 $self->{spell}->{$spell->{name}} = $spell;
3482 3892 $self->rebuild_spell_list;
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510} 3893}
3511 3894
3512sub remove_spell { 3895sub remove_spell {
3513 my ($self, $spell) = @_; 3896 my ($self, $spell) = @_;
3897
3514 delete $self->{spells}->{$spell->{name}}; 3898 delete $self->{spell}->{$spell->{name}};
3515 $self->rebuild_spell_list; 3899 $self->rebuild_spell_list;
3516} 3900}
3517 3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3518############################################################################# 3909#############################################################################
3519 3910
3520package CFClient::UI::Root; 3911package CFPlus::UI::Root;
3521 3912
3522our @ISA = CFClient::UI::Container::; 3913our @ISA = CFPlus::UI::Container::;
3523 3914
3524use List::Util qw(min max); 3915use List::Util qw(min max);
3525 3916
3526use CFClient::OpenGL; 3917use CFPlus::OpenGL;
3527 3918
3528sub new { 3919sub new {
3529 my $class = shift; 3920 my $class = shift;
3530 3921
3531 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3556 $coord = $max - $size if $coord > $max - $size; 3947 $coord = $max - $size if $coord > $max - $size;
3557 3948
3558 int $coord + 0.5 3949 int $coord + 0.5
3559} 3950}
3560 3951
3561sub size_allocate { 3952sub invoke_size_allocate {
3562 my ($self, $w, $h) = @_; 3953 my ($self, $w, $h) = @_;
3563 3954
3564 for my $child ($self->children) { 3955 for my $child ($self->children) {
3565 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3566 3957
… …
3570 $X = _to_pixel $X, $W, $self->{w}; 3961 $X = _to_pixel $X, $W, $self->{w};
3571 $Y = _to_pixel $Y, $H, $self->{h}; 3962 $Y = _to_pixel $Y, $H, $self->{h};
3572 3963
3573 $child->configure ($X, $Y, $W, $H); 3964 $child->configure ($X, $Y, $W, $H);
3574 } 3965 }
3966
3967 1
3575} 3968}
3576 3969
3577sub coord2local { 3970sub coord2local {
3578 my ($self, $x, $y) = @_; 3971 my ($self, $x, $y) = @_;
3579 3972
… …
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706 4099
3707 $w = 0 if $w < 0; 4100 $w = 0 if $w < 0;
3708 $h = 0 if $h < 0; 4101 $h = 0 if $h < 0;
3709 4102
4103 $w = max $widget->{min_w}, $w;
4104 $h = max $widget->{min_h}, $h;
4105
4106# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108
4109 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4111
3710 $w = int $w + 0.5; 4112 $w = int $w + 0.5;
3711 $h = int $h + 0.5; 4113 $h = int $h + 0.5;
3712 4114
3713 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4115 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714 $widget->{old_w} = $widget->{w}; 4116 $widget->{old_w} = $widget->{w};
… …
3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4139 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3738 glMatrixMode GL_MODELVIEW; 4140 glMatrixMode GL_MODELVIEW;
3739 glLoadIdentity; 4141 glLoadIdentity;
3740 4142
3741 { 4143 {
3742 package CFClient::UI::Base; 4144 package CFPlus::UI::Base;
3743 4145
3744 ($draw_x, $draw_y, $draw_w, $draw_h) = 4146 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3745 (0, 0, $self->{w}, $self->{h}); 4147 (0, 0, $self->{w}, $self->{h});
3746 }
3747 4148
3748 $self->_draw; 4149 $self->_draw;
4150 }
3749} 4151}
3750 4152
3751############################################################################# 4153#############################################################################
3752 4154
3753package CFClient::UI; 4155package CFPlus::UI;
3754 4156
3755$ROOT = new CFClient::UI::Root; 4157$ROOT = new CFPlus::UI::Root;
3756$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4158$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3757 4159
37581 41601
3759 4161

Diff Legend

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