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.288 by root, Mon Jun 5 21:14:40 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;
… …
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
… …
526} 585}
527 586
528sub reconfigure { 587sub reconfigure {
529 my ($self) = @_; 588 my ($self) = @_;
530 589
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc; 590 $self->realloc;
536 $self->update; 591 $self->update;
537} 592}
538 593
539# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
… …
546 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
547 602
548 # update screen rectangle 603 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553 606
554 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
557 610
… …
580 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
583 glEnd; 636 glEnd;
584 glPopMatrix; 637 glPopMatrix;
585 #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;
586 } 639 }
587 640
588 $self->_draw; 641 $self->_draw;
589 glPopMatrix; 642 glPopMatrix;
590} 643}
… …
596} 649}
597 650
598sub DESTROY { 651sub DESTROY {
599 my ($self) = @_; 652 my ($self) = @_;
600 653
654 return if CFPlus::in_destruct;
655
601 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
602 #$self->deactivate; 657
658 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
603} 660}
604 661
605############################################################################# 662#############################################################################
606 663
607package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
608 665
609our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
610 667
611use strict; 668use strict;
612use CFClient::OpenGL; 669use CFPlus::OpenGL;
613 670
614sub new { 671sub new {
615 my $class = shift; 672 my $class = shift;
616 673
617 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
648 } 705 }
649} 706}
650 707
651############################################################################# 708#############################################################################
652 709
653package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
654 711
655our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
656 713
657sub new { 714sub new {
658 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
659 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
660} 717}
… …
667 724
668sub draw { } 725sub draw { }
669 726
670############################################################################# 727#############################################################################
671 728
672package CFClient::UI::Container; 729package CFPlus::UI::Container;
673 730
674our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
675 732
676sub new { 733sub new {
677 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
678 735
679 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
688 if $children; 745 if $children;
689 746
690 $self 747 $self
691} 748}
692 749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
756}
757
693sub add { 758sub add {
694 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
695 760
696 $_->set_parent ($self) 761 $_->set_parent ($self)
697 for @widgets; 762 for @widgets;
… …
757 $_->draw for @{$self->{children}}; 822 $_->draw for @{$self->{children}};
758} 823}
759 824
760############################################################################# 825#############################################################################
761 826
762package CFClient::UI::Bin; 827package CFPlus::UI::Bin;
763 828
764our @ISA = CFClient::UI::Container::; 829our @ISA = CFPlus::UI::Container::;
765 830
766sub new { 831sub new {
767 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
768 833
769 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 834 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
770 835
771 $class->SUPER::new (children => [$child], %arg) 836 $class->SUPER::new (children => [$child], %arg)
772} 837}
773 838
774sub add { 839sub add {
775 my ($self, $child) = @_; 840 my ($self, $child) = @_;
776 841
777 $self->{children} = []; 842 $self->SUPER::remove ($_) for @{ $self->{children} };
778
779 $self->SUPER::add ($child); 843 $self->SUPER::add ($child);
780} 844}
781 845
782sub remove { 846sub remove {
783 my ($self, $widget) = @_; 847 my ($self, $widget) = @_;
784 848
785 $self->SUPER::remove ($widget); 849 $self->SUPER::remove ($widget);
786 850
787 $self->{children} = [new CFClient::UI::Empty] 851 $self->{children} = [new CFPlus::UI::Empty]
788 unless @{$self->{children}}; 852 unless @{$self->{children}};
789} 853}
790 854
791sub child { $_[0]->{children}[0] } 855sub child { $_[0]->{children}[0] }
792 856
793sub size_request { 857sub size_request {
794 $_[0]{children}[0]->size_request 858 $_[0]{children}[0]->size_request
795} 859}
796 860
797sub size_allocate { 861sub invoke_size_allocate {
798 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
799 863
800 $self->{children}[0]->configure (0, 0, $w, $h); 864 $self->{children}[0]->configure (0, 0, $w, $h);
865
866 1
801} 867}
802 868
803############################################################################# 869#############################################################################
804 870
805# back-buffered drawing area 871# back-buffered drawing area
806 872
807package CFClient::UI::Window; 873package CFPlus::UI::Window;
808 874
809our @ISA = CFClient::UI::Bin::; 875our @ISA = CFPlus::UI::Bin::;
810 876
811use CFClient::OpenGL; 877use CFPlus::OpenGL;
812 878
813sub new { 879sub new {
814 my ($class, %arg) = @_; 880 my ($class, %arg) = @_;
815 881
816 my $self = $class->SUPER::new (%arg); 882 my $self = $class->SUPER::new (%arg);
… …
821 887
822 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 888 $ROOT->on_post_alloc ($self => sub { $self->render_child });
823 $self->SUPER::update; 889 $self->SUPER::update;
824} 890}
825 891
826sub size_allocate { 892sub invoke_size_allocate {
827 my ($self, $w, $h) = @_; 893 my ($self, $w, $h) = @_;
828 894
829 $self->SUPER::size_allocate ($w, $h);
830 $self->update; 895 $self->update;
896
897 $self->SUPER::invoke_size_allocate ($w, $h)
831} 898}
832 899
833sub _render { 900sub _render {
834 my ($self) = @_; 901 my ($self) = @_;
835 902
… …
837} 904}
838 905
839sub render_child { 906sub render_child {
840 my ($self) = @_; 907 my ($self) = @_;
841 908
842 $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 {
843 glClearColor 0, 0, 0, 0; 910 glClearColor 0, 0, 0, 0;
844 glClear GL_COLOR_BUFFER_BIT; 911 glClear GL_COLOR_BUFFER_BIT;
845 912
846 { 913 {
847 package CFClient::UI::Base; 914 package CFPlus::UI::Base;
848 915
849 ($draw_x, $draw_y, $draw_w, $draw_h) = 916 local ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h}); 917 (0, 0, $self->{w}, $self->{h});
918
919 $self->_render;
851 } 920 }
852
853 $self->_render;
854 }; 921 };
855} 922}
856 923
857sub _draw { 924sub _draw {
858 my ($self) = @_; 925 my ($self) = @_;
859
860 my ($w, $h) = @$self{qw(w h)};
861 926
862 my $tex = $self->{texture} 927 my $tex = $self->{texture}
863 or return; 928 or return;
864 929
865 glEnable GL_TEXTURE_2D; 930 glEnable GL_TEXTURE_2D;
866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
867 glColor 0, 0, 0, 1; 932 glColor 0, 0, 0, 1;
868 933
869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 934 $tex->draw_quad_alpha_premultiplied (0, 0);
870 935
871 glDisable GL_TEXTURE_2D; 936 glDisable GL_TEXTURE_2D;
872} 937}
873 938
874############################################################################# 939#############################################################################
875 940
876package CFClient::UI::ViewPort; 941package CFPlus::UI::ViewPort;
877 942
878our @ISA = CFClient::UI::Window::; 943our @ISA = CFPlus::UI::Window::;
879 944
880sub new { 945sub new {
881 my $class = shift; 946 my $class = shift;
882 947
883 $class->SUPER::new ( 948 $class->SUPER::new (
… …
896 $h = 10 if $self->{scroll_y}; 961 $h = 10 if $self->{scroll_y};
897 962
898 ($w, $h) 963 ($w, $h)
899} 964}
900 965
901sub size_allocate { 966sub invoke_size_allocate {
902 my ($self, $w, $h) = @_; 967 my ($self, $w, $h) = @_;
903 968
904 my $child = $self->child; 969 my $child = $self->child;
905 970
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 971 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 972 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908 973
909 $self->child->configure (0, 0, $w, $h); 974 $self->child->configure (0, 0, $w, $h);
910 $self->update; 975 $self->update;
976
977 1
911} 978}
912 979
913sub set_offset { 980sub set_offset {
914 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
915 982
… …
941 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
942 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
943 ) { 1010 ) {
944 $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})
945 } else { 1012 } else {
946 $self->CFClient::UI::Base::find_widget ($x, $y) 1013 $self->CFPlus::UI::Base::find_widget ($x, $y)
947 } 1014 }
948} 1015}
949 1016
950sub _render { 1017sub _render {
951 my ($self) = @_; 1018 my ($self) = @_;
952 1019
953 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};
954 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};
955 1022
956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1023 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
957 1024
958 $self->SUPER::_render; 1025 $self->SUPER::_render;
959} 1026}
960 1027
961############################################################################# 1028#############################################################################
962 1029
963package CFClient::UI::ScrolledWindow; 1030package CFPlus::UI::ScrolledWindow;
964 1031
965our @ISA = CFClient::UI::HBox::; 1032our @ISA = CFPlus::UI::HBox::;
966 1033
967sub new { 1034sub new {
968 my ($class, %arg) = @_; 1035 my ($class, %arg) = @_;
969 1036
970 my $child = delete $arg{child}; 1037 my $child = delete $arg{child};
971 1038
972 my $self; 1039 my $self;
973 1040
974 my $slider = new CFClient::UI::Slider 1041 my $slider = new CFPlus::UI::Slider
975 vertical => 1, 1042 vertical => 1,
976 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
977 on_changed => sub { 1044 on_changed => sub {
978 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vp}->set_offset (0, $_[1]);
979 }, 1046 },
980 ; 1047 ;
981 1048
982 $self = $class->SUPER::new ( 1049 $self = $class->SUPER::new (
983 vp => (new CFClient::UI::ViewPort expand => 1), 1050 vp => (new CFPlus::UI::ViewPort expand => 1),
1051 can_events => 1,
984 slider => $slider, 1052 slider => $slider,
985 %arg, 1053 %arg,
986 ); 1054 );
987 1055
988 $self->SUPER::add ($self->{vp}, $self->{slider}); 1056 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child; 1057 $self->add ($child) if $child;
990 1058
991 $self 1059 $self
992} 1060}
993 1061
1062#TODO# update range on size_allocate depending on child
1063
994sub add { 1064sub add {
995 my ($self, $widget) = @_; 1065 my ($self, $widget) = @_;
996 1066
997 $self->{vp}->add ($self->{child} = $widget); 1067 $self->{vp}->add ($self->{child} = $widget);
998} 1068}
999 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
1000sub update { 1086sub update {
1001 my ($self) = @_; 1087 my ($self) = @_;
1002 1088
1003 $self->SUPER::update; 1089 $self->SUPER::update;
1004 1090
1005 # todo: overwrite size_allocate of child 1091 $self->update_slider;
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008} 1092}
1009 1093
1010sub size_allocate { 1094sub invoke_size_allocate {
1011 my ($self, $w, $h) = @_; 1095 my ($self, $w, $h) = @_;
1012 1096
1097 $self->update_slider;
1098
1013 $self->SUPER::size_allocate ($w, $h); 1099 $self->SUPER::invoke_size_allocate ($w, $h)
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1017} 1100}
1018
1019#TODO# update range on size_allocate depending on child
1020# update viewport offset on scroll
1021 1101
1022############################################################################# 1102#############################################################################
1023 1103
1024package CFClient::UI::Frame; 1104package CFPlus::UI::Frame;
1025 1105
1026our @ISA = CFClient::UI::Bin::; 1106our @ISA = CFPlus::UI::Bin::;
1027 1107
1028use CFClient::OpenGL; 1108use CFPlus::OpenGL;
1029 1109
1030sub new { 1110sub new {
1031 my $class = shift; 1111 my $class = shift;
1032 1112
1033 $class->SUPER::new ( 1113 $class->SUPER::new (
… …
1059 $self->SUPER::_draw; 1139 $self->SUPER::_draw;
1060} 1140}
1061 1141
1062############################################################################# 1142#############################################################################
1063 1143
1064package CFClient::UI::FancyFrame; 1144package CFPlus::UI::FancyFrame;
1065 1145
1066our @ISA = CFClient::UI::Bin::; 1146our @ISA = CFPlus::UI::Bin::;
1067 1147
1068use CFClient::OpenGL; 1148use CFPlus::OpenGL;
1069
1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1077 1149
1078sub new { 1150sub new {
1079 my ($class, %arg) = @_; 1151 my ($class, %arg) = @_;
1080 1152
1081 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) = @_;
1082 1260
1083 my $self = $class->SUPER::new ( 1261 my $self = $class->SUPER::new (
1084 bg => [1, 1, 1, 1], 1262 bg => [1, 1, 1, 1],
1085 border_bg => [1, 1, 1, 1], 1263 border_bg => [1, 1, 1, 1],
1086 border => 0.6, 1264 border => 0.6,
1087 can_events => 1, 1265 can_events => 1,
1088 min_w => 16, 1266 min_w => 64,
1089 min_h => 16, 1267 min_h => 32,
1090 %arg, 1268 %arg,
1091 ); 1269 );
1092 1270
1093 $self->{title} = new CFClient::UI::Label 1271 $self->{title_widget} = new CFPlus::UI::Label
1094 align => 0, 1272 align => 0,
1095 valign => 1, 1273 valign => 1,
1096 text => $title, 1274 text => $self->{title},
1097 fontsize => $self->{border} 1275 fontsize => $self->{border},
1098 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 }
1099 1286
1100 $self 1287 $self
1101} 1288}
1102 1289
1103sub add { 1290sub add {
1104 my ($self, @widgets) = @_; 1291 my ($self, @widgets) = @_;
1105 1292
1106 $self->SUPER::add (@widgets); 1293 $self->SUPER::add (@widgets);
1294 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1295 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1108} 1296}
1109 1297
1110sub border { 1298sub border {
1111 int $_[0]{border} * $::FONTSIZE 1299 int $_[0]{border} * $::FONTSIZE
1112} 1300}
1113 1301
1114sub size_request { 1302sub size_request {
1115 my ($self) = @_; 1303 my ($self) = @_;
1116 1304
1117 $self->{title}->size_request 1305 $self->{title_widget}->size_request
1118 if $self->{title}; 1306 if $self->{title_widget};
1307
1308 $self->{close_button}->size_request
1309 if $self->{close_button};
1119 1310
1120 my ($w, $h) = $self->SUPER::size_request; 1311 my ($w, $h) = $self->SUPER::size_request;
1121 1312
1122 ( 1313 (
1123 $w + $self->border * 2, 1314 $w + $self->border * 2,
1124 $h + $self->border * 2, 1315 $h + $self->border * 2,
1125 ) 1316 )
1126} 1317}
1127 1318
1128sub size_allocate { 1319sub invoke_size_allocate {
1129 my ($self, $w, $h) = @_; 1320 my ($self, $w, $h) = @_;
1130 1321
1131 if ($self->{title}) { 1322 if ($self->{title_widget}) {
1132 $self->{title}{w} = $w; 1323 $self->{title_widget}{w} = $w;
1133 $self->{title}{h} = $h; 1324 $self->{title_widget}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h); 1325 $self->{title_widget}->invoke_size_allocate ($w, $h);
1135 } 1326 }
1136 1327
1137 my $border = $self->border; 1328 my $border = $self->border;
1138 1329
1139 $h -= List::Util::max 0, $border * 2; 1330 $h -= List::Util::max 0, $border * 2;
1140 $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;
1141 1345
1142 $self->child->configure ($border, $border, $w, $h); 1346 1
1143} 1347}
1144 1348
1145sub button_down { 1349sub invoke_button_down {
1146 my ($self, $ev, $x, $y) = @_; 1350 my ($self, $ev, $x, $y) = @_;
1147 1351
1148 my ($w, $h) = @$self{qw(w h)}; 1352 my ($w, $h) = @$self{qw(w h)};
1149 my $border = $self->border; 1353 my $border = $self->border;
1150 1354
… …
1181 1385
1182 ($x, $y) = ($ev->{x}, $ev->{y}); 1386 ($x, $y) = ($ev->{x}, $ev->{y});
1183 1387
1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1388 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1185 # HACK: the next line is required to enforce placement 1389 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1390 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1187 }; 1391 };
1188 } else { 1392 } else {
1189 return 0; 1393 return 0;
1190 } 1394 }
1191 1395
1192 1 1396 1
1193} 1397}
1194 1398
1195sub button_up { 1399sub invoke_button_up {
1196 my ($self, $ev, $x, $y) = @_; 1400 my ($self, $ev, $x, $y) = @_;
1197 1401
1198 !!delete $self->{motion} 1402 ! ! delete $self->{motion}
1199} 1403}
1200 1404
1201sub mouse_motion { 1405sub invoke_mouse_motion {
1202 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
1203 1407
1204 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1408 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205 1409
1206 !!$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
1207} 1419}
1208 1420
1209sub _draw { 1421sub _draw {
1210 my ($self) = @_; 1422 my ($self) = @_;
1211 1423
… …
1237 1449
1238 glDisable GL_TEXTURE_2D; 1450 glDisable GL_TEXTURE_2D;
1239 1451
1240 $child->draw; 1452 $child->draw;
1241 1453
1242 if ($self->{title}) { 1454 if ($self->{title_widget}) {
1243 glTranslate 0, $border - $self->{h}; 1455 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw; 1456 $self->{title_widget}->_draw;
1457
1458 glTranslate 0, - ($border - $self->{h});
1245 } 1459 }
1460
1461 $self->{close_button}->draw
1462 if $self->{close_button};
1246} 1463}
1247 1464
1248############################################################################# 1465#############################################################################
1249 1466
1250package CFClient::UI::Table; 1467package CFPlus::UI::Table;
1251 1468
1252our @ISA = CFClient::UI::Base::; 1469our @ISA = CFPlus::UI::Base::;
1253 1470
1254use List::Util qw(max sum); 1471use List::Util qw(max sum);
1255 1472
1256use CFClient::OpenGL; 1473use CFPlus::OpenGL;
1257 1474
1258sub new { 1475sub new {
1259 my $class = shift; 1476 my $class = shift;
1260 1477
1261 $class->SUPER::new ( 1478 $class->SUPER::new (
… …
1267sub children { 1484sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1269} 1486}
1270 1487
1271sub add { 1488sub add {
1272 my ($self, $x, $y, $child) = @_; 1489 my ($self) = shift;
1273 1490
1491 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, ();
1274 $child->set_parent ($self); 1493 $child->set_parent ($self);
1275 $self->{children}[$y][$x] = $child; 1494 $self->{children}[$y][$x] = $child;
1495 }
1276 1496
1497 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1;
1277 $self->realloc; 1499 $self->realloc;
1500}
1501
1502sub remove {
1503 my ($self, $child) = @_;
1504
1505 # TODO: not yet implemented
1278} 1506}
1279 1507
1280# 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?
1281sub clear { 1509sub clear {
1282 my ($self) = @_; 1510 my ($self) = @_;
… …
1323 (sum @$ws), 1551 (sum @$ws),
1324 (sum @$hs), 1552 (sum @$hs),
1325 ) 1553 )
1326} 1554}
1327 1555
1328sub size_allocate { 1556sub invoke_size_allocate {
1329 my ($self, $w, $h) = @_; 1557 my ($self, $w, $h) = @_;
1330 1558
1331 my ($ws, $hs) = $self->get_wh; 1559 my ($ws, $hs) = $self->get_wh;
1332 1560
1333 my $req_w = (sum @$ws) || 1; 1561 my $req_w = (sum @$ws) || 1;
… …
1340 1568
1341 # linearly scale sizes 1569 # linearly scale sizes
1342 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1343 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1344 1572
1345 CFClient::UI::harmonize $ws; 1573 CFPlus::UI::harmonize $ws;
1346 CFClient::UI::harmonize $hs; 1574 CFPlus::UI::harmonize $hs;
1347 1575
1348 my $y; 1576 my $y;
1349 1577
1350 for my $r (0 .. $#{$self->{children}}) { 1578 for my $r (0 .. $#{$self->{children}}) {
1351 my $row = $self->{children}[$r] 1579 my $row = $self->{children}[$r]
… …
1365 } 1593 }
1366 1594
1367 $y += $row_h; 1595 $y += $row_h;
1368 } 1596 }
1369 1597
1598 1
1370} 1599}
1371 1600
1372sub find_widget { 1601sub find_widget {
1373 my ($self, $x, $y) = @_; 1602 my ($self, $x, $y) = @_;
1374 1603
… …
1393 } 1622 }
1394} 1623}
1395 1624
1396############################################################################# 1625#############################################################################
1397 1626
1398package CFClient::UI::Box; 1627package CFPlus::UI::Box;
1399 1628
1400our @ISA = CFClient::UI::Container::; 1629our @ISA = CFPlus::UI::Container::;
1401 1630
1402sub size_request { 1631sub size_request {
1403 my ($self) = @_; 1632 my ($self) = @_;
1404 1633
1405 $self->{vertical} 1634 $self->{vertical}
… …
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1640 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1641 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 ) 1642 )
1414} 1643}
1415 1644
1416sub size_allocate { 1645sub invoke_size_allocate {
1417 my ($self, $w, $h) = @_; 1646 my ($self, $w, $h) = @_;
1418 1647
1419 my $space = $self->{vertical} ? $h : $w; 1648 my $space = $self->{vertical} ? $h : $w;
1420 my $children = $self->{children}; 1649 my @children = $self->visible_children;
1421 1650
1422 my @req; 1651 my @req;
1423 1652
1424 if ($self->{homogeneous}) { 1653 if ($self->{homogeneous}) {
1425 @req = ($space / (@$children || 1)) x @$children; 1654 @req = ($space / (@children || 1)) x @children;
1426 } else { 1655 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1656 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1428 my $req = List::Util::sum @req; 1657 my $req = List::Util::sum @req;
1429 1658
1430 if ($req > $space) { 1659 if ($req > $space) {
1431 # ah well, not enough space 1660 # ah well, not enough space
1432 $_ *= $space / $req for @req; 1661 $_ *= $space / $req for @req;
1433 } else { 1662 } else {
1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1663 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1435 1664
1436 $space = ($space - $req) / $expand; # remaining space to give away 1665 $space = ($space - $req) / $expand; # remaining space to give away
1437 1666
1438 $req[$_] += $space * $children->[$_]{expand} 1667 $req[$_] += $space * $children[$_]{expand}
1439 for 0 .. $#$children; 1668 for 0 .. $#children;
1440 } 1669 }
1441 } 1670 }
1442 1671
1443 CFClient::UI::harmonize \@req; 1672 CFPlus::UI::harmonize \@req;
1444 1673
1445 my $pos = 0; 1674 my $pos = 0;
1446 for (0 .. $#$children) { 1675 for (0 .. $#children) {
1447 my $alloc = $req[$_]; 1676 my $alloc = $req[$_];
1448 $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));
1449 1678
1450 $pos += $alloc; 1679 $pos += $alloc;
1451 } 1680 }
1452 1681
1453 1 1682 1
1454} 1683}
1455 1684
1456############################################################################# 1685#############################################################################
1457 1686
1458package CFClient::UI::HBox; 1687package CFPlus::UI::HBox;
1459 1688
1460our @ISA = CFClient::UI::Box::; 1689our @ISA = CFPlus::UI::Box::;
1461 1690
1462sub new { 1691sub new {
1463 my $class = shift; 1692 my $class = shift;
1464 1693
1465 $class->SUPER::new ( 1694 $class->SUPER::new (
… …
1468 ) 1697 )
1469} 1698}
1470 1699
1471############################################################################# 1700#############################################################################
1472 1701
1473package CFClient::UI::VBox; 1702package CFPlus::UI::VBox;
1474 1703
1475our @ISA = CFClient::UI::Box::; 1704our @ISA = CFPlus::UI::Box::;
1476 1705
1477sub new { 1706sub new {
1478 my $class = shift; 1707 my $class = shift;
1479 1708
1480 $class->SUPER::new ( 1709 $class->SUPER::new (
… …
1483 ) 1712 )
1484} 1713}
1485 1714
1486############################################################################# 1715#############################################################################
1487 1716
1488package CFClient::UI::Label; 1717package CFPlus::UI::Label;
1489 1718
1490our @ISA = CFClient::UI::DrawBG::; 1719our @ISA = CFPlus::UI::DrawBG::;
1491 1720
1492use CFClient::OpenGL; 1721use CFPlus::OpenGL;
1493 1722
1494sub new { 1723sub new {
1495 my ($class, %arg) = @_; 1724 my ($class, %arg) = @_;
1496 1725
1497 my $self = $class->SUPER::new ( 1726 my $self = $class->SUPER::new (
… …
1500 #active_bg => none 1729 #active_bg => none
1501 #font => default_font 1730 #font => default_font
1502 #text => initial text 1731 #text => initial text
1503 #markup => initial narkup 1732 #markup => initial narkup
1504 #max_w => maximum pixel width 1733 #max_w => maximum pixel width
1734 #style => 0, # render flags
1505 ellipsise => 3, # end 1735 ellipsise => 3, # end
1506 layout => (new CFClient::Layout), 1736 layout => (new CFPlus::Layout),
1507 fontsize => 1, 1737 fontsize => 1,
1508 align => -1, 1738 align => -1,
1509 valign => -1, 1739 valign => -1,
1510 padding_x => 2, 1740 padding_x => 2,
1511 padding_y => 2, 1741 padding_y => 2,
1512 can_events => 0, 1742 can_events => 0,
1513 %arg 1743 %arg
1514 ); 1744 );
1515 1745
1516 if (exists $self->{template}) { 1746 if (exists $self->{template}) {
1517 my $layout = new CFClient::Layout; 1747 my $layout = new CFPlus::Layout;
1518 $layout->set_text (delete $self->{template}); 1748 $layout->set_text (delete $self->{template});
1519 $self->{template} = $layout; 1749 $self->{template} = $layout;
1520 } 1750 }
1521 1751
1522 if (exists $self->{markup}) { 1752 if (exists $self->{markup}) {
… …
1526 } 1756 }
1527 1757
1528 $self 1758 $self
1529} 1759}
1530 1760
1531sub escape($) {
1532 local $_ = $_[0];
1533
1534 s/&/&amp;/g;
1535 s/>/&gt;/g;
1536 s/</&lt;/g;
1537
1538 $_
1539}
1540
1541sub update { 1761sub update {
1542 my ($self) = @_; 1762 my ($self) = @_;
1543 1763
1544 delete $self->{texture}; 1764 delete $self->{texture};
1545 $self->SUPER::update; 1765 $self->SUPER::update;
… …
1556 my ($self, $text) = @_; 1776 my ($self, $text) = @_;
1557 1777
1558 return if $self->{text} eq "T$text"; 1778 return if $self->{text} eq "T$text";
1559 $self->{text} = "T$text"; 1779 $self->{text} = "T$text";
1560 1780
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1781 $self->{layout}->set_text ($text);
1563 1782
1564 delete $self->{req_h}; 1783 delete $self->{size_req};
1565 $self->realloc; 1784 $self->realloc;
1566 $self->update; 1785 $self->update;
1567} 1786}
1568 1787
1569sub set_markup { 1788sub set_markup {
… …
1572 return if $self->{text} eq "M$markup"; 1791 return if $self->{text} eq "M$markup";
1573 $self->{text} = "M$markup"; 1792 $self->{text} = "M$markup";
1574 1793
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1794 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1795
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1796 $self->{layout}->set_markup ($markup);
1579 1797
1580 delete $self->{req_h}; 1798 delete $self->{size_req};
1581 $self->realloc; 1799 $self->realloc;
1582 $self->update; 1800 $self->update;
1583} 1801}
1584 1802
1585sub size_request { 1803sub size_request {
1586 my ($self) = @_; 1804 my ($self) = @_;
1587 1805
1588 if (exists $self->{req_h}) { 1806 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1807 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1808 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1809 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1810 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1811 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1812
1597 my ($w, $h) = $self->{layout}->size; 1813 my ($w, $h) = $self->{layout}->size;
1598 1814
1599 if (exists $self->{template}) { 1815 if (exists $self->{template}) {
1600 $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);
1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1818 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1602 1819
1603 my ($w2, $h2) = $self->{template}->size; 1820 my ($w2, $h2) = $self->{template}->size;
1604 1821
1605 $w = List::Util::max $w, $w2; 1822 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1823 $h = List::Util::max $h, $h2;
1607 } 1824 }
1608 1825
1609 ($w, $h) 1826 [$w, $h]
1610 } 1827 };
1611}
1612 1828
1829 @{ $self->{size_req} }
1830}
1831
1832sub baseline_shift {
1833 $_[0]{layout}->descent
1834}
1835
1613sub size_allocate { 1836sub invoke_size_allocate {
1614 my ($self, $w, $h) = @_; 1837 my ($self, $w, $h) = @_;
1615 1838
1616 delete $self->{ox}; 1839 delete $self->{ox};
1617 1840
1618 delete $self->{texture} 1841 delete $self->{texture}
1619 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
1620} 1845}
1621 1846
1622sub set_fontsize { 1847sub set_fontsize {
1623 my ($self, $fontsize) = @_; 1848 my ($self, $fontsize) = @_;
1624 1849
1625 $self->{fontsize} = $fontsize; 1850 $self->{fontsize} = $fontsize;
1851 delete $self->{size_req};
1626 delete $self->{texture}; 1852 delete $self->{texture};
1627 1853
1628 $self->realloc; 1854 $self->realloc;
1629} 1855}
1630 1856
1857sub reconfigure {
1858 my ($self) = @_;
1859
1860 delete $self->{size_req};
1861 delete $self->{texture};
1862
1863 $self->SUPER::reconfigure;
1864}
1865
1631sub _draw { 1866sub _draw {
1632 my ($self) = @_; 1867 my ($self) = @_;
1633 1868
1634 $self->SUPER::_draw; # draw background, if applicable 1869 $self->SUPER::_draw; # draw background, if applicable
1635 1870
1636 my $tex = $self->{texture} ||= do { 1871 my $size = $self->{texture} ||= do {
1637 $self->{layout}->set_foreground (@{$self->{fg}}); 1872 $self->{layout}->set_foreground (@{$self->{fg}});
1638 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1873 $self->{layout}->set_font ($self->{font}) if $self->{font};
1639 $self->{layout}->set_width ($self->{w}); 1874 $self->{layout}->set_width ($self->{w});
1640 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1875 $self->{layout}->set_ellipsise ($self->{ellipsise});
1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1876 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1877 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1643 1878
1644 new_from_layout CFClient::Texture $self->{layout} 1879 [$self->{layout}->size]
1645 }; 1880 };
1646 1881
1647 unless (exists $self->{ox}) { 1882 unless (exists $self->{ox}) {
1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1883 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1884 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1650 : ($self->{w} - $tex->{w}) * 0.5); 1885 : ($self->{w} - $size->[0]) * 0.5);
1651 1886
1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1887 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1888 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1654 : ($self->{h} - $tex->{h}) * 0.5); 1889 : ($self->{h} - $size->[1]) * 0.5);
1655 }; 1890 };
1656 1891
1657 glEnable GL_TEXTURE_2D; 1892 my $w = List::Util::min $self->{w} + 4, $size->[0];
1893 my $h = List::Util::min $self->{h} + 2, $size->[1];
1658 1894
1659 if ($tex->{format} == GL_ALPHA) { 1895 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1661 glColor @{$self->{fg}};
1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1666 }
1667
1668 glDisable GL_TEXTURE_2D;
1669} 1896}
1670 1897
1671############################################################################# 1898#############################################################################
1672 1899
1673package CFClient::UI::EntryBase; 1900package CFPlus::UI::EntryBase;
1674 1901
1675our @ISA = CFClient::UI::Label::; 1902our @ISA = CFPlus::UI::Label::;
1676 1903
1677use CFClient::OpenGL; 1904use CFPlus::OpenGL;
1678 1905
1679sub new { 1906sub new {
1680 my $class = shift; 1907 my $class = shift;
1681 1908
1682 $class->SUPER::new ( 1909 $class->SUPER::new (
… …
1687 can_hover => 1, 1914 can_hover => 1,
1688 can_focus => 1, 1915 can_focus => 1,
1689 valign => 0, 1916 valign => 0,
1690 can_events => 1, 1917 can_events => 1,
1691 #text => ... 1918 #text => ...
1919 #hidden => "*",
1692 @_ 1920 @_
1693 ) 1921 )
1694} 1922}
1695 1923
1696sub _set_text { 1924sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1932 $self->{text} = $text;
1705 1933
1706 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1936 delete $self->{size_req};
1709 1937
1710 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1711 1939
1712 $self->realloc; 1940 $self->realloc;
1713 $self->update; 1941 $self->update;
1714} 1942}
1715 1943
… …
1730 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1731 1959
1732 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1733} 1961}
1734 1962
1735sub key_down { 1963sub invoke_key_down {
1736 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1737 1965
1738 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1739 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1740 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1743 1971
1744 if ($uni == 8) { 1972 if ($uni == 8) {
1745 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1746 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1747 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1748 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1749 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1750 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1751 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1752 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1753 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1754 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1755 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1756 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1757 $self->_emit ('escape'); 1988 $self->emit ('escape');
1758 } elsif ($uni) { 1989 } elsif ($uni) {
1759 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else { 1991 } else {
1761 return 0; 1992 return 0;
1762 } 1993 }
… …
1766 $self->realloc; 1997 $self->realloc;
1767 1998
1768 1 1999 1
1769} 2000}
1770 2001
1771sub focus_in { 2002sub invoke_focus_in {
1772 my ($self) = @_; 2003 my ($self) = @_;
1773 2004
1774 $self->{last_activity} = $::NOW; 2005 $self->{last_activity} = $::NOW;
1775 2006
1776 $self->SUPER::focus_in; 2007 $self->SUPER::invoke_focus_in
1777} 2008}
1778 2009
1779sub button_down { 2010sub invoke_button_down {
1780 my ($self, $ev, $x, $y) = @_; 2011 my ($self, $ev, $x, $y) = @_;
1781 2012
1782 $self->SUPER::button_down ($ev, $x, $y); 2013 $self->SUPER::invoke_button_down ($ev, $x, $y);
1783 2014
1784 my $idx = $self->{layout}->xy_to_index ($x, $y); 2015 my $idx = $self->{layout}->xy_to_index ($x, $y);
1785 2016
1786 # byte-index to char-index 2017 # byte-index to char-index
1787 my $text = $self->{text}; 2018 my $text = $self->{text};
1788 utf8::encode $text; 2019 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1789 $self->{cursor} = length substr $text, 0, $idx; 2020 $self->{cursor} = length $text;
1790 2021
1791 $self->_set_text ($self->{text}); 2022 $self->_set_text ($self->{text});
1792 $self->update; 2023 $self->update;
1793 2024
1794 1 2025 1
1795} 2026}
1796 2027
1797sub mouse_motion { 2028sub invoke_mouse_motion {
1798 my ($self, $ev, $x, $y) = @_; 2029 my ($self, $ev, $x, $y) = @_;
1799# 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#
1800 2031
1801 0 2032 1
1802} 2033}
1803 2034
1804sub _draw { 2035sub _draw {
1805 my ($self) = @_; 2036 my ($self) = @_;
1806 2037
… …
1833 utf8::encode $text; 2064 utf8::encode $text;
1834 2065
1835 @$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)
1836 } 2067 }
1837 2068
1838 glColor @{$self->{fg}};
1839 glBegin GL_LINES; 2069 glBegin GL_LINES;
1840 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};
1841 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};
1842 glEnd; 2072 glEnd;
1843 } 2073 }
1844} 2074}
1845 2075
1846package CFClient::UI::Entry; 2076package CFPlus::UI::Entry;
1847 2077
1848our @ISA = CFClient::UI::EntryBase::; 2078our @ISA = CFPlus::UI::EntryBase::;
1849 2079
1850use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1851 2081
1852sub key_down { 2082sub invoke_key_down {
1853 my ($self, $ev) = @_; 2083 my ($self, $ev) = @_;
1854 2084
1855 my $sym = $ev->{sym}; 2085 my $sym = $ev->{sym};
1856 2086
1857 if ($sym == 13) { 2087 if ($sym == 13) {
1858 unshift @{$self->{history}}, 2088 unshift @{$self->{history}},
1859 my $txt = $self->get_text; 2089 my $txt = $self->get_text;
2090
1860 $self->{history_pointer} = -1; 2091 $self->{history_pointer} = -1;
1861 $self->{history_saveback} = ''; 2092 $self->{history_saveback} = '';
1862 $self->_emit (activate => $txt); 2093 $self->emit (activate => $txt);
1863 $self->update; 2094 $self->update;
1864 2095
1865 } elsif ($sym == CFClient::SDLK_UP) { 2096 } elsif ($sym == CFPlus::SDLK_UP) {
1866 if ($self->{history_pointer} < 0) { 2097 if ($self->{history_pointer} < 0) {
1867 $self->{history_saveback} = $self->get_text; 2098 $self->{history_saveback} = $self->get_text;
1868 } 2099 }
1869 if (@{$self->{history} || []} > 0) { 2100 if (@{$self->{history} || []} > 0) {
1870 $self->{history_pointer}++; 2101 $self->{history_pointer}++;
… …
1872 $self->{history_pointer} = @{$self->{history} || []} - 1; 2103 $self->{history_pointer} = @{$self->{history} || []} - 1;
1873 } 2104 }
1874 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2105 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1875 } 2106 }
1876 2107
1877 } elsif ($sym == CFClient::SDLK_DOWN) { 2108 } elsif ($sym == CFPlus::SDLK_DOWN) {
1878 $self->{history_pointer}--; 2109 $self->{history_pointer}--;
1879 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2110 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1880 2111
1881 if ($self->{history_pointer} >= 0) { 2112 if ($self->{history_pointer} >= 0) {
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2113 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } else { 2114 } else {
1884 $self->set_text ($self->{history_saveback}); 2115 $self->set_text ($self->{history_saveback});
1885 } 2116 }
1886 2117
1887 } else { 2118 } else {
1888 return $self->SUPER::key_down ($ev) 2119 return $self->SUPER::invoke_key_down ($ev)
1889 } 2120 }
1890 2121
1891 1 2122 1
1892} 2123}
1893 2124
1894############################################################################# 2125#############################################################################
1895 2126
1896package CFClient::UI::Button; 2127package CFPlus::UI::Button;
1897 2128
1898our @ISA = CFClient::UI::Label::; 2129our @ISA = CFPlus::UI::Label::;
1899 2130
1900use CFClient::OpenGL; 2131use CFPlus::OpenGL;
1901 2132
1902my @tex = 2133my @tex =
1903 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1904 qw(b1_button_active.png); 2135 qw(b1_button_active.png);
1905 2136
1906sub new { 2137sub new {
1907 my $class = shift; 2138 my $class = shift;
1908 2139
… …
1917 can_events => 1, 2148 can_events => 1,
1918 @_ 2149 @_
1919 ) 2150 )
1920} 2151}
1921 2152
1922sub activate { }
1923
1924sub button_up { 2153sub invoke_button_up {
1925 my ($self, $ev, $x, $y) = @_; 2154 my ($self, $ev, $x, $y) = @_;
1926 2155
1927 $self->emit ("activate") 2156 $self->emit ("activate")
1928 if $x >= 0 && $x < $self->{w} 2157 if $x >= 0 && $x < $self->{w}
1929 && $y >= 0 && $y < $self->{h}; 2158 && $y >= 0 && $y < $self->{h};
… …
1947 $self->SUPER::_draw; 2176 $self->SUPER::_draw;
1948} 2177}
1949 2178
1950############################################################################# 2179#############################################################################
1951 2180
1952package CFClient::UI::CheckBox; 2181package CFPlus::UI::CheckBox;
1953 2182
1954our @ISA = CFClient::UI::DrawBG::; 2183our @ISA = CFPlus::UI::DrawBG::;
1955 2184
1956my @tex = 2185my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1958 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2187 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1959 2188
1960use CFClient::OpenGL; 2189use CFPlus::OpenGL;
1961 2190
1962sub new { 2191sub new {
1963 my $class = shift; 2192 my $class = shift;
1964 2193
1965 $class->SUPER::new ( 2194 $class->SUPER::new (
… …
1979 my ($self) = @_; 2208 my ($self) = @_;
1980 2209
1981 (6) x 2 2210 (6) x 2
1982} 2211}
1983 2212
2213sub toggle {
2214 my ($self) = @_;
2215
2216 $self->{state} = !$self->{state};
2217 $self->emit (changed => $self->{state});
2218 $self->update;
2219}
2220
1984sub button_down { 2221sub invoke_button_down {
1985 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1986 2223
1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2224 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2225 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1989 $self->{state} = !$self->{state}; 2226 $self->toggle;
1990 $self->_emit (changed => $self->{state});
1991 } else { 2227 } else {
1992 return 0 2228 return 0
1993 } 2229 }
1994 2230
1995 1 2231 1
… …
2015 glDisable GL_TEXTURE_2D; 2251 glDisable GL_TEXTURE_2D;
2016} 2252}
2017 2253
2018############################################################################# 2254#############################################################################
2019 2255
2020package CFClient::UI::Image; 2256package CFPlus::UI::Image;
2021 2257
2022our @ISA = CFClient::UI::Base::; 2258our @ISA = CFPlus::UI::Base::;
2023 2259
2024use CFClient::OpenGL; 2260use CFPlus::OpenGL;
2025use Carp qw/confess/;
2026 2261
2027our %loaded_images; 2262our %texture_cache;
2028 2263
2029sub new { 2264sub new {
2030 my $class = shift; 2265 my $class = shift;
2031 2266
2032 my $self = $class->SUPER::new (can_events => 0, @_); 2267 my $self = $class->SUPER::new (
2268 can_events => 0,
2269 @_,
2270 );
2033 2271
2034 $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";
2035 2274
2036 $loaded_images{$self->{image}} ||= 2275 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2037 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;
2038 2277
2039 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2278 Scalar::Util::weaken $texture_cache{$self->{path}};
2040 2279
2041 Scalar::Util::weaken $loaded_images{$self->{image}}; 2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2042
2043 $self->{aspect} = $tex->{w} / $tex->{h};
2044 2281
2045 $self 2282 $self
2046} 2283}
2047 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
2048sub size_request { 2300sub size_request {
2049 my ($self) = @_; 2301 my ($self) = @_;
2050 2302
2051 ($self->{tex}->{w}, $self->{tex}->{h}) 2303 ($self->{tex}{w}, $self->{tex}{h})
2052} 2304}
2053 2305
2054sub _draw { 2306sub _draw {
2055 my ($self) = @_; 2307 my ($self) = @_;
2056 2308
… …
2066 } 2318 }
2067 2319
2068 glEnable GL_TEXTURE_2D; 2320 glEnable GL_TEXTURE_2D;
2069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2070 2322
2071 $tex->draw_quad_alpha (0, 0, $w, $h); 2323 $tex->draw_quad (0, 0, $w, $h);
2072 2324
2073 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2074} 2326}
2075 2327
2076############################################################################# 2328#############################################################################
2077 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
2078package CFClient::UI::VGauge; 2366package CFPlus::UI::VGauge;
2079 2367
2080our @ISA = CFClient::UI::Base::; 2368our @ISA = CFPlus::UI::Base::;
2081 2369
2082use List::Util qw(min max); 2370use List::Util qw(min max);
2083 2371
2084use CFClient::OpenGL; 2372use CFPlus::OpenGL;
2085 2373
2086my %tex = ( 2374my %tex = (
2087 food => [ 2375 food => [
2088 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2376 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2089 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2377 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2090 ], 2378 ],
2091 grace => [ 2379 grace => [
2092 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2093 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/
2094 ], 2382 ],
2095 hp => [ 2383 hp => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2384 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2385 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2098 ], 2386 ],
2099 mana => [ 2387 mana => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2388 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101 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/
2102 ], 2390 ],
2103); 2391);
2104 2392
2105# eg. VGauge->new (gauge => 'food'), default gauge: food 2393# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2165 my $ycut1 = max 0, min 1, $ycut; 2453 my $ycut1 = max 0, min 1, $ycut;
2166 my $ycut2 = max 0, min 1, $ycut - 1; 2454 my $ycut2 = max 0, min 1, $ycut - 1;
2167 2455
2168 my $h1 = $self->{h} * (1 - $ycut1); 2456 my $h1 = $self->{h} * (1 - $ycut1);
2169 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);
2170 2461
2171 glEnable GL_BLEND; 2462 glEnable GL_BLEND;
2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2463 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2464 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2174 glEnable GL_TEXTURE_2D; 2465 glEnable GL_TEXTURE_2D;
… …
2193 2484
2194 if ($t3) { 2485 if ($t3) {
2195 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2486 glBindTexture GL_TEXTURE_2D, $t3->{name};
2196 glBegin GL_QUADS; 2487 glBegin GL_QUADS;
2197 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2488 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2198 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2489 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2199 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2490 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2200 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2491 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2201 glEnd; 2492 glEnd;
2202 } 2493 }
2203 2494
2204 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2205 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2206} 2497}
2207 2498
2208############################################################################# 2499#############################################################################
2209 2500
2210package CFClient::UI::Gauge; 2501package CFPlus::UI::Gauge;
2211 2502
2212our @ISA = CFClient::UI::VBox::; 2503our @ISA = CFPlus::UI::VBox::;
2213 2504
2214sub new { 2505sub new {
2215 my ($class, %arg) = @_; 2506 my ($class, %arg) = @_;
2216 2507
2217 my $self = $class->SUPER::new ( 2508 my $self = $class->SUPER::new (
… …
2219 can_hover => 1, 2510 can_hover => 1,
2220 can_events => 1, 2511 can_events => 1,
2221 %arg, 2512 %arg,
2222 ); 2513 );
2223 2514
2224 $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");
2225 $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);
2226 $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");
2227 2518
2228 $self 2519 $self
2229} 2520}
2230 2521
2231sub set_fontsize { 2522sub set_fontsize {
… …
2252 $self->{value}->set_text ($val); 2543 $self->{value}->set_text ($val);
2253} 2544}
2254 2545
2255############################################################################# 2546#############################################################################
2256 2547
2257package CFClient::UI::Slider; 2548package CFPlus::UI::Slider;
2258 2549
2259use strict; 2550use strict;
2260 2551
2261use CFClient::OpenGL; 2552use CFPlus::OpenGL;
2262 2553
2263our @ISA = CFClient::UI::DrawBG::; 2554our @ISA = CFPlus::UI::DrawBG::;
2264 2555
2265my @tex = 2556my @tex =
2266 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2557 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2267 qw(s1_slider.png s1_slider_bg.png); 2558 qw(s1_slider.png s1_slider_bg.png);
2268 2559
2269sub new { 2560sub new {
2270 my $class = shift; 2561 my $class = shift;
2271 2562
… …
2292 $self->update; 2583 $self->update;
2293 2584
2294 $self 2585 $self
2295} 2586}
2296 2587
2297sub changed { }
2298
2299sub set_range { 2588sub set_range {
2300 my ($self, $range) = @_; 2589 my ($self, $range) = @_;
2301 2590
2302 ($range, $self->{range}) = ($self->{range}, $range); 2591 ($range, $self->{range}) = ($self->{range}, $range);
2303 2592
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}"; 2593 if ("@$range" ne "@{$self->{range}}") {
2594 $self->update;
2595 $self->set_value ($self->{range}[0]);
2596 }
2306} 2597}
2307 2598
2308sub set_value { 2599sub set_value {
2309 my ($self, $value) = @_; 2600 my ($self, $value) = @_;
2310 2601
… …
2321 if $unit; 2612 if $unit;
2322 2613
2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2614 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2324 2615
2325 if ($value != $old_value) { 2616 if ($value != $old_value) {
2326 $self->_emit (changed => $value); 2617 $self->emit (changed => $value);
2327 $self->update; 2618 $self->update;
2328 } 2619 }
2329} 2620}
2330 2621
2331sub size_request { 2622sub size_request {
2332 my ($self) = @_; 2623 my ($self) = @_;
2333 2624
2334 ($self->{req_w}, $self->{req_h}) 2625 ($self->{req_w}, $self->{req_h})
2335} 2626}
2336 2627
2337sub button_down { 2628sub invoke_button_down {
2338 my ($self, $ev, $x, $y) = @_; 2629 my ($self, $ev, $x, $y) = @_;
2339 2630
2340 $self->SUPER::button_down ($ev, $x, $y); 2631 $self->SUPER::invoke_button_down ($ev, $x, $y);
2341 2632
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2633 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343 2634
2344 $self->mouse_motion ($ev, $x, $y) 2635 $self->invoke_mouse_motion ($ev, $x, $y)
2345} 2636}
2346 2637
2347sub mouse_motion { 2638sub invoke_mouse_motion {
2348 my ($self, $ev, $x, $y) = @_; 2639 my ($self, $ev, $x, $y) = @_;
2349 2640
2350 if ($GRAB == $self) { 2641 if ($GRAB == $self) {
2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2642 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2352 2643
… …
2358 } else { 2649 } else {
2359 return 0; 2650 return 0;
2360 } 2651 }
2361 2652
2362 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
2363} 2664}
2364 2665
2365sub update { 2666sub update {
2366 my ($self) = @_; 2667 my ($self) = @_;
2367 2668
… …
2416 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2417} 2718}
2418 2719
2419############################################################################# 2720#############################################################################
2420 2721
2421package CFClient::UI::ValSlider; 2722package CFPlus::UI::ValSlider;
2422 2723
2423our @ISA = CFClient::UI::HBox::; 2724our @ISA = CFPlus::UI::HBox::;
2424 2725
2425sub new { 2726sub new {
2426 my ($class, %arg) = @_; 2727 my ($class, %arg) = @_;
2427 2728
2428 my $range = delete $arg{range}; 2729 my $range = delete $arg{range};
2429 2730
2430 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2732 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2733 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift }, 2734 to_value => sub { shift },
2434 from_value => sub { shift }, 2735 from_value => sub { shift },
2435 %arg, 2736 %arg,
2436 ); 2737 );
2437 2738
… …
2457sub set_range { shift->{slider}->set_range (@_) } 2758sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) } 2759sub set_value { shift->{slider}->set_value (@_) }
2459 2760
2460############################################################################# 2761#############################################################################
2461 2762
2462package CFClient::UI::TextView; 2763package CFPlus::UI::TextScroller;
2463 2764
2464our @ISA = CFClient::UI::HBox::; 2765our @ISA = CFPlus::UI::HBox::;
2465 2766
2466use CFClient::OpenGL; 2767use CFPlus::OpenGL;
2467 2768
2468sub new { 2769sub new {
2469 my $class = shift; 2770 my $class = shift;
2470 2771
2471 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2472 fontsize => 1, 2773 fontsize => 1,
2473 can_events => 0, 2774 can_events => 1,
2775 indent => 0,
2474 #font => default_font 2776 #font => default_font
2475 @_, 2777 @_,
2476 2778
2477 layout => (new CFClient::Layout 1), 2779 layout => (new CFPlus::Layout),
2478 par => [], 2780 par => [],
2479 height => 0, 2781 height => 0,
2480 children => [ 2782 children => [
2481 (new CFClient::UI::Empty expand => 1), 2783 (new CFPlus::UI::Empty expand => 1),
2482 (new CFClient::UI::Slider vertical => 1), 2784 (new CFPlus::UI::Slider vertical => 1),
2483 ], 2785 ],
2484 ); 2786 );
2485 2787
2486 $self->{children}[1]->connect (changed => sub { $self->update }); 2788 $self->{children}[1]->connect (changed => sub { $self->update });
2487 2789
… …
2493 2795
2494 $self->{fontsize} = $fontsize; 2796 $self->{fontsize} = $fontsize;
2495 $self->reflow; 2797 $self->reflow;
2496} 2798}
2497 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
2498sub size_allocate { 2809sub invoke_size_allocate {
2499 my ($self, $w, $h) = @_; 2810 my ($self, $w, $h) = @_;
2500 2811
2501 $self->SUPER::size_allocate ($w, $h); 2812 my ($empty, $slider, @other) = @{ $self->{children} };
2813 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2502 2814
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2815 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2816 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $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});
2506 2819
2507 $self->reflow; 2820 $self->reflow;
2508}
2509 2821
2510sub text_size { 2822 local $self->{children} = [$empty, $slider];
2823 $self->SUPER::invoke_size_allocate ($w, $h)
2824}
2825
2826sub invoke_mouse_wheel {
2511 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) = @_;
2512 2838
2513 my $layout = $self->{layout}; 2839 my $layout = $self->{layout};
2514 2840
2841 $layout->set_font ($self->{font}) if $self->{font};
2842 $layout->set_foreground (@{$para->{fg}});
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2843 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $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});
2517 $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}}
2518 2852 );
2853
2519 $layout->size 2854 $layout
2520} 2855}
2521 2856
2522sub reflow { 2857sub reflow {
2523 my ($self) = @_; 2858 my ($self) = @_;
2524 2859
… …
2531 2866
2532 # todo: base offset on lines or so, not on pixels 2867 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset); 2868 $self->{children}[1]->set_value ($offset);
2534} 2869}
2535 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
2536sub clear { 2886sub clear {
2537 my ($self) = @_; 2887 my ($self) = @_;
2888
2889 my (undef, undef, @other) = @{ $self->{children} };
2890 $self->remove ($_) for @other;
2538 2891
2539 $self->{par} = []; 2892 $self->{par} = [];
2540 $self->{height} = 0; 2893 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2894 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542} 2895}
2543 2896
2544sub add_paragraph { 2897sub add_paragraph {
2545 my ($self, $color, $text, $indent) = @_; 2898 my $self = shift;
2546 2899
2547 for my $line (split /\n/, $text) { 2900 for my $para (@_) {
2548 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
2549 $self->{height} += $h; 2948 $self->{height} = $height;
2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2949 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2551 }
2552 2950
2553 $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 }
2554} 2957}
2555 2958
2556sub update { 2959sub update {
2557 my ($self) = @_; 2960 my ($self) = @_;
2558 2961
… …
2560 2963
2561 return unless $self->{h} > 0; 2964 return unless $self->{h} > 0;
2562 2965
2563 delete $self->{texture}; 2966 delete $self->{texture};
2564 2967
2565 $ROOT->on_post_alloc ($self, sub { 2968 $ROOT->on_post_alloc ($self => sub {
2969 $self->force_uptodate;
2970
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2971 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567 2972
2568 if (delete $self->{need_reflow}) {
2569 my $height = 0;
2570
2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2575 for (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2577 $layout->set_width ($W - $_->[3]);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3];
2581 $_->[1] = $h;
2582 }
2583
2584 $height += $_->[1];
2585 }
2586
2587 $self->{height} = $height;
2588
2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2590
2591 delete $self->{texture};
2592 }
2593
2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2973 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2595 glClearColor 0, 0, 0, 0; 2974 glClearColor 0, 0, 0, 0;
2596 glClear GL_COLOR_BUFFER_BIT; 2975 glClear GL_COLOR_BUFFER_BIT;
2597 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;
2598 my $top = int $self->{children}[1]{range}[0]; 2985 my $top = int $self->{children}[1]{range}[0];
2599 2986
2600 my $y0 = $top; 2987 my $y0 = $top;
2601 my $y1 = $top + $H; 2988 my $y1 = $top + $H;
2602 2989
2603 my $y = 0;
2604
2605 my $layout = $self->{layout};
2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608
2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2612
2613 for my $par (@{$self->{par}}) { 2990 for my $para (@{$self->{par}}) {
2614 my $h = $par->[1]; 2991 my $h = $para->{h};
2992 my $y = $para->{y};
2615 2993
2616 if ($y0 < $y + $h && $y < $y1) { 2994 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 2995 my $layout = $self->get_layout ($para);
2618 $layout->set_width ($W - $par->[3]);
2619 $layout->set_markup ($par->[4]);
2620 2996
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2997 $layout->render ($para->{indent}, $y - $y0);
2622 2998
2623 glRasterPos $par->[3], $y - $y0; 2999 if (my @w = @{ $para->{widget} }) {
2624 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 }
2625 } 3011 }
2626 3012
2627 $y += $h; 3013 $paridx++;
3014 $top_paragraph ||= $paridx if $y >= $top;
2628 } 3015 }
2629 3016
2630 glDisable GL_BLEND; 3017 $self->{top_paragraph} = $top_paragraph;
2631 }; 3018 };
2632 }); 3019 });
3020}
3021
3022sub reconfigure {
3023 my ($self) = @_;
3024
3025 $self->SUPER::reconfigure;
3026
3027 $_->{w} = 1e10 for @{ $self->{par} };
3028 $self->reflow;
2633} 3029}
2634 3030
2635sub _draw { 3031sub _draw {
2636 my ($self) = @_; 3032 my ($self) = @_;
2637 3033
… …
2640 glColor 0, 0, 0, 1; 3036 glColor 0, 0, 0, 1;
2641 $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});
2642 glDisable GL_TEXTURE_2D; 3038 glDisable GL_TEXTURE_2D;
2643 3039
2644 $self->{children}[1]->draw; 3040 $self->{children}[1]->draw;
2645
2646} 3041}
2647 3042
2648############################################################################# 3043#############################################################################
2649 3044
2650package CFClient::UI::Animator; 3045package CFPlus::UI::Animator;
2651 3046
2652use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2653 3048
2654our @ISA = CFClient::UI::Bin::; 3049our @ISA = CFPlus::UI::Bin::;
2655 3050
2656sub moveto { 3051sub moveto {
2657 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2658 3053
2659 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3054 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2687 glPopMatrix; 3082 glPopMatrix;
2688} 3083}
2689 3084
2690############################################################################# 3085#############################################################################
2691 3086
2692package CFClient::UI::Flopper; 3087package CFPlus::UI::Flopper;
2693 3088
2694our @ISA = CFClient::UI::Button::; 3089our @ISA = CFPlus::UI::Button::;
2695 3090
2696sub new { 3091sub new {
2697 my $class = shift; 3092 my $class = shift;
2698 3093
2699 my $self = $class->SUPER::new ( 3094 my $self = $class->SUPER::new (
… …
2711 $self->{other}->toggle_visibility; 3106 $self->{other}->toggle_visibility;
2712} 3107}
2713 3108
2714############################################################################# 3109#############################################################################
2715 3110
2716package CFClient::UI::Tooltip; 3111package CFPlus::UI::Tooltip;
2717 3112
2718our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2719 3114
2720use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2721 3116
2722sub new { 3117sub new {
2723 my $class = shift; 3118 my $class = shift;
2724 3119
2725 $class->SUPER::new ( 3120 $class->SUPER::new (
… …
2728 ) 3123 )
2729} 3124}
2730 3125
2731sub set_tooltip_from { 3126sub set_tooltip_from {
2732 my ($self, $widget) = @_; 3127 my ($self, $widget) = @_;
3128
3129 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130 if $widget->{tooltip} =~ /^#(.*)$/;
2733 3131
2734 my $tooltip = $widget->{tooltip}; 3132 my $tooltip = $widget->{tooltip};
2735 3133
2736 if ($ENV{CFPLUS_DEBUG} & 2) { 3134 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n" 3135 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3136 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n" 3137 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}"; 3138 . "visible $widget->{visible}";
2741 } 3139 }
2742 3140
3141 $tooltip =~ s/^\n+//;
3142 $tooltip =~ s/\n+$//;
3143
2743 $self->add (new CFClient::UI::Label 3144 $self->add (new CFPlus::UI::Label
2744 markup => $tooltip, 3145 markup => $tooltip,
2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3146 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2746 fontsize => 0.8, 3147 fontsize => 0.8,
2747 fg => [0, 0, 0, 1], 3148 style => 1, # FLAG_INVERSE
2748 ellipsise => 0, 3149 ellipsise => 0,
2749 font => ($widget->{tooltip_font} || $::FONT_PROP), 3150 font => ($widget->{tooltip_font} || $::FONT_PROP),
2750 ); 3151 );
2751} 3152}
2752 3153
… …
2756 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3157 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2757 3158
2758 ($w + 4, $h + 4) 3159 ($w + 4, $h + 4)
2759} 3160}
2760 3161
2761sub size_allocate { 3162sub invoke_size_allocate {
2762 my ($self, $w, $h) = @_; 3163 my ($self, $w, $h) = @_;
2763 3164
2764 $self->SUPER::size_allocate ($w - 4, $h - 4); 3165 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2765} 3166}
2766 3167
2767sub visibility_change { 3168sub invoke_visibility_change {
2768 my ($self, $visible) = @_; 3169 my ($self, $visible) = @_;
2769 3170
2770 return unless $visible; 3171 return unless $visible;
2771 3172
2772 $self->{root}->on_post_alloc ("move_$self" => sub { 3173 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner} 3174 my $widget = $self->{owner}
2774 or return; 3175 or return;
2775 3176
3177 if ($widget->{visible}) {
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3178 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777 3179
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3180 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH; 3181 if $x + $self->{w} > $self->{root}{w};
2780 3182
2781 $self->move_abs ($x, $y); 3183 $self->move_abs ($x, $y);
3184 } else {
3185 $self->hide;
3186 }
2782 }); 3187 });
2783} 3188}
2784 3189
2785sub _draw { 3190sub _draw {
2786 my ($self) = @_; 3191 my ($self) = @_;
… …
2810 $self->SUPER::_draw; 3215 $self->SUPER::_draw;
2811} 3216}
2812 3217
2813############################################################################# 3218#############################################################################
2814 3219
2815package CFClient::UI::Face; 3220package CFPlus::UI::Face;
2816 3221
2817our @ISA = CFClient::UI::Base::; 3222our @ISA = CFPlus::UI::DrawBG::;
2818 3223
2819use CFClient::OpenGL; 3224use CFPlus::OpenGL;
2820 3225
2821sub new { 3226sub new {
2822 my $class = shift; 3227 my $class = shift;
2823 3228
2824 my $self = $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
… …
2859sub _draw { 3264sub _draw {
2860 my ($self) = @_; 3265 my ($self) = @_;
2861 3266
2862 return unless $::CONN; 3267 return unless $::CONN;
2863 3268
3269 $self->SUPER::_draw;
3270
2864 my $face; 3271 my $face;
2865 3272
2866 if ($self->{frame}) { 3273 if ($self->{frame}) {
2867 my $anim = $::CONN->{anim}[$self->{anim}]; 3274 my $anim = $::CONN->{anim}[$self->{anim}];
2868 3275
… …
2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3286 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2880 glDisable GL_TEXTURE_2D; 3287 glDisable GL_TEXTURE_2D;
2881 } 3288 }
2882} 3289}
2883 3290
2884sub DESTROY { 3291sub destroy {
2885 my ($self) = @_; 3292 my ($self) = @_;
2886 3293
2887 $self->{timer}->cancel 3294 $self->{timer}->cancel
2888 if $self->{timer}; 3295 if $self->{timer};
2889 3296
2890 $self->SUPER::DESTROY; 3297 $self->SUPER::destroy;
2891} 3298}
2892 3299
2893############################################################################# 3300#############################################################################
2894 3301
2895package CFClient::UI::Buttonbar; 3302package CFPlus::UI::Buttonbar;
2896 3303
2897our @ISA = CFClient::UI::HBox::; 3304our @ISA = CFPlus::UI::HBox::;
2898 3305
2899# TODO: should actualyl wrap buttons and other goodies. 3306# TODO: should actually wrap buttons and other goodies.
2900 3307
2901############################################################################# 3308#############################################################################
2902 3309
2903package CFClient::UI::Menu; 3310package CFPlus::UI::Menu;
2904 3311
2905our @ISA = CFClient::UI::FancyFrame::; 3312our @ISA = CFPlus::UI::Toplevel::;
2906 3313
2907use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2908 3315
2909sub new { 3316sub new {
2910 my $class = shift; 3317 my $class = shift;
2911 3318
2912 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
2913 items => [], 3320 items => [],
2914 z => 100, 3321 z => 100,
2915 @_, 3322 @_,
2916 ); 3323 );
2917 3324
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3325 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2919 3326
2920 for my $item (@{ $self->{items} }) { 3327 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 3328 my ($widget, $cb, $tooltip) = @$item;
2922 3329
2923 # handle various types of items, only text for now 3330 # handle various types of items, only text for now
2924 if (!ref $widget) { 3331 if (!ref $widget) {
3332 if ($widget =~ /\t/) {
3333 my ($left, $right) = split /\t/, $widget, 2;
3334
2925 $widget = new CFClient::UI::Label 3335 $widget = new CFPlus::UI::HBox
2926 can_hover => 1, 3336 can_hover => 1,
2927 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,
2928 text => $widget; 3349 markup => $widget,
3350 tooltip => $tooltip;
3351 }
2929 } 3352 }
2930 3353
2931 $self->{item}{$widget} = $item; 3354 $self->{item}{$widget} = $item;
2932 3355
2933 $self->{vbox}->add ($widget); 3356 $self->{vbox}->add ($widget);
… …
2938 3361
2939# 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)
2940sub popup { 3363sub popup {
2941 my ($self, $ev) = @_; 3364 my ($self, $ev) = @_;
2942 3365
2943 $self->_emit ("popdown"); 3366 $self->emit ("popdown");
2944 3367
2945 # maybe save $GRAB? must be careful about events... 3368 # maybe save $GRAB? must be careful about events...
2946 $GRAB = $self; 3369 $GRAB = $self;
2947 $self->{button} = $ev->{button}; 3370 $self->{button} = $ev->{button};
2948 3371
2949 $self->show; 3372 $self->show;
2950 $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);
2951} 3374}
2952 3375
2953sub mouse_motion { 3376sub invoke_mouse_motion {
2954 my ($self, $ev, $x, $y) = @_; 3377 my ($self, $ev, $x, $y) = @_;
2955 3378
2956 # TODO: should use vbox->find_widget or so 3379 # TODO: should use vbox->find_widget or so
2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3380 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2958 $self->{hover} = $self->{item}{$HOVER}; 3381 $self->{hover} = $self->{item}{$HOVER};
2959 3382
2960 0 3383 0
2961} 3384}
2962 3385
2963sub button_up { 3386sub invoke_button_up {
2964 my ($self, $ev, $x, $y) = @_; 3387 my ($self, $ev, $x, $y) = @_;
2965 3388
2966 if ($ev->{button} == $self->{button}) { 3389 if ($ev->{button} == $self->{button}) {
2967 undef $GRAB; 3390 undef $GRAB;
2968 $self->hide; 3391 $self->hide;
2969 3392
2970 $self->_emit ("popdown"); 3393 $self->emit ("popdown");
2971 $self->{hover}[1]->() if $self->{hover}; 3394 $self->{hover}[1]->() if $self->{hover};
2972 } else { 3395 } else {
2973 return 0 3396 return 0
2974 } 3397 }
2975 3398
2976 1 3399 1
2977} 3400}
2978 3401
2979############################################################################# 3402#############################################################################
2980 3403
2981package CFClient::UI::Multiplexer; 3404package CFPlus::UI::Multiplexer;
2982 3405
2983our @ISA = CFClient::UI::Container::; 3406our @ISA = CFPlus::UI::Container::;
2984 3407
2985sub new { 3408sub new {
2986 my $class = shift; 3409 my $class = shift;
2987 3410
2988 my $self = $class->SUPER::new ( 3411 my $self = $class->SUPER::new (
… …
3002 3425
3003 $self->{current} = $self->{children}[0] 3426 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} }; 3427 if @{ $self->{children} };
3005} 3428}
3006 3429
3430sub get_current_page {
3431 my ($self) = @_;
3432
3433 $self->{current}
3434}
3435
3007sub set_current_page { 3436sub set_current_page {
3008 my ($self, $page_or_widget) = @_; 3437 my ($self, $page_or_widget) = @_;
3009 3438
3010 my $widget = ref $page_or_widget 3439 my $widget = ref $page_or_widget
3011 ? $page_or_widget 3440 ? $page_or_widget
3012 : $self->{children}[$page_or_widget]; 3441 : $self->{children}[$page_or_widget];
3013 3442
3014 $self->{current} = $widget; 3443 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3444 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016 3445
3017 $self->_emit (page_changed => $self->{current}); 3446 $self->emit (page_changed => $self->{current});
3018 3447
3019 $self->realloc; 3448 $self->realloc;
3020} 3449}
3021 3450
3022sub visible_children { 3451sub visible_children {
… …
3027 my ($self) = @_; 3456 my ($self) = @_;
3028 3457
3029 $self->{current}->size_request 3458 $self->{current}->size_request
3030} 3459}
3031 3460
3032sub size_allocate { 3461sub invoke_size_allocate {
3033 my ($self, $w, $h) = @_; 3462 my ($self, $w, $h) = @_;
3034 3463
3035 $self->{current}->configure (0, 0, $w, $h); 3464 $self->{current}->configure (0, 0, $w, $h);
3465
3466 1
3036} 3467}
3037 3468
3038sub _draw { 3469sub _draw {
3039 my ($self) = @_; 3470 my ($self) = @_;
3040 3471
3041 $self->{current}->draw; 3472 $self->{current}->draw;
3042} 3473}
3043 3474
3044############################################################################# 3475#############################################################################
3045 3476
3046package CFClient::UI::Notebook; 3477package CFPlus::UI::Notebook;
3047 3478
3048our @ISA = CFClient::UI::VBox::; 3479our @ISA = CFPlus::UI::VBox::;
3049 3480
3050sub new { 3481sub new {
3051 my $class = shift; 3482 my $class = shift;
3052 3483
3053 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar), 3485 buttonbar => (new CFPlus::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3486 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self 3487 # filter => # will be put between multiplexer and $self
3057 @_, 3488 @_,
3058 ); 3489 );
3059 3490
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3491 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3066sub add { 3497sub add {
3067 my ($self, $title, $widget, $tooltip) = @_; 3498 my ($self, $title, $widget, $tooltip) = @_;
3068 3499
3069 Scalar::Util::weaken $self; 3500 Scalar::Util::weaken $self;
3070 3501
3071 $self->{buttonbar}->add (new CFClient::UI::Button 3502 $self->{buttonbar}->add (new CFPlus::UI::Button
3072 markup => $title, 3503 markup => $title,
3073 tooltip => $tooltip, 3504 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) }, 3505 on_activate => sub { $self->set_current_page ($widget) },
3075 ); 3506 );
3076 3507
3077 $self->{multiplexer}->add ($widget); 3508 $self->{multiplexer}->add ($widget);
3078} 3509}
3079 3510
3511sub get_current_page {
3512 my ($self) = @_;
3513
3514 $self->{multiplexer}->get_current_page
3515}
3516
3080sub set_current_page { 3517sub set_current_page {
3081 my ($self, $page) = @_; 3518 my ($self, $page) = @_;
3082 3519
3083 $self->{multiplexer}->set_current_page ($page); 3520 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current}); 3521 $self->emit (page_changed => $self->{multiplexer}{current});
3085} 3522}
3086 3523
3087############################################################################# 3524#############################################################################
3088 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
3089package CFClient::UI::Statusbox; 3582package CFPlus::UI::Statusbox;
3090 3583
3091our @ISA = CFClient::UI::VBox::; 3584our @ISA = CFPlus::UI::VBox::;
3092 3585
3093sub new { 3586sub new {
3094 my $class = shift; 3587 my $class = shift;
3095 3588
3096 my $self = $class->SUPER::new ( 3589 my $self = $class->SUPER::new (
… …
3108sub reorder { 3601sub reorder {
3109 my ($self) = @_; 3602 my ($self) = @_;
3110 my $NOW = Time::HiRes::time; 3603 my $NOW = Time::HiRes::time;
3111 3604
3112 # freeze display when hovering over any label 3605 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner} 3606 return if $CFPlus::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3607 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} }; 3608 values %{ $self->{item} };
3116 3609
3117 while (my ($k, $v) = each %{ $self->{item} }) { 3610 while (my ($k, $v) = each %{ $self->{item} }) {
3118 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3611 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3119 } 3612 }
… …
3140 for ($short) { 3633 for ($short) {
3141 s/^\s+//; 3634 s/^\s+//;
3142 s/\s+/ /g; 3635 s/\s+/ /g;
3143 } 3636 }
3144 3637
3145 new CFClient::UI::Label 3638 new CFPlus::UI::Label
3146 markup => $short, 3639 markup => $short,
3147 tooltip => $item->{tooltip}, 3640 tooltip => $item->{tooltip},
3148 tooltip_font => $::FONT_PROP, 3641 tooltip_font => $::FONT_PROP,
3149 tooltip_width => 0.67, 3642 tooltip_width => 0.67,
3150 fontsize => $item->{fontsize} || $self->{fontsize}, 3643 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3188 $item->{count}++; 3681 $item->{count}++;
3189 } else { 3682 } else {
3190 $item->{count} = 1; 3683 $item->{count} = 1;
3191 $item->{text} = $item->{tooltip} = $text; 3684 $item->{text} = $item->{tooltip} = $text;
3192 } 3685 }
3193 $item->{id} = ++$self->{id}; 3686 $item->{id} += 0.2;#d#
3194 $item->{timeout} = $timeout; 3687 $item->{timeout} = $timeout;
3195 delete $item->{label}; 3688 delete $item->{label};
3196 } else { 3689 } else {
3197 $self->{item}{$group} = { 3690 $self->{item}{$group} = {
3198 id => ++$self->{id}, 3691 id => ++$self->{id},
… …
3204 count => 1, 3697 count => 1,
3205 %arg, 3698 %arg,
3206 }; 3699 };
3207 } 3700 }
3208 3701
3702 $ROOT->on_refresh (reorder => sub {
3209 $self->reorder; 3703 $self->reorder;
3704 });
3210} 3705}
3211 3706
3212sub reconfigure { 3707sub reconfigure {
3213 my ($self) = @_; 3708 my ($self) = @_;
3214 3709
… …
3217 3712
3218 $self->reorder; 3713 $self->reorder;
3219 $self->SUPER::reconfigure; 3714 $self->SUPER::reconfigure;
3220} 3715}
3221 3716
3222sub DESTROY { 3717sub destroy {
3223 my ($self) = @_; 3718 my ($self) = @_;
3224 3719
3225 $self->{timer}->cancel; 3720 $self->{timer}->cancel;
3226 3721
3227 $self->SUPER::DESTROY; 3722 $self->SUPER::destroy;
3228} 3723}
3229 3724
3230############################################################################# 3725#############################################################################
3231 3726
3232package CFClient::UI::Inventory; 3727package CFPlus::UI::Inventory;
3233 3728
3234our @ISA = CFClient::UI::ScrolledWindow::; 3729our @ISA = CFPlus::UI::Table::;
3235 3730
3236sub new { 3731sub new {
3237 my $class = shift; 3732 my $class = shift;
3238 3733
3239 my $self = $class->SUPER::new ( 3734 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3735 col_expand => [0, 1, 0],
3736 items => [],
3241 @_, 3737 @_,
3242 ); 3738 );
3243 3739
3740 $self->set_sort_order (undef);
3741
3244 $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;
3245} 3778}
3246 3779
3247sub set_items { 3780sub set_items {
3248 my ($self, $items) = @_; 3781 my ($self, $items) = @_;
3249 3782
3250 $self->{child}->clear; 3783 $self->{items} = [$items ? values %$items : ()];
3251 return unless $items; 3784 $self->update_items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270} 3785}
3271 3786
3272############################################################################# 3787#############################################################################
3273 3788
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList; 3789package CFPlus::UI::SpellList;
3472 3790
3473our @ISA = CFClient::UI::Table::; 3791our @ISA = CFPlus::UI::Table::;
3474 3792
3475sub new { 3793sub new {
3476 my $class = shift; 3794 my $class = shift;
3477 3795
3478 my $self = $class->SUPER::new ( 3796 my $self = $class->SUPER::new (
… …
3480 commands => [], 3798 commands => [],
3481 @_, 3799 @_,
3482 ) 3800 )
3483} 3801}
3484 3802
3485# 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
3486sub add_spell { 3888sub add_spell {
3487 my ($self, $spell) = @_; 3889 my ($self, $spell) = @_;
3890
3488 $self->{spells}->{$spell->{name}} = $spell; 3891 $self->{spell}->{$spell->{name}} = $spell;
3489 3892 $self->rebuild_spell_list;
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517} 3893}
3518 3894
3519sub remove_spell { 3895sub remove_spell {
3520 my ($self, $spell) = @_; 3896 my ($self, $spell) = @_;
3897
3521 delete $self->{spells}->{$spell->{name}}; 3898 delete $self->{spell}->{$spell->{name}};
3522 $self->rebuild_spell_list; 3899 $self->rebuild_spell_list;
3523} 3900}
3524 3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3525############################################################################# 3909#############################################################################
3526 3910
3527package CFClient::UI::Root; 3911package CFPlus::UI::Root;
3528 3912
3529our @ISA = CFClient::UI::Container::; 3913our @ISA = CFPlus::UI::Container::;
3530 3914
3531use List::Util qw(min max); 3915use List::Util qw(min max);
3532 3916
3533use CFClient::OpenGL; 3917use CFPlus::OpenGL;
3534 3918
3535sub new { 3919sub new {
3536 my $class = shift; 3920 my $class = shift;
3537 3921
3538 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3563 $coord = $max - $size if $coord > $max - $size; 3947 $coord = $max - $size if $coord > $max - $size;
3564 3948
3565 int $coord + 0.5 3949 int $coord + 0.5
3566} 3950}
3567 3951
3568sub size_allocate { 3952sub invoke_size_allocate {
3569 my ($self, $w, $h) = @_; 3953 my ($self, $w, $h) = @_;
3570 3954
3571 for my $child ($self->children) { 3955 for my $child ($self->children) {
3572 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)};
3573 3957
… …
3577 $X = _to_pixel $X, $W, $self->{w}; 3961 $X = _to_pixel $X, $W, $self->{w};
3578 $Y = _to_pixel $Y, $H, $self->{h}; 3962 $Y = _to_pixel $Y, $H, $self->{h};
3579 3963
3580 $child->configure ($X, $Y, $W, $H); 3964 $child->configure ($X, $Y, $W, $H);
3581 } 3965 }
3966
3967 1
3582} 3968}
3583 3969
3584sub coord2local { 3970sub coord2local {
3585 my ($self, $x, $y) = @_; 3971 my ($self, $x, $y) = @_;
3586 3972
… …
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3713 4099
3714 $w = 0 if $w < 0; 4100 $w = 0 if $w < 0;
3715 $h = 0 if $h < 0; 4101 $h = 0 if $h < 0;
3716 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
3717 $w = int $w + 0.5; 4112 $w = int $w + 0.5;
3718 $h = int $h + 0.5; 4113 $h = int $h + 0.5;
3719 4114
3720 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}) {
3721 $widget->{old_w} = $widget->{w}; 4116 $widget->{old_w} = $widget->{w};
… …
3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4139 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3745 glMatrixMode GL_MODELVIEW; 4140 glMatrixMode GL_MODELVIEW;
3746 glLoadIdentity; 4141 glLoadIdentity;
3747 4142
3748 { 4143 {
3749 package CFClient::UI::Base; 4144 package CFPlus::UI::Base;
3750 4145
3751 ($draw_x, $draw_y, $draw_w, $draw_h) = 4146 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h}); 4147 (0, 0, $self->{w}, $self->{h});
3753 }
3754 4148
3755 $self->_draw; 4149 $self->_draw;
4150 }
3756} 4151}
3757 4152
3758############################################################################# 4153#############################################################################
3759 4154
3760package CFClient::UI; 4155package CFPlus::UI;
3761 4156
3762$ROOT = new CFClient::UI::Root; 4157$ROOT = new CFPlus::UI::Root;
3763$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4158$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3764 4159
37651 41601
3766 4161

Diff Legend

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