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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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