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.310 by root, Fri Jun 23 20:28:20 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
278 delete $self->{root}; 308 delete $self->{root};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->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
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
914 $self->update; 995 $self->update;
915} 996}
916 997
917# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
918sub coord2local { 999sub coord2local {
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1019 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1021 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1023 }
943} 1024}
944 1025
945sub _render { 1026sub _render {
946 my ($self) = @_; 1027 my ($self) = @_;
947 1028
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1031
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1033
953 $self->SUPER::_render; 1034 $self->SUPER::_render;
954} 1035}
955 1036
956############################################################################# 1037#############################################################################
957 1038
958package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
959 1040
960our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
961 1042
962sub new { 1043sub new {
963 my ($class, %arg) = @_; 1044 my ($class, %arg) = @_;
964 1045
965 my $child = delete $arg{child}; 1046 my $child = delete $arg{child};
966 1047
967 my $self; 1048 my $self;
968 1049
969 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
1051 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub {
1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 },
1057 ;
1058
1059 my $vslider = new CFPlus::UI::Slider
970 vertical => 1, 1060 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1061 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1062 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974 }, 1065 },
975 ; 1066 ;
976 1067
977 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
979 slider => $slider, 1072 hslider => $hslider,
1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
980 %arg, 1076 %arg,
981 ); 1077 );
982 1078
1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085
1086 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y);
1088
1089 0
1090 },
1091 ;
1092
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1093 $self->SUPER::add (0, 0, $self->{vp});
1094
984 $self->add ($child) if $child; 1095 $self->add ($child) if $child;
985 1096
986 $self 1097 $self
987} 1098}
1099
1100#TODO# update range on size_allocate depending on child
988 1101
989sub add { 1102sub add {
990 my ($self, $widget) = @_; 1103 my ($self, $widget) = @_;
991 1104
992 $self->{vp}->add ($self->{child} = $widget); 1105 $self->{vp}->add ($self->{child} = $widget);
993} 1106}
994 1107
1108sub update_slider {
1109 my ($self) = @_;
1110
1111 my $child = ($self->{vp} or return)->child;
1112
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115
1116 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) {
1118 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1119 : $self->{hslider}->hide;
1120 }
1121
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124
1125 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) {
1127 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1128 : $self->{vslider}->hide;
1129 }
1130}
1131
995sub update { 1132sub update {
996 my ($self) = @_; 1133 my ($self) = @_;
997 1134
998 $self->SUPER::update; 1135 $self->SUPER::update;
1136 $self->update_slider;
1137}
999 1138
1000 # todo: overwrite size_allocate of child 1139sub invoke_mouse_wheel {
1001 my $child = $self->{vp}->child; 1140 my ($self, $ev) = @_;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1141
1142 return 0 unless $ev->{dy}; # only vertical movements for now
1143
1144 $self->{vslider}->emit (mouse_wheel => $ev);
1145
1146 1
1147}
1148
1149sub invoke_button_down {
1150 my ($self, $ev, $x, $y) = @_;
1151
1152 if ($ev->{button} == 2) {
1153 $self->grab_focus;
1154
1155 my $ox = $self->{vp}{view_x} + $ev->{x};
1156 my $oy = $self->{vp}{view_y} + $ev->{y};
1157
1158 $self->{motion} = sub {
1159 my ($ev, $x, $y) = @_;
1160
1161 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1162 $self->update;
1163 };
1164
1165 return 1;
1166 }
1167
1168 0
1169}
1170
1171sub invoke_button_up {
1172 my ($self, $ev, $x, $y) = @_;
1173
1174 if (delete $self->{motion}) {
1175 return 1;
1176 }
1177
1178 0
1179}
1180
1181sub invoke_mouse_motion {
1182 my ($self, $ev, $x, $y) = @_;
1183
1184 if ($self->{motion}) {
1185 $self->{motion}->($ev, $x, $y);
1186 return 1;
1187 }
1188
1189 0
1003} 1190}
1004 1191
1005sub invoke_size_allocate { 1192sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1193 my ($self, $w, $h) = @_;
1007 1194
1008 my $child = $self->{vp}->child; 1195 $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) 1196 $self->SUPER::invoke_size_allocate ($w, $h)
1012} 1197}
1013 1198
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016
1017############################################################################# 1199#############################################################################
1018 1200
1019package CFClient::UI::Frame; 1201package CFPlus::UI::Frame;
1020 1202
1021our @ISA = CFClient::UI::Bin::; 1203our @ISA = CFPlus::UI::Bin::;
1022 1204
1023use CFClient::OpenGL; 1205use CFPlus::OpenGL;
1024 1206
1025sub new { 1207sub new {
1026 my $class = shift; 1208 my $class = shift;
1027 1209
1028 $class->SUPER::new ( 1210 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1236 $self->SUPER::_draw;
1055} 1237}
1056 1238
1057############################################################################# 1239#############################################################################
1058 1240
1059package CFClient::UI::FancyFrame; 1241package CFPlus::UI::FancyFrame;
1060 1242
1061our @ISA = CFClient::UI::Bin::; 1243our @ISA = CFPlus::UI::Bin::;
1062 1244
1063use CFClient::OpenGL; 1245use CFPlus::OpenGL;
1246
1247sub new {
1248 my ($class, %arg) = @_;
1249
1250 if ((exists $arg{label}) && !ref $arg{label}) {
1251 $arg{label} = new CFPlus::UI::Label
1252 align => 1,
1253 valign => 0,
1254 text => $arg{label},
1255 fontsize => ($arg{border} || 0.8) * 0.75;
1256 }
1257
1258 my $self = $class->SUPER::new (
1259 # label => "",
1260 fg => [0.6, 0.3, 0.1],
1261 border => 0.8,
1262 style => 'single',
1263 %arg,
1264 );
1265
1266 $self
1267}
1268
1269sub add {
1270 my ($self, @widgets) = @_;
1271
1272 $self->SUPER::add (@widgets);
1273 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1274}
1275
1276sub border {
1277 int $_[0]{border} * $::FONTSIZE
1278}
1279
1280sub size_request {
1281 my ($self) = @_;
1282
1283 ($self->{label_w}, undef) = $self->{label}->size_request
1284 if $self->{label};
1285
1286 my ($w, $h) = $self->SUPER::size_request;
1287
1288 (
1289 $w + $self->border * 2,
1290 $h + $self->border * 2,
1291 )
1292}
1293
1294sub invoke_size_allocate {
1295 my ($self, $w, $h) = @_;
1296
1297 my $border = $self->border;
1298
1299 $w -= List::Util::max 0, $border * 2;
1300 $h -= List::Util::max 0, $border * 2;
1301
1302 if (my $label = $self->{label}) {
1303 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1304 $label->{h} = List::Util::min $h, $border;
1305 $label->invoke_size_allocate ($label->{w}, $label->{h});
1306 }
1307
1308 $self->child->configure ($border, $border, $w, $h);
1309
1310 1
1311}
1312
1313sub _draw {
1314 my ($self) = @_;
1315
1316 my $child = $self->{children}[0];
1317
1318 my $border = $self->border;
1319 my ($w, $h) = ($self->{w}, $self->{h});
1320
1321 $child->draw;
1322
1323 glColor @{$self->{fg}};
1324 glBegin GL_LINE_STRIP;
1325 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1329 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1330 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1331 glEnd;
1332
1333 if ($self->{label}) {
1334 glTranslate $border * 2, 0;
1335 $self->{label}->_draw;
1336 }
1337}
1338
1339#############################################################################
1340
1341package CFPlus::UI::Toplevel;
1342
1343our @ISA = CFPlus::UI::Bin::;
1344
1345use CFPlus::OpenGL;
1064 1346
1065my $bg = 1347my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1348 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1; 1349 mipmap => 1, wrap => 1;
1068 1350
1069my @border = 1351my @border =
1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1352 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); 1353 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1072 1354
1073sub new { 1355sub new {
1074 my ($class, %arg) = @_; 1356 my ($class, %arg) = @_;
1075 1357
1076 my $self = $class->SUPER::new ( 1358 my $self = $class->SUPER::new (
1077 bg => [1, 1, 1, 1], 1359 bg => [1, 1, 1, 1],
1078 border_bg => [1, 1, 1, 1], 1360 border_bg => [1, 1, 1, 1],
1079 border => 0.6, 1361 border => 0.6,
1080 can_events => 1, 1362 can_events => 1,
1081 min_w => 16, 1363 min_w => 64,
1082 min_h => 16, 1364 min_h => 32,
1083 %arg, 1365 %arg,
1084 ); 1366 );
1085 1367
1086 $self->{title_widget} = new CFClient::UI::Label 1368 $self->{title_widget} = new CFPlus::UI::Label
1087 align => 0, 1369 align => 0,
1088 valign => 1, 1370 valign => 1,
1089 text => $self->{title}, 1371 text => $self->{title},
1090 fontsize => $self->{border}, 1372 fontsize => $self->{border},
1091 if exists $self->{title}; 1373 if exists $self->{title};
1092 1374
1093 if ($self->{has_close_button}) { 1375 if ($self->{has_close_button}) {
1094 $self->{close_button} = 1376 $self->{close_button} =
1095 new CFClient::UI::ImageButton 1377 new CFPlus::UI::ImageButton
1096 path => 'x1_close.png', 1378 path => 'x1_close.png',
1097 on_activate => sub { $self->hide }; 1379 on_activate => sub { $self->emit ("delete") };
1098 1380
1099 $self->CFClient::UI::Container::add ($self->{close_button}); 1381 $self->CFPlus::UI::Container::add ($self->{close_button});
1100 } 1382 }
1101 1383
1102 $self 1384 $self
1103} 1385}
1104 1386
1105sub add { 1387sub add {
1106 my ($self, @widgets) = @_; 1388 my ($self, @widgets) = @_;
1107 1389
1108 $self->SUPER::add (@widgets); 1390 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1391 $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}; 1392 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1111} 1393}
1112 1394
1113sub border { 1395sub border {
1114 int $_[0]{border} * $::FONTSIZE 1396 int $_[0]{border} * $::FONTSIZE
1115} 1397}
… …
1148 $self->child->configure ($border, $border, $w, $h); 1430 $self->child->configure ($border, $border, $w, $h);
1149 1431
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1432 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button}; 1433 if $self->{close_button};
1152 1434
1435 1
1436}
1437
1438sub invoke_delete {
1439 my ($self) = @_;
1440
1441 $self->hide;
1442
1153 1 1443 1
1154} 1444}
1155 1445
1156sub invoke_button_down { 1446sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1447 my ($self, $ev, $x, $y) = @_;
… …
1215 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1505 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216 1506
1217 ! ! $self->{motion} 1507 ! ! $self->{motion}
1218} 1508}
1219 1509
1510sub invoke_visibility_change {
1511 my ($self, $visible) = @_;
1512
1513 delete $self->{motion} unless $visible;
1514
1515 0
1516}
1517
1220sub _draw { 1518sub _draw {
1221 my ($self) = @_; 1519 my ($self) = @_;
1222 1520
1223 my $child = $self->{children}[0]; 1521 my $child = $self->{children}[0];
1224 1522
… …
1261 if $self->{close_button}; 1559 if $self->{close_button};
1262} 1560}
1263 1561
1264############################################################################# 1562#############################################################################
1265 1563
1266package CFClient::UI::Table; 1564package CFPlus::UI::Table;
1267 1565
1268our @ISA = CFClient::UI::Base::; 1566our @ISA = CFPlus::UI::Base::;
1269 1567
1270use List::Util qw(max sum); 1568use List::Util qw(max sum);
1271 1569
1272use CFClient::OpenGL; 1570use CFPlus::OpenGL;
1273 1571
1274sub new { 1572sub new {
1275 my $class = shift; 1573 my $class = shift;
1276 1574
1277 $class->SUPER::new ( 1575 $class->SUPER::new (
1576 children => [],
1278 col_expand => [], 1577 col_expand => [],
1578 row_expand => [],
1279 @_, 1579 @_,
1280 ) 1580 )
1281} 1581}
1282 1582
1283sub children { 1583sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1584 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1285} 1585}
1286 1586
1587# TODO: store row/col info in child widget and use standard add/del
1287sub add { 1588sub add {
1288 my ($self, $x, $y, $child) = @_; 1589 my ($self) = shift;
1289 1590
1591 while (@_) {
1592 my ($x, $y, $child) = splice @_, 0, 3, ();
1290 $child->set_parent ($self); 1593 $child->set_parent ($self);
1291 $self->{children}[$y][$x] = $child; 1594 $self->{children}[$y][$x] = $child;
1595 }
1292 1596
1597 $self->{force_realloc} = 1;
1598 $self->{force_size_alloc} = 1;
1293 $self->realloc; 1599 $self->realloc;
1294} 1600}
1295 1601
1296sub remove { 1602sub remove {
1297 my ($self, $child) = @_; 1603 my ($self, $child) = @_;
1298 1604
1299 # TODO: not yet implemented 1605 for (@{ $self->{children} }) {
1606 for (@{ $_ || [] }) {
1607 $_ = undef if $_ == $child;
1608 }
1609 }
1300} 1610}
1301 1611
1302# TODO: move to container class maybe? send children a signal on removal? 1612# TODO: move to container class maybe? send children a signal on removal?
1303sub clear { 1613sub clear {
1304 my ($self) = @_; 1614 my ($self) = @_;
… …
1353 my ($ws, $hs) = $self->get_wh; 1663 my ($ws, $hs) = $self->get_wh;
1354 1664
1355 my $req_w = (sum @$ws) || 1; 1665 my $req_w = (sum @$ws) || 1;
1356 my $req_h = (sum @$hs) || 1; 1666 my $req_h = (sum @$hs) || 1;
1357 1667
1358 # TODO: nicer code && do row_expand 1668 # TODO: nicer code
1359 my @col_expand = @{$self->{col_expand}}; 1669 my @col_expand = @{$self->{col_expand}};
1360 @col_expand = (1) x @$ws unless @col_expand; 1670 @col_expand = (1) x @$ws unless @col_expand;
1361 my $col_expand = (sum @col_expand) || 1; 1671 my $col_expand = (sum @col_expand) || 1;
1362 1672
1363 # linearly scale sizes
1364 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1673 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1365 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1366 1674
1367 CFClient::UI::harmonize $ws; 1675 CFPlus::UI::harmonize $ws;
1676
1677 my @row_expand = @{$self->{row_expand}};
1678 @row_expand = (1) x @$ws unless @row_expand;
1679 my $row_expand = (sum @row_expand) || 1;
1680
1681 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1682
1368 CFClient::UI::harmonize $hs; 1683 CFPlus::UI::harmonize $hs;
1369 1684
1370 my $y; 1685 my $y;
1371 1686
1372 for my $r (0 .. $#{$self->{children}}) { 1687 for my $r (0 .. $#{$self->{children}}) {
1373 my $row = $self->{children}[$r] 1688 my $row = $self->{children}[$r]
… …
1416 } 1731 }
1417} 1732}
1418 1733
1419############################################################################# 1734#############################################################################
1420 1735
1421package CFClient::UI::Box; 1736package CFPlus::UI::Fixed;
1422 1737
1738use List::Util qw(min max);
1739
1423our @ISA = CFClient::UI::Container::; 1740our @ISA = CFPlus::UI::Container::;
1741
1742sub add {
1743 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1744
1745 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1746 $self->SUPER::add ($child);
1747}
1748
1749sub _scale($$$) {
1750 my ($mode, $val, $max) = @_;
1751
1752 $mode eq "abs" ? $val
1753 : $mode eq "rel" ? $val * $max
1754 : 0
1755}
1756
1757sub size_request {
1758 my ($self) = @_;
1759
1760 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1761
1762 # determine overall size by querying abs widgets
1763 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1765
1766 if ($pos eq "abs") {
1767 $w = _scale $size, $w, $child->{req_w};
1768 $h = _scale $size, $h, $child->{req_h};
1769
1770 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1771 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1772 }
1773 }
1774
1775 my $W = $x2 - $x1;
1776 my $H = $y2 - $y1;
1777
1778 # now layout remaining widgets
1779 for my $child ($self->visible_children) {
1780 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1781
1782 if ($pos ne "abs") {
1783 $x = _scale $pos, $x, $W;
1784 $y = _scale $pos, $x, $H;
1785 $w = _scale $size, $w, $child->{req_w};
1786 $h = _scale $size, $h, $child->{req_h};
1787
1788 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1789 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1790 }
1791 }
1792
1793 my $W = $x2 - $x1;
1794 my $H = $y2 - $y1;
1795
1796 ($W, $H)
1797}
1798
1799sub invoke_size_allocate {
1800 my ($self, $W, $H) = @_;
1801
1802 for my $child ($self->visible_children) {
1803 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1804
1805 $x = _scale $pos, $x, $W;
1806 $y = _scale $pos, $x, $H;
1807 $w = _scale $size, $w, $child->{req_w};
1808 $h = _scale $size, $h, $child->{req_h};
1809
1810 $child->configure ($x, $y, $w, $h);
1811 }
1812
1813 1
1814}
1815
1816#############################################################################
1817
1818package CFPlus::UI::Box;
1819
1820our @ISA = CFPlus::UI::Container::;
1424 1821
1425sub size_request { 1822sub size_request {
1426 my ($self) = @_; 1823 my ($self) = @_;
1427 1824
1428 $self->{vertical} 1825 $self->{vertical}
… …
1461 $req[$_] += $space * $children[$_]{expand} 1858 $req[$_] += $space * $children[$_]{expand}
1462 for 0 .. $#children; 1859 for 0 .. $#children;
1463 } 1860 }
1464 } 1861 }
1465 1862
1466 CFClient::UI::harmonize \@req; 1863 CFPlus::UI::harmonize \@req;
1467 1864
1468 my $pos = 0; 1865 my $pos = 0;
1469 for (0 .. $#children) { 1866 for (0 .. $#children) {
1470 my $alloc = $req[$_]; 1867 my $alloc = $req[$_];
1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1868 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
… …
1476 1 1873 1
1477} 1874}
1478 1875
1479############################################################################# 1876#############################################################################
1480 1877
1481package CFClient::UI::HBox; 1878package CFPlus::UI::HBox;
1482 1879
1483our @ISA = CFClient::UI::Box::; 1880our @ISA = CFPlus::UI::Box::;
1484 1881
1485sub new { 1882sub new {
1486 my $class = shift; 1883 my $class = shift;
1487 1884
1488 $class->SUPER::new ( 1885 $class->SUPER::new (
… …
1491 ) 1888 )
1492} 1889}
1493 1890
1494############################################################################# 1891#############################################################################
1495 1892
1496package CFClient::UI::VBox; 1893package CFPlus::UI::VBox;
1497 1894
1498our @ISA = CFClient::UI::Box::; 1895our @ISA = CFPlus::UI::Box::;
1499 1896
1500sub new { 1897sub new {
1501 my $class = shift; 1898 my $class = shift;
1502 1899
1503 $class->SUPER::new ( 1900 $class->SUPER::new (
… …
1506 ) 1903 )
1507} 1904}
1508 1905
1509############################################################################# 1906#############################################################################
1510 1907
1511package CFClient::UI::Label; 1908package CFPlus::UI::Label;
1512 1909
1513our @ISA = CFClient::UI::DrawBG::; 1910our @ISA = CFPlus::UI::DrawBG::;
1514 1911
1515use CFClient::OpenGL; 1912use CFPlus::OpenGL;
1516 1913
1517sub new { 1914sub new {
1518 my ($class, %arg) = @_; 1915 my ($class, %arg) = @_;
1519 1916
1520 my $self = $class->SUPER::new ( 1917 my $self = $class->SUPER::new (
… …
1523 #active_bg => none 1920 #active_bg => none
1524 #font => default_font 1921 #font => default_font
1525 #text => initial text 1922 #text => initial text
1526 #markup => initial narkup 1923 #markup => initial narkup
1527 #max_w => maximum pixel width 1924 #max_w => maximum pixel width
1925 #style => 0, # render flags
1528 ellipsise => 3, # end 1926 ellipsise => 3, # end
1529 layout => (new CFClient::Layout), 1927 layout => (new CFPlus::Layout),
1530 fontsize => 1, 1928 fontsize => 1,
1531 align => -1, 1929 align => -1,
1532 valign => -1, 1930 valign => -1,
1533 padding_x => 2, 1931 padding_x => 2,
1534 padding_y => 2, 1932 padding_y => 2,
1535 can_events => 0, 1933 can_events => 0,
1536 %arg 1934 %arg
1537 ); 1935 );
1538 1936
1539 if (exists $self->{template}) { 1937 if (exists $self->{template}) {
1540 my $layout = new CFClient::Layout; 1938 my $layout = new CFPlus::Layout;
1541 $layout->set_text (delete $self->{template}); 1939 $layout->set_text (delete $self->{template});
1542 $self->{template} = $layout; 1940 $self->{template} = $layout;
1543 } 1941 }
1544 1942
1545 if (exists $self->{markup}) { 1943 if (exists $self->{markup}) {
… …
1549 } 1947 }
1550 1948
1551 $self 1949 $self
1552} 1950}
1553 1951
1554sub escape($) {
1555 local $_ = $_[0];
1556
1557 s/&/&amp;/g;
1558 s/>/&gt;/g;
1559 s/</&lt;/g;
1560
1561 $_
1562}
1563
1564sub update { 1952sub update {
1565 my ($self) = @_; 1953 my ($self) = @_;
1566 1954
1567 delete $self->{texture}; 1955 delete $self->{texture};
1568 $self->SUPER::update; 1956 $self->SUPER::update;
… …
1579 my ($self, $text) = @_; 1967 my ($self, $text) = @_;
1580 1968
1581 return if $self->{text} eq "T$text"; 1969 return if $self->{text} eq "T$text";
1582 $self->{text} = "T$text"; 1970 $self->{text} = "T$text";
1583 1971
1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1585 $self->{layout}->set_text ($text); 1972 $self->{layout}->set_text ($text);
1586 1973
1587 delete $self->{size_req}; 1974 delete $self->{size_req};
1588 $self->realloc; 1975 $self->realloc;
1589 $self->update; 1976 $self->update;
… …
1595 return if $self->{text} eq "M$markup"; 1982 return if $self->{text} eq "M$markup";
1596 $self->{text} = "M$markup"; 1983 $self->{text} = "M$markup";
1597 1984
1598 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1985 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1599 1986
1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1601 $self->{layout}->set_markup ($markup); 1987 $self->{layout}->set_markup ($markup);
1602 1988
1603 delete $self->{size_req}; 1989 delete $self->{size_req};
1604 $self->realloc; 1990 $self->realloc;
1605 $self->update; 1991 $self->update;
… …
1617 2003
1618 my ($w, $h) = $self->{layout}->size; 2004 my ($w, $h) = $self->{layout}->size;
1619 2005
1620 if (exists $self->{template}) { 2006 if (exists $self->{template}) {
1621 $self->{template}->set_font ($self->{font}) if $self->{font}; 2007 $self->{template}->set_font ($self->{font}) if $self->{font};
2008 $self->{template}->set_width ($self->{max_w} || -1);
1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2009 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1623 2010
1624 my ($w2, $h2) = $self->{template}->size; 2011 my ($w2, $h2) = $self->{template}->size;
1625 2012
1626 $w = List::Util::max $w, $w2; 2013 $w = List::Util::max $w, $w2;
… …
1631 }; 2018 };
1632 2019
1633 @{ $self->{size_req} } 2020 @{ $self->{size_req} }
1634} 2021}
1635 2022
2023sub baseline_shift {
2024 $_[0]{layout}->descent
2025}
2026
1636sub invoke_size_allocate { 2027sub invoke_size_allocate {
1637 my ($self, $w, $h) = @_; 2028 my ($self, $w, $h) = @_;
1638 2029
1639 delete $self->{ox}; 2030 delete $self->{ox};
1640 2031
… …
1646 2037
1647sub set_fontsize { 2038sub set_fontsize {
1648 my ($self, $fontsize) = @_; 2039 my ($self, $fontsize) = @_;
1649 2040
1650 $self->{fontsize} = $fontsize; 2041 $self->{fontsize} = $fontsize;
2042 delete $self->{size_req};
1651 delete $self->{texture}; 2043 delete $self->{texture};
1652 2044
1653 $self->realloc; 2045 $self->realloc;
1654} 2046}
1655 2047
1656sub reconfigure { 2048sub reconfigure {
1657 my ($self) = @_; 2049 my ($self) = @_;
1658 2050
1659 delete $self->{size_req}; 2051 delete $self->{size_req};
2052 delete $self->{texture};
1660 2053
1661 $self->SUPER::reconfigure; 2054 $self->SUPER::reconfigure;
1662} 2055}
1663 2056
1664sub _draw { 2057sub _draw {
1665 my ($self) = @_; 2058 my ($self) = @_;
1666 2059
1667 $self->SUPER::_draw; # draw background, if applicable 2060 $self->SUPER::_draw; # draw background, if applicable
1668 2061
1669 my $tex = $self->{texture} ||= do { 2062 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 2063 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2064 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 2065 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2066 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2067 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2068 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 2069
1677 new_from_layout CFClient::Texture $self->{layout} 2070 [$self->{layout}->size]
1678 }; 2071 };
1679 2072
1680 unless (exists $self->{ox}) { 2073 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2074 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2075 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 2076 : ($self->{w} - $size->[0]) * 0.5);
1684 2077
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2078 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2079 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 2080 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 2081 };
1689 2082
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2083 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2084 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 2085
1695 if ($tex->{format} == GL_ALPHA) { 2086 $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} 2087}
1706 2088
1707############################################################################# 2089#############################################################################
1708 2090
1709package CFClient::UI::EntryBase; 2091package CFPlus::UI::EntryBase;
1710 2092
1711our @ISA = CFClient::UI::Label::; 2093our @ISA = CFPlus::UI::Label::;
1712 2094
1713use CFClient::OpenGL; 2095use CFPlus::OpenGL;
1714 2096
1715sub new { 2097sub new {
1716 my $class = shift; 2098 my $class = shift;
1717 2099
1718 $class->SUPER::new ( 2100 $class->SUPER::new (
… …
1722 active_fg => [0, 0, 0], 2104 active_fg => [0, 0, 0],
1723 can_hover => 1, 2105 can_hover => 1,
1724 can_focus => 1, 2106 can_focus => 1,
1725 valign => 0, 2107 valign => 0,
1726 can_events => 1, 2108 can_events => 1,
2109 ellipsise => 0,
1727 #text => ... 2110 #text => ...
1728 #hidden => "*", 2111 #hidden => "*",
1729 @_ 2112 @_
1730 ) 2113 )
1731} 2114}
… …
1776 my $sym = $ev->{sym}; 2159 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 2160 my $uni = $ev->{unicode};
1778 2161
1779 my $text = $self->get_text; 2162 my $text = $self->get_text;
1780 2163
2164 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2165
1781 if ($uni == 8) { 2166 if ($uni == 8) {
1782 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2167 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1783 } elsif ($uni == 127) { 2168 } elsif ($uni == 127) {
1784 substr $text, $self->{cursor}, 1, ""; 2169 substr $text, $self->{cursor}, 1, "";
1785 } elsif ($sym == CFClient::SDLK_LEFT) { 2170 } elsif ($sym == CFPlus::SDLK_LEFT) {
1786 --$self->{cursor} if $self->{cursor}; 2171 --$self->{cursor} if $self->{cursor};
1787 } elsif ($sym == CFClient::SDLK_RIGHT) { 2172 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1788 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2173 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1789 } elsif ($sym == CFClient::SDLK_HOME) { 2174 } elsif ($sym == CFPlus::SDLK_HOME) {
2175 # what a hack
2176 $self->{cursor} =
2177 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2178 ? length $1
2179 : 0;
2180 } elsif ($sym == CFPlus::SDLK_END) {
2181 # uh, again
2182 $self->{cursor} =
2183 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2184 ? $self->{cursor} + length $1
2185 : length $self->{text};
2186 } elsif ($uni == 21) { # ctrl-u
2187 $text = "";
1790 $self->{cursor} = 0; 2188 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 2189 } elsif ($uni == 27) {
1794 $self->emit ('escape'); 2190 $self->emit ('escape');
1795 } elsif ($uni) { 2191 } elsif ($uni == 0x0d) {
2192 substr $text, $self->{cursor}++, 0, "\012";
2193 } elsif ($uni >= 0x20) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 2194 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 2195 } else {
1798 return 0; 2196 return 0;
1799 } 2197 }
1800 2198
1801 $self->_set_text ($text); 2199 $self->_set_text ($text);
1802 2200
1803 $self->realloc; 2201 $self->realloc;
2202 $self->update;
1804 2203
1805 1 2204 1
1806} 2205}
1807 2206
1808sub invoke_focus_in { 2207sub invoke_focus_in {
… …
1820 2219
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 2220 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 2221
1823 # byte-index to char-index 2222 # byte-index to char-index
1824 my $text = $self->{text}; 2223 my $text = $self->{text};
1825 utf8::encode $text; 2224 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 2225 $self->{cursor} = length $text;
1827 2226
1828 $self->_set_text ($self->{text}); 2227 $self->_set_text ($self->{text});
1829 $self->update; 2228 $self->update;
1830 2229
1831 1 2230 1
… …
1870 utf8::encode $text; 2269 utf8::encode $text;
1871 2270
1872 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2271 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1873 } 2272 }
1874 2273
1875 glColor @{$self->{fg}};
1876 glBegin GL_LINES; 2274 glBegin GL_LINES;
1877 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1878 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2276 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1879 glEnd; 2277 glEnd;
1880 } 2278 }
1881} 2279}
1882 2280
2281#############################################################################
2282
1883package CFClient::UI::Entry; 2283package CFPlus::UI::Entry;
1884 2284
1885our @ISA = CFClient::UI::EntryBase::; 2285our @ISA = CFPlus::UI::EntryBase::;
1886 2286
1887use CFClient::OpenGL; 2287use CFPlus::OpenGL;
1888 2288
1889sub invoke_key_down { 2289sub invoke_key_down {
1890 my ($self, $ev) = @_; 2290 my ($self, $ev) = @_;
1891 2291
1892 my $sym = $ev->{sym}; 2292 my $sym = $ev->{sym};
1893 2293
1894 if ($sym == 13) { 2294 if ($ev->{uni} == 0x0d || $sym == 13) {
1895 unshift @{$self->{history}}, 2295 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 2296 my $txt = $self->get_text;
1897 2297
1898 $self->{history_pointer} = -1; 2298 $self->{history_pointer} = -1;
1899 $self->{history_saveback} = ''; 2299 $self->{history_saveback} = '';
1900 $self->emit (activate => $txt); 2300 $self->emit (activate => $txt);
1901 $self->update; 2301 $self->update;
1902 2302
1903 } elsif ($sym == CFClient::SDLK_UP) { 2303 } elsif ($sym == CFPlus::SDLK_UP) {
1904 if ($self->{history_pointer} < 0) { 2304 if ($self->{history_pointer} < 0) {
1905 $self->{history_saveback} = $self->get_text; 2305 $self->{history_saveback} = $self->get_text;
1906 } 2306 }
1907 if (@{$self->{history} || []} > 0) { 2307 if (@{$self->{history} || []} > 0) {
1908 $self->{history_pointer}++; 2308 $self->{history_pointer}++;
… …
1910 $self->{history_pointer} = @{$self->{history} || []} - 1; 2310 $self->{history_pointer} = @{$self->{history} || []} - 1;
1911 } 2311 }
1912 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2312 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1913 } 2313 }
1914 2314
1915 } elsif ($sym == CFClient::SDLK_DOWN) { 2315 } elsif ($sym == CFPlus::SDLK_DOWN) {
1916 $self->{history_pointer}--; 2316 $self->{history_pointer}--;
1917 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2317 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1918 2318
1919 if ($self->{history_pointer} >= 0) { 2319 if ($self->{history_pointer} >= 0) {
1920 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2320 $self->set_text ($self->{history}->[$self->{history_pointer}]);
… …
1929 1 2329 1
1930} 2330}
1931 2331
1932############################################################################# 2332#############################################################################
1933 2333
2334package CFPlus::UI::TextEdit;
2335
2336our @ISA = CFPlus::UI::EntryBase::;
2337
2338use CFPlus::OpenGL;
2339
2340sub move_cursor_ver {
2341 my ($self, $dy) = @_;
2342
2343 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2344
2345 $y += $dy;
2346
2347 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2348 $self->{cursor} = $index;
2349 delete $self->{cur_h};
2350 $self->update;
2351 return;
2352 }
2353}
2354
2355sub invoke_key_down {
2356 my ($self, $ev) = @_;
2357
2358 my $sym = $ev->{sym};
2359
2360 if ($sym == CFPlus::SDLK_UP) {
2361 $self->move_cursor_ver (-1);
2362 } elsif ($sym == CFPlus::SDLK_DOWN) {
2363 $self->move_cursor_ver (+1);
2364 } else {
2365 return $self->SUPER::invoke_key_down ($ev)
2366 }
2367
2368 1
2369}
2370
2371#############################################################################
2372
1934package CFClient::UI::Button; 2373package CFPlus::UI::Button;
1935 2374
1936our @ISA = CFClient::UI::Label::; 2375our @ISA = CFPlus::UI::Label::;
1937 2376
1938use CFClient::OpenGL; 2377use CFPlus::OpenGL;
1939 2378
1940my @tex = 2379my @tex =
1941 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1942 qw(b1_button_active.png); 2381 qw(b1_button_active.png);
1943 2382
1944sub new { 2383sub new {
1945 my $class = shift; 2384 my $class = shift;
1946 2385
… …
1983 $self->SUPER::_draw; 2422 $self->SUPER::_draw;
1984} 2423}
1985 2424
1986############################################################################# 2425#############################################################################
1987 2426
2427package CFPlus::UI::CheckBox;
2428
2429our @ISA = CFPlus::UI::DrawBG::;
2430
2431my @tex =
2432 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2433 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2434
2435use CFPlus::OpenGL;
2436
2437sub new {
2438 my $class = shift;
2439
2440 $class->SUPER::new (
2441 padding_x => 2,
2442 padding_y => 2,
2443 fg => [1, 1, 1],
2444 active_fg => [1, 1, 0],
2445 bg => [0, 0, 0, 0.2],
2446 active_bg => [1, 1, 1, 0.5],
2447 state => 0,
2448 can_hover => 1,
2449 @_
2450 )
2451}
2452
2453sub size_request {
2454 my ($self) = @_;
2455
2456 (6) x 2
2457}
2458
2459sub toggle {
2460 my ($self) = @_;
2461
2462 $self->{state} = !$self->{state};
2463 $self->emit (changed => $self->{state});
2464 $self->update;
2465}
2466
2467sub invoke_button_down {
2468 my ($self, $ev, $x, $y) = @_;
2469
2470 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2471 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2472 $self->toggle;
2473 } else {
2474 return 0
2475 }
2476
2477 1
2478}
2479
2480sub _draw {
2481 my ($self) = @_;
2482
2483 $self->SUPER::_draw;
2484
2485 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2486
2487 my ($w, $h) = @$self{qw(w h)};
2488
2489 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2490
2491 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2492
2493 my $tex = $self->{state} ? $tex[1] : $tex[0];
2494
2495 glEnable GL_TEXTURE_2D;
2496 $tex->draw_quad_alpha (0, 0, $s, $s);
2497 glDisable GL_TEXTURE_2D;
2498}
2499
2500#############################################################################
2501
2502package CFPlus::UI::Image;
2503
2504our @ISA = CFPlus::UI::Base::;
2505
2506use CFPlus::OpenGL;
2507
2508our %texture_cache;
2509
2510sub new {
2511 my $class = shift;
2512
2513 my $self = $class->SUPER::new (
2514 can_events => 0,
2515 @_,
2516 );
2517
2518 $self->{path} || $self->{tex}
2519 or Carp::croak "'path' or 'tex' attributes required";
2520
2521 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2522 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2523
2524 CFPlus::weaken $texture_cache{$self->{path}};
2525
2526 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2527
2528 $self
2529}
2530
2531sub STORABLE_freeze {
2532 my ($self, $cloning) = @_;
2533
2534 $self->{path}
2535 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2536
2537 $self->{path}
2538}
2539
2540sub STORABLE_attach {
2541 my ($self, $cloning, $path) = @_;
2542
2543 $self->new (path => $path)
2544}
2545
2546sub size_request {
2547 my ($self) = @_;
2548
2549 ($self->{tex}{w}, $self->{tex}{h})
2550}
2551
2552sub _draw {
2553 my ($self) = @_;
2554
2555 my $tex = $self->{tex};
2556
2557 my ($w, $h) = ($self->{w}, $self->{h});
2558
2559 if ($self->{rot90}) {
2560 glRotate 90, 0, 0, 1;
2561 glTranslate 0, -$self->{w}, 0;
2562
2563 ($w, $h) = ($h, $w);
2564 }
2565
2566 glEnable GL_TEXTURE_2D;
2567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2568
2569 $tex->draw_quad (0, 0, $w, $h);
2570
2571 glDisable GL_TEXTURE_2D;
2572}
2573
2574#############################################################################
2575
1988package CFClient::UI::ImageButton; 2576package CFPlus::UI::ImageButton;
1989 2577
1990our @ISA = CFClient::UI::Image::; 2578our @ISA = CFPlus::UI::Image::;
1991 2579
1992use CFClient::OpenGL; 2580use CFPlus::OpenGL;
1993 2581
1994my %textures; 2582my %textures;
1995 2583
1996sub new { 2584sub new {
1997 my $class = shift; 2585 my $class = shift;
… …
2019 1 2607 1
2020} 2608}
2021 2609
2022############################################################################# 2610#############################################################################
2023 2611
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; 2612package CFPlus::UI::VGauge;
2093 2613
2094our @ISA = CFClient::UI::Base::; 2614our @ISA = CFPlus::UI::Base::;
2095
2096use CFClient::OpenGL;
2097
2098our %texture_cache;
2099
2100sub new {
2101 my $class = shift;
2102
2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2107
2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
2110
2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113
2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2115
2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self
2119}
2120
2121sub size_request {
2122 my ($self) = @_;
2123
2124 ($self->{tex}{w}, $self->{tex}{h})
2125}
2126
2127sub _draw {
2128 my ($self) = @_;
2129
2130 my $tex = $self->{tex};
2131
2132 my ($w, $h) = ($self->{w}, $self->{h});
2133
2134 if ($self->{rot90}) {
2135 glRotate 90, 0, 0, 1;
2136 glTranslate 0, -$self->{w}, 0;
2137
2138 ($w, $h) = ($h, $w);
2139 }
2140
2141 glEnable GL_TEXTURE_2D;
2142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2143
2144 $tex->draw_quad_alpha (0, 0, $w, $h);
2145
2146 glDisable GL_TEXTURE_2D;
2147}
2148
2149#############################################################################
2150
2151package CFClient::UI::VGauge;
2152
2153our @ISA = CFClient::UI::Base::;
2154 2615
2155use List::Util qw(min max); 2616use List::Util qw(min max);
2156 2617
2157use CFClient::OpenGL; 2618use CFPlus::OpenGL;
2158 2619
2159my %tex = ( 2620my %tex = (
2160 food => [ 2621 food => [
2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2622 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2162 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2623 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2163 ], 2624 ],
2164 grace => [ 2625 grace => [
2165 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2626 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2166 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2627 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2167 ], 2628 ],
2168 hp => [ 2629 hp => [
2169 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2630 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2170 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2631 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2171 ], 2632 ],
2172 mana => [ 2633 mana => [
2173 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2634 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2174 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2635 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2175 ], 2636 ],
2176); 2637);
2177 2638
2178# eg. VGauge->new (gauge => 'food'), default gauge: food 2639# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2238 my $ycut1 = max 0, min 1, $ycut; 2699 my $ycut1 = max 0, min 1, $ycut;
2239 my $ycut2 = max 0, min 1, $ycut - 1; 2700 my $ycut2 = max 0, min 1, $ycut - 1;
2240 2701
2241 my $h1 = $self->{h} * (1 - $ycut1); 2702 my $h1 = $self->{h} * (1 - $ycut1);
2242 my $h2 = $self->{h} * (1 - $ycut2); 2703 my $h2 = $self->{h} * (1 - $ycut2);
2704 my $h3 = $self->{h};
2705
2706 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2243 2707
2244 glEnable GL_BLEND; 2708 glEnable GL_BLEND;
2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2709 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2710 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glEnable GL_TEXTURE_2D; 2711 glEnable GL_TEXTURE_2D;
… …
2266 2730
2267 if ($t3) { 2731 if ($t3) {
2268 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2732 glBindTexture GL_TEXTURE_2D, $t3->{name};
2269 glBegin GL_QUADS; 2733 glBegin GL_QUADS;
2270 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2734 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2271 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2735 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2272 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2736 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2273 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2737 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2274 glEnd; 2738 glEnd;
2275 } 2739 }
2276 2740
2277 glDisable GL_BLEND; 2741 glDisable GL_BLEND;
2278 glDisable GL_TEXTURE_2D; 2742 glDisable GL_TEXTURE_2D;
2279} 2743}
2280 2744
2281############################################################################# 2745#############################################################################
2282 2746
2283package CFClient::UI::Gauge; 2747package CFPlus::UI::Gauge;
2284 2748
2285our @ISA = CFClient::UI::VBox::; 2749our @ISA = CFPlus::UI::VBox::;
2286 2750
2287sub new { 2751sub new {
2288 my ($class, %arg) = @_; 2752 my ($class, %arg) = @_;
2289 2753
2290 my $self = $class->SUPER::new ( 2754 my $self = $class->SUPER::new (
… …
2292 can_hover => 1, 2756 can_hover => 1,
2293 can_events => 1, 2757 can_events => 1,
2294 %arg, 2758 %arg,
2295 ); 2759 );
2296 2760
2297 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2761 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2298 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2762 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2299 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2763 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2300 2764
2301 $self 2765 $self
2302} 2766}
2303 2767
2304sub set_fontsize { 2768sub set_fontsize {
… …
2325 $self->{value}->set_text ($val); 2789 $self->{value}->set_text ($val);
2326} 2790}
2327 2791
2328############################################################################# 2792#############################################################################
2329 2793
2330package CFClient::UI::Slider; 2794package CFPlus::UI::Slider;
2331 2795
2332use strict; 2796use strict;
2333 2797
2334use CFClient::OpenGL; 2798use CFPlus::OpenGL;
2335 2799
2336our @ISA = CFClient::UI::DrawBG::; 2800our @ISA = CFPlus::UI::DrawBG::;
2337 2801
2338my @tex = 2802my @tex =
2339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2803 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2340 qw(s1_slider.png s1_slider_bg.png); 2804 qw(s1_slider.png s1_slider_bg.png);
2341 2805
2342sub new { 2806sub new {
2343 my $class = shift; 2807 my $class = shift;
2344 2808
… …
2433 } 2897 }
2434 2898
2435 1 2899 1
2436} 2900}
2437 2901
2902sub invoke_mouse_wheel {
2903 my ($self, $ev) = @_;
2904
2905 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2906
2907 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2908
2909 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2910
2911 ! ! $delta
2912}
2913
2438sub update { 2914sub update {
2439 my ($self) = @_; 2915 my ($self) = @_;
2440 2916
2441 delete $self->{knob_w}; 2917 delete $self->{knob_w};
2442 $self->SUPER::update; 2918 $self->SUPER::update;
… …
2489 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2490} 2966}
2491 2967
2492############################################################################# 2968#############################################################################
2493 2969
2494package CFClient::UI::ValSlider; 2970package CFPlus::UI::ValSlider;
2495 2971
2496our @ISA = CFClient::UI::HBox::; 2972our @ISA = CFPlus::UI::HBox::;
2497 2973
2498sub new { 2974sub new {
2499 my ($class, %arg) = @_; 2975 my ($class, %arg) = @_;
2500 2976
2501 my $range = delete $arg{range}; 2977 my $range = delete $arg{range};
2502 2978
2503 my $self = $class->SUPER::new ( 2979 my $self = $class->SUPER::new (
2504 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2980 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2505 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2981 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2506 to_value => sub { shift }, 2982 to_value => sub { shift },
2507 from_value => sub { shift }, 2983 from_value => sub { shift },
2508 %arg, 2984 %arg,
2509 ); 2985 );
2510 2986
… …
2530sub set_range { shift->{slider}->set_range (@_) } 3006sub set_range { shift->{slider}->set_range (@_) }
2531sub set_value { shift->{slider}->set_value (@_) } 3007sub set_value { shift->{slider}->set_value (@_) }
2532 3008
2533############################################################################# 3009#############################################################################
2534 3010
2535package CFClient::UI::TextScroller; 3011package CFPlus::UI::TextScroller;
2536 3012
2537our @ISA = CFClient::UI::HBox::; 3013our @ISA = CFPlus::UI::HBox::;
2538 3014
2539use CFClient::OpenGL; 3015use CFPlus::OpenGL;
2540 3016
2541sub new { 3017sub new {
2542 my $class = shift; 3018 my $class = shift;
2543 3019
2544 my $self = $class->SUPER::new ( 3020 my $self = $class->SUPER::new (
2545 fontsize => 1, 3021 fontsize => 1,
2546 can_events => 0, 3022 can_events => 1,
2547 indent => 0, 3023 indent => 0,
2548 #font => default_font 3024 #font => default_font
2549 @_, 3025 @_,
2550 3026
2551 layout => (new CFClient::Layout 1), 3027 layout => (new CFPlus::Layout),
2552 par => [], 3028 par => [],
3029 max_par => 0,
2553 height => 0, 3030 height => 0,
2554 children => [ 3031 children => [
2555 (new CFClient::UI::Empty expand => 1), 3032 (new CFPlus::UI::Empty expand => 1),
2556 (new CFClient::UI::Slider vertical => 1), 3033 (new CFPlus::UI::Slider vertical => 1),
2557 ], 3034 ],
2558 ); 3035 );
2559 3036
2560 $self->{children}[1]->connect (changed => sub { $self->update }); 3037 $self->{children}[1]->connect (changed => sub { $self->update });
2561 3038
… …
2567 3044
2568 $self->{fontsize} = $fontsize; 3045 $self->{fontsize} = $fontsize;
2569 $self->reflow; 3046 $self->reflow;
2570} 3047}
2571 3048
2572sub visible_children { 3049sub size_request {
2573 my ($self) = @_; 3050 my ($self) = @_;
2574 3051
2575 @{$self->{children}}[0,1] 3052 my ($empty, $slider) = @{ $self->{children} };
3053
3054 local $self->{children} = [$empty, $slider];
3055 $self->SUPER::size_request
2576} 3056}
2577 3057
2578sub invoke_size_allocate { 3058sub invoke_size_allocate {
2579 my ($self, $w, $h) = @_; 3059 my ($self, $w, $h) = @_;
2580 3060
2581 my (undef, undef, @other) = @{ $self->{children} }; 3061 my ($empty, $slider, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other; 3062 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2583 3063
2584 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3064 $self->{layout}->set_font ($self->{font}) if $self->{font};
2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2586 $self->{layout}->set_width ($self->{children}[0]{w}); 3066 $self->{layout}->set_width ($empty->{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3067 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2588 3068
2589 $self->reflow; 3069 $self->reflow;
2590 3070
3071 local $self->{children} = [$empty, $slider];
2591 $self->SUPER::invoke_size_allocate ($w, $h) 3072 $self->SUPER::invoke_size_allocate ($w, $h)
3073}
3074
3075sub invoke_mouse_wheel {
3076 my ($self, $ev) = @_;
3077
3078 return 0 unless $ev->{dy}; # only vertical movements
3079
3080 $self->{children}[1]->emit (mouse_wheel => $ev);
3081
3082 1
2592} 3083}
2593 3084
2594sub get_layout { 3085sub get_layout {
2595 my ($self, $para) = @_; 3086 my ($self, $para) = @_;
2596 3087
2597 my $layout = $self->{layout}; 3088 my $layout = $self->{layout};
2598 3089
2599 $layout->set_font ($self->{font}) if $self->{font}; 3090 $layout->set_font ($self->{font}) if $self->{font};
3091 $layout->set_foreground (@{$para->{fg}});
2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3092 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent}); 3093 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3094 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2603 $layout->set_markup ($para->{markup}); 3095 $layout->set_markup ($para->{markup});
2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}}); 3096
3097 $layout->set_shapes (
3098 map
3099 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3100 @{$para->{widget}}
3101 );
2605 3102
2606 $layout 3103 $layout
2607} 3104}
2608 3105
2609sub reflow { 3106sub reflow {
… …
2616sub set_offset { 3113sub set_offset {
2617 my ($self, $offset) = @_; 3114 my ($self, $offset) = @_;
2618 3115
2619 # todo: base offset on lines or so, not on pixels 3116 # todo: base offset on lines or so, not on pixels
2620 $self->{children}[1]->set_value ($offset); 3117 $self->{children}[1]->set_value ($offset);
3118}
3119
3120sub current_paragraph {
3121 my ($self) = @_;
3122
3123 $self->{top_paragraph} - 1
3124}
3125
3126sub scroll_to {
3127 my ($self, $para) = @_;
3128
3129 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3130
3131 $self->{scroll_to} = $para;
3132 $self->update;
2621} 3133}
2622 3134
2623sub clear { 3135sub clear {
2624 my ($self) = @_; 3136 my ($self) = @_;
2625 3137
… …
2630 $self->{height} = 0; 3142 $self->{height} = 0;
2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3143 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2632} 3144}
2633 3145
2634sub add_paragraph { 3146sub add_paragraph {
2635 my ($self, $color, $para, $indent) = @_; 3147 my $self = shift;
2636 3148
2637 my ($text, @w) = ref $para ? @$para : $para; 3149 for my $para (@_) {
2638
2639 $para = { 3150 $para = {
3151 fg => [1, 1, 1, 1],
3152 indent => 0,
3153 markup => "",
3154 widget => [],
3155 ref $para ? %$para : (markup => $para),
2640 w => 1e10, 3156 w => 1e10,
2641 wrapped => 1, 3157 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2646 }; 3158 };
2647 3159
2648 $self->add (@w) if @w; 3160 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2649 push @{$self->{par}}, $para; 3161 push @{$self->{par}}, $para;
3162 }
3163
3164 if (my $max = $self->{max_par}) {
3165 shift @{$self->{par}} while @{$self->{par}} > $max;
3166 }
2650 3167
2651 $self->{need_reflow}++; 3168 $self->{need_reflow}++;
2652 $self->update; 3169 $self->update;
2653} 3170}
2654 3171
2655sub scroll_to_bottom { 3172sub scroll_to_bottom {
2656 my ($self) = @_; 3173 my ($self) = @_;
2657 3174
2658 $self->{scroll_to_bottom} = 1; 3175 $self->{scroll_to} = $#{$self->{par}};
2659 $self->update; 3176 $self->update;
2660} 3177}
2661 3178
3179sub force_uptodate {
3180 my ($self) = @_;
3181
3182 if (delete $self->{need_reflow}) {
3183 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3184
3185 my $height = 0;
3186
3187 for my $para (@{$self->{par}}) {
3188 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3189 my $layout = $self->get_layout ($para);
3190 my ($w, $h) = $layout->size;
3191
3192 $para->{w} = $w + $para->{indent};
3193 $para->{h} = $h;
3194 $para->{wrapped} = $layout->has_wrapped;
3195 }
3196
3197 $para->{y} = $height;
3198 $height += $para->{h};
3199 }
3200
3201 $self->{height} = $height;
3202 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3203
3204 delete $self->{texture};
3205 }
3206
3207 if (my $paridx = delete $self->{scroll_to}) {
3208 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3209 }
3210}
3211
2662sub update { 3212sub update {
2663 my ($self) = @_; 3213 my ($self) = @_;
2664 3214
2665 $self->SUPER::update; 3215 $self->SUPER::update;
2666 3216
2667 return unless $self->{h} > 0; 3217 return unless $self->{h} > 0;
2668 3218
2669 delete $self->{texture}; 3219 delete $self->{texture};
2670 3220
2671 $ROOT->on_post_alloc ($self => sub { 3221 $ROOT->on_post_alloc ($self => sub {
3222 $self->force_uptodate;
3223
2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3224 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673 3225
2674 if (delete $self->{need_reflow}) {
2675 my $height = 0;
2676
2677 for my $para (@{$self->{par}}) {
2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2679 my $layout = $self->get_layout ($para);
2680 my ($w, $h) = $layout->size;
2681
2682 $para->{w} = $w + $para->{indent};
2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2685 }
2686
2687 $height += $para->{h};
2688 }
2689
2690 $self->{height} = $height;
2691
2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2693
2694 delete $self->{texture};
2695 }
2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3226 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2702 glClearColor 0, 0, 0, 0; 3227 glClearColor 0, 0, 0, 0;
2703 glClear GL_COLOR_BUFFER_BIT; 3228 glClear GL_COLOR_BUFFER_BIT;
2704 3229
3230 package CFPlus::UI::Base;
3231 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3232 (0, 0, $self->{w}, $self->{h});
3233
3234 my $top = int $self->{children}[1]{range}[0];
3235
3236 my $paridx = 0;
3237 my $top_paragraph;
2705 my $top = int $self->{children}[1]{range}[0]; 3238 my $top = int $self->{children}[1]{range}[0];
2706 3239
2707 my $y0 = $top; 3240 my $y0 = $top;
2708 my $y1 = $top + $H; 3241 my $y1 = $top + $H;
2709 3242
2710 my $y = 0;
2711
2712 glEnable GL_BLEND;
2713 #TODO# not correct in windows where rgba is forced off
2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2715
2716 for my $para (@{$self->{par}}) { 3243 for my $para (@{$self->{par}}) {
2717 my $h = $para->{h}; 3244 my $h = $para->{h};
3245 my $y = $para->{y};
2718 3246
2719 if ($y0 < $y + $h && $y < $y1) { 3247 if ($y0 < $y + $h && $y < $y1) {
2720
2721 my $layout = $self->get_layout ($para); 3248 my $layout = $self->get_layout ($para);
2722 3249
2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2724
2725 glRasterPos $para->{indent}, $y - $y0; 3250 $layout->render ($para->{indent}, $y - $y0);
2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727 3251
2728 if (my @w = @{ $para->{widget} }) { 3252 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes; 3253 my @s = $layout->get_shapes;
2730 3254
2731 for (@w) { 3255 for (@w) {
… …
2737 $_->draw; 3261 $_->draw;
2738 } 3262 }
2739 } 3263 }
2740 } 3264 }
2741 3265
2742 $y += $h; 3266 $paridx++;
3267 $top_paragraph ||= $paridx if $y >= $top;
2743 } 3268 }
2744 3269
2745 glDisable GL_BLEND; 3270 $self->{top_paragraph} = $top_paragraph;
2746 }; 3271 };
2747 }); 3272 });
2748} 3273}
2749 3274
2750sub reconfigure { 3275sub reconfigure {
… …
2768 $self->{children}[1]->draw; 3293 $self->{children}[1]->draw;
2769} 3294}
2770 3295
2771############################################################################# 3296#############################################################################
2772 3297
2773package CFClient::UI::Animator; 3298package CFPlus::UI::Animator;
2774 3299
2775use CFClient::OpenGL; 3300use CFPlus::OpenGL;
2776 3301
2777our @ISA = CFClient::UI::Bin::; 3302our @ISA = CFPlus::UI::Bin::;
2778 3303
2779sub moveto { 3304sub moveto {
2780 my ($self, $x, $y) = @_; 3305 my ($self, $x, $y) = @_;
2781 3306
2782 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3307 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2810 glPopMatrix; 3335 glPopMatrix;
2811} 3336}
2812 3337
2813############################################################################# 3338#############################################################################
2814 3339
2815package CFClient::UI::Flopper; 3340package CFPlus::UI::Flopper;
2816 3341
2817our @ISA = CFClient::UI::Button::; 3342our @ISA = CFPlus::UI::Button::;
2818 3343
2819sub new { 3344sub new {
2820 my $class = shift; 3345 my $class = shift;
2821 3346
2822 my $self = $class->SUPER::new ( 3347 my $self = $class->SUPER::new (
… …
2834 $self->{other}->toggle_visibility; 3359 $self->{other}->toggle_visibility;
2835} 3360}
2836 3361
2837############################################################################# 3362#############################################################################
2838 3363
2839package CFClient::UI::Tooltip; 3364package CFPlus::UI::Tooltip;
2840 3365
2841our @ISA = CFClient::UI::Bin::; 3366our @ISA = CFPlus::UI::Bin::;
2842 3367
2843use CFClient::OpenGL; 3368use CFPlus::OpenGL;
2844 3369
2845sub new { 3370sub new {
2846 my $class = shift; 3371 my $class = shift;
2847 3372
2848 $class->SUPER::new ( 3373 $class->SUPER::new (
… …
2851 ) 3376 )
2852} 3377}
2853 3378
2854sub set_tooltip_from { 3379sub set_tooltip_from {
2855 my ($self, $widget) = @_; 3380 my ($self, $widget) = @_;
3381
3382 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3383 if $widget->{tooltip} =~ /^#(.*)$/;
2856 3384
2857 my $tooltip = $widget->{tooltip}; 3385 my $tooltip = $widget->{tooltip};
2858 3386
2859 if ($ENV{CFPLUS_DEBUG} & 2) { 3387 if ($ENV{CFPLUS_DEBUG} & 2) {
2860 $tooltip .= "\n\n" . (ref $widget) . "\n" 3388 $tooltip .= "\n\n" . (ref $widget) . "\n"
… …
2864 } 3392 }
2865 3393
2866 $tooltip =~ s/^\n+//; 3394 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//; 3395 $tooltip =~ s/\n+$//;
2868 3396
2869 $self->add (new CFClient::UI::Label 3397 $self->add (new CFPlus::UI::Label
2870 markup => $tooltip, 3398 markup => $tooltip,
2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3399 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2872 fontsize => 0.8, 3400 fontsize => 0.8,
2873 fg => [0, 0, 0, 1], 3401 style => 1, # FLAG_INVERSE
2874 ellipsise => 0, 3402 ellipsise => 0,
2875 font => ($widget->{tooltip_font} || $::FONT_PROP), 3403 font => ($widget->{tooltip_font} || $::FONT_PROP),
2876 ); 3404 );
2877} 3405}
2878 3406
… …
2897 3425
2898 $self->{root}->on_post_alloc ("move_$self" => sub { 3426 $self->{root}->on_post_alloc ("move_$self" => sub {
2899 my $widget = $self->{owner} 3427 my $widget = $self->{owner}
2900 or return; 3428 or return;
2901 3429
3430 if ($widget->{visible}) {
2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3431 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2903 3432
2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3433 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2905 if $x + $self->{w} > $self->{root}{w}; 3434 if $x + $self->{w} > $self->{root}{w};
2906 3435
2907 $self->move_abs ($x, $y); 3436 $self->move_abs ($x, $y);
3437 } else {
3438 $self->hide;
3439 }
2908 }); 3440 });
2909} 3441}
2910 3442
2911sub _draw { 3443sub _draw {
2912 my ($self) = @_; 3444 my ($self) = @_;
… …
2936 $self->SUPER::_draw; 3468 $self->SUPER::_draw;
2937} 3469}
2938 3470
2939############################################################################# 3471#############################################################################
2940 3472
2941package CFClient::UI::Face; 3473package CFPlus::UI::Face;
2942 3474
2943our @ISA = CFClient::UI::Base::; 3475our @ISA = CFPlus::UI::DrawBG::;
2944 3476
2945use CFClient::OpenGL; 3477use CFPlus::OpenGL;
2946 3478
2947sub new { 3479sub new {
2948 my $class = shift; 3480 my $class = shift;
2949 3481
2950 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3483 size_w => 32,
3484 size_h => 8,
2951 aspect => 1, 3485 aspect => 1,
2952 can_events => 0, 3486 can_events => 0,
2953 @_, 3487 @_,
2954 ); 3488 );
2955 3489
2956 if ($self->{anim} && $self->{animspeed}) { 3490 if ($self->{anim} && $self->{animspeed}) {
2957 Scalar::Util::weaken (my $widget = $self); 3491 CFPlus::weaken (my $widget = $self);
2958 3492
2959 $self->{timer} = Event->timer ( 3493 $self->{timer} = Event->timer (
2960 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3494 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2961 hard => 1, 3495 hard => 1,
2962 interval => $self->{animspeed}, 3496 interval => $self->{animspeed},
2963 cb => sub { 3497 cb => sub {
3498 return unless $::CONN;
3499
2964 ++$widget->{frame}; 3500 ++$widget->{frame};
3501 $self->update_face;
2965 $widget->update; 3502 $self->update;
2966 }, 3503 },
2967 ); 3504 );
3505
3506 $self->update_face;
2968 } 3507 }
2969 3508
2970 $self 3509 $self
2971} 3510}
2972 3511
3512sub update_face {
3513 my ($self) = @_;
3514
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
2973sub size_request { 3525sub size_request {
2974 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc;
3535 });
3536 }
3537 }
3538 }
3539
3540 ($self->{size_w} || 8, $self->{size_h} || 8)
2975} 3541}
2976 3542
2977sub update { 3543sub update {
2978 my ($self) = @_; 3544 my ($self) = @_;
2979 3545
… …
2985sub _draw { 3551sub _draw {
2986 my ($self) = @_; 3552 my ($self) = @_;
2987 3553
2988 return unless $::CONN; 3554 return unless $::CONN;
2989 3555
2990 my $face; 3556 $self->SUPER::_draw;
2991 3557
2992 if ($self->{frame}) {
2993 my $anim = $::CONN->{anim}[$self->{anim}]; 3558 my $faceid = $::CONN->{faceid}[$self->{face}]
2994 3559 or return;
2995 $face = $anim->[ $self->{frame} % @$anim ]
2996 if $anim && @$anim;
2997 }
2998 3560
2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3561 my $tex = $::CONN->{texture}[$faceid];
3000 3562
3001 if ($tex) { 3563 if ($tex) {
3002 glEnable GL_TEXTURE_2D; 3564 glEnable GL_TEXTURE_2D;
3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3565 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3004 glColor 0, 0, 0, 1; 3566 glColor 0, 0, 0, 1;
… …
3016 $self->SUPER::destroy; 3578 $self->SUPER::destroy;
3017} 3579}
3018 3580
3019############################################################################# 3581#############################################################################
3020 3582
3021package CFClient::UI::Buttonbar; 3583package CFPlus::UI::Buttonbar;
3022 3584
3023our @ISA = CFClient::UI::HBox::; 3585our @ISA = CFPlus::UI::HBox::;
3024 3586
3025# TODO: should actualyl wrap buttons and other goodies. 3587# TODO: should actually wrap buttons and other goodies.
3026 3588
3027############################################################################# 3589#############################################################################
3028 3590
3029package CFClient::UI::Menu; 3591package CFPlus::UI::Menu;
3030 3592
3031our @ISA = CFClient::UI::FancyFrame::; 3593our @ISA = CFPlus::UI::Toplevel::;
3032 3594
3033use CFClient::OpenGL; 3595use CFPlus::OpenGL;
3034 3596
3035sub new { 3597sub new {
3036 my $class = shift; 3598 my $class = shift;
3037 3599
3038 my $self = $class->SUPER::new ( 3600 my $self = $class->SUPER::new (
3039 items => [], 3601 items => [],
3040 z => 100, 3602 z => 100,
3041 @_, 3603 @_,
3042 ); 3604 );
3043 3605
3044 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3606 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3045 3607
3046 for my $item (@{ $self->{items} }) { 3608 for my $item (@{ $self->{items} }) {
3047 my ($widget, $cb, $tooltip) = @$item; 3609 my ($widget, $cb, $tooltip) = @$item;
3048 3610
3049 # handle various types of items, only text for now 3611 # handle various types of items, only text for now
3050 if (!ref $widget) { 3612 if (!ref $widget) {
3613 if ($widget =~ /\t/) {
3614 my ($left, $right) = split /\t/, $widget, 2;
3615
3051 $widget = new CFClient::UI::Label 3616 $widget = new CFPlus::UI::HBox
3052 can_hover => 1, 3617 can_hover => 1,
3053 can_events => 1, 3618 can_events => 1,
3619 tooltip => $tooltip,
3620 children => [
3621 (new CFPlus::UI::Label markup => $left, expand => 1),
3622 (new CFPlus::UI::Label markup => $right, align => +1),
3623 ],
3624 ;
3625
3626 } else {
3627 $widget = new CFPlus::UI::Label
3628 can_hover => 1,
3629 can_events => 1,
3054 markup => $widget, 3630 markup => $widget,
3055 tooltip => $tooltip 3631 tooltip => $tooltip;
3632 }
3056 } 3633 }
3057 3634
3058 $self->{item}{$widget} = $item; 3635 $self->{item}{$widget} = $item;
3059 3636
3060 $self->{vbox}->add ($widget); 3637 $self->{vbox}->add ($widget);
… …
3103 1 3680 1
3104} 3681}
3105 3682
3106############################################################################# 3683#############################################################################
3107 3684
3108package CFClient::UI::Multiplexer; 3685package CFPlus::UI::Multiplexer;
3109 3686
3110our @ISA = CFClient::UI::Container::; 3687our @ISA = CFPlus::UI::Container::;
3111 3688
3112sub new { 3689sub new {
3113 my $class = shift; 3690 my $class = shift;
3114 3691
3115 my $self = $class->SUPER::new ( 3692 my $self = $class->SUPER::new (
… …
3129 3706
3130 $self->{current} = $self->{children}[0] 3707 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} }; 3708 if @{ $self->{children} };
3132} 3709}
3133 3710
3711sub get_current_page {
3712 my ($self) = @_;
3713
3714 $self->{current}
3715}
3716
3134sub set_current_page { 3717sub set_current_page {
3135 my ($self, $page_or_widget) = @_; 3718 my ($self, $page_or_widget) = @_;
3136 3719
3137 my $widget = ref $page_or_widget 3720 my $widget = ref $page_or_widget
3138 ? $page_or_widget 3721 ? $page_or_widget
… …
3170 $self->{current}->draw; 3753 $self->{current}->draw;
3171} 3754}
3172 3755
3173############################################################################# 3756#############################################################################
3174 3757
3175package CFClient::UI::Notebook; 3758package CFPlus::UI::Notebook;
3176 3759
3177our @ISA = CFClient::UI::VBox::; 3760our @ISA = CFPlus::UI::VBox::;
3178 3761
3179sub new { 3762sub new {
3180 my $class = shift; 3763 my $class = shift;
3181 3764
3182 my $self = $class->SUPER::new ( 3765 my $self = $class->SUPER::new (
3183 buttonbar => (new CFClient::UI::Buttonbar), 3766 buttonbar => (new CFPlus::UI::Buttonbar),
3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3767 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3185 # filter => # will be put between multiplexer and $self 3768 # filter => # will be put between multiplexer and $self
3186 @_, 3769 @_,
3187 ); 3770 );
3188 3771
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3772 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3193} 3776}
3194 3777
3195sub add { 3778sub add {
3196 my ($self, $title, $widget, $tooltip) = @_; 3779 my ($self, $title, $widget, $tooltip) = @_;
3197 3780
3198 Scalar::Util::weaken $self; 3781 CFPlus::weaken $self;
3199 3782
3200 $self->{buttonbar}->add (new CFClient::UI::Button 3783 $self->{buttonbar}->add (new CFPlus::UI::Button
3201 markup => $title, 3784 markup => $title,
3202 tooltip => $tooltip, 3785 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) }, 3786 on_activate => sub { $self->set_current_page ($widget) },
3204 ); 3787 );
3205 3788
3206 $self->{multiplexer}->add ($widget); 3789 $self->{multiplexer}->add ($widget);
3207} 3790}
3208 3791
3792sub get_current_page {
3793 my ($self) = @_;
3794
3795 $self->{multiplexer}->get_current_page
3796}
3797
3209sub set_current_page { 3798sub set_current_page {
3210 my ($self, $page) = @_; 3799 my ($self, $page) = @_;
3211 3800
3212 $self->{multiplexer}->set_current_page ($page); 3801 $self->{multiplexer}->set_current_page ($page);
3213 $self->emit (page_changed => $self->{multiplexer}{current}); 3802 $self->emit (page_changed => $self->{multiplexer}{current});
3214} 3803}
3215 3804
3216############################################################################# 3805#############################################################################
3217 3806
3218package CFClient::UI::Combobox; 3807package CFPlus::UI::Selector;
3219 3808
3220use utf8; 3809use utf8;
3221 3810
3222our @ISA = CFClient::UI::Button::; 3811our @ISA = CFPlus::UI::Button::;
3223 3812
3224sub new { 3813sub new {
3225 my $class = shift; 3814 my $class = shift;
3226 3815
3227 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
… …
3244 my ($value, $title, $tooltip) = @$_; 3833 my ($value, $title, $tooltip) = @$_;
3245 3834
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 3835 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 } 3836 }
3248 3837
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3838 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250} 3839}
3251 3840
3252sub _set_value { 3841sub _set_value {
3253 my ($self, $value) = @_; 3842 my ($self, $value) = @_;
3254 3843
… …
3269 $self->emit (changed => $value); 3858 $self->emit (changed => $value);
3270} 3859}
3271 3860
3272############################################################################# 3861#############################################################################
3273 3862
3274package CFClient::UI::Statusbox; 3863package CFPlus::UI::Statusbox;
3275 3864
3276our @ISA = CFClient::UI::VBox::; 3865our @ISA = CFPlus::UI::VBox::;
3277 3866
3278sub new { 3867sub new {
3279 my $class = shift; 3868 my $class = shift;
3280 3869
3281 my $self = $class->SUPER::new ( 3870 my $self = $class->SUPER::new (
3282 fontsize => 0.8, 3871 fontsize => 0.8,
3283 @_, 3872 @_,
3284 ); 3873 );
3285 3874
3286 Scalar::Util::weaken (my $this = $self); 3875 CFPlus::weaken (my $this = $self);
3287 3876
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3877 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289 3878
3290 $self 3879 $self
3291} 3880}
… …
3293sub reorder { 3882sub reorder {
3294 my ($self) = @_; 3883 my ($self) = @_;
3295 my $NOW = Time::HiRes::time; 3884 my $NOW = Time::HiRes::time;
3296 3885
3297 # freeze display when hovering over any label 3886 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner} 3887 return if $CFPlus::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3888 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} }; 3889 values %{ $self->{item} };
3301 3890
3302 while (my ($k, $v) = each %{ $self->{item} }) { 3891 while (my ($k, $v) = each %{ $self->{item} }) {
3303 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3892 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3304 } 3893 }
… …
3325 for ($short) { 3914 for ($short) {
3326 s/^\s+//; 3915 s/^\s+//;
3327 s/\s+/ /g; 3916 s/\s+/ /g;
3328 } 3917 }
3329 3918
3330 new CFClient::UI::Label 3919 new CFPlus::UI::Label
3331 markup => $short, 3920 markup => $short,
3332 tooltip => $item->{tooltip}, 3921 tooltip => $item->{tooltip},
3333 tooltip_font => $::FONT_PROP, 3922 tooltip_font => $::FONT_PROP,
3334 tooltip_width => 0.67, 3923 tooltip_width => 0.67,
3335 fontsize => $item->{fontsize} || $self->{fontsize}, 3924 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3389 count => 1, 3978 count => 1,
3390 %arg, 3979 %arg,
3391 }; 3980 };
3392 } 3981 }
3393 3982
3983 $ROOT->on_refresh (reorder => sub {
3394 $self->reorder; 3984 $self->reorder;
3985 });
3395} 3986}
3396 3987
3397sub reconfigure { 3988sub reconfigure {
3398 my ($self) = @_; 3989 my ($self) = @_;
3399 3990
… …
3412 $self->SUPER::destroy; 4003 $self->SUPER::destroy;
3413} 4004}
3414 4005
3415############################################################################# 4006#############################################################################
3416 4007
3417package CFClient::UI::Inventory;
3418
3419our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421sub new {
3422 my $class = shift;
3423
3424 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426 @_,
3427 );
3428
3429 $self
3430}
3431
3432sub set_items {
3433 my ($self, $items) = @_;
3434
3435 $self->{child}->clear;
3436 return unless $items;
3437
3438 my @items = sort {
3439 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name})
3441 } @$items;
3442
3443 $self->{real_items} = \@items;
3444
3445 my $row = 0;
3446 for my $item (@items) {
3447 CFClient::Item::update_widgets $item;
3448
3449 $self->{child}->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget});
3452
3453 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 }
3663}
3664
3665#############################################################################
3666
3667package CFClient::UI::SpellList;
3668
3669our @ISA = CFClient::UI::Table::;
3670
3671sub new {
3672 my $class = shift;
3673
3674 my $self = $class->SUPER::new (
3675 binding => [],
3676 commands => [],
3677 @_,
3678 )
3679}
3680
3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3766sub add_spell {
3767 my ($self, $spell) = @_;
3768
3769 $self->{spell}->{$spell->{name}} = $spell;
3770 $self->rebuild_spell_list;
3771}
3772
3773sub remove_spell {
3774 my ($self, $spell) = @_;
3775
3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3784 $self->rebuild_spell_list;
3785}
3786
3787#############################################################################
3788
3789package CFClient::UI::Root; 4008package CFPlus::UI::Root;
3790 4009
3791our @ISA = CFClient::UI::Container::; 4010our @ISA = CFPlus::UI::Container::;
3792 4011
3793use List::Util qw(min max); 4012use List::Util qw(min max);
3794 4013
3795use CFClient::OpenGL; 4014use CFPlus::OpenGL;
3796 4015
3797sub new { 4016sub new {
3798 my $class = shift; 4017 my $class = shift;
3799 4018
3800 my $self = $class->SUPER::new ( 4019 my $self = $class->SUPER::new (
3801 visible => 1, 4020 visible => 1,
3802 @_, 4021 @_,
3803 ); 4022 );
3804 4023
3805 Scalar::Util::weaken ($self->{root} = $self); 4024 CFPlus::weaken ($self->{root} = $self);
3806 4025
3807 $self 4026 $self
3808} 4027}
3809 4028
3810sub size_request { 4029sub size_request {
… …
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4195 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 4196
3978 $w = 0 if $w < 0; 4197 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0; 4198 $h = 0 if $h < 0;
3980 4199
4200 $w = max $widget->{min_w}, $w;
4201 $h = max $widget->{min_h}, $h;
4202
4203# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4204# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4205
4206 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4207 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4208
3981 $w = int $w + 0.5; 4209 $w = int $w + 0.5;
3982 $h = int $h + 0.5; 4210 $h = int $h + 0.5;
3983 4211
3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4212 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w}; 4213 $widget->{old_w} = $widget->{w};
… …
4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4236 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4009 glMatrixMode GL_MODELVIEW; 4237 glMatrixMode GL_MODELVIEW;
4010 glLoadIdentity; 4238 glLoadIdentity;
4011 4239
4012 { 4240 {
4013 package CFClient::UI::Base; 4241 package CFPlus::UI::Base;
4014 4242
4015 ($draw_x, $draw_y, $draw_w, $draw_h) = 4243 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h}); 4244 (0, 0, $self->{w}, $self->{h});
4017 }
4018 4245
4019 $self->_draw; 4246 $self->_draw;
4247 }
4020} 4248}
4021 4249
4022############################################################################# 4250#############################################################################
4023 4251
4024package CFClient::UI; 4252package CFPlus::UI;
4025 4253
4026$ROOT = new CFClient::UI::Root; 4254$ROOT = new CFPlus::UI::Root;
4027$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4255$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4028 4256
40291 42571
4030 4258

Diff Legend

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