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.308 by root, Mon Jun 19 05:18:14 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 #d##TODO# stop propagating at first true, do not use sum 532 # I do not really like this solution, but I do not like duplication
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 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
477 || ($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
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
479} 550}
480 551
481sub find_widget { 552sub find_widget {
482 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
483 554
… …
491} 562}
492 563
493sub set_parent { 564sub set_parent {
494 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
495 566
496 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
497 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
498} 569}
499 570
500sub realloc { 571sub realloc {
501 my ($self) = @_; 572 my ($self) = @_;
… …
535 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
536 607
537 # update screen rectangle 608 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542 611
543 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
546 615
… …
569 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
570 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
571 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
572 glEnd; 641 glEnd;
573 glPopMatrix; 642 glPopMatrix;
574 #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;
575 } 644 }
576 645
577 $self->_draw; 646 $self->_draw;
578 glPopMatrix; 647 glPopMatrix;
579} 648}
… …
582 my ($self) = @_; 651 my ($self) = @_;
583 652
584 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
585} 654}
586 655
656my $cntx;#d#
587sub DESTROY { 657sub DESTROY {
588 my ($self) = @_; 658 my ($self) = @_;
589 659
590 delete $WIDGET{$self+0}; 660 return if CFPlus::in_destruct;
591 661
592 eval { $self->destroy }; 662 eval { $self->destroy };
593 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};
594} 666}
595 667
596############################################################################# 668#############################################################################
597 669
598package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
599 671
600our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
601 673
602use strict; 674use strict;
603use CFClient::OpenGL; 675use CFPlus::OpenGL;
604 676
605sub new { 677sub new {
606 my $class = shift; 678 my $class = shift;
607 679
608 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
639 } 711 }
640} 712}
641 713
642############################################################################# 714#############################################################################
643 715
644package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
645 717
646our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
647 719
648sub new { 720sub new {
649 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
650 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
651} 723}
… …
658 730
659sub draw { } 731sub draw { }
660 732
661############################################################################# 733#############################################################################
662 734
663package CFClient::UI::Container; 735package CFPlus::UI::Container;
664 736
665our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
666 738
667sub new { 739sub new {
668 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
669 741
670 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
679 if $children; 751 if $children;
680 752
681 $self 753 $self
682} 754}
683 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
684sub add { 764sub add {
685 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
686 766
687 $_->set_parent ($self) 767 $_->set_parent ($self)
688 for @widgets; 768 for @widgets;
… …
748 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
749} 829}
750 830
751############################################################################# 831#############################################################################
752 832
753package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
754 834
755our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
756 836
757sub new { 837sub new {
758 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
759 839
760 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
761 841
762 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
763} 843}
764 844
765sub add { 845sub add {
… …
772sub remove { 852sub remove {
773 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
774 854
775 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
776 856
777 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
778 unless @{$self->{children}}; 858 unless @{$self->{children}};
779} 859}
780 860
781sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
782 862
… …
794 874
795############################################################################# 875#############################################################################
796 876
797# back-buffered drawing area 877# back-buffered drawing area
798 878
799package CFClient::UI::Window; 879package CFPlus::UI::Window;
800 880
801our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
802 882
803use CFClient::OpenGL; 883use CFPlus::OpenGL;
804 884
805sub new { 885sub new {
806 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
807 887
808 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
830} 910}
831 911
832sub render_child { 912sub render_child {
833 my ($self) = @_; 913 my ($self) = @_;
834 914
835 $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 {
836 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
837 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
838 918
839 { 919 {
840 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
841 921
842 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
844 } 926 }
845
846 $self->_render;
847 }; 927 };
848} 928}
849 929
850sub _draw { 930sub _draw {
851 my ($self) = @_; 931 my ($self) = @_;
852
853 my ($w, $h) = @$self{qw(w h)};
854 932
855 my $tex = $self->{texture} 933 my $tex = $self->{texture}
856 or return; 934 or return;
857 935
858 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
861 939
862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
863 941
864 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
865} 943}
866 944
867############################################################################# 945#############################################################################
868 946
869package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
870 948
949use List::Util qw(min max);
950
871our @ISA = CFClient::UI::Window::; 951our @ISA = CFPlus::UI::Window::;
872 952
873sub new { 953sub new {
874 my $class = shift; 954 my $class = shift;
875 955
876 $class->SUPER::new ( 956 $class->SUPER::new (
… …
906} 986}
907 987
908sub set_offset { 988sub set_offset {
909 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
910 990
911 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
912 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
913 993
914 $self->update; 994 $self->update;
915} 995}
916 996
917# 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
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1016 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1017 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1018 ) {
939 $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})
940 } else { 1020 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1021 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1022 }
943} 1023}
944 1024
945sub _render { 1025sub _render {
946 my ($self) = @_; 1026 my ($self) = @_;
947 1027
948 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};
949 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};
950 1030
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1031 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1032
953 $self->SUPER::_render; 1033 $self->SUPER::_render;
954} 1034}
955 1035
956############################################################################# 1036#############################################################################
957 1037
958package CFClient::UI::ScrolledWindow; 1038package CFPlus::UI::ScrolledWindow;
959 1039
960our @ISA = CFClient::UI::HBox::; 1040our @ISA = CFPlus::UI::Table::;
961 1041
962sub new { 1042sub new {
963 my ($class, %arg) = @_; 1043 my ($class, %arg) = @_;
964 1044
965 my $child = delete $arg{child}; 1045 my $child = delete $arg{child};
966 1046
967 my $self; 1047 my $self;
968 1048
969 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
970 vertical => 1, 1059 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1060 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1061 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1062 $self->{vpos} = $_[1];
1063 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974 }, 1064 },
975 ; 1065 ;
976 1066
977 $self = $class->SUPER::new ( 1067 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1068 scroll_x => 0,
1069 scroll_y => 1,
1070 can_events => 1,
979 slider => $slider, 1071 hslider => $hslider,
1072 vslider => $vslider,
1073 col_expand => [1, 0],
1074 row_expand => [1, 0],
980 %arg, 1075 %arg,
981 ); 1076 );
982 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
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1084 $self->SUPER::add (0, 0, $self->{vp});
1085
984 $self->add ($child) if $child; 1086 $self->add ($child) if $child;
985 1087
986 $self 1088 $self
987} 1089}
1090
1091#TODO# update range on size_allocate depending on child
988 1092
989sub add { 1093sub add {
990 my ($self, $widget) = @_; 1094 my ($self, $widget) = @_;
991 1095
992 $self->{vp}->add ($self->{child} = $widget); 1096 $self->{vp}->add ($self->{child} = $widget);
993} 1097}
994 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
995sub update { 1123sub update {
996 my ($self) = @_; 1124 my ($self) = @_;
997 1125
998 $self->SUPER::update; 1126 $self->SUPER::update;
1127 $self->update_slider;
1128}
999 1129
1000 # todo: overwrite size_allocate of child 1130sub invoke_mouse_wheel {
1001 my $child = $self->{vp}->child; 1131 my ($self, $ev) = @_;
1002 $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
1003} 1180}
1004 1181
1005sub invoke_size_allocate { 1182sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
1007 1184
1008 my $child = $self->{vp}->child; 1185 $self->update_slider;
1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h) 1186 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1187}
1013 1188
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1189#############################################################################
1018 1190
1019package CFClient::UI::Frame; 1191package CFPlus::UI::Frame;
1020 1192
1021our @ISA = CFClient::UI::Bin::; 1193our @ISA = CFPlus::UI::Bin::;
1022 1194
1023use CFClient::OpenGL; 1195use CFPlus::OpenGL;
1024 1196
1025sub new { 1197sub new {
1026 my $class = shift; 1198 my $class = shift;
1027 1199
1028 $class->SUPER::new ( 1200 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1226 $self->SUPER::_draw;
1055} 1227}
1056 1228
1057############################################################################# 1229#############################################################################
1058 1230
1059package CFClient::UI::FancyFrame; 1231package CFPlus::UI::FancyFrame;
1060 1232
1061our @ISA = CFClient::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1062 1234
1063use 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;
1064 1336
1065my $bg = 1337my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1338 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1339 mipmap => 1, wrap => 1;
1068 1340
1069my @border = 1341my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1342 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1071 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);
1072 1344
1073sub new { 1345sub new {
1074 my ($class, %arg) = @_; 1346 my ($class, %arg) = @_;
1075 1347
1076 my $self = $class->SUPER::new ( 1348 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1349 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1350 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1351 border => 0.6,
1080 can_events => 1, 1352 can_events => 1,
1081 min_w => 16, 1353 min_w => 64,
1082 min_h => 16, 1354 min_h => 32,
1083 %arg, 1355 %arg,
1084 ); 1356 );
1085 1357
1086 $self->{title_widget} = new CFClient::UI::Label 1358 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1359 align => 0,
1088 valign => 1, 1360 valign => 1,
1089 text => $self->{title}, 1361 text => $self->{title},
1090 fontsize => $self->{border}, 1362 fontsize => $self->{border},
1091 if exists $self->{title}; 1363 if exists $self->{title};
1092 1364
1093 if ($self->{has_close_button}) { 1365 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1366 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1367 new CFPlus::UI::ImageButton
1096 image => 'x1_close.png', 1368 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1369 on_activate => sub { $self->emit ("delete") };
1098 1370
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1371 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1372 }
1101 1373
1102 $self 1374 $self
1103} 1375}
1104 1376
1105sub add { 1377sub add {
1106 my ($self, @widgets) = @_; 1378 my ($self, @widgets) = @_;
1107 1379
1108 $self->SUPER::add (@widgets); 1380 $self->SUPER::add (@widgets);
1109 $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};
1110 $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};
1111} 1383}
1112 1384
1113sub border { 1385sub border {
1114 int $_[0]{border} * $::FONTSIZE 1386 int $_[0]{border} * $::FONTSIZE
1115} 1387}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1420 $self->child->configure ($border, $border, $w, $h);
1149 1421
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1422 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1423 if $self->{close_button};
1152 1424
1425 1
1426}
1427
1428sub invoke_delete {
1429 my ($self) = @_;
1430
1431 $self->hide;
1432
1153 1 1433 1
1154} 1434}
1155 1435
1156sub invoke_button_down { 1436sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1437 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1495 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1496
1217 ! ! $self->{motion} 1497 ! ! $self->{motion}
1218} 1498}
1219 1499
1500sub invoke_visibility_change {
1501 my ($self, $visible) = @_;
1502
1503 delete $self->{motion} unless $visible;
1504
1505 0
1506}
1507
1220sub _draw { 1508sub _draw {
1221 my ($self) = @_; 1509 my ($self) = @_;
1222 1510
1223 my $child = $self->{children}[0]; 1511 my $child = $self->{children}[0];
1224 1512
… …
1261 if $self->{close_button}; 1549 if $self->{close_button};
1262} 1550}
1263 1551
1264############################################################################# 1552#############################################################################
1265 1553
1266package CFClient::UI::Table; 1554package CFPlus::UI::Table;
1267 1555
1268our @ISA = CFClient::UI::Base::; 1556our @ISA = CFPlus::UI::Base::;
1269 1557
1270use List::Util qw(max sum); 1558use List::Util qw(max sum);
1271 1559
1272use CFClient::OpenGL; 1560use CFPlus::OpenGL;
1273 1561
1274sub new { 1562sub new {
1275 my $class = shift; 1563 my $class = shift;
1276 1564
1277 $class->SUPER::new ( 1565 $class->SUPER::new (
1566 children => [],
1278 col_expand => [], 1567 col_expand => [],
1568 row_expand => [],
1279 @_, 1569 @_,
1280 ) 1570 )
1281} 1571}
1282 1572
1283sub children { 1573sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1574 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285} 1575}
1286 1576
1577# TODO: store row/col info in child widget and use standard add/del
1287sub add { 1578sub add {
1288 my ($self, $x, $y, $child) = @_; 1579 my ($self) = shift;
1289 1580
1581 while (@_) {
1582 my ($x, $y, $child) = splice @_, 0, 3, ();
1290 $child->set_parent ($self); 1583 $child->set_parent ($self);
1291 $self->{children}[$y][$x] = $child; 1584 $self->{children}[$y][$x] = $child;
1585 }
1292 1586
1587 $self->{force_realloc} = 1;
1588 $self->{force_size_alloc} = 1;
1293 $self->realloc; 1589 $self->realloc;
1294} 1590}
1295 1591
1296sub remove { 1592sub remove {
1297 my ($self, $child) = @_; 1593 my ($self, $child) = @_;
1298 1594
1299 # TODO: not yet implemented 1595 for (@{ $self->{children} }) {
1596 for (@{ $_ || [] }) {
1597 $_ = undef if $_ == $child;
1598 }
1599 }
1300} 1600}
1301 1601
1302# 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?
1303sub clear { 1603sub clear {
1304 my ($self) = @_; 1604 my ($self) = @_;
… …
1353 my ($ws, $hs) = $self->get_wh; 1653 my ($ws, $hs) = $self->get_wh;
1354 1654
1355 my $req_w = (sum @$ws) || 1; 1655 my $req_w = (sum @$ws) || 1;
1356 my $req_h = (sum @$hs) || 1; 1656 my $req_h = (sum @$hs) || 1;
1357 1657
1358 # TODO: nicer code && do row_expand 1658 # TODO: nicer code
1359 my @col_expand = @{$self->{col_expand}}; 1659 my @col_expand = @{$self->{col_expand}};
1360 @col_expand = (1) x @$ws unless @col_expand; 1660 @col_expand = (1) x @$ws unless @col_expand;
1361 my $col_expand = (sum @col_expand) || 1; 1661 my $col_expand = (sum @col_expand) || 1;
1362 1662
1363 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1663 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1664
1367 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
1368 CFClient::UI::harmonize $hs; 1673 CFPlus::UI::harmonize $hs;
1369 1674
1370 my $y; 1675 my $y;
1371 1676
1372 for my $r (0 .. $#{$self->{children}}) { 1677 for my $r (0 .. $#{$self->{children}}) {
1373 my $row = $self->{children}[$r] 1678 my $row = $self->{children}[$r]
… …
1416 } 1721 }
1417} 1722}
1418 1723
1419############################################################################# 1724#############################################################################
1420 1725
1421package CFClient::UI::Box; 1726package CFPlus::UI::Fixed;
1422 1727
1728use List::Util qw(min max);
1729
1423our @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::;
1424 1811
1425sub size_request { 1812sub size_request {
1426 my ($self) = @_; 1813 my ($self) = @_;
1427 1814
1428 $self->{vertical} 1815 $self->{vertical}
… …
1438 1825
1439sub invoke_size_allocate { 1826sub invoke_size_allocate {
1440 my ($self, $w, $h) = @_; 1827 my ($self, $w, $h) = @_;
1441 1828
1442 my $space = $self->{vertical} ? $h : $w; 1829 my $space = $self->{vertical} ? $h : $w;
1443 my $children = $self->{children}; 1830 my @children = $self->visible_children;
1444 1831
1445 my @req; 1832 my @req;
1446 1833
1447 if ($self->{homogeneous}) { 1834 if ($self->{homogeneous}) {
1448 @req = ($space / (@$children || 1)) x @$children; 1835 @req = ($space / (@children || 1)) x @children;
1449 } else { 1836 } else {
1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1837 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1451 my $req = List::Util::sum @req; 1838 my $req = List::Util::sum @req;
1452 1839
1453 if ($req > $space) { 1840 if ($req > $space) {
1454 # ah well, not enough space 1841 # ah well, not enough space
1455 $_ *= $space / $req for @req; 1842 $_ *= $space / $req for @req;
1456 } else { 1843 } else {
1457 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1844 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1458 1845
1459 $space = ($space - $req) / $expand; # remaining space to give away 1846 $space = ($space - $req) / $expand; # remaining space to give away
1460 1847
1461 $req[$_] += $space * $children->[$_]{expand} 1848 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#$children; 1849 for 0 .. $#children;
1463 } 1850 }
1464 } 1851 }
1465 1852
1466 CFClient::UI::harmonize \@req; 1853 CFPlus::UI::harmonize \@req;
1467 1854
1468 my $pos = 0; 1855 my $pos = 0;
1469 for (0 .. $#$children) { 1856 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1857 my $alloc = $req[$_];
1471 $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));
1472 1859
1473 $pos += $alloc; 1860 $pos += $alloc;
1474 } 1861 }
1475 1862
1476 1 1863 1
1477} 1864}
1478 1865
1479############################################################################# 1866#############################################################################
1480 1867
1481package CFClient::UI::HBox; 1868package CFPlus::UI::HBox;
1482 1869
1483our @ISA = CFClient::UI::Box::; 1870our @ISA = CFPlus::UI::Box::;
1484 1871
1485sub new { 1872sub new {
1486 my $class = shift; 1873 my $class = shift;
1487 1874
1488 $class->SUPER::new ( 1875 $class->SUPER::new (
… …
1491 ) 1878 )
1492} 1879}
1493 1880
1494############################################################################# 1881#############################################################################
1495 1882
1496package CFClient::UI::VBox; 1883package CFPlus::UI::VBox;
1497 1884
1498our @ISA = CFClient::UI::Box::; 1885our @ISA = CFPlus::UI::Box::;
1499 1886
1500sub new { 1887sub new {
1501 my $class = shift; 1888 my $class = shift;
1502 1889
1503 $class->SUPER::new ( 1890 $class->SUPER::new (
… …
1506 ) 1893 )
1507} 1894}
1508 1895
1509############################################################################# 1896#############################################################################
1510 1897
1511package CFClient::UI::Label; 1898package CFPlus::UI::Label;
1512 1899
1513our @ISA = CFClient::UI::DrawBG::; 1900our @ISA = CFPlus::UI::DrawBG::;
1514 1901
1515use CFClient::OpenGL; 1902use CFPlus::OpenGL;
1516 1903
1517sub new { 1904sub new {
1518 my ($class, %arg) = @_; 1905 my ($class, %arg) = @_;
1519 1906
1520 my $self = $class->SUPER::new ( 1907 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1910 #active_bg => none
1524 #font => default_font 1911 #font => default_font
1525 #text => initial text 1912 #text => initial text
1526 #markup => initial narkup 1913 #markup => initial narkup
1527 #max_w => maximum pixel width 1914 #max_w => maximum pixel width
1915 #style => 0, # render flags
1528 ellipsise => 3, # end 1916 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1917 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1918 fontsize => 1,
1531 align => -1, 1919 align => -1,
1532 valign => -1, 1920 valign => -1,
1533 padding_x => 2, 1921 padding_x => 2,
1534 padding_y => 2, 1922 padding_y => 2,
1535 can_events => 0, 1923 can_events => 0,
1536 %arg 1924 %arg
1537 ); 1925 );
1538 1926
1539 if (exists $self->{template}) { 1927 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1928 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1929 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1930 $self->{template} = $layout;
1543 } 1931 }
1544 1932
1545 if (exists $self->{markup}) { 1933 if (exists $self->{markup}) {
… …
1549 } 1937 }
1550 1938
1551 $self 1939 $self
1552} 1940}
1553 1941
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1942sub update {
1565 my ($self) = @_; 1943 my ($self) = @_;
1566 1944
1567 delete $self->{texture}; 1945 delete $self->{texture};
1568 $self->SUPER::update; 1946 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1957 my ($self, $text) = @_;
1580 1958
1581 return if $self->{text} eq "T$text"; 1959 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1960 $self->{text} = "T$text";
1583 1961
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1962 $self->{layout}->set_text ($text);
1586 1963
1587 delete $self->{size_req}; 1964 delete $self->{size_req};
1588 $self->realloc; 1965 $self->realloc;
1589 $self->update; 1966 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1972 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1973 $self->{text} = "M$markup";
1597 1974
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1975 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1976
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1977 $self->{layout}->set_markup ($markup);
1602 1978
1603 delete $self->{size_req}; 1979 delete $self->{size_req};
1604 $self->realloc; 1980 $self->realloc;
1605 $self->update; 1981 $self->update;
… …
1617 1993
1618 my ($w, $h) = $self->{layout}->size; 1994 my ($w, $h) = $self->{layout}->size;
1619 1995
1620 if (exists $self->{template}) { 1996 if (exists $self->{template}) {
1621 $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);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1999 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 2000
1624 my ($w2, $h2) = $self->{template}->size; 2001 my ($w2, $h2) = $self->{template}->size;
1625 2002
1626 $w = List::Util::max $w, $w2; 2003 $w = List::Util::max $w, $w2;
… …
1631 }; 2008 };
1632 2009
1633 @{ $self->{size_req} } 2010 @{ $self->{size_req} }
1634} 2011}
1635 2012
2013sub baseline_shift {
2014 $_[0]{layout}->descent
2015}
2016
1636sub invoke_size_allocate { 2017sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 2018 my ($self, $w, $h) = @_;
1638 2019
1639 delete $self->{ox}; 2020 delete $self->{ox};
1640 2021
… …
1646 2027
1647sub set_fontsize { 2028sub set_fontsize {
1648 my ($self, $fontsize) = @_; 2029 my ($self, $fontsize) = @_;
1649 2030
1650 $self->{fontsize} = $fontsize; 2031 $self->{fontsize} = $fontsize;
2032 delete $self->{size_req};
1651 delete $self->{texture}; 2033 delete $self->{texture};
1652 2034
1653 $self->realloc; 2035 $self->realloc;
1654} 2036}
1655 2037
1656sub reconfigure { 2038sub reconfigure {
1657 my ($self) = @_; 2039 my ($self) = @_;
1658 2040
1659 delete $self->{size_req}; 2041 delete $self->{size_req};
2042 delete $self->{texture};
1660 2043
1661 $self->SUPER::reconfigure; 2044 $self->SUPER::reconfigure;
1662} 2045}
1663 2046
1664sub _draw { 2047sub _draw {
1665 my ($self) = @_; 2048 my ($self) = @_;
1666 2049
1667 $self->SUPER::_draw; # draw background, if applicable 2050 $self->SUPER::_draw; # draw background, if applicable
1668 2051
1669 my $tex = $self->{texture} ||= do { 2052 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 2053 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2054 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 2055 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2056 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2057 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2058 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2059
1677 new_from_layout CFClient::Texture $self->{layout} 2060 [$self->{layout}->size]
1678 }; 2061 };
1679 2062
1680 unless (exists $self->{ox}) { 2063 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2064 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2065 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2066 : ($self->{w} - $size->[0]) * 0.5);
1684 2067
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2068 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2069 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2070 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 2071 };
1689 2072
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2073 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2074 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 2075
1695 if ($tex->{format} == GL_ALPHA) { 2076 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 2077}
1706 2078
1707############################################################################# 2079#############################################################################
1708 2080
1709package CFClient::UI::EntryBase; 2081package CFPlus::UI::EntryBase;
1710 2082
1711our @ISA = CFClient::UI::Label::; 2083our @ISA = CFPlus::UI::Label::;
1712 2084
1713use CFClient::OpenGL; 2085use CFPlus::OpenGL;
1714 2086
1715sub new { 2087sub new {
1716 my $class = shift; 2088 my $class = shift;
1717 2089
1718 $class->SUPER::new ( 2090 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 2094 active_fg => [0, 0, 0],
1723 can_hover => 1, 2095 can_hover => 1,
1724 can_focus => 1, 2096 can_focus => 1,
1725 valign => 0, 2097 valign => 0,
1726 can_events => 1, 2098 can_events => 1,
2099 ellipsise => 0,
1727 #text => ... 2100 #text => ...
1728 #hidden => "*", 2101 #hidden => "*",
1729 @_ 2102 @_
1730 ) 2103 )
1731} 2104}
… …
1776 my $sym = $ev->{sym}; 2149 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2150 my $uni = $ev->{unicode};
1778 2151
1779 my $text = $self->get_text; 2152 my $text = $self->get_text;
1780 2153
2154 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2155
1781 if ($uni == 8) { 2156 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2157 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2158 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2159 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2160 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2161 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2162 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2163 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } 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 = "";
1790 $self->{cursor} = 0; 2178 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2179 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 2180 $self->emit ('escape');
1795 } elsif ($uni) { 2181 } elsif ($uni == 0x0d) {
2182 substr $text, $self->{cursor}++, 0, "\012";
2183 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2184 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2185 } else {
1798 return 0; 2186 return 0;
1799 } 2187 }
1800 2188
1801 $self->_set_text ($text); 2189 $self->_set_text ($text);
1802 2190
1803 $self->realloc; 2191 $self->realloc;
2192 $self->update;
1804 2193
1805 1 2194 1
1806} 2195}
1807 2196
1808sub invoke_focus_in { 2197sub invoke_focus_in {
… …
1820 2209
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2210 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2211
1823 # byte-index to char-index 2212 # byte-index to char-index
1824 my $text = $self->{text}; 2213 my $text = $self->{text};
1825 utf8::encode $text; 2214 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2215 $self->{cursor} = length $text;
1827 2216
1828 $self->_set_text ($self->{text}); 2217 $self->_set_text ($self->{text});
1829 $self->update; 2218 $self->update;
1830 2219
1831 1 2220 1
… …
1870 utf8::encode $text; 2259 utf8::encode $text;
1871 2260
1872 @$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)
1873 } 2262 }
1874 2263
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2264 glBegin GL_LINES;
1877 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};
1878 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};
1879 glEnd; 2267 glEnd;
1880 } 2268 }
1881} 2269}
1882 2270
2271#############################################################################
2272
1883package CFClient::UI::Entry; 2273package CFPlus::UI::Entry;
1884 2274
1885our @ISA = CFClient::UI::EntryBase::; 2275our @ISA = CFPlus::UI::EntryBase::;
1886 2276
1887use CFClient::OpenGL; 2277use CFPlus::OpenGL;
1888 2278
1889sub invoke_key_down { 2279sub invoke_key_down {
1890 my ($self, $ev) = @_; 2280 my ($self, $ev) = @_;
1891 2281
1892 my $sym = $ev->{sym}; 2282 my $sym = $ev->{sym};
1893 2283
1894 if ($sym == 13) { 2284 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2285 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2286 my $txt = $self->get_text;
1897 2287
1898 $self->{history_pointer} = -1; 2288 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2289 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2290 $self->emit (activate => $txt);
1901 $self->update; 2291 $self->update;
1902 2292
1903 } elsif ($sym == CFClient::SDLK_UP) { 2293 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2294 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2295 $self->{history_saveback} = $self->get_text;
1906 } 2296 }
1907 if (@{$self->{history} || []} > 0) { 2297 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2298 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2300 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2301 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2302 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2303 }
1914 2304
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2305 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2306 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2307 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2308
1919 if ($self->{history_pointer} >= 0) { 2309 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2310 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2319 1
1930} 2320}
1931 2321
1932############################################################################# 2322#############################################################################
1933 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
1934package CFClient::UI::Button; 2363package CFPlus::UI::Button;
1935 2364
1936our @ISA = CFClient::UI::Label::; 2365our @ISA = CFPlus::UI::Label::;
1937 2366
1938use CFClient::OpenGL; 2367use CFPlus::OpenGL;
1939 2368
1940my @tex = 2369my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2370 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2371 qw(b1_button_active.png);
1943 2372
1944sub new { 2373sub new {
1945 my $class = shift; 2374 my $class = shift;
1946 2375
… …
1983 $self->SUPER::_draw; 2412 $self->SUPER::_draw;
1984} 2413}
1985 2414
1986############################################################################# 2415#############################################################################
1987 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
1988package CFClient::UI::ImageButton; 2566package CFPlus::UI::ImageButton;
1989 2567
1990our @ISA = CFClient::UI::Image::; 2568our @ISA = CFPlus::UI::Image::;
1991 2569
1992use CFClient::OpenGL; 2570use CFPlus::OpenGL;
1993 2571
1994my %textures; 2572my %textures;
1995 2573
1996sub new { 2574sub new {
1997 my $class = shift; 2575 my $class = shift;
… …
2019 1 2597 1
2020} 2598}
2021 2599
2022############################################################################# 2600#############################################################################
2023 2601
2024package CFClient::UI::CheckBox;
2025
2026our @ISA = CFClient::UI::DrawBG::;
2027
2028my @tex =
2029 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2030 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2031
2032use CFClient::OpenGL;
2033
2034sub new {
2035 my $class = shift;
2036
2037 $class->SUPER::new (
2038 padding_x => 2,
2039 padding_y => 2,
2040 fg => [1, 1, 1],
2041 active_fg => [1, 1, 0],
2042 bg => [0, 0, 0, 0.2],
2043 active_bg => [1, 1, 1, 0.5],
2044 state => 0,
2045 can_hover => 1,
2046 @_
2047 )
2048}
2049
2050sub size_request {
2051 my ($self) = @_;
2052
2053 (6) x 2
2054}
2055
2056sub invoke_button_down {
2057 my ($self, $ev, $x, $y) = @_;
2058
2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2061 $self->{state} = !$self->{state};
2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
2067 1
2068}
2069
2070sub _draw {
2071 my ($self) = @_;
2072
2073 $self->SUPER::_draw;
2074
2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2076
2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2080
2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2082
2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
2084
2085 glEnable GL_TEXTURE_2D;
2086 $tex->draw_quad_alpha (0, 0, $s, $s);
2087 glDisable GL_TEXTURE_2D;
2088}
2089
2090#############################################################################
2091
2092package CFClient::UI::Image; 2602package CFPlus::UI::VGauge;
2093 2603
2094our @ISA = CFClient::UI::Base::; 2604our @ISA = CFPlus::UI::Base::;
2095
2096use CFClient::OpenGL;
2097use Carp qw/confess/;
2098
2099our %loaded_images;
2100
2101sub new {
2102 my $class = shift;
2103
2104 my $self = $class->SUPER::new (can_events => 0, @_);
2105
2106 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2107
2108 $loaded_images{$self->{image}} ||=
2109 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2110
2111 my $tex = $self->{tex} = $loaded_images{$self->{image}};
2112
2113 Scalar::Util::weaken $loaded_images{$self->{image}};
2114
2115 $self->{aspect} = $tex->{w} / $tex->{h};
2116
2117 $self
2118}
2119
2120sub size_request {
2121 my ($self) = @_;
2122
2123 ($self->{tex}->{w}, $self->{tex}->{h})
2124}
2125
2126sub _draw {
2127 my ($self) = @_;
2128
2129 my $tex = $self->{tex};
2130
2131 my ($w, $h) = ($self->{w}, $self->{h});
2132
2133 if ($self->{rot90}) {
2134 glRotate 90, 0, 0, 1;
2135 glTranslate 0, -$self->{w}, 0;
2136
2137 ($w, $h) = ($h, $w);
2138 }
2139
2140 glEnable GL_TEXTURE_2D;
2141 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2142
2143 $tex->draw_quad_alpha (0, 0, $w, $h);
2144
2145 glDisable GL_TEXTURE_2D;
2146}
2147
2148#############################################################################
2149
2150package CFClient::UI::VGauge;
2151
2152our @ISA = CFClient::UI::Base::;
2153 2605
2154use List::Util qw(min max); 2606use List::Util qw(min max);
2155 2607
2156use CFClient::OpenGL; 2608use CFPlus::OpenGL;
2157 2609
2158my %tex = ( 2610my %tex = (
2159 food => [ 2611 food => [
2160 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2161 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2613 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2162 ], 2614 ],
2163 grace => [ 2615 grace => [
2164 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2165 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/
2166 ], 2618 ],
2167 hp => [ 2619 hp => [
2168 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2169 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2621 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2170 ], 2622 ],
2171 mana => [ 2623 mana => [
2172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2624 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2173 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/
2174 ], 2626 ],
2175); 2627);
2176 2628
2177# eg. VGauge->new (gauge => 'food'), default gauge: food 2629# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2237 my $ycut1 = max 0, min 1, $ycut; 2689 my $ycut1 = max 0, min 1, $ycut;
2238 my $ycut2 = max 0, min 1, $ycut - 1; 2690 my $ycut2 = max 0, min 1, $ycut - 1;
2239 2691
2240 my $h1 = $self->{h} * (1 - $ycut1); 2692 my $h1 = $self->{h} * (1 - $ycut1);
2241 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);
2242 2697
2243 glEnable GL_BLEND; 2698 glEnable GL_BLEND;
2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2699 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2700 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2246 glEnable GL_TEXTURE_2D; 2701 glEnable GL_TEXTURE_2D;
… …
2265 2720
2266 if ($t3) { 2721 if ($t3) {
2267 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2722 glBindTexture GL_TEXTURE_2D, $t3->{name};
2268 glBegin GL_QUADS; 2723 glBegin GL_QUADS;
2269 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2724 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2270 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2725 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2271 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2726 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2272 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2727 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2273 glEnd; 2728 glEnd;
2274 } 2729 }
2275 2730
2276 glDisable GL_BLEND; 2731 glDisable GL_BLEND;
2277 glDisable GL_TEXTURE_2D; 2732 glDisable GL_TEXTURE_2D;
2278} 2733}
2279 2734
2280############################################################################# 2735#############################################################################
2281 2736
2282package CFClient::UI::Gauge; 2737package CFPlus::UI::Gauge;
2283 2738
2284our @ISA = CFClient::UI::VBox::; 2739our @ISA = CFPlus::UI::VBox::;
2285 2740
2286sub new { 2741sub new {
2287 my ($class, %arg) = @_; 2742 my ($class, %arg) = @_;
2288 2743
2289 my $self = $class->SUPER::new ( 2744 my $self = $class->SUPER::new (
… …
2291 can_hover => 1, 2746 can_hover => 1,
2292 can_events => 1, 2747 can_events => 1,
2293 %arg, 2748 %arg,
2294 ); 2749 );
2295 2750
2296 $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");
2297 $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);
2298 $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");
2299 2754
2300 $self 2755 $self
2301} 2756}
2302 2757
2303sub set_fontsize { 2758sub set_fontsize {
… …
2324 $self->{value}->set_text ($val); 2779 $self->{value}->set_text ($val);
2325} 2780}
2326 2781
2327############################################################################# 2782#############################################################################
2328 2783
2329package CFClient::UI::Slider; 2784package CFPlus::UI::Slider;
2330 2785
2331use strict; 2786use strict;
2332 2787
2333use CFClient::OpenGL; 2788use CFPlus::OpenGL;
2334 2789
2335our @ISA = CFClient::UI::DrawBG::; 2790our @ISA = CFPlus::UI::DrawBG::;
2336 2791
2337my @tex = 2792my @tex =
2338 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2793 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2339 qw(s1_slider.png s1_slider_bg.png); 2794 qw(s1_slider.png s1_slider_bg.png);
2340 2795
2341sub new { 2796sub new {
2342 my $class = shift; 2797 my $class = shift;
2343 2798
… …
2432 } 2887 }
2433 2888
2434 1 2889 1
2435} 2890}
2436 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
2437sub update { 2904sub update {
2438 my ($self) = @_; 2905 my ($self) = @_;
2439 2906
2440 delete $self->{knob_w}; 2907 delete $self->{knob_w};
2441 $self->SUPER::update; 2908 $self->SUPER::update;
… …
2488 glDisable GL_TEXTURE_2D; 2955 glDisable GL_TEXTURE_2D;
2489} 2956}
2490 2957
2491############################################################################# 2958#############################################################################
2492 2959
2493package CFClient::UI::ValSlider; 2960package CFPlus::UI::ValSlider;
2494 2961
2495our @ISA = CFClient::UI::HBox::; 2962our @ISA = CFPlus::UI::HBox::;
2496 2963
2497sub new { 2964sub new {
2498 my ($class, %arg) = @_; 2965 my ($class, %arg) = @_;
2499 2966
2500 my $range = delete $arg{range}; 2967 my $range = delete $arg{range};
2501 2968
2502 my $self = $class->SUPER::new ( 2969 my $self = $class->SUPER::new (
2503 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2970 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2504 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2971 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2505 to_value => sub { shift }, 2972 to_value => sub { shift },
2506 from_value => sub { shift }, 2973 from_value => sub { shift },
2507 %arg, 2974 %arg,
2508 ); 2975 );
2509 2976
… …
2529sub set_range { shift->{slider}->set_range (@_) } 2996sub set_range { shift->{slider}->set_range (@_) }
2530sub set_value { shift->{slider}->set_value (@_) } 2997sub set_value { shift->{slider}->set_value (@_) }
2531 2998
2532############################################################################# 2999#############################################################################
2533 3000
2534package CFClient::UI::TextScroller; 3001package CFPlus::UI::TextScroller;
2535 3002
2536our @ISA = CFClient::UI::HBox::; 3003our @ISA = CFPlus::UI::HBox::;
2537 3004
2538use CFClient::OpenGL; 3005use CFPlus::OpenGL;
2539 3006
2540sub new { 3007sub new {
2541 my $class = shift; 3008 my $class = shift;
2542 3009
2543 my $self = $class->SUPER::new ( 3010 my $self = $class->SUPER::new (
2544 fontsize => 1, 3011 fontsize => 1,
2545 can_events => 0, 3012 can_events => 1,
2546 indent => 0, 3013 indent => 0,
2547 #font => default_font 3014 #font => default_font
2548 @_, 3015 @_,
2549 3016
2550 layout => (new CFClient::Layout 1), 3017 layout => (new CFPlus::Layout),
2551 par => [], 3018 par => [],
3019 max_par => 0,
2552 height => 0, 3020 height => 0,
2553 children => [ 3021 children => [
2554 (new CFClient::UI::Empty expand => 1), 3022 (new CFPlus::UI::Empty expand => 1),
2555 (new CFClient::UI::Slider vertical => 1), 3023 (new CFPlus::UI::Slider vertical => 1),
2556 ], 3024 ],
2557 ); 3025 );
2558 3026
2559 $self->{children}[1]->connect (changed => sub { $self->update }); 3027 $self->{children}[1]->connect (changed => sub { $self->update });
2560 3028
… …
2566 3034
2567 $self->{fontsize} = $fontsize; 3035 $self->{fontsize} = $fontsize;
2568 $self->reflow; 3036 $self->reflow;
2569} 3037}
2570 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
2571sub invoke_size_allocate { 3048sub invoke_size_allocate {
2572 my ($self, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2573 3050
3051 my ($empty, $slider, @other) = @{ $self->{children} };
3052 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
3053
2574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3054 $self->{layout}->set_font ($self->{font}) if $self->{font};
2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3055 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2576 $self->{layout}->set_width ($self->{children}[0]{w}); 3056 $self->{layout}->set_width ($empty->{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3057 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 3058
2579 $self->reflow; 3059 $self->reflow;
2580 3060
3061 local $self->{children} = [$empty, $slider];
2581 $self->SUPER::invoke_size_allocate ($w, $h) 3062 $self->SUPER::invoke_size_allocate ($w, $h)
2582} 3063}
2583 3064
2584sub text_size { 3065sub invoke_mouse_wheel {
2585 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) = @_;
2586 3077
2587 my $layout = $self->{layout}; 3078 my $layout = $self->{layout};
2588 3079
3080 $layout->set_font ($self->{font}) if $self->{font};
3081 $layout->set_foreground (@{$para->{fg}});
2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3082 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2590 $layout->set_width ($self->{children}[0]{w} - $indent); 3083 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3084 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $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}}
2593 3091 );
3092
2594 $layout->size 3093 $layout
2595} 3094}
2596 3095
2597sub reflow { 3096sub reflow {
2598 my ($self) = @_; 3097 my ($self) = @_;
2599 3098
… …
2606 3105
2607 # todo: base offset on lines or so, not on pixels 3106 # todo: base offset on lines or so, not on pixels
2608 $self->{children}[1]->set_value ($offset); 3107 $self->{children}[1]->set_value ($offset);
2609} 3108}
2610 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
2611sub clear { 3125sub clear {
2612 my ($self) = @_; 3126 my ($self) = @_;
3127
3128 my (undef, undef, @other) = @{ $self->{children} };
3129 $self->remove ($_) for @other;
2613 3130
2614 $self->{par} = []; 3131 $self->{par} = [];
2615 $self->{height} = 0; 3132 $self->{height} = 0;
2616 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3133 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2617} 3134}
2618 3135
2619sub add_paragraph { 3136sub add_paragraph {
2620 my ($self, $color, $text, $indent) = @_; 3137 my $self = shift;
2621 3138
2622 for my $line (split /\n/, $text) { 3139 for my $para (@_) {
2623 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
2624 $self->{height} += $h; 3191 $self->{height} = $height;
2625 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3192 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2626 }
2627 3193
2628 $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 }
2629} 3200}
2630 3201
2631sub update { 3202sub update {
2632 my ($self) = @_; 3203 my ($self) = @_;
2633 3204
… …
2636 return unless $self->{h} > 0; 3207 return unless $self->{h} > 0;
2637 3208
2638 delete $self->{texture}; 3209 delete $self->{texture};
2639 3210
2640 $ROOT->on_post_alloc ($self => sub { 3211 $ROOT->on_post_alloc ($self => sub {
3212 $self->force_uptodate;
3213
2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3214 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2642 3215
2643 if (delete $self->{need_reflow}) {
2644 my $height = 0;
2645
2646 my $layout = $self->{layout};
2647
2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2649
2650 for (@{$self->{par}}) {
2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2654 $layout->set_markup ($_->[4]);
2655 my ($w, $h) = $layout->size;
2656 $_->[0] = $w + $_->[3];
2657 $_->[1] = $h;
2658 }
2659
2660 $height += $_->[1];
2661 }
2662
2663 $self->{height} = $height;
2664
2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2666
2667 delete $self->{texture};
2668 }
2669
2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3216 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2671 glClearColor 0, 0, 0, 0; 3217 glClearColor 0, 0, 0, 0;
2672 glClear GL_COLOR_BUFFER_BIT; 3218 glClear GL_COLOR_BUFFER_BIT;
2673 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;
2674 my $top = int $self->{children}[1]{range}[0]; 3228 my $top = int $self->{children}[1]{range}[0];
2675 3229
2676 my $y0 = $top; 3230 my $y0 = $top;
2677 my $y1 = $top + $H; 3231 my $y1 = $top + $H;
2678 3232
2679 my $y = 0;
2680
2681 my $layout = $self->{layout};
2682
2683 $layout->set_font ($self->{font}) if $self->{font};
2684
2685 glEnable GL_BLEND;
2686 #TODO# not correct in windows where rgba is forced off
2687 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2688
2689 for my $par (@{$self->{par}}) { 3233 for my $para (@{$self->{par}}) {
2690 my $h = $par->[1]; 3234 my $h = $para->{h};
3235 my $y = $para->{y};
2691 3236
2692 if ($y0 < $y + $h && $y < $y1) { 3237 if ($y0 < $y + $h && $y < $y1) {
2693 $layout->set_foreground (@{ $par->[2] }); 3238 my $layout = $self->get_layout ($para);
2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2696 $layout->set_markup ($par->[4]);
2697 3239
2698 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3240 $layout->render ($para->{indent}, $y - $y0);
2699 3241
2700 glRasterPos $par->[3], $y - $y0; 3242 if (my @w = @{ $para->{widget} }) {
2701 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 }
2702 } 3254 }
2703 3255
2704 $y += $h; 3256 $paridx++;
3257 $top_paragraph ||= $paridx if $y >= $top;
2705 } 3258 }
2706 3259
2707 glDisable GL_BLEND; 3260 $self->{top_paragraph} = $top_paragraph;
2708 }; 3261 };
2709 }); 3262 });
3263}
3264
3265sub reconfigure {
3266 my ($self) = @_;
3267
3268 $self->SUPER::reconfigure;
3269
3270 $_->{w} = 1e10 for @{ $self->{par} };
3271 $self->reflow;
2710} 3272}
2711 3273
2712sub _draw { 3274sub _draw {
2713 my ($self) = @_; 3275 my ($self) = @_;
2714 3276
… …
2717 glColor 0, 0, 0, 1; 3279 glColor 0, 0, 0, 1;
2718 $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});
2719 glDisable GL_TEXTURE_2D; 3281 glDisable GL_TEXTURE_2D;
2720 3282
2721 $self->{children}[1]->draw; 3283 $self->{children}[1]->draw;
2722
2723} 3284}
2724 3285
2725############################################################################# 3286#############################################################################
2726 3287
2727package CFClient::UI::Animator; 3288package CFPlus::UI::Animator;
2728 3289
2729use CFClient::OpenGL; 3290use CFPlus::OpenGL;
2730 3291
2731our @ISA = CFClient::UI::Bin::; 3292our @ISA = CFPlus::UI::Bin::;
2732 3293
2733sub moveto { 3294sub moveto {
2734 my ($self, $x, $y) = @_; 3295 my ($self, $x, $y) = @_;
2735 3296
2736 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2764 glPopMatrix; 3325 glPopMatrix;
2765} 3326}
2766 3327
2767############################################################################# 3328#############################################################################
2768 3329
2769package CFClient::UI::Flopper; 3330package CFPlus::UI::Flopper;
2770 3331
2771our @ISA = CFClient::UI::Button::; 3332our @ISA = CFPlus::UI::Button::;
2772 3333
2773sub new { 3334sub new {
2774 my $class = shift; 3335 my $class = shift;
2775 3336
2776 my $self = $class->SUPER::new ( 3337 my $self = $class->SUPER::new (
… …
2788 $self->{other}->toggle_visibility; 3349 $self->{other}->toggle_visibility;
2789} 3350}
2790 3351
2791############################################################################# 3352#############################################################################
2792 3353
2793package CFClient::UI::Tooltip; 3354package CFPlus::UI::Tooltip;
2794 3355
2795our @ISA = CFClient::UI::Bin::; 3356our @ISA = CFPlus::UI::Bin::;
2796 3357
2797use CFClient::OpenGL; 3358use CFPlus::OpenGL;
2798 3359
2799sub new { 3360sub new {
2800 my $class = shift; 3361 my $class = shift;
2801 3362
2802 $class->SUPER::new ( 3363 $class->SUPER::new (
… …
2805 ) 3366 )
2806} 3367}
2807 3368
2808sub set_tooltip_from { 3369sub set_tooltip_from {
2809 my ($self, $widget) = @_; 3370 my ($self, $widget) = @_;
3371
3372 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3373 if $widget->{tooltip} =~ /^#(.*)$/;
2810 3374
2811 my $tooltip = $widget->{tooltip}; 3375 my $tooltip = $widget->{tooltip};
2812 3376
2813 if ($ENV{CFPLUS_DEBUG} & 2) { 3377 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n" 3378 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2818 } 3382 }
2819 3383
2820 $tooltip =~ s/^\n+//; 3384 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//; 3385 $tooltip =~ s/\n+$//;
2822 3386
2823 $self->add (new CFClient::UI::Label 3387 $self->add (new CFPlus::UI::Label
2824 markup => $tooltip, 3388 markup => $tooltip,
2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3389 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2826 fontsize => 0.8, 3390 fontsize => 0.8,
2827 fg => [0, 0, 0, 1], 3391 style => 1, # FLAG_INVERSE
2828 ellipsise => 0, 3392 ellipsise => 0,
2829 font => ($widget->{tooltip_font} || $::FONT_PROP), 3393 font => ($widget->{tooltip_font} || $::FONT_PROP),
2830 ); 3394 );
2831} 3395}
2832 3396
… …
2851 3415
2852 $self->{root}->on_post_alloc ("move_$self" => sub { 3416 $self->{root}->on_post_alloc ("move_$self" => sub {
2853 my $widget = $self->{owner} 3417 my $widget = $self->{owner}
2854 or return; 3418 or return;
2855 3419
3420 if ($widget->{visible}) {
2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3421 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2857 3422
2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3423 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2859 if $x + $self->{w} > $self->{root}{w}; 3424 if $x + $self->{w} > $self->{root}{w};
2860 3425
2861 $self->move_abs ($x, $y); 3426 $self->move_abs ($x, $y);
3427 } else {
3428 $self->hide;
3429 }
2862 }); 3430 });
2863} 3431}
2864 3432
2865sub _draw { 3433sub _draw {
2866 my ($self) = @_; 3434 my ($self) = @_;
… …
2890 $self->SUPER::_draw; 3458 $self->SUPER::_draw;
2891} 3459}
2892 3460
2893############################################################################# 3461#############################################################################
2894 3462
2895package CFClient::UI::Face; 3463package CFPlus::UI::Face;
2896 3464
2897our @ISA = CFClient::UI::Base::; 3465our @ISA = CFPlus::UI::DrawBG::;
2898 3466
2899use CFClient::OpenGL; 3467use CFPlus::OpenGL;
2900 3468
2901sub new { 3469sub new {
2902 my $class = shift; 3470 my $class = shift;
2903 3471
2904 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3473 size_w => 32,
3474 size_h => 8,
2905 aspect => 1, 3475 aspect => 1,
2906 can_events => 0, 3476 can_events => 0,
2907 @_, 3477 @_,
2908 ); 3478 );
2909 3479
2910 if ($self->{anim} && $self->{animspeed}) { 3480 if ($self->{anim} && $self->{animspeed}) {
2911 Scalar::Util::weaken (my $widget = $self); 3481 CFPlus::weaken (my $widget = $self);
2912 3482
2913 $self->{timer} = Event->timer ( 3483 $self->{timer} = Event->timer (
2914 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3484 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2915 hard => 1, 3485 hard => 1,
2916 interval => $self->{animspeed}, 3486 interval => $self->{animspeed},
2917 cb => sub { 3487 cb => sub {
3488 return unless $::CONN;
3489
2918 ++$widget->{frame}; 3490 ++$widget->{frame};
3491 $self->update_face;
2919 $widget->update; 3492 $self->update;
2920 }, 3493 },
2921 ); 3494 );
3495
3496 $self->update_face;
2922 } 3497 }
2923 3498
2924 $self 3499 $self
2925} 3500}
2926 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
2927sub size_request { 3515sub size_request {
2928 (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)
2929} 3531}
2930 3532
2931sub update { 3533sub update {
2932 my ($self) = @_; 3534 my ($self) = @_;
2933 3535
… …
2939sub _draw { 3541sub _draw {
2940 my ($self) = @_; 3542 my ($self) = @_;
2941 3543
2942 return unless $::CONN; 3544 return unless $::CONN;
2943 3545
2944 my $face; 3546 $self->SUPER::_draw;
2945 3547
2946 if ($self->{frame}) {
2947 my $anim = $::CONN->{anim}[$self->{anim}]; 3548 my $faceid = $::CONN->{faceid}[$self->{face}]
2948 3549 or return;
2949 $face = $anim->[ $self->{frame} % @$anim ]
2950 if $anim && @$anim;
2951 }
2952 3550
2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3551 my $tex = $::CONN->{texture}[$faceid];
2954 3552
2955 if ($tex) { 3553 if ($tex) {
2956 glEnable GL_TEXTURE_2D; 3554 glEnable GL_TEXTURE_2D;
2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2958 glColor 0, 0, 0, 1; 3556 glColor 0, 0, 0, 1;
… …
2970 $self->SUPER::destroy; 3568 $self->SUPER::destroy;
2971} 3569}
2972 3570
2973############################################################################# 3571#############################################################################
2974 3572
2975package CFClient::UI::Buttonbar; 3573package CFPlus::UI::Buttonbar;
2976 3574
2977our @ISA = CFClient::UI::HBox::; 3575our @ISA = CFPlus::UI::HBox::;
2978 3576
2979# TODO: should actualyl wrap buttons and other goodies. 3577# TODO: should actually wrap buttons and other goodies.
2980 3578
2981############################################################################# 3579#############################################################################
2982 3580
2983package CFClient::UI::Menu; 3581package CFPlus::UI::Menu;
2984 3582
2985our @ISA = CFClient::UI::FancyFrame::; 3583our @ISA = CFPlus::UI::Toplevel::;
2986 3584
2987use CFClient::OpenGL; 3585use CFPlus::OpenGL;
2988 3586
2989sub new { 3587sub new {
2990 my $class = shift; 3588 my $class = shift;
2991 3589
2992 my $self = $class->SUPER::new ( 3590 my $self = $class->SUPER::new (
2993 items => [], 3591 items => [],
2994 z => 100, 3592 z => 100,
2995 @_, 3593 @_,
2996 ); 3594 );
2997 3595
2998 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3596 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2999 3597
3000 for my $item (@{ $self->{items} }) { 3598 for my $item (@{ $self->{items} }) {
3001 my ($widget, $cb, $tooltip) = @$item; 3599 my ($widget, $cb, $tooltip) = @$item;
3002 3600
3003 # handle various types of items, only text for now 3601 # handle various types of items, only text for now
3004 if (!ref $widget) { 3602 if (!ref $widget) {
3603 if ($widget =~ /\t/) {
3604 my ($left, $right) = split /\t/, $widget, 2;
3605
3005 $widget = new CFClient::UI::Label 3606 $widget = new CFPlus::UI::HBox
3006 can_hover => 1, 3607 can_hover => 1,
3007 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,
3008 markup => $widget, 3620 markup => $widget,
3009 tooltip => $tooltip 3621 tooltip => $tooltip;
3622 }
3010 } 3623 }
3011 3624
3012 $self->{item}{$widget} = $item; 3625 $self->{item}{$widget} = $item;
3013 3626
3014 $self->{vbox}->add ($widget); 3627 $self->{vbox}->add ($widget);
… …
3057 1 3670 1
3058} 3671}
3059 3672
3060############################################################################# 3673#############################################################################
3061 3674
3062package CFClient::UI::Multiplexer; 3675package CFPlus::UI::Multiplexer;
3063 3676
3064our @ISA = CFClient::UI::Container::; 3677our @ISA = CFPlus::UI::Container::;
3065 3678
3066sub new { 3679sub new {
3067 my $class = shift; 3680 my $class = shift;
3068 3681
3069 my $self = $class->SUPER::new ( 3682 my $self = $class->SUPER::new (
… …
3083 3696
3084 $self->{current} = $self->{children}[0] 3697 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} }; 3698 if @{ $self->{children} };
3086} 3699}
3087 3700
3701sub get_current_page {
3702 my ($self) = @_;
3703
3704 $self->{current}
3705}
3706
3088sub set_current_page { 3707sub set_current_page {
3089 my ($self, $page_or_widget) = @_; 3708 my ($self, $page_or_widget) = @_;
3090 3709
3091 my $widget = ref $page_or_widget 3710 my $widget = ref $page_or_widget
3092 ? $page_or_widget 3711 ? $page_or_widget
… …
3124 $self->{current}->draw; 3743 $self->{current}->draw;
3125} 3744}
3126 3745
3127############################################################################# 3746#############################################################################
3128 3747
3129package CFClient::UI::Notebook; 3748package CFPlus::UI::Notebook;
3130 3749
3131our @ISA = CFClient::UI::VBox::; 3750our @ISA = CFPlus::UI::VBox::;
3132 3751
3133sub new { 3752sub new {
3134 my $class = shift; 3753 my $class = shift;
3135 3754
3136 my $self = $class->SUPER::new ( 3755 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar), 3756 buttonbar => (new CFPlus::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3757 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self 3758 # filter => # will be put between multiplexer and $self
3140 @_, 3759 @_,
3141 ); 3760 );
3142 3761
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3762 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3147} 3766}
3148 3767
3149sub add { 3768sub add {
3150 my ($self, $title, $widget, $tooltip) = @_; 3769 my ($self, $title, $widget, $tooltip) = @_;
3151 3770
3152 Scalar::Util::weaken $self; 3771 CFPlus::weaken $self;
3153 3772
3154 $self->{buttonbar}->add (new CFClient::UI::Button 3773 $self->{buttonbar}->add (new CFPlus::UI::Button
3155 markup => $title, 3774 markup => $title,
3156 tooltip => $tooltip, 3775 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) }, 3776 on_activate => sub { $self->set_current_page ($widget) },
3158 ); 3777 );
3159 3778
3160 $self->{multiplexer}->add ($widget); 3779 $self->{multiplexer}->add ($widget);
3161} 3780}
3162 3781
3782sub get_current_page {
3783 my ($self) = @_;
3784
3785 $self->{multiplexer}->get_current_page
3786}
3787
3163sub set_current_page { 3788sub set_current_page {
3164 my ($self, $page) = @_; 3789 my ($self, $page) = @_;
3165 3790
3166 $self->{multiplexer}->set_current_page ($page); 3791 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current}); 3792 $self->emit (page_changed => $self->{multiplexer}{current});
3168} 3793}
3169 3794
3170############################################################################# 3795#############################################################################
3171 3796
3172package CFClient::UI::Combobox; 3797package CFPlus::UI::Selector;
3173 3798
3174use utf8; 3799use utf8;
3175 3800
3176our @ISA = CFClient::UI::Button::; 3801our @ISA = CFPlus::UI::Button::;
3177 3802
3178sub new { 3803sub new {
3179 my $class = shift; 3804 my $class = shift;
3180 3805
3181 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
… …
3198 my ($value, $title, $tooltip) = @$_; 3823 my ($value, $title, $tooltip) = @$_;
3199 3824
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3825 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 } 3826 }
3202 3827
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3828 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204} 3829}
3205 3830
3206sub _set_value { 3831sub _set_value {
3207 my ($self, $value) = @_; 3832 my ($self, $value) = @_;
3208 3833
… …
3223 $self->emit (changed => $value); 3848 $self->emit (changed => $value);
3224} 3849}
3225 3850
3226############################################################################# 3851#############################################################################
3227 3852
3228package CFClient::UI::Statusbox; 3853package CFPlus::UI::Statusbox;
3229 3854
3230our @ISA = CFClient::UI::VBox::; 3855our @ISA = CFPlus::UI::VBox::;
3231 3856
3232sub new { 3857sub new {
3233 my $class = shift; 3858 my $class = shift;
3234 3859
3235 my $self = $class->SUPER::new ( 3860 my $self = $class->SUPER::new (
3236 fontsize => 0.8, 3861 fontsize => 0.8,
3237 @_, 3862 @_,
3238 ); 3863 );
3239 3864
3240 Scalar::Util::weaken (my $this = $self); 3865 CFPlus::weaken (my $this = $self);
3241 3866
3242 $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 });
3243 3868
3244 $self 3869 $self
3245} 3870}
… …
3247sub reorder { 3872sub reorder {
3248 my ($self) = @_; 3873 my ($self) = @_;
3249 my $NOW = Time::HiRes::time; 3874 my $NOW = Time::HiRes::time;
3250 3875
3251 # freeze display when hovering over any label 3876 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner} 3877 return if $CFPlus::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3878 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} }; 3879 values %{ $self->{item} };
3255 3880
3256 while (my ($k, $v) = each %{ $self->{item} }) { 3881 while (my ($k, $v) = each %{ $self->{item} }) {
3257 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3882 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3258 } 3883 }
… …
3279 for ($short) { 3904 for ($short) {
3280 s/^\s+//; 3905 s/^\s+//;
3281 s/\s+/ /g; 3906 s/\s+/ /g;
3282 } 3907 }
3283 3908
3284 new CFClient::UI::Label 3909 new CFPlus::UI::Label
3285 markup => $short, 3910 markup => $short,
3286 tooltip => $item->{tooltip}, 3911 tooltip => $item->{tooltip},
3287 tooltip_font => $::FONT_PROP, 3912 tooltip_font => $::FONT_PROP,
3288 tooltip_width => 0.67, 3913 tooltip_width => 0.67,
3289 fontsize => $item->{fontsize} || $self->{fontsize}, 3914 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3343 count => 1, 3968 count => 1,
3344 %arg, 3969 %arg,
3345 }; 3970 };
3346 } 3971 }
3347 3972
3973 $ROOT->on_refresh (reorder => sub {
3348 $self->reorder; 3974 $self->reorder;
3975 });
3349} 3976}
3350 3977
3351sub reconfigure { 3978sub reconfigure {
3352 my ($self) = @_; 3979 my ($self) = @_;
3353 3980
… …
3366 $self->SUPER::destroy; 3993 $self->SUPER::destroy;
3367} 3994}
3368 3995
3369############################################################################# 3996#############################################################################
3370 3997
3371package CFClient::UI::Inventory;
3372
3373our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375sub new {
3376 my $class = shift;
3377
3378 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380 @_,
3381 );
3382
3383 $self
3384}
3385
3386sub set_items {
3387 my ($self, $items) = @_;
3388
3389 $self->{child}->clear;
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 }
3607}
3608
3609#############################################################################
3610
3611package CFClient::UI::SpellList;
3612
3613our @ISA = CFClient::UI::Table::;
3614
3615sub new {
3616 my $class = shift;
3617
3618 my $self = $class->SUPER::new (
3619 binding => [],
3620 commands => [],
3621 @_,
3622 )
3623}
3624
3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
3657 $row++;
3658
3659 my $spell_cb = sub {
3660 my ($widget, $ev) = @_;
3661
3662 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu
3668 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ],
3672 )->popup ($ev);
3673 } else {
3674 return 0;
3675 }
3676
3677 1
3678 };
3679
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3710sub add_spell {
3711 my ($self, $spell) = @_;
3712
3713 $self->{spell}->{$spell->{name}} = $spell;
3714 $self->rebuild_spell_list;
3715}
3716
3717sub remove_spell {
3718 my ($self, $spell) = @_;
3719
3720 delete $self->{spell}->{$spell->{name}};
3721 $self->rebuild_spell_list;
3722}
3723
3724sub clear_spells {
3725 my ($self) = @_;
3726
3727 $self->{spell} = {};
3728 $self->rebuild_spell_list;
3729}
3730
3731#############################################################################
3732
3733package CFClient::UI::Root; 3998package CFPlus::UI::Root;
3734 3999
3735our @ISA = CFClient::UI::Container::; 4000our @ISA = CFPlus::UI::Container::;
3736 4001
3737use List::Util qw(min max); 4002use List::Util qw(min max);
3738 4003
3739use CFClient::OpenGL; 4004use CFPlus::OpenGL;
3740 4005
3741sub new { 4006sub new {
3742 my $class = shift; 4007 my $class = shift;
3743 4008
3744 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3745 visible => 1, 4010 visible => 1,
3746 @_, 4011 @_,
3747 ); 4012 );
3748 4013
3749 Scalar::Util::weaken ($self->{root} = $self); 4014 CFPlus::weaken ($self->{root} = $self);
3750 4015
3751 $self 4016 $self
3752} 4017}
3753 4018
3754sub size_request { 4019sub size_request {
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4185 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 4186
3922 $w = 0 if $w < 0; 4187 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 4188 $h = 0 if $h < 0;
3924 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
3925 $w = int $w + 0.5; 4199 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 4200 $h = int $h + 0.5;
3927 4201
3928 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}) {
3929 $widget->{old_w} = $widget->{w}; 4203 $widget->{old_w} = $widget->{w};
… …
3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4226 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3953 glMatrixMode GL_MODELVIEW; 4227 glMatrixMode GL_MODELVIEW;
3954 glLoadIdentity; 4228 glLoadIdentity;
3955 4229
3956 { 4230 {
3957 package CFClient::UI::Base; 4231 package CFPlus::UI::Base;
3958 4232
3959 ($draw_x, $draw_y, $draw_w, $draw_h) = 4233 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h}); 4234 (0, 0, $self->{w}, $self->{h});
3961 }
3962 4235
3963 $self->_draw; 4236 $self->_draw;
4237 }
3964} 4238}
3965 4239
3966############################################################################# 4240#############################################################################
3967 4241
3968package CFClient::UI; 4242package CFPlus::UI;
3969 4243
3970$ROOT = new CFClient::UI::Root; 4244$ROOT = new CFPlus::UI::Root;
3971$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4245$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3972 4246
39731 42471
3974 4248

Diff Legend

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