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.306 by root, Sun Jun 18 17:39:36 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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