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.375 by root, Mon Jul 16 20:12:19 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
949use List::Util qw(min max);
950
870our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
871 952
872sub new { 953sub new {
873 my $class = shift; 954 my $class = shift;
874 955
875 $class->SUPER::new ( 956 $class->SUPER::new (
… …
905} 986}
906 987
907sub set_offset { 988sub set_offset {
908 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
909 990
910 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
911 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
912 993
913 $self->update; 994 $self->update;
914} 995}
915 996
916# hmm, this does not work for topleft of $self... but we should not ask for that 997# hmm, this does not work for topleft of $self... but we should not ask for that
… …
935 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
936 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
937 ) { 1018 ) {
938 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1019 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
939 } else { 1020 } else {
940 $self->CFClient::UI::Base::find_widget ($x, $y) 1021 $self->CFPlus::UI::Base::find_widget ($x, $y)
941 } 1022 }
942} 1023}
943 1024
944sub _render { 1025sub _render {
945 my ($self) = @_; 1026 my ($self) = @_;
946 1027
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1028 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}; 1029 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
949 1030
950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1031 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
951 1032
952 $self->SUPER::_render; 1033 $self->SUPER::_render;
953} 1034}
954 1035
955############################################################################# 1036#############################################################################
956 1037
957package CFClient::UI::ScrolledWindow; 1038package CFPlus::UI::ScrolledWindow;
958 1039
959our @ISA = CFClient::UI::HBox::; 1040our @ISA = CFPlus::UI::Table::;
960 1041
961sub new { 1042sub new {
962 my ($class, %arg) = @_; 1043 my ($class, %arg) = @_;
963 1044
964 my $child = delete $arg{child}; 1045 my $child = delete $arg{child};
965 1046
966 my $self; 1047 my $self;
967 1048
968 my $slider = new CFClient::UI::Slider 1049 my $hslider = new CFPlus::UI::Slider
1050 vertical => 0,
1051 range => [0, 0, 1, 0.01], # HACK fix
1052 on_changed => sub {
1053 $self->{hpos} = $_[1];
1054 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1055 },
1056 ;
1057
1058 my $vslider = new CFPlus::UI::Slider
969 vertical => 1, 1059 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub { 1061 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]); 1062 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
973 }, 1064 },
974 ; 1065 ;
975 1066
976 $self = $class->SUPER::new ( 1067 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1), 1068 scroll_x => 0,
1069 scroll_y => 1,
1070 can_events => 1,
978 slider => $slider, 1071 hslider => $hslider,
1072 vslider => $vslider,
1073 col_expand => [1, 0],
1074 row_expand => [1, 0],
979 %arg, 1075 %arg,
980 ); 1076 );
981 1077
1078 $self->{vp} = new CFPlus::UI::ViewPort
1079 expand => 1,
1080 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y},
1082 ;
1083
982 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->SUPER::add (0, 0, $self->{vp});
1085
983 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
984 1087
985 $self 1088 $self
986} 1089}
1090
1091#TODO# update range on size_allocate depending on child
987 1092
988sub add { 1093sub add {
989 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
990 1095
991 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
992} 1097}
993 1098
1099sub update_slider {
1100 my ($self) = @_;
1101
1102 my $child = ($self->{vp} or return)->child;
1103
1104 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1105 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1106
1107 my $visible = $w1 > $w2;
1108 if ($visible != $self->{hslider}{visible}) {
1109 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1110 : $self->{hslider}->hide;
1111 }
1112
1113 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1114 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1115
1116 my $visible = $h1 > $h2;
1117 if ($visible != $self->{vslider}{visible}) {
1118 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1119 : $self->{vslider}->hide;
1120 }
1121}
1122
994sub update { 1123sub update {
995 my ($self) = @_; 1124 my ($self) = @_;
996 1125
997 $self->SUPER::update; 1126 $self->SUPER::update;
1127 $self->update_slider;
1128}
998 1129
999 # todo: overwrite size_allocate of child 1130sub invoke_mouse_wheel {
1000 my $child = $self->{vp}->child; 1131 my ($self, $ev) = @_;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1132
1133 return 0 unless $ev->{dy}; # only vertical movements for now
1134
1135 $self->{vslider}->emit (mouse_wheel => $ev);
1136
1137 1
1138}
1139
1140sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_;
1142
1143 if ($ev->{button} == 2) {
1144 $self->grab_focus;
1145
1146 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_;
1148
1149 $self->{vp}->set_offset (
1150 $self->{vp}{view_x} - $ev->{xrel},
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 };
1154
1155 return 1;
1156 }
1157
1158 0
1159}
1160
1161sub invoke_button_up {
1162 my ($self, $ev, $x, $y) = @_;
1163
1164 if (delete $self->{motion}) {
1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_mouse_motion {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if ($self->{motion}) {
1175 $self->{motion}->($ev, $x, $y);
1176 return 1;
1177 }
1178
1179 0
1002} 1180}
1003 1181
1004sub invoke_size_allocate { 1182sub invoke_size_allocate {
1005 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1006 1184
1007 my $child = $self->{vp}->child; 1185 $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) 1186 $self->SUPER::invoke_size_allocate ($w, $h)
1011} 1187}
1012 1188
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
1016############################################################################# 1189#############################################################################
1017 1190
1018package CFClient::UI::Frame; 1191package CFPlus::UI::Frame;
1019 1192
1020our @ISA = CFClient::UI::Bin::; 1193our @ISA = CFPlus::UI::Bin::;
1021 1194
1022use CFClient::OpenGL; 1195use CFPlus::OpenGL;
1023 1196
1024sub new { 1197sub new {
1025 my $class = shift; 1198 my $class = shift;
1026 1199
1027 $class->SUPER::new ( 1200 $class->SUPER::new (
… …
1053 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1054} 1227}
1055 1228
1056############################################################################# 1229#############################################################################
1057 1230
1058package CFClient::UI::FancyFrame; 1231package CFPlus::UI::FancyFrame;
1059 1232
1060our @ISA = CFClient::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1061 1234
1062use CFClient::OpenGL; 1235use CFPlus::OpenGL;
1236
1237sub new {
1238 my ($class, %arg) = @_;
1239
1240 if ((exists $arg{label}) && !ref $arg{label}) {
1241 $arg{label} = new CFPlus::UI::Label
1242 align => 1,
1243 valign => 0,
1244 text => $arg{label},
1245 fontsize => ($arg{border} || 0.8) * 0.75;
1246 }
1247
1248 my $self = $class->SUPER::new (
1249 # label => "",
1250 fg => [0.6, 0.3, 0.1],
1251 border => 0.8,
1252 style => 'single',
1253 %arg,
1254 );
1255
1256 $self
1257}
1258
1259sub add {
1260 my ($self, @widgets) = @_;
1261
1262 $self->SUPER::add (@widgets);
1263 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1264}
1265
1266sub border {
1267 int $_[0]{border} * $::FONTSIZE
1268}
1269
1270sub size_request {
1271 my ($self) = @_;
1272
1273 ($self->{label_w}, undef) = $self->{label}->size_request
1274 if $self->{label};
1275
1276 my ($w, $h) = $self->SUPER::size_request;
1277
1278 (
1279 $w + $self->border * 2,
1280 $h + $self->border * 2,
1281 )
1282}
1283
1284sub invoke_size_allocate {
1285 my ($self, $w, $h) = @_;
1286
1287 my $border = $self->border;
1288
1289 $w -= List::Util::max 0, $border * 2;
1290 $h -= List::Util::max 0, $border * 2;
1291
1292 if (my $label = $self->{label}) {
1293 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1294 $label->{h} = List::Util::min $h, $border;
1295 $label->invoke_size_allocate ($label->{w}, $label->{h});
1296 }
1297
1298 $self->child->configure ($border, $border, $w, $h);
1299
1300 1
1301}
1302
1303sub _draw {
1304 my ($self) = @_;
1305
1306 my $child = $self->{children}[0];
1307
1308 my $border = $self->border;
1309 my ($w, $h) = ($self->{w}, $self->{h});
1310
1311 $child->draw;
1312
1313 glColor @{$self->{fg}};
1314 glBegin GL_LINE_STRIP;
1315 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1316 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1317 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1318 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1319 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1320 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1321 glEnd;
1322
1323 if ($self->{label}) {
1324 glTranslate $border * 2, 0;
1325 $self->{label}->_draw;
1326 }
1327}
1328
1329#############################################################################
1330
1331package CFPlus::UI::Toplevel;
1332
1333our @ISA = CFPlus::UI::Bin::;
1334
1335use CFPlus::OpenGL;
1063 1336
1064my $bg = 1337my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1338 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1; 1339 mipmap => 1, wrap => 1;
1067 1340
1068my @border = 1341my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1342 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); 1343 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071 1344
1072sub new { 1345sub new {
1073 my ($class, %arg) = @_; 1346 my ($class, %arg) = @_;
1074 1347
1075 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1076 bg => [1, 1, 1, 1], 1349 bg => [1, 1, 1, 1],
1077 border_bg => [1, 1, 1, 1], 1350 border_bg => [1, 1, 1, 1],
1078 border => 0.6, 1351 border => 0.6,
1079 can_events => 1, 1352 can_events => 1,
1080 min_w => 16, 1353 min_w => 64,
1081 min_h => 16, 1354 min_h => 32,
1082 %arg, 1355 %arg,
1083 ); 1356 );
1084 1357
1085 $self->{title_widget} = new CFClient::UI::Label 1358 $self->{title_widget} = new CFPlus::UI::Label
1086 align => 0, 1359 align => 0,
1087 valign => 1, 1360 valign => 1,
1088 text => $self->{title}, 1361 text => $self->{title},
1089 fontsize => $self->{border}, 1362 fontsize => $self->{border},
1090 if exists $self->{title}; 1363 if exists $self->{title};
1091 1364
1092 if ($self->{has_close_button}) { 1365 if ($self->{has_close_button}) {
1093 $self->{close_button} = 1366 $self->{close_button} =
1094 new CFClient::UI::ImageButton 1367 new CFPlus::UI::ImageButton
1095 image => 'x1_close.png', 1368 path => 'x1_close.png',
1096 on_activate => sub { $self->hide }; 1369 on_activate => sub { $self->emit ("delete") };
1097 1370
1098 $self->CFClient::UI::Container::add ($self->{close_button}); 1371 $self->CFPlus::UI::Container::add ($self->{close_button});
1099 } 1372 }
1100 1373
1101 $self 1374 $self
1102} 1375}
1103 1376
1104sub add { 1377sub add {
1105 my ($self, @widgets) = @_; 1378 my ($self, @widgets) = @_;
1106 1379
1107 $self->SUPER::add (@widgets); 1380 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1381 $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}; 1382 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1110} 1383}
1111 1384
1112sub border { 1385sub border {
1113 int $_[0]{border} * $::FONTSIZE 1386 int $_[0]{border} * $::FONTSIZE
1114} 1387}
… …
1147 $self->child->configure ($border, $border, $w, $h); 1420 $self->child->configure ($border, $border, $w, $h);
1148 1421
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1422 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button}; 1423 if $self->{close_button};
1151 1424
1425 1
1426}
1427
1428sub invoke_delete {
1429 my ($self) = @_;
1430
1431 $self->hide;
1432
1152 1 1433 1
1153} 1434}
1154 1435
1155sub invoke_button_down { 1436sub invoke_button_down {
1156 my ($self, $ev, $x, $y) = @_; 1437 my ($self, $ev, $x, $y) = @_;
… …
1214 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1495 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215 1496
1216 ! ! $self->{motion} 1497 ! ! $self->{motion}
1217} 1498}
1218 1499
1500sub invoke_visibility_change {
1501 my ($self, $visible) = @_;
1502
1503 delete $self->{motion} unless $visible;
1504
1505 0
1506}
1507
1219sub _draw { 1508sub _draw {
1220 my ($self) = @_; 1509 my ($self) = @_;
1221 1510
1222 my $child = $self->{children}[0]; 1511 my $child = $self->{children}[0];
1223 1512
… …
1260 if $self->{close_button}; 1549 if $self->{close_button};
1261} 1550}
1262 1551
1263############################################################################# 1552#############################################################################
1264 1553
1265package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1266 1555
1267our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Base::;
1268 1557
1269use List::Util qw(max sum); 1558use List::Util qw(max sum);
1270 1559
1271use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1272 1561
1273sub new { 1562sub new {
1274 my $class = shift; 1563 my $class = shift;
1275 1564
1276 $class->SUPER::new ( 1565 $class->SUPER::new (
1566 children => [],
1277 col_expand => [], 1567 col_expand => [],
1568 row_expand => [],
1278 @_, 1569 @_,
1279 ) 1570 )
1280} 1571}
1281 1572
1282sub children { 1573sub children {
1283 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1284} 1575}
1285 1576
1577# TODO: store row/col info in child widget and use standard add/del
1286sub add { 1578sub add {
1287 my ($self, $x, $y, $child) = @_; 1579 my ($self) = shift;
1288 1580
1581 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, ();
1289 $child->set_parent ($self); 1583 $child->set_parent ($self);
1290 $self->{children}[$y][$x] = $child; 1584 $self->{children}[$y][$x] = $child;
1585 }
1291 1586
1587 $self->{force_realloc} = 1;
1588 $self->{force_size_alloc} = 1;
1292 $self->realloc; 1589 $self->realloc;
1293} 1590}
1294 1591
1295sub remove { 1592sub remove {
1296 my ($self, $child) = @_; 1593 my ($self, $child) = @_;
1297 1594
1298 # TODO: not yet implemented 1595 for (@{ $self->{children} }) {
1596 for (@{ $_ || [] }) {
1597 $_ = undef if $_ == $child;
1598 }
1599 }
1299} 1600}
1300 1601
1301# TODO: move to container class maybe? send children a signal on removal? 1602# TODO: move to container class maybe? send children a signal on removal?
1302sub clear { 1603sub clear {
1303 my ($self) = @_; 1604 my ($self) = @_;
… …
1352 my ($ws, $hs) = $self->get_wh; 1653 my ($ws, $hs) = $self->get_wh;
1353 1654
1354 my $req_w = (sum @$ws) || 1; 1655 my $req_w = (sum @$ws) || 1;
1355 my $req_h = (sum @$hs) || 1; 1656 my $req_h = (sum @$hs) || 1;
1356 1657
1357 # TODO: nicer code && do row_expand 1658 # TODO: nicer code
1358 my @col_expand = @{$self->{col_expand}}; 1659 my @col_expand = @{$self->{col_expand}};
1359 @col_expand = (1) x @$ws unless @col_expand; 1660 @col_expand = (1) x @$ws unless @col_expand;
1360 my $col_expand = (sum @col_expand) || 1; 1661 my $col_expand = (sum @col_expand) || 1;
1361 1662
1362 # linearly scale sizes
1363 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1364 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1365 1664
1366 CFClient::UI::harmonize $ws; 1665 CFPlus::UI::harmonize $ws;
1666
1667 my @row_expand = @{$self->{row_expand}};
1668 @row_expand = (1) x @$ws unless @row_expand;
1669 my $row_expand = (sum @row_expand) || 1;
1670
1671 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1672
1367 CFClient::UI::harmonize $hs; 1673 CFPlus::UI::harmonize $hs;
1368 1674
1369 my $y; 1675 my $y;
1370 1676
1371 for my $r (0 .. $#{$self->{children}}) { 1677 for my $r (0 .. $#{$self->{children}}) {
1372 my $row = $self->{children}[$r] 1678 my $row = $self->{children}[$r]
… …
1415 } 1721 }
1416} 1722}
1417 1723
1418############################################################################# 1724#############################################################################
1419 1725
1420package CFClient::UI::Box; 1726package CFPlus::UI::Fixed;
1421 1727
1728use List::Util qw(min max);
1729
1422our @ISA = CFClient::UI::Container::; 1730our @ISA = CFPlus::UI::Container::;
1731
1732sub add {
1733 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1734
1735 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1736 $self->SUPER::add ($child);
1737}
1738
1739sub _scale($$$) {
1740 my ($mode, $val, $max) = @_;
1741
1742 $mode eq "abs" ? $val
1743 : $mode eq "rel" ? $val * $max
1744 : 0
1745}
1746
1747sub size_request {
1748 my ($self) = @_;
1749
1750 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1751
1752 # determine overall size by querying abs widgets
1753 for my $child ($self->visible_children) {
1754 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1755
1756 if ($pos eq "abs") {
1757 $w = _scale $size, $w, $child->{req_w};
1758 $h = _scale $size, $h, $child->{req_h};
1759
1760 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1761 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1762 }
1763 }
1764
1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
1768 # now layout remaining widgets
1769 for my $child ($self->visible_children) {
1770 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1771
1772 if ($pos ne "abs") {
1773 $x = _scale $pos, $x, $W;
1774 $y = _scale $pos, $x, $H;
1775 $w = _scale $size, $w, $child->{req_w};
1776 $h = _scale $size, $h, $child->{req_h};
1777
1778 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1779 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1780 }
1781 }
1782
1783 my $W = $x2 - $x1;
1784 my $H = $y2 - $y1;
1785
1786 ($W, $H)
1787}
1788
1789sub invoke_size_allocate {
1790 my ($self, $W, $H) = @_;
1791
1792 for my $child ($self->visible_children) {
1793 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1794
1795 $x = _scale $pos, $x, $W;
1796 $y = _scale $pos, $x, $H;
1797 $w = _scale $size, $w, $child->{req_w};
1798 $h = _scale $size, $h, $child->{req_h};
1799
1800 $child->configure ($x, $y, $w, $h);
1801 }
1802
1803 1
1804}
1805
1806#############################################################################
1807
1808package CFPlus::UI::Box;
1809
1810our @ISA = CFPlus::UI::Container::;
1423 1811
1424sub size_request { 1812sub size_request {
1425 my ($self) = @_; 1813 my ($self) = @_;
1426 1814
1427 $self->{vertical} 1815 $self->{vertical}
… …
1437 1825
1438sub invoke_size_allocate { 1826sub invoke_size_allocate {
1439 my ($self, $w, $h) = @_; 1827 my ($self, $w, $h) = @_;
1440 1828
1441 my $space = $self->{vertical} ? $h : $w; 1829 my $space = $self->{vertical} ? $h : $w;
1442 my $children = $self->{children}; 1830 my @children = $self->visible_children;
1443 1831
1444 my @req; 1832 my @req;
1445 1833
1446 if ($self->{homogeneous}) { 1834 if ($self->{homogeneous}) {
1447 @req = ($space / (@$children || 1)) x @$children; 1835 @req = ($space / (@children || 1)) x @children;
1448 } else { 1836 } else {
1449 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1837 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1450 my $req = List::Util::sum @req; 1838 my $req = List::Util::sum @req;
1451 1839
1452 if ($req > $space) { 1840 if ($req > $space) {
1453 # ah well, not enough space 1841 # ah well, not enough space
1454 $_ *= $space / $req for @req; 1842 $_ *= $space / $req for @req;
1455 } else { 1843 } else {
1456 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1844 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1457 1845
1458 $space = ($space - $req) / $expand; # remaining space to give away 1846 $space = ($space - $req) / $expand; # remaining space to give away
1459 1847
1460 $req[$_] += $space * $children->[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1461 for 0 .. $#$children; 1849 for 0 .. $#children;
1462 } 1850 }
1463 } 1851 }
1464 1852
1465 CFClient::UI::harmonize \@req; 1853 CFPlus::UI::harmonize \@req;
1466 1854
1467 my $pos = 0; 1855 my $pos = 0;
1468 for (0 .. $#$children) { 1856 for (0 .. $#children) {
1469 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1470 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1858 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1471 1859
1472 $pos += $alloc; 1860 $pos += $alloc;
1473 } 1861 }
1474 1862
1475 1 1863 1
1476} 1864}
1477 1865
1478############################################################################# 1866#############################################################################
1479 1867
1480package CFClient::UI::HBox; 1868package CFPlus::UI::HBox;
1481 1869
1482our @ISA = CFClient::UI::Box::; 1870our @ISA = CFPlus::UI::Box::;
1483 1871
1484sub new { 1872sub new {
1485 my $class = shift; 1873 my $class = shift;
1486 1874
1487 $class->SUPER::new ( 1875 $class->SUPER::new (
… …
1490 ) 1878 )
1491} 1879}
1492 1880
1493############################################################################# 1881#############################################################################
1494 1882
1495package CFClient::UI::VBox; 1883package CFPlus::UI::VBox;
1496 1884
1497our @ISA = CFClient::UI::Box::; 1885our @ISA = CFPlus::UI::Box::;
1498 1886
1499sub new { 1887sub new {
1500 my $class = shift; 1888 my $class = shift;
1501 1889
1502 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1505 ) 1893 )
1506} 1894}
1507 1895
1508############################################################################# 1896#############################################################################
1509 1897
1510package CFClient::UI::Label; 1898package CFPlus::UI::Label;
1511 1899
1512our @ISA = CFClient::UI::DrawBG::; 1900our @ISA = CFPlus::UI::DrawBG::;
1513 1901
1514use CFClient::OpenGL; 1902use CFPlus::OpenGL;
1515 1903
1516sub new { 1904sub new {
1517 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1518 1906
1519 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
… …
1522 #active_bg => none 1910 #active_bg => none
1523 #font => default_font 1911 #font => default_font
1524 #text => initial text 1912 #text => initial text
1525 #markup => initial narkup 1913 #markup => initial narkup
1526 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1915 #style => 0, # render flags
1527 ellipsise => 3, # end 1916 ellipsise => 3, # end
1528 layout => (new CFClient::Layout), 1917 layout => (new CFPlus::Layout),
1529 fontsize => 1, 1918 fontsize => 1,
1530 align => -1, 1919 align => -1,
1531 valign => -1, 1920 valign => -1,
1532 padding_x => 2, 1921 padding_x => 2,
1533 padding_y => 2, 1922 padding_y => 2,
1534 can_events => 0, 1923 can_events => 0,
1535 %arg 1924 %arg
1536 ); 1925 );
1537 1926
1538 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1539 my $layout = new CFClient::Layout; 1928 my $layout = new CFPlus::Layout;
1540 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1541 $self->{template} = $layout; 1930 $self->{template} = $layout;
1542 } 1931 }
1543 1932
1544 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
… …
1548 } 1937 }
1549 1938
1550 $self 1939 $self
1551} 1940}
1552 1941
1553sub escape($) {
1554 local $_ = $_[0];
1555
1556 s/&/&amp;/g;
1557 s/>/&gt;/g;
1558 s/</&lt;/g;
1559
1560 $_
1561}
1562
1563sub update { 1942sub update {
1564 my ($self) = @_; 1943 my ($self) = @_;
1565 1944
1566 delete $self->{texture}; 1945 delete $self->{texture};
1567 $self->SUPER::update; 1946 $self->SUPER::update;
… …
1578 my ($self, $text) = @_; 1957 my ($self, $text) = @_;
1579 1958
1580 return if $self->{text} eq "T$text"; 1959 return if $self->{text} eq "T$text";
1581 $self->{text} = "T$text"; 1960 $self->{text} = "T$text";
1582 1961
1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1584 $self->{layout}->set_text ($text); 1962 $self->{layout}->set_text ($text);
1585 1963
1586 delete $self->{size_req}; 1964 delete $self->{size_req};
1587 $self->realloc; 1965 $self->realloc;
1588 $self->update; 1966 $self->update;
… …
1594 return if $self->{text} eq "M$markup"; 1972 return if $self->{text} eq "M$markup";
1595 $self->{text} = "M$markup"; 1973 $self->{text} = "M$markup";
1596 1974
1597 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1975 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1598 1976
1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1600 $self->{layout}->set_markup ($markup); 1977 $self->{layout}->set_markup ($markup);
1601 1978
1602 delete $self->{size_req}; 1979 delete $self->{size_req};
1603 $self->realloc; 1980 $self->realloc;
1604 $self->update; 1981 $self->update;
… …
1616 1993
1617 my ($w, $h) = $self->{layout}->size; 1994 my ($w, $h) = $self->{layout}->size;
1618 1995
1619 if (exists $self->{template}) { 1996 if (exists $self->{template}) {
1620 $self->{template}->set_font ($self->{font}) if $self->{font}; 1997 $self->{template}->set_font ($self->{font}) if $self->{font};
1998 $self->{template}->set_width ($self->{max_w} || -1);
1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1999 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 2000
1623 my ($w2, $h2) = $self->{template}->size; 2001 my ($w2, $h2) = $self->{template}->size;
1624 2002
1625 $w = List::Util::max $w, $w2; 2003 $w = List::Util::max $w, $w2;
… …
1630 }; 2008 };
1631 2009
1632 @{ $self->{size_req} } 2010 @{ $self->{size_req} }
1633} 2011}
1634 2012
2013sub baseline_shift {
2014 $_[0]{layout}->descent
2015}
2016
1635sub invoke_size_allocate { 2017sub invoke_size_allocate {
1636 my ($self, $w, $h) = @_; 2018 my ($self, $w, $h) = @_;
1637 2019
1638 delete $self->{ox}; 2020 delete $self->{ox};
1639 2021
… …
1645 2027
1646sub set_fontsize { 2028sub set_fontsize {
1647 my ($self, $fontsize) = @_; 2029 my ($self, $fontsize) = @_;
1648 2030
1649 $self->{fontsize} = $fontsize; 2031 $self->{fontsize} = $fontsize;
2032 delete $self->{size_req};
1650 delete $self->{texture}; 2033 delete $self->{texture};
1651 2034
1652 $self->realloc; 2035 $self->realloc;
1653} 2036}
1654 2037
1655sub reconfigure { 2038sub reconfigure {
1656 my ($self) = @_; 2039 my ($self) = @_;
1657 2040
1658 delete $self->{size_req}; 2041 delete $self->{size_req};
2042 delete $self->{texture};
1659 2043
1660 $self->SUPER::reconfigure; 2044 $self->SUPER::reconfigure;
1661} 2045}
1662 2046
1663sub _draw { 2047sub _draw {
1664 my ($self) = @_; 2048 my ($self) = @_;
1665 2049
1666 $self->SUPER::_draw; # draw background, if applicable 2050 $self->SUPER::_draw; # draw background, if applicable
1667 2051
1668 my $tex = $self->{texture} ||= do { 2052 my $size = $self->{texture} ||= do {
1669 $self->{layout}->set_foreground (@{$self->{fg}}); 2053 $self->{layout}->set_foreground (@{$self->{fg}});
1670 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2054 $self->{layout}->set_font ($self->{font}) if $self->{font};
1671 $self->{layout}->set_width ($self->{w}); 2055 $self->{layout}->set_width ($self->{w});
1672 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2056 $self->{layout}->set_ellipsise ($self->{ellipsise});
1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2057 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2058 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1675 2059
1676 new_from_layout CFClient::Texture $self->{layout} 2060 [$self->{layout}->size]
1677 }; 2061 };
1678 2062
1679 unless (exists $self->{ox}) { 2063 unless (exists $self->{ox}) {
1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2064 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2065 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1682 : ($self->{w} - $tex->{w}) * 0.5); 2066 : ($self->{w} - $size->[0]) * 0.5);
1683 2067
1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2068 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2069 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1686 : ($self->{h} - $tex->{h}) * 0.5); 2070 : ($self->{h} - $size->[1]) * 0.5);
1687 }; 2071 };
1688 2072
1689 glEnable GL_TEXTURE_2D;
1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2073 my $w = List::Util::min $self->{w} + 4, $size->[0];
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2074 my $h = List::Util::min $self->{h} + 2, $size->[1];
1693 2075
1694 if ($tex->{format} == GL_ALPHA) { 2076 $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} 2077}
1705 2078
1706############################################################################# 2079#############################################################################
1707 2080
1708package CFClient::UI::EntryBase; 2081package CFPlus::UI::EntryBase;
1709 2082
1710our @ISA = CFClient::UI::Label::; 2083our @ISA = CFPlus::UI::Label::;
1711 2084
1712use CFClient::OpenGL; 2085use CFPlus::OpenGL;
1713 2086
1714sub new { 2087sub new {
1715 my $class = shift; 2088 my $class = shift;
1716 2089
1717 $class->SUPER::new ( 2090 $class->SUPER::new (
… …
1721 active_fg => [0, 0, 0], 2094 active_fg => [0, 0, 0],
1722 can_hover => 1, 2095 can_hover => 1,
1723 can_focus => 1, 2096 can_focus => 1,
1724 valign => 0, 2097 valign => 0,
1725 can_events => 1, 2098 can_events => 1,
2099 ellipsise => 0,
1726 #text => ... 2100 #text => ...
1727 #hidden => "*", 2101 #hidden => "*",
1728 @_ 2102 @_
1729 ) 2103 )
1730} 2104}
… …
1775 my $sym = $ev->{sym}; 2149 my $sym = $ev->{sym};
1776 my $uni = $ev->{unicode}; 2150 my $uni = $ev->{unicode};
1777 2151
1778 my $text = $self->get_text; 2152 my $text = $self->get_text;
1779 2153
2154 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2155
1780 if ($uni == 8) { 2156 if ($uni == 8) {
1781 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2157 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1782 } elsif ($uni == 127) { 2158 } elsif ($uni == 127) {
1783 substr $text, $self->{cursor}, 1, ""; 2159 substr $text, $self->{cursor}, 1, "";
1784 } elsif ($sym == CFClient::SDLK_LEFT) { 2160 } elsif ($sym == CFPlus::SDLK_LEFT) {
1785 --$self->{cursor} if $self->{cursor}; 2161 --$self->{cursor} if $self->{cursor};
1786 } elsif ($sym == CFClient::SDLK_RIGHT) { 2162 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1787 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2163 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1788 } elsif ($sym == CFClient::SDLK_HOME) { 2164 } elsif ($sym == CFPlus::SDLK_HOME) {
2165 # what a hack
2166 $self->{cursor} =
2167 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2168 ? length $1
2169 : 0;
2170 } elsif ($sym == CFPlus::SDLK_END) {
2171 # uh, again
2172 $self->{cursor} =
2173 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2174 ? $self->{cursor} + length $1
2175 : length $self->{text};
2176 } elsif ($uni == 21) { # ctrl-u
2177 $text = "";
1789 $self->{cursor} = 0; 2178 $self->{cursor} = 0;
1790 } elsif ($sym == CFClient::SDLK_END) {
1791 $self->{cursor} = length $text;
1792 } elsif ($uni == 27) { 2179 } elsif ($uni == 27) {
1793 $self->emit ('escape'); 2180 $self->emit ('escape');
1794 } elsif ($uni) { 2181 } elsif ($uni == 0x0d) {
2182 substr $text, $self->{cursor}++, 0, "\012";
2183 } elsif ($uni >= 0x20) {
1795 substr $text, $self->{cursor}++, 0, chr $uni; 2184 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else { 2185 } else {
1797 return 0; 2186 return 0;
1798 } 2187 }
1799 2188
1800 $self->_set_text ($text); 2189 $self->_set_text ($text);
1801 2190
1802 $self->realloc; 2191 $self->realloc;
2192 $self->update;
1803 2193
1804 1 2194 1
1805} 2195}
1806 2196
1807sub invoke_focus_in { 2197sub invoke_focus_in {
… …
1819 2209
1820 my $idx = $self->{layout}->xy_to_index ($x, $y); 2210 my $idx = $self->{layout}->xy_to_index ($x, $y);
1821 2211
1822 # byte-index to char-index 2212 # byte-index to char-index
1823 my $text = $self->{text}; 2213 my $text = $self->{text};
1824 utf8::encode $text; 2214 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1825 $self->{cursor} = length substr $text, 0, $idx; 2215 $self->{cursor} = length $text;
1826 2216
1827 $self->_set_text ($self->{text}); 2217 $self->_set_text ($self->{text});
1828 $self->update; 2218 $self->update;
1829 2219
1830 1 2220 1
… …
1869 utf8::encode $text; 2259 utf8::encode $text;
1870 2260
1871 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2261 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1872 } 2262 }
1873 2263
1874 glColor @{$self->{fg}};
1875 glBegin GL_LINES; 2264 glBegin GL_LINES;
1876 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2265 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}; 2266 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1878 glEnd; 2267 glEnd;
1879 } 2268 }
1880} 2269}
1881 2270
2271#############################################################################
2272
1882package CFClient::UI::Entry; 2273package CFPlus::UI::Entry;
1883 2274
1884our @ISA = CFClient::UI::EntryBase::; 2275our @ISA = CFPlus::UI::EntryBase::;
1885 2276
1886use CFClient::OpenGL; 2277use CFPlus::OpenGL;
1887 2278
1888sub invoke_key_down { 2279sub invoke_key_down {
1889 my ($self, $ev) = @_; 2280 my ($self, $ev) = @_;
1890 2281
1891 my $sym = $ev->{sym}; 2282 my $sym = $ev->{sym};
1892 2283
1893 if ($sym == 13) { 2284 if ($ev->{uni} == 0x0d || $sym == 13) {
1894 unshift @{$self->{history}}, 2285 unshift @{$self->{history}},
1895 my $txt = $self->get_text; 2286 my $txt = $self->get_text;
1896 2287
1897 $self->{history_pointer} = -1; 2288 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 2289 $self->{history_saveback} = '';
1899 $self->emit (activate => $txt); 2290 $self->emit (activate => $txt);
1900 $self->update; 2291 $self->update;
1901 2292
1902 } elsif ($sym == CFClient::SDLK_UP) { 2293 } elsif ($sym == CFPlus::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 2294 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 2295 $self->{history_saveback} = $self->get_text;
1905 } 2296 }
1906 if (@{$self->{history} || []} > 0) { 2297 if (@{$self->{history} || []} > 0) {
1907 $self->{history_pointer}++; 2298 $self->{history_pointer}++;
… …
1909 $self->{history_pointer} = @{$self->{history} || []} - 1; 2300 $self->{history_pointer} = @{$self->{history} || []} - 1;
1910 } 2301 }
1911 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2302 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1912 } 2303 }
1913 2304
1914 } elsif ($sym == CFClient::SDLK_DOWN) { 2305 } elsif ($sym == CFPlus::SDLK_DOWN) {
1915 $self->{history_pointer}--; 2306 $self->{history_pointer}--;
1916 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2307 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1917 2308
1918 if ($self->{history_pointer} >= 0) { 2309 if ($self->{history_pointer} >= 0) {
1919 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2310 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1928 1 2319 1
1929} 2320}
1930 2321
1931############################################################################# 2322#############################################################################
1932 2323
2324package CFPlus::UI::TextEdit;
2325
2326our @ISA = CFPlus::UI::EntryBase::;
2327
2328use CFPlus::OpenGL;
2329
2330sub move_cursor_ver {
2331 my ($self, $dy) = @_;
2332
2333 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2334
2335 $y += $dy;
2336
2337 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2338 $self->{cursor} = $index;
2339 delete $self->{cur_h};
2340 $self->update;
2341 return;
2342 }
2343}
2344
2345sub invoke_key_down {
2346 my ($self, $ev) = @_;
2347
2348 my $sym = $ev->{sym};
2349
2350 if ($sym == CFPlus::SDLK_UP) {
2351 $self->move_cursor_ver (-1);
2352 } elsif ($sym == CFPlus::SDLK_DOWN) {
2353 $self->move_cursor_ver (+1);
2354 } else {
2355 return $self->SUPER::invoke_key_down ($ev)
2356 }
2357
2358 1
2359}
2360
2361#############################################################################
2362
1933package CFClient::UI::Button; 2363package CFPlus::UI::Button;
1934 2364
1935our @ISA = CFClient::UI::Label::; 2365our @ISA = CFPlus::UI::Label::;
1936 2366
1937use CFClient::OpenGL; 2367use CFPlus::OpenGL;
1938 2368
1939my @tex = 2369my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(b1_button_active.png); 2371 qw(b1_button_active.png);
1942 2372
1943sub new { 2373sub new {
1944 my $class = shift; 2374 my $class = shift;
1945 2375
… …
1982 $self->SUPER::_draw; 2412 $self->SUPER::_draw;
1983} 2413}
1984 2414
1985############################################################################# 2415#############################################################################
1986 2416
2417package CFPlus::UI::CheckBox;
2418
2419our @ISA = CFPlus::UI::DrawBG::;
2420
2421my @tex =
2422 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2423 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2424
2425use CFPlus::OpenGL;
2426
2427sub new {
2428 my $class = shift;
2429
2430 $class->SUPER::new (
2431 padding_x => 2,
2432 padding_y => 2,
2433 fg => [1, 1, 1],
2434 active_fg => [1, 1, 0],
2435 bg => [0, 0, 0, 0.2],
2436 active_bg => [1, 1, 1, 0.5],
2437 state => 0,
2438 can_hover => 1,
2439 @_
2440 )
2441}
2442
2443sub size_request {
2444 my ($self) = @_;
2445
2446 (6) x 2
2447}
2448
2449sub toggle {
2450 my ($self) = @_;
2451
2452 $self->{state} = !$self->{state};
2453 $self->emit (changed => $self->{state});
2454 $self->update;
2455}
2456
2457sub invoke_button_down {
2458 my ($self, $ev, $x, $y) = @_;
2459
2460 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2461 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2462 $self->toggle;
2463 } else {
2464 return 0
2465 }
2466
2467 1
2468}
2469
2470sub _draw {
2471 my ($self) = @_;
2472
2473 $self->SUPER::_draw;
2474
2475 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2476
2477 my ($w, $h) = @$self{qw(w h)};
2478
2479 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2480
2481 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2482
2483 my $tex = $self->{state} ? $tex[1] : $tex[0];
2484
2485 glEnable GL_TEXTURE_2D;
2486 $tex->draw_quad_alpha (0, 0, $s, $s);
2487 glDisable GL_TEXTURE_2D;
2488}
2489
2490#############################################################################
2491
2492package CFPlus::UI::Image;
2493
2494our @ISA = CFPlus::UI::Base::;
2495
2496use CFPlus::OpenGL;
2497
2498our %texture_cache;
2499
2500sub new {
2501 my $class = shift;
2502
2503 my $self = $class->SUPER::new (
2504 can_events => 0,
2505 @_,
2506 );
2507
2508 $self->{path} || $self->{tex}
2509 or Carp::croak "'path' or 'tex' attributes required";
2510
2511 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2512 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2513
2514 CFPlus::weaken $texture_cache{$self->{path}};
2515
2516 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2517
2518 $self
2519}
2520
2521sub STORABLE_freeze {
2522 my ($self, $cloning) = @_;
2523
2524 $self->{path}
2525 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2526
2527 $self->{path}
2528}
2529
2530sub STORABLE_attach {
2531 my ($self, $cloning, $path) = @_;
2532
2533 $self->new (path => $path)
2534}
2535
2536sub size_request {
2537 my ($self) = @_;
2538
2539 ($self->{tex}{w}, $self->{tex}{h})
2540}
2541
2542sub _draw {
2543 my ($self) = @_;
2544
2545 my $tex = $self->{tex};
2546
2547 my ($w, $h) = ($self->{w}, $self->{h});
2548
2549 if ($self->{rot90}) {
2550 glRotate 90, 0, 0, 1;
2551 glTranslate 0, -$self->{w}, 0;
2552
2553 ($w, $h) = ($h, $w);
2554 }
2555
2556 glEnable GL_TEXTURE_2D;
2557 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2558
2559 $tex->draw_quad (0, 0, $w, $h);
2560
2561 glDisable GL_TEXTURE_2D;
2562}
2563
2564#############################################################################
2565
1987package CFClient::UI::ImageButton; 2566package CFPlus::UI::ImageButton;
1988 2567
1989our @ISA = CFClient::UI::Image::; 2568our @ISA = CFPlus::UI::Image::;
1990 2569
1991use CFClient::OpenGL; 2570use CFPlus::OpenGL;
1992 2571
1993my %textures; 2572my %textures;
1994 2573
1995sub new { 2574sub new {
1996 my $class = shift; 2575 my $class = shift;
… …
2018 1 2597 1
2019} 2598}
2020 2599
2021############################################################################# 2600#############################################################################
2022 2601
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; 2602package CFPlus::UI::VGauge;
2092 2603
2093our @ISA = CFClient::UI::Base::; 2604our @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 2605
2153use List::Util qw(min max); 2606use List::Util qw(min max);
2154 2607
2155use CFClient::OpenGL; 2608use CFPlus::OpenGL;
2156 2609
2157my %tex = ( 2610my %tex = (
2158 food => [ 2611 food => [
2159 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2160 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2613 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2161 ], 2614 ],
2162 grace => [ 2615 grace => [
2163 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 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/ 2617 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2165 ], 2618 ],
2166 hp => [ 2619 hp => [
2167 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2168 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2621 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2169 ], 2622 ],
2170 mana => [ 2623 mana => [
2171 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 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/ 2625 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2173 ], 2626 ],
2174); 2627);
2175 2628
2176# eg. VGauge->new (gauge => 'food'), default gauge: food 2629# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2236 my $ycut1 = max 0, min 1, $ycut; 2689 my $ycut1 = max 0, min 1, $ycut;
2237 my $ycut2 = max 0, min 1, $ycut - 1; 2690 my $ycut2 = max 0, min 1, $ycut - 1;
2238 2691
2239 my $h1 = $self->{h} * (1 - $ycut1); 2692 my $h1 = $self->{h} * (1 - $ycut1);
2240 my $h2 = $self->{h} * (1 - $ycut2); 2693 my $h2 = $self->{h} * (1 - $ycut2);
2694 my $h3 = $self->{h};
2695
2696 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2241 2697
2242 glEnable GL_BLEND; 2698 glEnable GL_BLEND;
2243 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2699 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2244 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2700 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2245 glEnable GL_TEXTURE_2D; 2701 glEnable GL_TEXTURE_2D;
… …
2264 2720
2265 if ($t3) { 2721 if ($t3) {
2266 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2722 glBindTexture GL_TEXTURE_2D, $t3->{name};
2267 glBegin GL_QUADS; 2723 glBegin GL_QUADS;
2268 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2724 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2269 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2725 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2270 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2726 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2271 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2727 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2272 glEnd; 2728 glEnd;
2273 } 2729 }
2274 2730
2275 glDisable GL_BLEND; 2731 glDisable GL_BLEND;
2276 glDisable GL_TEXTURE_2D; 2732 glDisable GL_TEXTURE_2D;
2277} 2733}
2278 2734
2279############################################################################# 2735#############################################################################
2280 2736
2281package CFClient::UI::Gauge; 2737package CFPlus::UI::Gauge;
2282 2738
2283our @ISA = CFClient::UI::VBox::; 2739our @ISA = CFPlus::UI::VBox::;
2284 2740
2285sub new { 2741sub new {
2286 my ($class, %arg) = @_; 2742 my ($class, %arg) = @_;
2287 2743
2288 my $self = $class->SUPER::new ( 2744 my $self = $class->SUPER::new (
… …
2290 can_hover => 1, 2746 can_hover => 1,
2291 can_events => 1, 2747 can_events => 1,
2292 %arg, 2748 %arg,
2293 ); 2749 );
2294 2750
2295 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2751 $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); 2752 $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"); 2753 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2298 2754
2299 $self 2755 $self
2300} 2756}
2301 2757
2302sub set_fontsize { 2758sub set_fontsize {
… …
2323 $self->{value}->set_text ($val); 2779 $self->{value}->set_text ($val);
2324} 2780}
2325 2781
2326############################################################################# 2782#############################################################################
2327 2783
2328package CFClient::UI::Slider; 2784package CFPlus::UI::Slider;
2329 2785
2330use strict; 2786use strict;
2331 2787
2332use CFClient::OpenGL; 2788use CFPlus::OpenGL;
2333 2789
2334our @ISA = CFClient::UI::DrawBG::; 2790our @ISA = CFPlus::UI::DrawBG::;
2335 2791
2336my @tex = 2792my @tex =
2337 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2793 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2338 qw(s1_slider.png s1_slider_bg.png); 2794 qw(s1_slider.png s1_slider_bg.png);
2339 2795
2340sub new { 2796sub new {
2341 my $class = shift; 2797 my $class = shift;
2342 2798
… …
2431 } 2887 }
2432 2888
2433 1 2889 1
2434} 2890}
2435 2891
2892sub invoke_mouse_wheel {
2893 my ($self, $ev) = @_;
2894
2895 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2896
2897 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2898
2899 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2900
2901 ! ! $delta
2902}
2903
2436sub update { 2904sub update {
2437 my ($self) = @_; 2905 my ($self) = @_;
2438 2906
2439 delete $self->{knob_w}; 2907 delete $self->{knob_w};
2440 $self->SUPER::update; 2908 $self->SUPER::update;
… …
2487 glDisable GL_TEXTURE_2D; 2955 glDisable GL_TEXTURE_2D;
2488} 2956}
2489 2957
2490############################################################################# 2958#############################################################################
2491 2959
2492package CFClient::UI::ValSlider; 2960package CFPlus::UI::ValSlider;
2493 2961
2494our @ISA = CFClient::UI::HBox::; 2962our @ISA = CFPlus::UI::HBox::;
2495 2963
2496sub new { 2964sub new {
2497 my ($class, %arg) = @_; 2965 my ($class, %arg) = @_;
2498 2966
2499 my $range = delete $arg{range}; 2967 my $range = delete $arg{range};
2500 2968
2501 my $self = $class->SUPER::new ( 2969 my $self = $class->SUPER::new (
2502 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2970 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2503 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2971 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2504 to_value => sub { shift }, 2972 to_value => sub { shift },
2505 from_value => sub { shift }, 2973 from_value => sub { shift },
2506 %arg, 2974 %arg,
2507 ); 2975 );
2508 2976
… …
2528sub set_range { shift->{slider}->set_range (@_) } 2996sub set_range { shift->{slider}->set_range (@_) }
2529sub set_value { shift->{slider}->set_value (@_) } 2997sub set_value { shift->{slider}->set_value (@_) }
2530 2998
2531############################################################################# 2999#############################################################################
2532 3000
2533package CFClient::UI::TextScroller; 3001package CFPlus::UI::TextScroller;
2534 3002
2535our @ISA = CFClient::UI::HBox::; 3003our @ISA = CFPlus::UI::HBox::;
2536 3004
2537use CFClient::OpenGL; 3005use CFPlus::OpenGL;
2538 3006
2539sub new { 3007sub new {
2540 my $class = shift; 3008 my $class = shift;
2541 3009
2542 my $self = $class->SUPER::new ( 3010 my $self = $class->SUPER::new (
2543 fontsize => 1, 3011 fontsize => 1,
2544 can_events => 0, 3012 can_events => 1,
2545 indent => 0, 3013 indent => 0,
2546 #font => default_font 3014 #font => default_font
2547 @_, 3015 @_,
2548 3016
2549 layout => (new CFClient::Layout 1), 3017 layout => (new CFPlus::Layout),
2550 par => [], 3018 par => [],
3019 max_par => 0,
2551 height => 0, 3020 height => 0,
2552 children => [ 3021 children => [
2553 (new CFClient::UI::Empty expand => 1), 3022 (new CFPlus::UI::Empty expand => 1),
2554 (new CFClient::UI::Slider vertical => 1), 3023 (new CFPlus::UI::Slider vertical => 1),
2555 ], 3024 ],
2556 ); 3025 );
2557 3026
2558 $self->{children}[1]->connect (changed => sub { $self->update }); 3027 $self->{children}[1]->connect (changed => sub { $self->update });
2559 3028
… …
2565 3034
2566 $self->{fontsize} = $fontsize; 3035 $self->{fontsize} = $fontsize;
2567 $self->reflow; 3036 $self->reflow;
2568} 3037}
2569 3038
3039sub size_request {
3040 my ($self) = @_;
3041
3042 my ($empty, $slider) = @{ $self->{children} };
3043
3044 local $self->{children} = [$empty, $slider];
3045 $self->SUPER::size_request
3046}
3047
2570sub invoke_size_allocate { 3048sub invoke_size_allocate {
2571 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2572 3050
3051 my ($empty, $slider, @other) = @{ $self->{children} };
3052 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3053
2573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3054 $self->{layout}->set_font ($self->{font}) if $self->{font};
2574 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3055 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2575 $self->{layout}->set_width ($self->{children}[0]{w}); 3056 $self->{layout}->set_width ($empty->{w});
2576 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3057 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2577 3058
2578 $self->reflow; 3059 $self->reflow;
2579 3060
3061 local $self->{children} = [$empty, $slider];
2580 $self->SUPER::invoke_size_allocate ($w, $h) 3062 $self->SUPER::invoke_size_allocate ($w, $h)
2581} 3063}
2582 3064
2583sub text_size { 3065sub invoke_mouse_wheel {
2584 my ($self, $text, $indent) = @_; 3066 my ($self, $ev) = @_;
3067
3068 return 0 unless $ev->{dy}; # only vertical movements
3069
3070 $self->{children}[1]->emit (mouse_wheel => $ev);
3071
3072 1
3073}
3074
3075sub get_layout {
3076 my ($self, $para) = @_;
2585 3077
2586 my $layout = $self->{layout}; 3078 my $layout = $self->{layout};
2587 3079
3080 $layout->set_font ($self->{font}) if $self->{font};
3081 $layout->set_foreground (@{$para->{fg}});
2588 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3082 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2589 $layout->set_width ($self->{children}[0]{w} - $indent); 3083 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2590 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3084 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2591 $layout->set_markup ($text); 3085 $layout->set_markup ($para->{markup});
3086
3087 $layout->set_shapes (
3088 map
3089 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3090 @{$para->{widget}}
2592 3091 );
3092
2593 $layout->size 3093 $layout
2594} 3094}
2595 3095
2596sub reflow { 3096sub reflow {
2597 my ($self) = @_; 3097 my ($self) = @_;
2598 3098
… …
2605 3105
2606 # todo: base offset on lines or so, not on pixels 3106 # todo: base offset on lines or so, not on pixels
2607 $self->{children}[1]->set_value ($offset); 3107 $self->{children}[1]->set_value ($offset);
2608} 3108}
2609 3109
3110sub current_paragraph {
3111 my ($self) = @_;
3112
3113 $self->{top_paragraph} - 1
3114}
3115
3116sub scroll_to {
3117 my ($self, $para) = @_;
3118
3119 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3120
3121 $self->{scroll_to} = $para;
3122 $self->update;
3123}
3124
2610sub clear { 3125sub clear {
2611 my ($self) = @_; 3126 my ($self) = @_;
3127
3128 my (undef, undef, @other) = @{ $self->{children} };
3129 $self->remove ($_) for @other;
2612 3130
2613 $self->{par} = []; 3131 $self->{par} = [];
2614 $self->{height} = 0; 3132 $self->{height} = 0;
2615 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3133 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2616} 3134}
2617 3135
2618sub add_paragraph { 3136sub add_paragraph {
2619 my ($self, $color, $text, $indent) = @_; 3137 my $self = shift;
2620 3138
2621 for my $line (split /\n/, $text) { 3139 for my $para (@_) {
2622 my ($w, $h) = $self->text_size ($line); 3140 $para = {
3141 fg => [1, 1, 1, 1],
3142 indent => 0,
3143 markup => "",
3144 widget => [],
3145 ref $para ? %$para : (markup => $para),
3146 w => 1e10,
3147 wrapped => 1,
3148 };
3149
3150 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3151 push @{$self->{par}}, $para;
3152 }
3153
3154 if (my $max = $self->{max_par}) {
3155 shift @{$self->{par}} while @{$self->{par}} > $max;
3156 }
3157
3158 $self->{need_reflow}++;
3159 $self->update;
3160}
3161
3162sub scroll_to_bottom {
3163 my ($self) = @_;
3164
3165 $self->{scroll_to} = $#{$self->{par}};
3166 $self->update;
3167}
3168
3169sub force_uptodate {
3170 my ($self) = @_;
3171
3172 if (delete $self->{need_reflow}) {
3173 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3174
3175 my $height = 0;
3176
3177 for my $para (@{$self->{par}}) {
3178 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3179 my $layout = $self->get_layout ($para);
3180 my ($w, $h) = $layout->size;
3181
3182 $para->{w} = $w + $para->{indent};
3183 $para->{h} = $h;
3184 $para->{wrapped} = $layout->has_wrapped;
3185 }
3186
3187 $para->{y} = $height;
3188 $height += $para->{h};
3189 }
3190
2623 $self->{height} += $h; 3191 $self->{height} = $height;
2624 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3192 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2625 }
2626 3193
2627 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3194 delete $self->{texture};
3195 }
3196
3197 if (my $paridx = delete $self->{scroll_to}) {
3198 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3199 }
2628} 3200}
2629 3201
2630sub update { 3202sub update {
2631 my ($self) = @_; 3203 my ($self) = @_;
2632 3204
… …
2635 return unless $self->{h} > 0; 3207 return unless $self->{h} > 0;
2636 3208
2637 delete $self->{texture}; 3209 delete $self->{texture};
2638 3210
2639 $ROOT->on_post_alloc ($self => sub { 3211 $ROOT->on_post_alloc ($self => sub {
3212 $self->force_uptodate;
3213
2640 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3214 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2641 3215
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 { 3216 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2670 glClearColor 0, 0, 0, 0; 3217 glClearColor 0, 0, 0, 0;
2671 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
2672 3219
3220 package CFPlus::UI::Base;
3221 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3222 (0, 0, $self->{w}, $self->{h});
3223
3224 my $top = int $self->{children}[1]{range}[0];
3225
3226 my $paridx = 0;
3227 my $top_paragraph;
2673 my $top = int $self->{children}[1]{range}[0]; 3228 my $top = int $self->{children}[1]{range}[0];
2674 3229
2675 my $y0 = $top; 3230 my $y0 = $top;
2676 my $y1 = $top + $H; 3231 my $y1 = $top + $H;
2677 3232
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}}) { 3233 for my $para (@{$self->{par}}) {
2689 my $h = $par->[1]; 3234 my $h = $para->{h};
3235 my $y = $para->{y};
2690 3236
2691 if ($y0 < $y + $h && $y < $y1) { 3237 if ($y0 < $y + $h && $y < $y1) {
2692 $layout->set_foreground (@{ $par->[2] }); 3238 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 3239
2697 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3240 $layout->render ($para->{indent}, $y - $y0);
2698 3241
2699 glRasterPos $par->[3], $y - $y0; 3242 if (my @w = @{ $para->{widget} }) {
2700 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3243 my @s = $layout->get_shapes;
3244
3245 for (@w) {
3246 my ($dx, $dy) = splice @s, 0, 2, ();
3247
3248 $_->{x} = $dx + $para->{indent};
3249 $_->{y} = $dy + $y - $y0;
3250
3251 $_->draw;
3252 }
3253 }
2701 } 3254 }
2702 3255
2703 $y += $h; 3256 $paridx++;
3257 $top_paragraph ||= $paridx if $y >= $top;
2704 } 3258 }
2705 3259
2706 glDisable GL_BLEND; 3260 $self->{top_paragraph} = $top_paragraph;
2707 }; 3261 };
2708 }); 3262 });
3263}
3264
3265sub reconfigure {
3266 my ($self) = @_;
3267
3268 $self->SUPER::reconfigure;
3269
3270 $_->{w} = 1e10 for @{ $self->{par} };
3271 $self->reflow;
2709} 3272}
2710 3273
2711sub _draw { 3274sub _draw {
2712 my ($self) = @_; 3275 my ($self) = @_;
2713 3276
… …
2716 glColor 0, 0, 0, 1; 3279 glColor 0, 0, 0, 1;
2717 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3280 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2718 glDisable GL_TEXTURE_2D; 3281 glDisable GL_TEXTURE_2D;
2719 3282
2720 $self->{children}[1]->draw; 3283 $self->{children}[1]->draw;
2721
2722} 3284}
2723 3285
2724############################################################################# 3286#############################################################################
2725 3287
2726package CFClient::UI::Animator; 3288package CFPlus::UI::Animator;
2727 3289
2728use CFClient::OpenGL; 3290use CFPlus::OpenGL;
2729 3291
2730our @ISA = CFClient::UI::Bin::; 3292our @ISA = CFPlus::UI::Bin::;
2731 3293
2732sub moveto { 3294sub moveto {
2733 my ($self, $x, $y) = @_; 3295 my ($self, $x, $y) = @_;
2734 3296
2735 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2763 glPopMatrix; 3325 glPopMatrix;
2764} 3326}
2765 3327
2766############################################################################# 3328#############################################################################
2767 3329
2768package CFClient::UI::Flopper; 3330package CFPlus::UI::Flopper;
2769 3331
2770our @ISA = CFClient::UI::Button::; 3332our @ISA = CFPlus::UI::Button::;
2771 3333
2772sub new { 3334sub new {
2773 my $class = shift; 3335 my $class = shift;
2774 3336
2775 my $self = $class->SUPER::new ( 3337 my $self = $class->SUPER::new (
… …
2787 $self->{other}->toggle_visibility; 3349 $self->{other}->toggle_visibility;
2788} 3350}
2789 3351
2790############################################################################# 3352#############################################################################
2791 3353
2792package CFClient::UI::Tooltip; 3354package CFPlus::UI::Tooltip;
2793 3355
2794our @ISA = CFClient::UI::Bin::; 3356our @ISA = CFPlus::UI::Bin::;
2795 3357
2796use CFClient::OpenGL; 3358use CFPlus::OpenGL;
2797 3359
2798sub new { 3360sub new {
2799 my $class = shift; 3361 my $class = shift;
2800 3362
2801 $class->SUPER::new ( 3363 $class->SUPER::new (
… …
2804 ) 3366 )
2805} 3367}
2806 3368
2807sub set_tooltip_from { 3369sub set_tooltip_from {
2808 my ($self, $widget) = @_; 3370 my ($self, $widget) = @_;
3371
3372 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3373 if $widget->{tooltip} =~ /^#(.*)$/;
2809 3374
2810 my $tooltip = $widget->{tooltip}; 3375 my $tooltip = $widget->{tooltip};
2811 3376
2812 if ($ENV{CFPLUS_DEBUG} & 2) { 3377 if ($ENV{CFPLUS_DEBUG} & 2) {
2813 $tooltip .= "\n\n" . (ref $widget) . "\n" 3378 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2817 } 3382 }
2818 3383
2819 $tooltip =~ s/^\n+//; 3384 $tooltip =~ s/^\n+//;
2820 $tooltip =~ s/\n+$//; 3385 $tooltip =~ s/\n+$//;
2821 3386
2822 $self->add (new CFClient::UI::Label 3387 $self->add (new CFPlus::UI::Label
2823 markup => $tooltip, 3388 markup => $tooltip,
2824 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3389 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2825 fontsize => 0.8, 3390 fontsize => 0.8,
2826 fg => [0, 0, 0, 1], 3391 style => 1, # FLAG_INVERSE
2827 ellipsise => 0, 3392 ellipsise => 0,
2828 font => ($widget->{tooltip_font} || $::FONT_PROP), 3393 font => ($widget->{tooltip_font} || $::FONT_PROP),
2829 ); 3394 );
2830} 3395}
2831 3396
… …
2850 3415
2851 $self->{root}->on_post_alloc ("move_$self" => sub { 3416 $self->{root}->on_post_alloc ("move_$self" => sub {
2852 my $widget = $self->{owner} 3417 my $widget = $self->{owner}
2853 or return; 3418 or return;
2854 3419
3420 if ($widget->{visible}) {
2855 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3421 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2856 3422
2857 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3423 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2858 if $x + $self->{w} > $self->{root}{w}; 3424 if $x + $self->{w} > $self->{root}{w};
2859 3425
2860 $self->move_abs ($x, $y); 3426 $self->move_abs ($x, $y);
3427 } else {
3428 $self->hide;
3429 }
2861 }); 3430 });
2862} 3431}
2863 3432
2864sub _draw { 3433sub _draw {
2865 my ($self) = @_; 3434 my ($self) = @_;
… …
2889 $self->SUPER::_draw; 3458 $self->SUPER::_draw;
2890} 3459}
2891 3460
2892############################################################################# 3461#############################################################################
2893 3462
2894package CFClient::UI::Face; 3463package CFPlus::UI::Face;
2895 3464
2896our @ISA = CFClient::UI::Base::; 3465our @ISA = CFPlus::UI::DrawBG::;
2897 3466
2898use CFClient::OpenGL; 3467use CFPlus::OpenGL;
2899 3468
2900sub new { 3469sub new {
2901 my $class = shift; 3470 my $class = shift;
2902 3471
2903 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3473 size_w => 32,
3474 size_h => 8,
2904 aspect => 1, 3475 aspect => 1,
2905 can_events => 0, 3476 can_events => 0,
2906 @_, 3477 @_,
2907 ); 3478 );
2908 3479
2909 if ($self->{anim} && $self->{animspeed}) { 3480 if ($self->{anim} && $self->{animspeed}) {
2910 Scalar::Util::weaken (my $widget = $self); 3481 CFPlus::weaken (my $widget = $self);
2911 3482
2912 $self->{timer} = Event->timer ( 3483 $self->{timer} = Event->timer (
2913 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2914 hard => 1, 3485 hard => 1,
2915 interval => $self->{animspeed}, 3486 interval => $self->{animspeed},
2916 cb => sub { 3487 cb => sub {
3488 return unless $::CONN;
3489
2917 ++$widget->{frame}; 3490 ++$widget->{frame};
3491 $self->update_face;
2918 $widget->update; 3492 $self->update;
2919 }, 3493 },
2920 ); 3494 );
3495
3496 $self->update_face;
2921 } 3497 }
2922 3498
2923 $self 3499 $self
2924} 3500}
2925 3501
3502sub update_face {
3503 my ($self) = @_;
3504
3505 return unless $::CONN;
3506
3507 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3508 if ($anim && @$anim) {
3509 delete $self->{wait_face};
3510 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3511 }
3512 }
3513}
3514
2926sub size_request { 3515sub size_request {
2927 (32, 8) 3516 my ($self) = @_;
3517
3518 if ($::CONN) {
3519 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3520 if (my $tex = $::CONN->{texture}[$faceid]) {
3521 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3522 } else {
3523 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3524 $self->realloc;
3525 });
3526 }
3527 }
3528 }
3529
3530 ($self->{size_w} || 8, $self->{size_h} || 8)
2928} 3531}
2929 3532
2930sub update { 3533sub update {
2931 my ($self) = @_; 3534 my ($self) = @_;
2932 3535
… …
2938sub _draw { 3541sub _draw {
2939 my ($self) = @_; 3542 my ($self) = @_;
2940 3543
2941 return unless $::CONN; 3544 return unless $::CONN;
2942 3545
2943 my $face; 3546 $self->SUPER::_draw;
2944 3547
2945 if ($self->{frame}) {
2946 my $anim = $::CONN->{anim}[$self->{anim}]; 3548 my $faceid = $::CONN->{faceid}[$self->{face}]
2947 3549 or return;
2948 $face = $anim->[ $self->{frame} % @$anim ]
2949 if $anim && @$anim;
2950 }
2951 3550
2952 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3551 my $tex = $::CONN->{texture}[$faceid];
2953 3552
2954 if ($tex) { 3553 if ($tex) {
2955 glEnable GL_TEXTURE_2D; 3554 glEnable GL_TEXTURE_2D;
2956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2957 glColor 0, 0, 0, 1; 3556 glColor 0, 0, 0, 1;
… …
2969 $self->SUPER::destroy; 3568 $self->SUPER::destroy;
2970} 3569}
2971 3570
2972############################################################################# 3571#############################################################################
2973 3572
2974package CFClient::UI::Buttonbar; 3573package CFPlus::UI::Buttonbar;
2975 3574
2976our @ISA = CFClient::UI::HBox::; 3575our @ISA = CFPlus::UI::HBox::;
2977 3576
2978# TODO: should actualyl wrap buttons and other goodies. 3577# TODO: should actually wrap buttons and other goodies.
2979 3578
2980############################################################################# 3579#############################################################################
2981 3580
2982package CFClient::UI::Menu; 3581package CFPlus::UI::Menu;
2983 3582
2984our @ISA = CFClient::UI::FancyFrame::; 3583our @ISA = CFPlus::UI::Toplevel::;
2985 3584
2986use CFClient::OpenGL; 3585use CFPlus::OpenGL;
2987 3586
2988sub new { 3587sub new {
2989 my $class = shift; 3588 my $class = shift;
2990 3589
2991 my $self = $class->SUPER::new ( 3590 my $self = $class->SUPER::new (
2992 items => [], 3591 items => [],
2993 z => 100, 3592 z => 100,
2994 @_, 3593 @_,
2995 ); 3594 );
2996 3595
2997 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3596 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2998 3597
2999 for my $item (@{ $self->{items} }) { 3598 for my $item (@{ $self->{items} }) {
3000 my ($widget, $cb, $tooltip) = @$item; 3599 my ($widget, $cb, $tooltip) = @$item;
3001 3600
3002 # handle various types of items, only text for now 3601 # handle various types of items, only text for now
3003 if (!ref $widget) { 3602 if (!ref $widget) {
3603 if ($widget =~ /\t/) {
3604 my ($left, $right) = split /\t/, $widget, 2;
3605
3004 $widget = new CFClient::UI::Label 3606 $widget = new CFPlus::UI::HBox
3005 can_hover => 1, 3607 can_hover => 1,
3006 can_events => 1, 3608 can_events => 1,
3609 tooltip => $tooltip,
3610 children => [
3611 (new CFPlus::UI::Label markup => $left, expand => 1),
3612 (new CFPlus::UI::Label markup => $right, align => +1),
3613 ],
3614 ;
3615
3616 } else {
3617 $widget = new CFPlus::UI::Label
3618 can_hover => 1,
3619 can_events => 1,
3007 markup => $widget, 3620 markup => $widget,
3008 tooltip => $tooltip 3621 tooltip => $tooltip;
3622 }
3009 } 3623 }
3010 3624
3011 $self->{item}{$widget} = $item; 3625 $self->{item}{$widget} = $item;
3012 3626
3013 $self->{vbox}->add ($widget); 3627 $self->{vbox}->add ($widget);
… …
3056 1 3670 1
3057} 3671}
3058 3672
3059############################################################################# 3673#############################################################################
3060 3674
3061package CFClient::UI::Multiplexer; 3675package CFPlus::UI::Multiplexer;
3062 3676
3063our @ISA = CFClient::UI::Container::; 3677our @ISA = CFPlus::UI::Container::;
3064 3678
3065sub new { 3679sub new {
3066 my $class = shift; 3680 my $class = shift;
3067 3681
3068 my $self = $class->SUPER::new ( 3682 my $self = $class->SUPER::new (
… …
3082 3696
3083 $self->{current} = $self->{children}[0] 3697 $self->{current} = $self->{children}[0]
3084 if @{ $self->{children} }; 3698 if @{ $self->{children} };
3085} 3699}
3086 3700
3701sub get_current_page {
3702 my ($self) = @_;
3703
3704 $self->{current}
3705}
3706
3087sub set_current_page { 3707sub set_current_page {
3088 my ($self, $page_or_widget) = @_; 3708 my ($self, $page_or_widget) = @_;
3089 3709
3090 my $widget = ref $page_or_widget 3710 my $widget = ref $page_or_widget
3091 ? $page_or_widget 3711 ? $page_or_widget
… …
3123 $self->{current}->draw; 3743 $self->{current}->draw;
3124} 3744}
3125 3745
3126############################################################################# 3746#############################################################################
3127 3747
3128package CFClient::UI::Notebook; 3748package CFPlus::UI::Notebook;
3129 3749
3130our @ISA = CFClient::UI::VBox::; 3750our @ISA = CFPlus::UI::VBox::;
3131 3751
3132sub new { 3752sub new {
3133 my $class = shift; 3753 my $class = shift;
3134 3754
3135 my $self = $class->SUPER::new ( 3755 my $self = $class->SUPER::new (
3136 buttonbar => (new CFClient::UI::Buttonbar), 3756 buttonbar => (new CFPlus::UI::Buttonbar),
3137 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3757 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3138 # filter => # will be put between multiplexer and $self 3758 # filter => # will be put between multiplexer and $self
3139 @_, 3759 @_,
3140 ); 3760 );
3141 3761
3142 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3762 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3146} 3766}
3147 3767
3148sub add { 3768sub add {
3149 my ($self, $title, $widget, $tooltip) = @_; 3769 my ($self, $title, $widget, $tooltip) = @_;
3150 3770
3151 Scalar::Util::weaken $self; 3771 CFPlus::weaken $self;
3152 3772
3153 $self->{buttonbar}->add (new CFClient::UI::Button 3773 $self->{buttonbar}->add (new CFPlus::UI::Button
3154 markup => $title, 3774 markup => $title,
3155 tooltip => $tooltip, 3775 tooltip => $tooltip,
3156 on_activate => sub { $self->set_current_page ($widget) }, 3776 on_activate => sub { $self->set_current_page ($widget) },
3157 ); 3777 );
3158 3778
3159 $self->{multiplexer}->add ($widget); 3779 $self->{multiplexer}->add ($widget);
3160} 3780}
3161 3781
3782sub get_current_page {
3783 my ($self) = @_;
3784
3785 $self->{multiplexer}->get_current_page
3786}
3787
3162sub set_current_page { 3788sub set_current_page {
3163 my ($self, $page) = @_; 3789 my ($self, $page) = @_;
3164 3790
3165 $self->{multiplexer}->set_current_page ($page); 3791 $self->{multiplexer}->set_current_page ($page);
3166 $self->emit (page_changed => $self->{multiplexer}{current}); 3792 $self->emit (page_changed => $self->{multiplexer}{current});
3167} 3793}
3168 3794
3169############################################################################# 3795#############################################################################
3170 3796
3171package CFClient::UI::Combobox; 3797package CFPlus::UI::Selector;
3172 3798
3173use utf8; 3799use utf8;
3174 3800
3175our @ISA = CFClient::UI::Button::; 3801our @ISA = CFPlus::UI::Button::;
3176 3802
3177sub new { 3803sub new {
3178 my $class = shift; 3804 my $class = shift;
3179 3805
3180 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
… …
3197 my ($value, $title, $tooltip) = @$_; 3823 my ($value, $title, $tooltip) = @$_;
3198 3824
3199 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3825 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3200 } 3826 }
3201 3827
3202 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3828 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3203} 3829}
3204 3830
3205sub _set_value { 3831sub _set_value {
3206 my ($self, $value) = @_; 3832 my ($self, $value) = @_;
3207 3833
… …
3222 $self->emit (changed => $value); 3848 $self->emit (changed => $value);
3223} 3849}
3224 3850
3225############################################################################# 3851#############################################################################
3226 3852
3227package CFClient::UI::Statusbox; 3853package CFPlus::UI::Statusbox;
3228 3854
3229our @ISA = CFClient::UI::VBox::; 3855our @ISA = CFPlus::UI::VBox::;
3230 3856
3231sub new { 3857sub new {
3232 my $class = shift; 3858 my $class = shift;
3233 3859
3234 my $self = $class->SUPER::new ( 3860 my $self = $class->SUPER::new (
3235 fontsize => 0.8, 3861 fontsize => 0.8,
3236 @_, 3862 @_,
3237 ); 3863 );
3238 3864
3239 Scalar::Util::weaken (my $this = $self); 3865 CFPlus::weaken (my $this = $self);
3240 3866
3241 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3867 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3242 3868
3243 $self 3869 $self
3244} 3870}
… …
3246sub reorder { 3872sub reorder {
3247 my ($self) = @_; 3873 my ($self) = @_;
3248 my $NOW = Time::HiRes::time; 3874 my $NOW = Time::HiRes::time;
3249 3875
3250 # freeze display when hovering over any label 3876 # freeze display when hovering over any label
3251 return if $CFClient::UI::TOOLTIP->{owner} 3877 return if $CFPlus::UI::TOOLTIP->{owner}
3252 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3878 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3253 values %{ $self->{item} }; 3879 values %{ $self->{item} };
3254 3880
3255 while (my ($k, $v) = each %{ $self->{item} }) { 3881 while (my ($k, $v) = each %{ $self->{item} }) {
3256 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3882 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3257 } 3883 }
… …
3278 for ($short) { 3904 for ($short) {
3279 s/^\s+//; 3905 s/^\s+//;
3280 s/\s+/ /g; 3906 s/\s+/ /g;
3281 } 3907 }
3282 3908
3283 new CFClient::UI::Label 3909 new CFPlus::UI::Label
3284 markup => $short, 3910 markup => $short,
3285 tooltip => $item->{tooltip}, 3911 tooltip => $item->{tooltip},
3286 tooltip_font => $::FONT_PROP, 3912 tooltip_font => $::FONT_PROP,
3287 tooltip_width => 0.67, 3913 tooltip_width => 0.67,
3288 fontsize => $item->{fontsize} || $self->{fontsize}, 3914 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3342 count => 1, 3968 count => 1,
3343 %arg, 3969 %arg,
3344 }; 3970 };
3345 } 3971 }
3346 3972
3973 $ROOT->on_refresh (reorder => sub {
3347 $self->reorder; 3974 $self->reorder;
3975 });
3348} 3976}
3349 3977
3350sub reconfigure { 3978sub reconfigure {
3351 my ($self) = @_; 3979 my ($self) = @_;
3352 3980
… …
3365 $self->SUPER::destroy; 3993 $self->SUPER::destroy;
3366} 3994}
3367 3995
3368############################################################################# 3996#############################################################################
3369 3997
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; 3998package CFPlus::UI::Root;
3733 3999
3734our @ISA = CFClient::UI::Container::; 4000our @ISA = CFPlus::UI::Container::;
3735 4001
3736use List::Util qw(min max); 4002use List::Util qw(min max);
3737 4003
3738use CFClient::OpenGL; 4004use CFPlus::OpenGL;
3739 4005
3740sub new { 4006sub new {
3741 my $class = shift; 4007 my $class = shift;
3742 4008
3743 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3744 visible => 1, 4010 visible => 1,
3745 @_, 4011 @_,
3746 ); 4012 );
3747 4013
3748 Scalar::Util::weaken ($self->{root} = $self); 4014 CFPlus::weaken ($self->{root} = $self);
3749 4015
3750 $self 4016 $self
3751} 4017}
3752 4018
3753sub size_request { 4019sub size_request {
… …
3919 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3920 4186
3921 $w = 0 if $w < 0; 4187 $w = 0 if $w < 0;
3922 $h = 0 if $h < 0; 4188 $h = 0 if $h < 0;
3923 4189
4190 $w = max $widget->{min_w}, $w;
4191 $h = max $widget->{min_h}, $h;
4192
4193# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4194# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4195
4196 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4197 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4198
3924 $w = int $w + 0.5; 4199 $w = int $w + 0.5;
3925 $h = int $h + 0.5; 4200 $h = int $h + 0.5;
3926 4201
3927 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4202 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3928 $widget->{old_w} = $widget->{w}; 4203 $widget->{old_w} = $widget->{w};
… …
3951 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4226 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3952 glMatrixMode GL_MODELVIEW; 4227 glMatrixMode GL_MODELVIEW;
3953 glLoadIdentity; 4228 glLoadIdentity;
3954 4229
3955 { 4230 {
3956 package CFClient::UI::Base; 4231 package CFPlus::UI::Base;
3957 4232
3958 ($draw_x, $draw_y, $draw_w, $draw_h) = 4233 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3959 (0, 0, $self->{w}, $self->{h}); 4234 (0, 0, $self->{w}, $self->{h});
3960 }
3961 4235
3962 $self->_draw; 4236 $self->_draw;
4237 }
3963} 4238}
3964 4239
3965############################################################################# 4240#############################################################################
3966 4241
3967package CFClient::UI; 4242package CFPlus::UI;
3968 4243
3969$ROOT = new CFClient::UI::Root; 4244$ROOT = new CFPlus::UI::Root;
3970$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4245$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3971 4246
39721 42471
3973 4248

Diff Legend

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