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.307 by root, Sun Jun 18 19:13:20 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->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 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
978 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
979 %arg, 1073 %arg,
980 ); 1074 );
981 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
983 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
984 1085
985 $self 1086 $self
986} 1087}
1088
1089#TODO# update range on size_allocate depending on child
987 1090
988sub add { 1091sub add {
989 my ($self, $widget) = @_; 1092 my ($self, $widget) = @_;
990 1093
991 $self->{vp}->add ($self->{child} = $widget); 1094 $self->{vp}->add ($self->{child} = $widget);
992} 1095}
993 1096
1097sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_;
1099
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev);
1103
1104 1
1105}
1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
994sub update { 1131sub update {
995 my ($self) = @_; 1132 my ($self) = @_;
996 1133
997 $self->SUPER::update; 1134 $self->SUPER::update;
998 1135 $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} 1136}
1003 1137
1004sub invoke_size_allocate { 1138sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1006 1140
1007 my $child = $self->{vp}->child; 1141 $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) 1142 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1143}
1012 1144
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
1016############################################################################# 1145#############################################################################
1017 1146
1018package CFClient::UI::Frame; 1147package CFPlus::UI::Frame;
1019 1148
1020our @ISA = CFClient::UI::Bin::; 1149our @ISA = CFPlus::UI::Bin::;
1021 1150
1022use CFClient::OpenGL; 1151use CFPlus::OpenGL;
1023 1152
1024sub new { 1153sub new {
1025 my $class = shift; 1154 my $class = shift;
1026 1155
1027 $class->SUPER::new ( 1156 $class->SUPER::new (
… …
1053 $self->SUPER::_draw; 1182 $self->SUPER::_draw;
1054} 1183}
1055 1184
1056############################################################################# 1185#############################################################################
1057 1186
1058package CFClient::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1059 1188
1060our @ISA = CFClient::UI::Bin::; 1189our @ISA = CFPlus::UI::Bin::;
1061 1190
1062use CFClient::OpenGL; 1191use CFPlus::OpenGL;
1192
1193sub new {
1194 my ($class, %arg) = @_;
1195
1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1288
1289our @ISA = CFPlus::UI::Bin::;
1290
1291use CFPlus::OpenGL;
1063 1292
1064my $bg = 1293my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1; 1295 mipmap => 1, wrap => 1;
1067 1296
1068my @border = 1297my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1298 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); 1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1300
1072sub new { 1301sub new {
1073 my ($class, %arg) = @_; 1302 my ($class, %arg) = @_;
1074 1303
1075 my $self = $class->SUPER::new ( 1304 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1305 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1306 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1307 border => 0.6,
1079 can_events => 1, 1308 can_events => 1,
1080 min_w => 16, 1309 min_w => 64,
1081 min_h => 16, 1310 min_h => 32,
1082 %arg, 1311 %arg,
1083 ); 1312 );
1084 1313
1085 $self->{title_widget} = new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1315 align => 0,
1087 valign => 1, 1316 valign => 1,
1088 text => $self->{title}, 1317 text => $self->{title},
1089 fontsize => $self->{border}, 1318 fontsize => $self->{border},
1090 if exists $self->{title}; 1319 if exists $self->{title};
1091 1320
1092 if ($self->{has_close_button}) { 1321 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1322 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1323 new CFPlus::UI::ImageButton
1095 image => 'x1_close.png', 1324 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1325 on_activate => sub { $self->emit ("delete") };
1097 1326
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1327 $self->CFPlus::UI::Container::add ($self->{close_button});
1099 } 1328 }
1100 1329
1101 $self 1330 $self
1102} 1331}
1103 1332
1104sub add { 1333sub add {
1105 my ($self, @widgets) = @_; 1334 my ($self, @widgets) = @_;
1106 1335
1107 $self->SUPER::add (@widgets); 1336 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1337 $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}; 1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110} 1339}
1111 1340
1112sub border { 1341sub border {
1113 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1114} 1343}
… …
1147 $self->child->configure ($border, $border, $w, $h); 1376 $self->child->configure ($border, $border, $w, $h);
1148 1377
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1378 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1379 if $self->{close_button};
1151 1380
1381 1
1382}
1383
1384sub invoke_delete {
1385 my ($self) = @_;
1386
1387 $self->hide;
1388
1152 1 1389 1
1153} 1390}
1154 1391
1155sub invoke_button_down { 1392sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
… …
1214 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1451 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215 1452
1216 ! ! $self->{motion} 1453 ! ! $self->{motion}
1217} 1454}
1218 1455
1456sub invoke_visibility_change {
1457 my ($self, $visible) = @_;
1458
1459 delete $self->{motion} unless $visible;
1460
1461 0
1462}
1463
1219sub _draw { 1464sub _draw {
1220 my ($self) = @_; 1465 my ($self) = @_;
1221 1466
1222 my $child = $self->{children}[0]; 1467 my $child = $self->{children}[0];
1223 1468
… …
1260 if $self->{close_button}; 1505 if $self->{close_button};
1261} 1506}
1262 1507
1263############################################################################# 1508#############################################################################
1264 1509
1265package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1266 1511
1267our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1268 1513
1269use List::Util qw(max sum); 1514use List::Util qw(max sum);
1270 1515
1271use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1272 1517
1273sub new { 1518sub new {
1274 my $class = shift; 1519 my $class = shift;
1275 1520
1276 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1277 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1278 @_, 1525 @_,
1279 ) 1526 )
1280} 1527}
1281 1528
1282sub children { 1529sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284} 1531}
1285 1532
1533# TODO: store row/col info in child widget and use standard add/del
1286sub add { 1534sub add {
1287 my ($self, $x, $y, $child) = @_; 1535 my ($self) = shift;
1288 1536
1537 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1289 $child->set_parent ($self); 1539 $child->set_parent ($self);
1290 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1541 }
1291 1542
1543 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1;
1292 $self->realloc; 1545 $self->realloc;
1293} 1546}
1294 1547
1295sub remove { 1548sub remove {
1296 my ($self, $child) = @_; 1549 my ($self, $child) = @_;
1297 1550
1298 # TODO: not yet implemented 1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1299} 1556}
1300 1557
1301# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1302sub clear { 1559sub clear {
1303 my ($self) = @_; 1560 my ($self) = @_;
… …
1352 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1353 1610
1354 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1355 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1356 1613
1357 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1358 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1359 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1360 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1361 1618
1362 # linearly scale sizes
1363 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365 1620
1366 CFClient::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1367 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1368 1630
1369 my $y; 1631 my $y;
1370 1632
1371 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1372 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1415 } 1677 }
1416} 1678}
1417 1679
1418############################################################################# 1680#############################################################################
1419 1681
1420package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1421 1683
1684use List::Util qw(min max);
1685
1422our @ISA = CFClient::UI::Container::; 1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Box;
1765
1766our @ISA = CFPlus::UI::Container::;
1423 1767
1424sub size_request { 1768sub size_request {
1425 my ($self) = @_; 1769 my ($self) = @_;
1426 1770
1427 $self->{vertical} 1771 $self->{vertical}
… …
1437 1781
1438sub invoke_size_allocate { 1782sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1783 my ($self, $w, $h) = @_;
1440 1784
1441 my $space = $self->{vertical} ? $h : $w; 1785 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1786 my @children = $self->visible_children;
1443 1787
1444 my @req; 1788 my @req;
1445 1789
1446 if ($self->{homogeneous}) { 1790 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1791 @req = ($space / (@children || 1)) x @children;
1448 } else { 1792 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1793 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1794 my $req = List::Util::sum @req;
1451 1795
1452 if ($req > $space) { 1796 if ($req > $space) {
1453 # ah well, not enough space 1797 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1798 $_ *= $space / $req for @req;
1455 } else { 1799 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1800 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1801
1458 $space = ($space - $req) / $expand; # remaining space to give away 1802 $space = ($space - $req) / $expand; # remaining space to give away
1459 1803
1460 $req[$_] += $space * $children->[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1805 for 0 .. $#children;
1462 } 1806 }
1463 } 1807 }
1464 1808
1465 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1466 1810
1467 my $pos = 0; 1811 my $pos = 0;
1468 for (0 .. $#$children) { 1812 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1815
1472 $pos += $alloc; 1816 $pos += $alloc;
1473 } 1817 }
1474 1818
1475 1 1819 1
1476} 1820}
1477 1821
1478############################################################################# 1822#############################################################################
1479 1823
1480package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1481 1825
1482our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1483 1827
1484sub new { 1828sub new {
1485 my $class = shift; 1829 my $class = shift;
1486 1830
1487 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1490 ) 1834 )
1491} 1835}
1492 1836
1493############################################################################# 1837#############################################################################
1494 1838
1495package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1496 1840
1497our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1498 1842
1499sub new { 1843sub new {
1500 my $class = shift; 1844 my $class = shift;
1501 1845
1502 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1505 ) 1849 )
1506} 1850}
1507 1851
1508############################################################################# 1852#############################################################################
1509 1853
1510package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1511 1855
1512our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1513 1857
1514use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1515 1859
1516sub new { 1860sub new {
1517 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1518 1862
1519 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1522 #active_bg => none 1866 #active_bg => none
1523 #font => default_font 1867 #font => default_font
1524 #text => initial text 1868 #text => initial text
1525 #markup => initial narkup 1869 #markup => initial narkup
1526 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1527 ellipsise => 3, # end 1872 ellipsise => 3, # end
1528 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1529 fontsize => 1, 1874 fontsize => 1,
1530 align => -1, 1875 align => -1,
1531 valign => -1, 1876 valign => -1,
1532 padding_x => 2, 1877 padding_x => 2,
1533 padding_y => 2, 1878 padding_y => 2,
1534 can_events => 0, 1879 can_events => 0,
1535 %arg 1880 %arg
1536 ); 1881 );
1537 1882
1538 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1539 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1540 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1541 $self->{template} = $layout; 1886 $self->{template} = $layout;
1542 } 1887 }
1543 1888
1544 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1548 } 1893 }
1549 1894
1550 $self 1895 $self
1551} 1896}
1552 1897
1553sub escape($) {
1554 local $_ = $_[0];
1555
1556 s/&/&amp;/g;
1557 s/>/&gt;/g;
1558 s/</&lt;/g;
1559
1560 $_
1561}
1562
1563sub update { 1898sub update {
1564 my ($self) = @_; 1899 my ($self) = @_;
1565 1900
1566 delete $self->{texture}; 1901 delete $self->{texture};
1567 $self->SUPER::update; 1902 $self->SUPER::update;
… …
1578 my ($self, $text) = @_; 1913 my ($self, $text) = @_;
1579 1914
1580 return if $self->{text} eq "T$text"; 1915 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1916 $self->{text} = "T$text";
1582 1917
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1918 $self->{layout}->set_text ($text);
1585 1919
1586 delete $self->{size_req}; 1920 delete $self->{size_req};
1587 $self->realloc; 1921 $self->realloc;
1588 $self->update; 1922 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1928 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1929 $self->{text} = "M$markup";
1596 1930
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1931 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1932
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1933 $self->{layout}->set_markup ($markup);
1601 1934
1602 delete $self->{size_req}; 1935 delete $self->{size_req};
1603 $self->realloc; 1936 $self->realloc;
1604 $self->update; 1937 $self->update;
… …
1616 1949
1617 my ($w, $h) = $self->{layout}->size; 1950 my ($w, $h) = $self->{layout}->size;
1618 1951
1619 if (exists $self->{template}) { 1952 if (exists $self->{template}) {
1620 $self->{template}->set_font ($self->{font}) if $self->{font}; 1953 $self->{template}->set_font ($self->{font}) if $self->{font};
1954 $self->{template}->set_width ($self->{max_w} || -1);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1956
1623 my ($w2, $h2) = $self->{template}->size; 1957 my ($w2, $h2) = $self->{template}->size;
1624 1958
1625 $w = List::Util::max $w, $w2; 1959 $w = List::Util::max $w, $w2;
… …
1630 }; 1964 };
1631 1965
1632 @{ $self->{size_req} } 1966 @{ $self->{size_req} }
1633} 1967}
1634 1968
1969sub baseline_shift {
1970 $_[0]{layout}->descent
1971}
1972
1635sub invoke_size_allocate { 1973sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 1974 my ($self, $w, $h) = @_;
1637 1975
1638 delete $self->{ox}; 1976 delete $self->{ox};
1639 1977
… …
1645 1983
1646sub set_fontsize { 1984sub set_fontsize {
1647 my ($self, $fontsize) = @_; 1985 my ($self, $fontsize) = @_;
1648 1986
1649 $self->{fontsize} = $fontsize; 1987 $self->{fontsize} = $fontsize;
1988 delete $self->{size_req};
1650 delete $self->{texture}; 1989 delete $self->{texture};
1651 1990
1652 $self->realloc; 1991 $self->realloc;
1653} 1992}
1654 1993
1655sub reconfigure { 1994sub reconfigure {
1656 my ($self) = @_; 1995 my ($self) = @_;
1657 1996
1658 delete $self->{size_req}; 1997 delete $self->{size_req};
1998 delete $self->{texture};
1659 1999
1660 $self->SUPER::reconfigure; 2000 $self->SUPER::reconfigure;
1661} 2001}
1662 2002
1663sub _draw { 2003sub _draw {
1664 my ($self) = @_; 2004 my ($self) = @_;
1665 2005
1666 $self->SUPER::_draw; # draw background, if applicable 2006 $self->SUPER::_draw; # draw background, if applicable
1667 2007
1668 my $tex = $self->{texture} ||= do { 2008 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 2009 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2010 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 2011 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2012 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2013 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 2015
1676 new_from_layout CFClient::Texture $self->{layout} 2016 [$self->{layout}->size]
1677 }; 2017 };
1678 2018
1679 unless (exists $self->{ox}) { 2019 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 2022 : ($self->{w} - $size->[0]) * 0.5);
1683 2023
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 2026 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 2027 };
1688 2028
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 2031
1694 if ($tex->{format} == GL_ALPHA) { 2032 $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} 2033}
1705 2034
1706############################################################################# 2035#############################################################################
1707 2036
1708package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1709 2038
1710our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1711 2040
1712use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1713 2042
1714sub new { 2043sub new {
1715 my $class = shift; 2044 my $class = shift;
1716 2045
1717 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1721 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1722 can_hover => 1, 2051 can_hover => 1,
1723 can_focus => 1, 2052 can_focus => 1,
1724 valign => 0, 2053 valign => 0,
1725 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1726 #text => ... 2056 #text => ...
1727 #hidden => "*", 2057 #hidden => "*",
1728 @_ 2058 @_
1729 ) 2059 )
1730} 2060}
… …
1775 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1776 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1777 2107
1778 my $text = $self->get_text; 2108 my $text = $self->get_text;
1779 2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2111
1780 if ($uni == 8) { 2112 if ($uni == 8) {
1781 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1783 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1784 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1785 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1786 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1787 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1788 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1789 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1790 } elsif ($sym == CFClient::SDLK_END) {
1791 $self->{cursor} = length $text;
1792 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1793 $self->emit ('escape'); 2136 $self->emit ('escape');
1794 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1795 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else { 2141 } else {
1797 return 0; 2142 return 0;
1798 } 2143 }
1799 2144
1800 $self->_set_text ($text); 2145 $self->_set_text ($text);
1801 2146
1802 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1803 2149
1804 1 2150 1
1805} 2151}
1806 2152
1807sub invoke_focus_in { 2153sub invoke_focus_in {
… …
1819 2165
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 2167
1822 # byte-index to char-index 2168 # byte-index to char-index
1823 my $text = $self->{text}; 2169 my $text = $self->{text};
1824 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1826 2172
1827 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1828 $self->update; 2174 $self->update;
1829 2175
1830 1 2176 1
… …
1869 utf8::encode $text; 2215 utf8::encode $text;
1870 2216
1871 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872 } 2218 }
1873 2219
1874 glColor @{$self->{fg}};
1875 glBegin GL_LINES; 2220 glBegin GL_LINES;
1876 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 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}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878 glEnd; 2223 glEnd;
1879 } 2224 }
1880} 2225}
1881 2226
2227#############################################################################
2228
1882package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1883 2230
1884our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1885 2232
1886use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1887 2234
1888sub invoke_key_down { 2235sub invoke_key_down {
1889 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1890 2237
1891 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1892 2239
1893 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1894 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
1896 2243
1897 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1899 $self->emit (activate => $txt); 2246 $self->emit (activate => $txt);
1900 $self->update; 2247 $self->update;
1901 2248
1902 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1905 } 2252 }
1906 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2257 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2259 }
1913 2260
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2264
1918 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1928 1 2275 1
1929} 2276}
1930 2277
1931############################################################################# 2278#############################################################################
1932 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1933package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1934 2320
1935our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1936 2322
1937use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1938 2324
1939my @tex = 2325my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
1942 2328
1943sub new { 2329sub new {
1944 my $class = shift; 2330 my $class = shift;
1945 2331
… …
1982 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
1983} 2369}
1984 2370
1985############################################################################# 2371#############################################################################
1986 2372
2373package CFPlus::UI::CheckBox;
2374
2375our @ISA = CFPlus::UI::DrawBG::;
2376
2377my @tex =
2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2380
2381use CFPlus::OpenGL;
2382
2383sub new {
2384 my $class = shift;
2385
2386 $class->SUPER::new (
2387 padding_x => 2,
2388 padding_y => 2,
2389 fg => [1, 1, 1],
2390 active_fg => [1, 1, 0],
2391 bg => [0, 0, 0, 0.2],
2392 active_bg => [1, 1, 1, 0.5],
2393 state => 0,
2394 can_hover => 1,
2395 @_
2396 )
2397}
2398
2399sub size_request {
2400 my ($self) = @_;
2401
2402 (6) x 2
2403}
2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
2413sub invoke_button_down {
2414 my ($self, $ev, $x, $y) = @_;
2415
2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2418 $self->toggle;
2419 } else {
2420 return 0
2421 }
2422
2423 1
2424}
2425
2426sub _draw {
2427 my ($self) = @_;
2428
2429 $self->SUPER::_draw;
2430
2431 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2432
2433 my ($w, $h) = @$self{qw(w h)};
2434
2435 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2436
2437 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2438
2439 my $tex = $self->{state} ? $tex[1] : $tex[0];
2440
2441 glEnable GL_TEXTURE_2D;
2442 $tex->draw_quad_alpha (0, 0, $s, $s);
2443 glDisable GL_TEXTURE_2D;
2444}
2445
2446#############################################################################
2447
2448package CFPlus::UI::Image;
2449
2450our @ISA = CFPlus::UI::Base::;
2451
2452use CFPlus::OpenGL;
2453
2454our %texture_cache;
2455
2456sub new {
2457 my $class = shift;
2458
2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
2463
2464 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required";
2466
2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2469
2470 CFPlus::weaken $texture_cache{$self->{path}};
2471
2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2473
2474 $self
2475}
2476
2477sub STORABLE_freeze {
2478 my ($self, $cloning) = @_;
2479
2480 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2482
2483 $self->{path}
2484}
2485
2486sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_;
2488
2489 $self->new (path => $path)
2490}
2491
2492sub size_request {
2493 my ($self) = @_;
2494
2495 ($self->{tex}{w}, $self->{tex}{h})
2496}
2497
2498sub _draw {
2499 my ($self) = @_;
2500
2501 my $tex = $self->{tex};
2502
2503 my ($w, $h) = ($self->{w}, $self->{h});
2504
2505 if ($self->{rot90}) {
2506 glRotate 90, 0, 0, 1;
2507 glTranslate 0, -$self->{w}, 0;
2508
2509 ($w, $h) = ($h, $w);
2510 }
2511
2512 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514
2515 $tex->draw_quad (0, 0, $w, $h);
2516
2517 glDisable GL_TEXTURE_2D;
2518}
2519
2520#############################################################################
2521
1987package CFClient::UI::ImageButton; 2522package CFPlus::UI::ImageButton;
1988 2523
1989our @ISA = CFClient::UI::Image::; 2524our @ISA = CFPlus::UI::Image::;
1990 2525
1991use CFClient::OpenGL; 2526use CFPlus::OpenGL;
1992 2527
1993my %textures; 2528my %textures;
1994 2529
1995sub new { 2530sub new {
1996 my $class = shift; 2531 my $class = shift;
… …
2018 1 2553 1
2019} 2554}
2020 2555
2021############################################################################# 2556#############################################################################
2022 2557
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; 2558package CFPlus::UI::VGauge;
2092 2559
2093our @ISA = CFClient::UI::Base::; 2560our @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 2561
2153use List::Util qw(min max); 2562use List::Util qw(min max);
2154 2563
2155use CFClient::OpenGL; 2564use CFPlus::OpenGL;
2156 2565
2157my %tex = ( 2566my %tex = (
2158 food => [ 2567 food => [
2159 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161 ], 2570 ],
2162 grace => [ 2571 grace => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 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/ 2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2165 ], 2574 ],
2166 hp => [ 2575 hp => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169 ], 2578 ],
2170 mana => [ 2579 mana => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 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/ 2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2173 ], 2582 ],
2174); 2583);
2175 2584
2176# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2236 my $ycut1 = max 0, min 1, $ycut; 2645 my $ycut1 = max 0, min 1, $ycut;
2237 my $ycut2 = max 0, min 1, $ycut - 1; 2646 my $ycut2 = max 0, min 1, $ycut - 1;
2238 2647
2239 my $h1 = $self->{h} * (1 - $ycut1); 2648 my $h1 = $self->{h} * (1 - $ycut1);
2240 my $h2 = $self->{h} * (1 - $ycut2); 2649 my $h2 = $self->{h} * (1 - $ycut2);
2650 my $h3 = $self->{h};
2651
2652 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2241 2653
2242 glEnable GL_BLEND; 2654 glEnable GL_BLEND;
2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2655 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2656 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245 glEnable GL_TEXTURE_2D; 2657 glEnable GL_TEXTURE_2D;
… …
2264 2676
2265 if ($t3) { 2677 if ($t3) {
2266 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t3->{name};
2267 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
2268 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2680 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2681 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2682 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2683 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272 glEnd; 2684 glEnd;
2273 } 2685 }
2274 2686
2275 glDisable GL_BLEND; 2687 glDisable GL_BLEND;
2276 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2277} 2689}
2278 2690
2279############################################################################# 2691#############################################################################
2280 2692
2281package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2282 2694
2283our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2284 2696
2285sub new { 2697sub new {
2286 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2287 2699
2288 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2290 can_hover => 1, 2702 can_hover => 1,
2291 can_events => 1, 2703 can_events => 1,
2292 %arg, 2704 %arg,
2293 ); 2705 );
2294 2706
2295 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2707 $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); 2708 $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"); 2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2298 2710
2299 $self 2711 $self
2300} 2712}
2301 2713
2302sub set_fontsize { 2714sub set_fontsize {
… …
2323 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2324} 2736}
2325 2737
2326############################################################################# 2738#############################################################################
2327 2739
2328package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2329 2741
2330use strict; 2742use strict;
2331 2743
2332use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2333 2745
2334our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2335 2747
2336my @tex = 2748my @tex =
2337 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2339 2751
2340sub new { 2752sub new {
2341 my $class = shift; 2753 my $class = shift;
2342 2754
… …
2431 } 2843 }
2432 2844
2433 1 2845 1
2434} 2846}
2435 2847
2848sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_;
2850
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856
2857 ! ! $delta
2858}
2859
2436sub update { 2860sub update {
2437 my ($self) = @_; 2861 my ($self) = @_;
2438 2862
2439 delete $self->{knob_w}; 2863 delete $self->{knob_w};
2440 $self->SUPER::update; 2864 $self->SUPER::update;
… …
2487 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2488} 2912}
2489 2913
2490############################################################################# 2914#############################################################################
2491 2915
2492package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2493 2917
2494our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2495 2919
2496sub new { 2920sub new {
2497 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2498 2922
2499 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2500 2924
2501 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2502 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504 to_value => sub { shift }, 2928 to_value => sub { shift },
2505 from_value => sub { shift }, 2929 from_value => sub { shift },
2506 %arg, 2930 %arg,
2507 ); 2931 );
2508 2932
… …
2528sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2529sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2530 2954
2531############################################################################# 2955#############################################################################
2532 2956
2533package CFClient::UI::TextScroller; 2957package CFPlus::UI::TextScroller;
2534 2958
2535our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2536 2960
2537use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2538 2962
2539sub new { 2963sub new {
2540 my $class = shift; 2964 my $class = shift;
2541 2965
2542 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2543 fontsize => 1, 2967 fontsize => 1,
2544 can_events => 0, 2968 can_events => 1,
2545 indent => 0, 2969 indent => 0,
2546 #font => default_font 2970 #font => default_font
2547 @_, 2971 @_,
2548 2972
2549 layout => (new CFClient::Layout 1), 2973 layout => (new CFPlus::Layout),
2550 par => [], 2974 par => [],
2975 max_par => 0,
2551 height => 0, 2976 height => 0,
2552 children => [ 2977 children => [
2553 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2554 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2555 ], 2980 ],
2556 ); 2981 );
2557 2982
2558 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2559 2984
… …
2565 2990
2566 $self->{fontsize} = $fontsize; 2991 $self->{fontsize} = $fontsize;
2567 $self->reflow; 2992 $self->reflow;
2568} 2993}
2569 2994
2995sub size_request {
2996 my ($self) = @_;
2997
2998 my ($empty, $slider) = @{ $self->{children} };
2999
3000 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request
3002}
3003
2570sub invoke_size_allocate { 3004sub invoke_size_allocate {
2571 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2572 3006
3007 my ($empty, $slider, @other) = @{ $self->{children} };
3008 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3009
2573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3010 $self->{layout}->set_font ($self->{font}) if $self->{font};
2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3011 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575 $self->{layout}->set_width ($self->{children}[0]{w}); 3012 $self->{layout}->set_width ($empty->{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3013 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577 3014
2578 $self->reflow; 3015 $self->reflow;
2579 3016
3017 local $self->{children} = [$empty, $slider];
2580 $self->SUPER::invoke_size_allocate ($w, $h) 3018 $self->SUPER::invoke_size_allocate ($w, $h)
2581} 3019}
2582 3020
2583sub text_size { 3021sub invoke_mouse_wheel {
2584 my ($self, $text, $indent) = @_; 3022 my ($self, $ev) = @_;
3023
3024 return 0 unless $ev->{dy}; # only vertical movements
3025
3026 $self->{children}[1]->emit (mouse_wheel => $ev);
3027
3028 1
3029}
3030
3031sub get_layout {
3032 my ($self, $para) = @_;
2585 3033
2586 my $layout = $self->{layout}; 3034 my $layout = $self->{layout};
2587 3035
3036 $layout->set_font ($self->{font}) if $self->{font};
3037 $layout->set_foreground (@{$para->{fg}});
2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3038 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589 $layout->set_width ($self->{children}[0]{w} - $indent); 3039 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3040 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591 $layout->set_markup ($text); 3041 $layout->set_markup ($para->{markup});
3042
3043 $layout->set_shapes (
3044 map
3045 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3046 @{$para->{widget}}
2592 3047 );
3048
2593 $layout->size 3049 $layout
2594} 3050}
2595 3051
2596sub reflow { 3052sub reflow {
2597 my ($self) = @_; 3053 my ($self) = @_;
2598 3054
… …
2605 3061
2606 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2607 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2608} 3064}
2609 3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
3079}
3080
2610sub clear { 3081sub clear {
2611 my ($self) = @_; 3082 my ($self) = @_;
3083
3084 my (undef, undef, @other) = @{ $self->{children} };
3085 $self->remove ($_) for @other;
2612 3086
2613 $self->{par} = []; 3087 $self->{par} = [];
2614 $self->{height} = 0; 3088 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616} 3090}
2617 3091
2618sub add_paragraph { 3092sub add_paragraph {
2619 my ($self, $color, $text, $indent) = @_; 3093 my $self = shift;
2620 3094
2621 for my $line (split /\n/, $text) { 3095 for my $para (@_) {
2622 my ($w, $h) = $self->text_size ($line); 3096 $para = {
3097 fg => [1, 1, 1, 1],
3098 indent => 0,
3099 markup => "",
3100 widget => [],
3101 ref $para ? %$para : (markup => $para),
3102 w => 1e10,
3103 wrapped => 1,
3104 };
3105
3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
3114 $self->{need_reflow}++;
3115 $self->update;
3116}
3117
3118sub scroll_to_bottom {
3119 my ($self) = @_;
3120
3121 $self->{scroll_to} = $#{$self->{par}};
3122 $self->update;
3123}
3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
2623 $self->{height} += $h; 3147 $self->{height} = $height;
2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2625 }
2626 3149
2627 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
2628} 3156}
2629 3157
2630sub update { 3158sub update {
2631 my ($self) = @_; 3159 my ($self) = @_;
2632 3160
… …
2635 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2636 3164
2637 delete $self->{texture}; 3165 delete $self->{texture};
2638 3166
2639 $ROOT->on_post_alloc ($self => sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641 3171
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 { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670 glClearColor 0, 0, 0, 0; 3173 glClearColor 0, 0, 0, 0;
2671 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2672 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2673 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2674 3185
2675 my $y0 = $top; 3186 my $y0 = $top;
2676 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2677 3188
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}}) { 3189 for my $para (@{$self->{par}}) {
2689 my $h = $par->[1]; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2690 3192
2691 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2692 $layout->set_foreground (@{ $par->[2] }); 3194 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 3195
2697 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3196 $layout->render ($para->{indent}, $y - $y0);
2698 3197
2699 glRasterPos $par->[3], $y - $y0; 3198 if (my @w = @{ $para->{widget} }) {
2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3199 my @s = $layout->get_shapes;
3200
3201 for (@w) {
3202 my ($dx, $dy) = splice @s, 0, 2, ();
3203
3204 $_->{x} = $dx + $para->{indent};
3205 $_->{y} = $dy + $y - $y0;
3206
3207 $_->draw;
3208 }
3209 }
2701 } 3210 }
2702 3211
2703 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2704 } 3214 }
2705 3215
2706 glDisable GL_BLEND; 3216 $self->{top_paragraph} = $top_paragraph;
2707 }; 3217 };
2708 }); 3218 });
3219}
3220
3221sub reconfigure {
3222 my ($self) = @_;
3223
3224 $self->SUPER::reconfigure;
3225
3226 $_->{w} = 1e10 for @{ $self->{par} };
3227 $self->reflow;
2709} 3228}
2710 3229
2711sub _draw { 3230sub _draw {
2712 my ($self) = @_; 3231 my ($self) = @_;
2713 3232
… …
2716 glColor 0, 0, 0, 1; 3235 glColor 0, 0, 0, 1;
2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3236 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718 glDisable GL_TEXTURE_2D; 3237 glDisable GL_TEXTURE_2D;
2719 3238
2720 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2721
2722} 3240}
2723 3241
2724############################################################################# 3242#############################################################################
2725 3243
2726package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2727 3245
2728use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2729 3247
2730our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2731 3249
2732sub moveto { 3250sub moveto {
2733 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2734 3252
2735 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2763 glPopMatrix; 3281 glPopMatrix;
2764} 3282}
2765 3283
2766############################################################################# 3284#############################################################################
2767 3285
2768package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2769 3287
2770our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2771 3289
2772sub new { 3290sub new {
2773 my $class = shift; 3291 my $class = shift;
2774 3292
2775 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2787 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2788} 3306}
2789 3307
2790############################################################################# 3308#############################################################################
2791 3309
2792package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2793 3311
2794our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2795 3313
2796use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2797 3315
2798sub new { 3316sub new {
2799 my $class = shift; 3317 my $class = shift;
2800 3318
2801 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2804 ) 3322 )
2805} 3323}
2806 3324
2807sub set_tooltip_from { 3325sub set_tooltip_from {
2808 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
2809 3330
2810 my $tooltip = $widget->{tooltip}; 3331 my $tooltip = $widget->{tooltip};
2811 3332
2812 if ($ENV{CFPLUS_DEBUG} & 2) { 3333 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n" 3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2817 } 3338 }
2818 3339
2819 $tooltip =~ s/^\n+//; 3340 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//; 3341 $tooltip =~ s/\n+$//;
2821 3342
2822 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2823 markup => $tooltip, 3344 markup => $tooltip,
2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825 fontsize => 0.8, 3346 fontsize => 0.8,
2826 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2827 ellipsise => 0, 3348 ellipsise => 0,
2828 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2829 ); 3350 );
2830} 3351}
2831 3352
… …
2850 3371
2851 $self->{root}->on_post_alloc ("move_$self" => sub { 3372 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner} 3373 my $widget = $self->{owner}
2853 or return; 3374 or return;
2854 3375
3376 if ($widget->{visible}) {
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3377 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856 3378
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3379 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w}; 3380 if $x + $self->{w} > $self->{root}{w};
2859 3381
2860 $self->move_abs ($x, $y); 3382 $self->move_abs ($x, $y);
3383 } else {
3384 $self->hide;
3385 }
2861 }); 3386 });
2862} 3387}
2863 3388
2864sub _draw { 3389sub _draw {
2865 my ($self) = @_; 3390 my ($self) = @_;
… …
2889 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
2890} 3415}
2891 3416
2892############################################################################# 3417#############################################################################
2893 3418
2894package CFClient::UI::Face; 3419package CFPlus::UI::Face;
2895 3420
2896our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
2897 3422
2898use CFClient::OpenGL; 3423use CFPlus::OpenGL;
2899 3424
2900sub new { 3425sub new {
2901 my $class = shift; 3426 my $class = shift;
2902 3427
2903 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
2904 aspect => 1, 3431 aspect => 1,
2905 can_events => 0, 3432 can_events => 0,
2906 @_, 3433 @_,
2907 ); 3434 );
2908 3435
2909 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
2910 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
2911 3438
2912 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
2913 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2914 hard => 1, 3441 hard => 1,
2915 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
2916 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
2917 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
2918 $widget->update; 3448 $self->update;
2919 }, 3449 },
2920 ); 3450 );
3451
3452 $self->update_face;
2921 } 3453 }
2922 3454
2923 $self 3455 $self
2924} 3456}
2925 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
2926sub size_request { 3471sub size_request {
2927 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
2928} 3487}
2929 3488
2930sub update { 3489sub update {
2931 my ($self) = @_; 3490 my ($self) = @_;
2932 3491
… …
2938sub _draw { 3497sub _draw {
2939 my ($self) = @_; 3498 my ($self) = @_;
2940 3499
2941 return unless $::CONN; 3500 return unless $::CONN;
2942 3501
2943 my $face; 3502 $self->SUPER::_draw;
2944 3503
2945 if ($self->{frame}) {
2946 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
2947 3505 or return;
2948 $face = $anim->[ $self->{frame} % @$anim ]
2949 if $anim && @$anim;
2950 }
2951 3506
2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
2953 3508
2954 if ($tex) { 3509 if ($tex) {
2955 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2957 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;
… …
2969 $self->SUPER::destroy; 3524 $self->SUPER::destroy;
2970} 3525}
2971 3526
2972############################################################################# 3527#############################################################################
2973 3528
2974package CFClient::UI::Buttonbar; 3529package CFPlus::UI::Buttonbar;
2975 3530
2976our @ISA = CFClient::UI::HBox::; 3531our @ISA = CFPlus::UI::HBox::;
2977 3532
2978# TODO: should actualyl wrap buttons and other goodies. 3533# TODO: should actually wrap buttons and other goodies.
2979 3534
2980############################################################################# 3535#############################################################################
2981 3536
2982package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
2983 3538
2984our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
2985 3540
2986use CFClient::OpenGL; 3541use CFPlus::OpenGL;
2987 3542
2988sub new { 3543sub new {
2989 my $class = shift; 3544 my $class = shift;
2990 3545
2991 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
2992 items => [], 3547 items => [],
2993 z => 100, 3548 z => 100,
2994 @_, 3549 @_,
2995 ); 3550 );
2996 3551
2997 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998 3553
2999 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
3000 my ($widget, $cb, $tooltip) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
3001 3556
3002 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
3003 if (!ref $widget) { 3558 if (!ref $widget) {
3559 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2;
3561
3004 $widget = new CFClient::UI::Label 3562 $widget = new CFPlus::UI::HBox
3005 can_hover => 1, 3563 can_hover => 1,
3006 can_events => 1, 3564 can_events => 1,
3565 tooltip => $tooltip,
3566 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1),
3569 ],
3570 ;
3571
3572 } else {
3573 $widget = new CFPlus::UI::Label
3574 can_hover => 1,
3575 can_events => 1,
3007 markup => $widget, 3576 markup => $widget,
3008 tooltip => $tooltip 3577 tooltip => $tooltip;
3578 }
3009 } 3579 }
3010 3580
3011 $self->{item}{$widget} = $item; 3581 $self->{item}{$widget} = $item;
3012 3582
3013 $self->{vbox}->add ($widget); 3583 $self->{vbox}->add ($widget);
… …
3056 1 3626 1
3057} 3627}
3058 3628
3059############################################################################# 3629#############################################################################
3060 3630
3061package CFClient::UI::Multiplexer; 3631package CFPlus::UI::Multiplexer;
3062 3632
3063our @ISA = CFClient::UI::Container::; 3633our @ISA = CFPlus::UI::Container::;
3064 3634
3065sub new { 3635sub new {
3066 my $class = shift; 3636 my $class = shift;
3067 3637
3068 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
… …
3082 3652
3083 $self->{current} = $self->{children}[0] 3653 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} }; 3654 if @{ $self->{children} };
3085} 3655}
3086 3656
3657sub get_current_page {
3658 my ($self) = @_;
3659
3660 $self->{current}
3661}
3662
3087sub set_current_page { 3663sub set_current_page {
3088 my ($self, $page_or_widget) = @_; 3664 my ($self, $page_or_widget) = @_;
3089 3665
3090 my $widget = ref $page_or_widget 3666 my $widget = ref $page_or_widget
3091 ? $page_or_widget 3667 ? $page_or_widget
… …
3123 $self->{current}->draw; 3699 $self->{current}->draw;
3124} 3700}
3125 3701
3126############################################################################# 3702#############################################################################
3127 3703
3128package CFClient::UI::Notebook; 3704package CFPlus::UI::Notebook;
3129 3705
3130our @ISA = CFClient::UI::VBox::; 3706our @ISA = CFPlus::UI::VBox::;
3131 3707
3132sub new { 3708sub new {
3133 my $class = shift; 3709 my $class = shift;
3134 3710
3135 my $self = $class->SUPER::new ( 3711 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar), 3712 buttonbar => (new CFPlus::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self 3714 # filter => # will be put between multiplexer and $self
3139 @_, 3715 @_,
3140 ); 3716 );
3141 3717
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3146} 3722}
3147 3723
3148sub add { 3724sub add {
3149 my ($self, $title, $widget, $tooltip) = @_; 3725 my ($self, $title, $widget, $tooltip) = @_;
3150 3726
3151 Scalar::Util::weaken $self; 3727 CFPlus::weaken $self;
3152 3728
3153 $self->{buttonbar}->add (new CFClient::UI::Button 3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3154 markup => $title, 3730 markup => $title,
3155 tooltip => $tooltip, 3731 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) }, 3732 on_activate => sub { $self->set_current_page ($widget) },
3157 ); 3733 );
3158 3734
3159 $self->{multiplexer}->add ($widget); 3735 $self->{multiplexer}->add ($widget);
3160} 3736}
3161 3737
3738sub get_current_page {
3739 my ($self) = @_;
3740
3741 $self->{multiplexer}->get_current_page
3742}
3743
3162sub set_current_page { 3744sub set_current_page {
3163 my ($self, $page) = @_; 3745 my ($self, $page) = @_;
3164 3746
3165 $self->{multiplexer}->set_current_page ($page); 3747 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current}); 3748 $self->emit (page_changed => $self->{multiplexer}{current});
3167} 3749}
3168 3750
3169############################################################################# 3751#############################################################################
3170 3752
3171package CFClient::UI::Combobox; 3753package CFPlus::UI::Selector;
3172 3754
3173use utf8; 3755use utf8;
3174 3756
3175our @ISA = CFClient::UI::Button::; 3757our @ISA = CFPlus::UI::Button::;
3176 3758
3177sub new { 3759sub new {
3178 my $class = shift; 3760 my $class = shift;
3179 3761
3180 my $self = $class->SUPER::new ( 3762 my $self = $class->SUPER::new (
… …
3197 my ($value, $title, $tooltip) = @$_; 3779 my ($value, $title, $tooltip) = @$_;
3198 3780
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 } 3782 }
3201 3783
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203} 3785}
3204 3786
3205sub _set_value { 3787sub _set_value {
3206 my ($self, $value) = @_; 3788 my ($self, $value) = @_;
3207 3789
… …
3222 $self->emit (changed => $value); 3804 $self->emit (changed => $value);
3223} 3805}
3224 3806
3225############################################################################# 3807#############################################################################
3226 3808
3227package CFClient::UI::Statusbox; 3809package CFPlus::UI::Statusbox;
3228 3810
3229our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3230 3812
3231sub new { 3813sub new {
3232 my $class = shift; 3814 my $class = shift;
3233 3815
3234 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3235 fontsize => 0.8, 3817 fontsize => 0.8,
3236 @_, 3818 @_,
3237 ); 3819 );
3238 3820
3239 Scalar::Util::weaken (my $this = $self); 3821 CFPlus::weaken (my $this = $self);
3240 3822
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242 3824
3243 $self 3825 $self
3244} 3826}
… …
3246sub reorder { 3828sub reorder {
3247 my ($self) = @_; 3829 my ($self) = @_;
3248 my $NOW = Time::HiRes::time; 3830 my $NOW = Time::HiRes::time;
3249 3831
3250 # freeze display when hovering over any label 3832 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner} 3833 return if $CFPlus::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} }; 3835 values %{ $self->{item} };
3254 3836
3255 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
3256 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257 } 3839 }
… …
3278 for ($short) { 3860 for ($short) {
3279 s/^\s+//; 3861 s/^\s+//;
3280 s/\s+/ /g; 3862 s/\s+/ /g;
3281 } 3863 }
3282 3864
3283 new CFClient::UI::Label 3865 new CFPlus::UI::Label
3284 markup => $short, 3866 markup => $short,
3285 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
3286 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
3287 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
3288 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3342 count => 1, 3924 count => 1,
3343 %arg, 3925 %arg,
3344 }; 3926 };
3345 } 3927 }
3346 3928
3929 $ROOT->on_refresh (reorder => sub {
3347 $self->reorder; 3930 $self->reorder;
3931 });
3348} 3932}
3349 3933
3350sub reconfigure { 3934sub reconfigure {
3351 my ($self) = @_; 3935 my ($self) = @_;
3352 3936
… …
3365 $self->SUPER::destroy; 3949 $self->SUPER::destroy;
3366} 3950}
3367 3951
3368############################################################################# 3952#############################################################################
3369 3953
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; 3954package CFPlus::UI::Root;
3733 3955
3734our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3735 3957
3736use List::Util qw(min max); 3958use List::Util qw(min max);
3737 3959
3738use CFClient::OpenGL; 3960use CFPlus::OpenGL;
3739 3961
3740sub new { 3962sub new {
3741 my $class = shift; 3963 my $class = shift;
3742 3964
3743 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3744 visible => 1, 3966 visible => 1,
3745 @_, 3967 @_,
3746 ); 3968 );
3747 3969
3748 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3749 3971
3750 $self 3972 $self
3751} 3973}
3752 3974
3753sub size_request { 3975sub size_request {
… …
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920 4142
3921 $w = 0 if $w < 0; 4143 $w = 0 if $w < 0;
3922 $h = 0 if $h < 0; 4144 $h = 0 if $h < 0;
3923 4145
4146 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h;
4148
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154
3924 $w = int $w + 0.5; 4155 $w = int $w + 0.5;
3925 $h = int $h + 0.5; 4156 $h = int $h + 0.5;
3926 4157
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w}; 4159 $widget->{old_w} = $widget->{w};
… …
3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3953 glLoadIdentity; 4184 glLoadIdentity;
3954 4185
3955 { 4186 {
3956 package CFClient::UI::Base; 4187 package CFPlus::UI::Base;
3957 4188
3958 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
3960 }
3961 4191
3962 $self->_draw; 4192 $self->_draw;
4193 }
3963} 4194}
3964 4195
3965############################################################################# 4196#############################################################################
3966 4197
3967package CFClient::UI; 4198package CFPlus::UI;
3968 4199
3969$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3970$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971 4202
39721 42031
3973 4204

Diff Legend

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