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

Diff Legend

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