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.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 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
… …
272 306
273 return unless $self->{visible}; 307 return unless $self->{visible};
274 308
275 $_->set_invisible for $self->children; 309 $_->set_invisible for $self->children;
276 310
311 delete $self->{visible};
277 delete $self->{root}; 312 delete $self->{root};
278 delete $self->{visible};
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
655 return if CFPlus::in_destruct;
656
657 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
597 delete $WIDGET{$self+0}; 660 delete $WIDGET{$self+0};
598 #$self->deactivate;
599} 661}
600 662
601############################################################################# 663#############################################################################
602 664
603package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
604 666
605our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
606 668
607use strict; 669use strict;
608use CFClient::OpenGL; 670use CFPlus::OpenGL;
609 671
610sub new { 672sub new {
611 my $class = shift; 673 my $class = shift;
612 674
613 # range [value, low, high, page] 675 # range [value, low, high, page]
… …
644 } 706 }
645} 707}
646 708
647############################################################################# 709#############################################################################
648 710
649package CFClient::UI::Empty; 711package CFPlus::UI::Empty;
650 712
651our @ISA = CFClient::UI::Base::; 713our @ISA = CFPlus::UI::Base::;
652 714
653sub new { 715sub new {
654 my ($class, %arg) = @_; 716 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 717 $class->SUPER::new (can_events => 0, %arg);
656} 718}
… …
663 725
664sub draw { } 726sub draw { }
665 727
666############################################################################# 728#############################################################################
667 729
668package CFClient::UI::Container; 730package CFPlus::UI::Container;
669 731
670our @ISA = CFClient::UI::Base::; 732our @ISA = CFPlus::UI::Base::;
671 733
672sub new { 734sub new {
673 my ($class, %arg) = @_; 735 my ($class, %arg) = @_;
674 736
675 my $children = delete $arg{children}; 737 my $children = delete $arg{children};
… …
679 can_events => 0, 741 can_events => 0,
680 %arg, 742 %arg,
681 ); 743 );
682 744
683 $self->add (@$children) 745 $self->add (@$children)
684 if $children; 746 if $children && @$children;
685 747
686 $self 748 $self
749}
750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
687} 757}
688 758
689sub add { 759sub add {
690 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
691 761
692 $_->set_parent ($self) 762 $_->set_parent ($self)
693 for @widgets; 763 for @widgets;
694 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
695 use sort 'stable'; 766 use sort 'stable';
696 767
697 $self->{children} = [ 768 $self->{children} = [
698 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
699 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
718} 789}
719 790
720sub clear { 791sub clear {
721 my ($self) = @_; 792 my ($self) = @_;
722 793
723 my $children = delete $self->{children}; 794 my $children = $self->{children};
724 $self->{children} = []; 795 $self->{children} = [];
725 796
726 for (@$children) { 797 for (@$children) {
727 delete $_->{parent}; 798 delete $_->{parent};
728 $_->hide; 799 $_->hide;
… …
753 $_->draw for @{$self->{children}}; 824 $_->draw for @{$self->{children}};
754} 825}
755 826
756############################################################################# 827#############################################################################
757 828
758package CFClient::UI::Bin; 829package CFPlus::UI::Bin;
759 830
760our @ISA = CFClient::UI::Container::; 831our @ISA = CFPlus::UI::Container::;
761 832
762sub new { 833sub new {
763 my ($class, %arg) = @_; 834 my ($class, %arg) = @_;
764 835
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 836 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 837
767 $class->SUPER::new (children => [$child], %arg) 838 $class->SUPER::new (children => [$child], %arg)
768} 839}
769 840
770sub add { 841sub add {
771 my ($self, $child) = @_; 842 my ($self, $child) = @_;
772 843
773 $self->{children} = []; 844 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 845 $self->SUPER::add ($child);
776} 846}
777 847
778sub remove { 848sub remove {
779 my ($self, $widget) = @_; 849 my ($self, $widget) = @_;
780 850
781 $self->SUPER::remove ($widget); 851 $self->SUPER::remove ($widget);
782 852
783 $self->{children} = [new CFClient::UI::Empty] 853 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 854 unless @{$self->{children}};
785} 855}
786 856
787sub child { $_[0]->{children}[0] } 857sub child { $_[0]->{children}[0] }
788 858
789sub size_request { 859sub size_request {
790 $_[0]{children}[0]->size_request 860 $_[0]{children}[0]->size_request
791} 861}
792 862
793sub size_allocate { 863sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 864 my ($self, $w, $h) = @_;
795 865
796 $self->{children}[0]->configure (0, 0, $w, $h); 866 $self->{children}[0]->configure (0, 0, $w, $h);
867
868 1
797} 869}
798 870
799############################################################################# 871#############################################################################
800 872
801# back-buffered drawing area 873# back-buffered drawing area
802 874
803package CFClient::UI::Window; 875package CFPlus::UI::Window;
804 876
805our @ISA = CFClient::UI::Bin::; 877our @ISA = CFPlus::UI::Bin::;
806 878
807use CFClient::OpenGL; 879use CFPlus::OpenGL;
808 880
809sub new { 881sub new {
810 my ($class, %arg) = @_; 882 my ($class, %arg) = @_;
811 883
812 my $self = $class->SUPER::new (%arg); 884 my $self = $class->SUPER::new (%arg);
… …
817 889
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 890 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 891 $self->SUPER::update;
820} 892}
821 893
822sub size_allocate { 894sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
824 896
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 897 $self->update;
898
899 $self->SUPER::invoke_size_allocate ($w, $h)
827} 900}
828 901
829sub _render { 902sub _render {
830 my ($self) = @_; 903 my ($self) = @_;
831 904
… …
833} 906}
834 907
835sub render_child { 908sub render_child {
836 my ($self) = @_; 909 my ($self) = @_;
837 910
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 911 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 912 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
841 914
842 { 915 {
843 package CFClient::UI::Base; 916 package CFPlus::UI::Base;
844 917
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
847 } 922 }
848
849 $self->_render;
850 }; 923 };
851} 924}
852 925
853sub _draw { 926sub _draw {
854 my ($self) = @_; 927 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 928
858 my $tex = $self->{texture} 929 my $tex = $self->{texture}
859 or return; 930 or return;
860 931
861 glEnable GL_TEXTURE_2D; 932 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 934 glColor 0, 0, 0, 1;
864 935
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 936 $tex->draw_quad_alpha_premultiplied (0, 0);
866 937
867 glDisable GL_TEXTURE_2D; 938 glDisable GL_TEXTURE_2D;
868} 939}
869 940
870############################################################################# 941#############################################################################
871 942
872package CFClient::UI::ViewPort; 943package CFPlus::UI::ViewPort;
873 944
945use List::Util qw(min max);
946
874our @ISA = CFClient::UI::Window::; 947our @ISA = CFPlus::UI::Window::;
875 948
876sub new { 949sub new {
877 my $class = shift; 950 my $class = shift;
878 951
879 $class->SUPER::new ( 952 $class->SUPER::new (
… …
886sub size_request { 959sub size_request {
887 my ($self) = @_; 960 my ($self) = @_;
888 961
889 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
890 963
891 $w = 10 if $self->{scroll_x}; 964 $w = 1 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y}; 965 $h = 1 if $self->{scroll_y};
893 966
894 ($w, $h) 967 ($w, $h)
895} 968}
896 969
897sub size_allocate { 970sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 971 my ($self, $w, $h) = @_;
899 972
900 my $child = $self->child; 973 my $child = $self->child;
901 974
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 975 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 976 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 977
905 $self->child->configure (0, 0, $w, $h); 978 $self->child->configure (0, 0, $w, $h);
906 $self->update; 979 $self->update;
980
981 1
907} 982}
908 983
909sub set_offset { 984sub set_offset {
910 my ($self, $x, $y) = @_; 985 my ($self, $x, $y) = @_;
911 986
987 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
988 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
989
990 if ($x != $self->{view_x} or $y != $self->{view_y}) {
912 $self->{view_x} = int $x; 991 $self->{view_x} = $x;
913 $self->{view_y} = int $y; 992 $self->{view_y} = $y;
914 993
994 $self->emit (changed => $x, $y);
915 $self->update; 995 $self->update;
996 }
916} 997}
917 998
918# hmm, this does not work for topleft of $self... but we should not ask for that 999# hmm, this does not work for topleft of $self... but we should not ask for that
919sub coord2local { 1000sub coord2local {
920 my ($self, $x, $y) = @_; 1001 my ($self, $x, $y) = @_;
… …
935 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
936 1017
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1018 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1019 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1020 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1021 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1022 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1023 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1024 }
944} 1025}
945 1026
946sub _render { 1027sub _render {
947 my ($self) = @_; 1028 my ($self) = @_;
948 1029
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1030 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1031 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1032
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1033 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1034
954 $self->SUPER::_render; 1035 $self->SUPER::_render;
955} 1036}
956 1037
957############################################################################# 1038#############################################################################
958 1039
959package CFClient::UI::ScrolledWindow; 1040package CFPlus::UI::ScrolledWindow;
960 1041
961our @ISA = CFClient::UI::HBox::; 1042our @ISA = CFPlus::UI::Table::;
962 1043
963sub new { 1044sub new {
964 my ($class, %arg) = @_; 1045 my ($class, %arg) = @_;
965 1046
966 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
967 1048
968 my $self; 1049 my $self;
969 1050
970 my $slider = new CFClient::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1054 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub {
1057 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 },
1060 ;
1061
1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
971 vertical => 1, 1065 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1067 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1068 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1070 },
976 ; 1071 ;
977 1072
978 $self = $class->SUPER::new ( 1073 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1074 scroll_x => 0,
1075 scroll_y => 1,
1076 can_events => 1,
980 slider => $slider, 1077 hslider => $hslider,
1078 vslider => $vslider,
1079 col_expand => [1, 0],
1080 row_expand => [1, 0],
981 %arg, 1081 %arg,
982 ); 1082 );
983 1083
1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1087 expand => 1,
1088 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y},
1090 on_changed => sub {
1091 my ($vp, $x, $y) = @_;
1092
1093 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y);
1095
1096 0
1097 },
1098 ;
1099
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1100 $self->SUPER::add ($self->{vp});
1101
985 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
986 1103
987 $self 1104 $self
988} 1105}
989 1106
… …
991 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
992 1109
993 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
994} 1111}
995 1112
996sub update { 1113sub update_slider {
1114 my ($self) = @_;
1115
1116 my $child = ($self->{vp} or return)->child;
1117
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120
1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider});
1126 }
1127
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130
1131 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider});
1136 }
1137}
1138
1139
1140sub start_dragging {
997 my ($self) = @_; 1141 my ($self, $ev) = @_;
998 1142
999 $self->SUPER::update; 1143 $self->grab_focus;
1000 1144
1001 # todo: overwrite size_allocate of child 1145 my $ox = $self->{vp}{view_x};
1002 my $child = $self->{vp}->child; 1146 my $oy = $self->{vp}{view_y};
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1147
1004} 1148 $self->{motion} = sub {
1149 my ($ev, $x, $y) = @_;
1005 1150
1151 $ox -= $ev->{xrel};
1152 $oy -= $ev->{yrel};
1153
1154 $self->{vp}->set_offset ($ox, $oy);
1155 };
1156}
1157
1158sub invoke_mouse_wheel {
1159 my ($self, $ev) = @_;
1160
1161 $self->{vslider}->emit (mouse_wheel => $ev);
1162 $self->{hslider}->emit (mouse_wheel => $ev);
1163
1164 1
1165}
1166
1167sub invoke_button_down {
1168 my ($self, $ev, $x, $y) = @_;
1169
1170 $self->start_dragging ($ev);
1171
1172 1
1173}
1174
1175sub invoke_button_up {
1176 my ($self, $ev, $x, $y) = @_;
1177
1178 if (delete $self->{motion}) {
1179 return 1;
1180 }
1181
1182 0
1183}
1184
1185sub invoke_mouse_motion {
1186 my ($self, $ev, $x, $y) = @_;
1187
1188 if ($self->{motion}) {
1189 $self->{motion}->($ev, $x, $y);
1190 return 1;
1191 }
1192
1193 0
1194}
1195
1006sub size_allocate { 1196sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1197 my ($self, $w, $h) = @_;
1008 1198
1199 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1200 $self->SUPER::invoke_size_allocate ($w, $h)
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013} 1201}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1202
1018############################################################################# 1203#############################################################################
1019 1204
1020package CFClient::UI::Frame; 1205package CFPlus::UI::Frame;
1021 1206
1022our @ISA = CFClient::UI::Bin::; 1207our @ISA = CFPlus::UI::Bin::;
1023 1208
1024use CFClient::OpenGL; 1209use CFPlus::OpenGL;
1025 1210
1026sub new { 1211sub new {
1027 my $class = shift; 1212 my $class = shift;
1028 1213
1029 $class->SUPER::new ( 1214 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1240 $self->SUPER::_draw;
1056} 1241}
1057 1242
1058############################################################################# 1243#############################################################################
1059 1244
1060package CFClient::UI::FancyFrame; 1245package CFPlus::UI::FancyFrame;
1061 1246
1062our @ISA = CFClient::UI::Bin::; 1247our @ISA = CFPlus::UI::Bin::;
1063 1248
1064use CFClient::OpenGL; 1249use CFPlus::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1250
1074sub new { 1251sub new {
1075 my ($class, %arg) = @_; 1252 my ($class, %arg) = @_;
1076 1253
1077 my $title = delete $arg{title}; 1254 if ((exists $arg{label}) && !ref $arg{label}) {
1255 $arg{label} = new CFPlus::UI::Label
1256 align => 1,
1257 valign => 0,
1258 text => $arg{label},
1259 fontsize => ($arg{border} || 0.8) * 0.75;
1260 }
1261
1262 my $self = $class->SUPER::new (
1263 # label => "",
1264 fg => [0.6, 0.3, 0.1],
1265 border => 0.8,
1266 style => 'single',
1267 %arg,
1268 );
1269
1270 $self
1271}
1272
1273sub add {
1274 my ($self, @widgets) = @_;
1275
1276 $self->SUPER::add (@widgets);
1277 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1278}
1279
1280sub border {
1281 int $_[0]{border} * $::FONTSIZE
1282}
1283
1284sub size_request {
1285 my ($self) = @_;
1286
1287 ($self->{label_w}, undef) = $self->{label}->size_request
1288 if $self->{label};
1289
1290 my ($w, $h) = $self->SUPER::size_request;
1291
1292 (
1293 $w + $self->border * 2,
1294 $h + $self->border * 2,
1295 )
1296}
1297
1298sub invoke_size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 my $border = $self->border;
1302
1303 $w -= List::Util::max 0, $border * 2;
1304 $h -= List::Util::max 0, $border * 2;
1305
1306 if (my $label = $self->{label}) {
1307 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1308 $label->{h} = List::Util::min $h, $border;
1309 $label->invoke_size_allocate ($label->{w}, $label->{h});
1310 }
1311
1312 $self->child->configure ($border, $border, $w, $h);
1313
1314 1
1315}
1316
1317sub _draw {
1318 my ($self) = @_;
1319
1320 my $child = $self->{children}[0];
1321
1322 my $border = $self->border;
1323 my ($w, $h) = ($self->{w}, $self->{h});
1324
1325 $child->draw;
1326
1327 glColor @{$self->{fg}};
1328 glBegin GL_LINE_STRIP;
1329 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1330 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1331 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1332 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1333 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1334 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1335 glEnd;
1336
1337 if ($self->{label}) {
1338 glTranslate $border * 2, 0;
1339 $self->{label}->_draw;
1340 }
1341}
1342
1343#############################################################################
1344
1345package CFPlus::UI::Toplevel;
1346
1347our @ISA = CFPlus::UI::Bin::;
1348
1349use CFPlus::OpenGL;
1350
1351my $bg =
1352 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1353 mipmap => 1, wrap => 1;
1354
1355my @border =
1356 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1357 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1358
1359my @icon =
1360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1361 qw(x1_move.png x1_resize.png);
1362
1363sub new {
1364 my ($class, %arg) = @_;
1078 1365
1079 my $self = $class->SUPER::new ( 1366 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1367 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1368 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1369 border => 0.6,
1083 can_events => 1, 1370 can_events => 1,
1084 min_w => 16, 1371 min_w => 64,
1085 min_h => 16, 1372 min_h => 32,
1086 %arg, 1373 %arg,
1087 ); 1374 );
1088 1375
1089 $self->{title} = new CFClient::UI::Label 1376 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1377 align => 0,
1091 valign => 1, 1378 valign => 1,
1092 text => $title, 1379 text => $self->{title},
1093 fontsize => $self->{border} 1380 fontsize => $self->{border},
1094 if defined $title; 1381 if exists $self->{title};
1382
1383 if ($self->{has_close_button}) {
1384 $self->{close_button} =
1385 new CFPlus::UI::ImageButton
1386 path => 'x1_close.png',
1387 on_activate => sub { $self->emit ("delete") };
1388
1389 $self->CFPlus::UI::Container::add ($self->{close_button});
1390 }
1095 1391
1096 $self 1392 $self
1097} 1393}
1098 1394
1099sub add { 1395sub add {
1100 my ($self, @widgets) = @_; 1396 my ($self, @widgets) = @_;
1101 1397
1102 $self->SUPER::add (@widgets); 1398 $self->SUPER::add (@widgets);
1399 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1400 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1401}
1105 1402
1106sub border { 1403sub border {
1107 int $_[0]{border} * $::FONTSIZE 1404 int $_[0]{border} * $::FONTSIZE
1108} 1405}
1109 1406
1110sub size_request { 1407sub size_request {
1111 my ($self) = @_; 1408 my ($self) = @_;
1112 1409
1113 $self->{title}->size_request 1410 $self->{title_widget}->size_request
1114 if $self->{title}; 1411 if $self->{title_widget};
1412
1413 $self->{close_button}->size_request
1414 if $self->{close_button};
1115 1415
1116 my ($w, $h) = $self->SUPER::size_request; 1416 my ($w, $h) = $self->SUPER::size_request;
1117 1417
1118 ( 1418 (
1119 $w + $self->border * 2, 1419 $w + $self->border * 2,
1120 $h + $self->border * 2, 1420 $h + $self->border * 2,
1121 ) 1421 )
1122} 1422}
1123 1423
1124sub size_allocate { 1424sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1425 my ($self, $w, $h) = @_;
1126 1426
1127 if ($self->{title}) { 1427 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1428 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1429 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1430 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1431 }
1132 1432
1133 my $border = $self->border; 1433 my $border = $self->border;
1134 1434
1135 $h -= List::Util::max 0, $border * 2; 1435 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1436 $w -= List::Util::max 0, $border * 2;
1437
1438 $self->child->configure ($border, $border, $w, $h);
1439
1440 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1441 if $self->{close_button};
1442
1443 1
1444}
1445
1446sub invoke_delete {
1447 my ($self) = @_;
1448
1449 $self->hide;
1137 1450
1138 $self->child->configure ($border, $border, $w, $h); 1451 1
1139} 1452}
1140 1453
1141sub button_down { 1454sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1455 my ($self, $ev, $x, $y) = @_;
1143 1456
1144 my ($w, $h) = @$self{qw(w h)}; 1457 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1458 my $border = $self->border;
1146 1459
… …
1177 1490
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1491 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1492
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1493 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1494 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1495 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1496 };
1184 } else { 1497 } else {
1185 return 0; 1498 return 0;
1186 } 1499 }
1187 1500
1188 1 1501 1
1189} 1502}
1190 1503
1191sub button_up { 1504sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1505 my ($self, $ev, $x, $y) = @_;
1193 1506
1194 !!delete $self->{motion} 1507 ! ! delete $self->{motion}
1195} 1508}
1196 1509
1197sub mouse_motion { 1510sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1511 my ($self, $ev, $x, $y) = @_;
1199 1512
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1513 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1514
1202 !!$self->{motion} 1515 ! ! $self->{motion}
1516}
1517
1518sub invoke_visibility_change {
1519 my ($self, $visible) = @_;
1520
1521 delete $self->{motion} unless $visible;
1522
1523 0
1203} 1524}
1204 1525
1205sub _draw { 1526sub _draw {
1206 my ($self) = @_; 1527 my ($self) = @_;
1207 1528
… …
1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1535 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215 1536
1216 my $border = $self->border; 1537 my $border = $self->border;
1217 1538
1218 glColor @{ $self->{border_bg} }; 1539 glColor @{ $self->{border_bg} };
1219 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1540 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1541 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1542 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1543 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1544
1545 # move
1546 my $w2 = ($w - $border) * .5;
1547 my $h2 = ($h - $border) * .5;
1548 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1549 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1551
1552 # resize
1553 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1554 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1555 unless $self->{has_close_button};
1556 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1557 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1223 1558
1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1559 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} }; 1560 glColor @{ $self->{bg} };
1226 1561
1227 # TODO: repeat texture not scale 1562 # TODO: repeat texture not scale
… …
1233 1568
1234 glDisable GL_TEXTURE_2D; 1569 glDisable GL_TEXTURE_2D;
1235 1570
1236 $child->draw; 1571 $child->draw;
1237 1572
1238 if ($self->{title}) { 1573 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1574 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1575 $self->{title_widget}->_draw;
1576
1577 glTranslate 0, - ($border - $self->{h});
1241 } 1578 }
1579
1580 $self->{close_button}->draw
1581 if $self->{close_button};
1242} 1582}
1243 1583
1244############################################################################# 1584#############################################################################
1245 1585
1246package CFClient::UI::Table; 1586package CFPlus::UI::Table;
1247 1587
1248our @ISA = CFClient::UI::Base::; 1588our @ISA = CFPlus::UI::Container::;
1249 1589
1250use List::Util qw(max sum); 1590use List::Util qw(max sum);
1251 1591
1252use CFClient::OpenGL; 1592use CFPlus::OpenGL;
1253 1593
1254sub new { 1594sub new {
1255 my $class = shift; 1595 my $class = shift;
1256 1596
1257 $class->SUPER::new ( 1597 $class->SUPER::new (
1258 col_expand => [], 1598 col_expand => [],
1599 row_expand => [],
1259 @_, 1600 @_,
1260 ) 1601 )
1261} 1602}
1262 1603
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265}
1266
1267sub add { 1604sub add {
1268 my ($self, $x, $y, $child) = @_;
1269
1270 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child;
1272
1273 $self->realloc;
1274}
1275
1276# TODO: move to container class maybe? send children a signal on removal?
1277sub clear {
1278 my ($self) = @_; 1605 my ($self, @widgets) = @_;
1606
1607 for my $child (@widgets) {
1608 $child->{rowspan} ||= 1;
1609 $child->{colspan} ||= 1;
1610 }
1611
1612 $self->SUPER::add (@widgets);
1613}
1614
1615sub add_at {
1616 my $self = shift;
1617
1618 my @widgets;
1619
1620 while (@_) {
1621 my ($col, $row, $child) = splice @_, 0, 3, ();
1622
1623 $child->{row} = $row;
1624 $child->{col} = $col;
1625
1626 push @widgets, $child;
1627 }
1628
1629 $self->add (@widgets);
1630}
1631
1632sub get_wh {
1633 my ($self) = @_;
1634
1635 my (@w, @h);
1279 1636
1280 my @children = $self->children; 1637 my @children = $self->children;
1281 delete $self->{children}; 1638
1639 # first pass, columns
1640 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1641 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1642
1643 my $sw = sum @w[$c .. $c + $cs - 1];
1644
1645 if ($w > $sw) {
1646 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1647 }
1282 1648 }
1283 for (@children) {
1284 delete $_->{parent};
1285 $_->hide;
1286 }
1287 1649
1288 $self->realloc; 1650 # second pass, rows
1289} 1651 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1290
1291sub get_wh {
1292 my ($self) = @_;
1293
1294 my (@w, @h);
1295
1296 for my $y (0 .. $#{$self->{children}}) {
1297 my $row = $self->{children}[$y]
1298 or next;
1299
1300 for my $x (0 .. $#$row) {
1301 my $widget = $row->[$x]
1302 or next;
1303 my ($w, $h) = @$widget{qw(req_w req_h)}; 1652 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1304 1653
1305 $w[$x] = max $w[$x], $w; 1654 my $sh = sum @h[$r .. $r + $rs - 1];
1306 $h[$y] = max $h[$y], $h; 1655
1656 if ($h > $sh) {
1657 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1307 } 1658 }
1308 } 1659 }
1309 1660
1310 (\@w, \@h) 1661 (\@w, \@h)
1311} 1662}
… …
1319 (sum @$ws), 1670 (sum @$ws),
1320 (sum @$hs), 1671 (sum @$hs),
1321 ) 1672 )
1322} 1673}
1323 1674
1324sub size_allocate { 1675sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1676 my ($self, $w, $h) = @_;
1326 1677
1327 my ($ws, $hs) = $self->get_wh; 1678 my ($ws, $hs) = $self->get_wh;
1328 1679
1329 my $req_w = (sum @$ws) || 1; 1680 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1681 my $req_h = (sum @$hs) || 1;
1331 1682
1332 # TODO: nicer code && do row_expand 1683 # now linearly scale the rows/columns to the allocated size
1333 my @col_expand = @{$self->{col_expand}}; 1684 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1685 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1686 my $col_expand = (sum @col_expand) || 1;
1336 1687
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1688 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1689
1341 CFClient::UI::harmonize $ws; 1690 CFPlus::UI::harmonize $ws;
1691
1692 my @row_expand = @{$self->{row_expand}};
1693 @row_expand = (1) x @$ws unless @row_expand;
1694 my $row_expand = (sum @row_expand) || 1;
1695
1696 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1697
1342 CFClient::UI::harmonize $hs; 1698 CFPlus::UI::harmonize $hs;
1343 1699
1344 my $y; 1700 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1701 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1345 1702
1346 for my $r (0 .. $#{$self->{children}}) { 1703 for my $widget ($self->children) {
1347 my $row = $self->{children}[$r] 1704 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1348 or next;
1349 1705
1350 my $x = 0; 1706 $widget->configure (
1351 my $row_h = $hs->[$r]; 1707 $x[$c], $y[$r],
1708 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1352 1709 );
1353 for my $c (0 .. $#$row) { 1710 }
1354 my $col_w = $ws->[$c];
1355 1711
1356 if (my $widget = $row->[$c]) { 1712 1
1357 $widget->configure ($x, $y, $col_w, $row_h); 1713}
1358 }
1359 1714
1360 $x += $col_w; 1715#############################################################################
1716
1717package CFPlus::UI::Fixed;
1718
1719use List::Util qw(min max);
1720
1721our @ISA = CFPlus::UI::Container::;
1722
1723sub add {
1724 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1725
1726 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1727 $self->SUPER::add ($child);
1728}
1729
1730sub _scale($$$) {
1731 my ($mode, $val, $max) = @_;
1732
1733 $mode eq "abs" ? $val
1734 : $mode eq "rel" ? $val * $max
1735 : 0
1736}
1737
1738sub size_request {
1739 my ($self) = @_;
1740
1741 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1742
1743 # determine overall size by querying abs widgets
1744 for my $child ($self->visible_children) {
1745 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1746
1747 if ($pos eq "abs") {
1748 $w = _scale $size, $w, $child->{req_w};
1749 $h = _scale $size, $h, $child->{req_h};
1750
1751 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1752 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1361 } 1753 }
1362
1363 $y += $row_h;
1364 } 1754 }
1365 1755
1366} 1756 my $W = $x2 - $x1;
1757 my $H = $y2 - $y1;
1367 1758
1368sub find_widget { 1759 # now layout remaining widgets
1760 for my $child ($self->visible_children) {
1761 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1762
1763 if ($pos ne "abs") {
1764 $x = _scale $pos, $x, $W;
1765 $y = _scale $pos, $x, $H;
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1772 }
1773
1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 ($W, $H)
1778}
1779
1780sub invoke_size_allocate {
1369 my ($self, $x, $y) = @_; 1781 my ($self, $W, $H) = @_;
1370 1782
1371 $x -= $self->{x}; 1783 for my $child ($self->visible_children) {
1372 $y -= $self->{y}; 1784 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1373 1785
1374 my $res; 1786 $x = _scale $pos, $x, $W;
1787 $y = _scale $pos, $x, $H;
1788 $w = _scale $size, $w, $child->{req_w};
1789 $h = _scale $size, $h, $child->{req_h};
1375 1790
1376 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1791 $child->configure ($x, $y, $w, $h);
1377 $res = $_->find_widget ($x, $y) 1792 }
1378 and return $res; 1793
1379 } 1794 1
1380
1381 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1382}
1383
1384sub _draw {
1385 my ($self) = @_;
1386
1387 for (grep $_, @{$self->{children}}) {
1388 $_->draw for grep $_, @$_;
1389 }
1390} 1795}
1391 1796
1392############################################################################# 1797#############################################################################
1393 1798
1394package CFClient::UI::Box; 1799package CFPlus::UI::Box;
1395 1800
1396our @ISA = CFClient::UI::Container::; 1801our @ISA = CFPlus::UI::Container::;
1397 1802
1398sub size_request { 1803sub size_request {
1399 my ($self) = @_; 1804 my ($self) = @_;
1400 1805
1401 $self->{vertical} 1806 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1812 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1813 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1814 )
1410} 1815}
1411 1816
1412sub size_allocate { 1817sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1818 my ($self, $w, $h) = @_;
1414 1819
1415 my $space = $self->{vertical} ? $h : $w; 1820 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1821 my @children = $self->visible_children;
1417 1822
1418 my @req; 1823 my @req;
1419 1824
1420 if ($self->{homogeneous}) { 1825 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1826 @req = ($space / (@children || 1)) x @children;
1422 } else { 1827 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1828 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1829 my $req = List::Util::sum @req;
1425 1830
1426 if ($req > $space) { 1831 if ($req > $space) {
1427 # ah well, not enough space 1832 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1833 $_ *= $space / $req for @req;
1429 } else { 1834 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1835 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1836
1432 $space = ($space - $req) / $expand; # remaining space to give away 1837 $space = ($space - $req) / $expand; # remaining space to give away
1433 1838
1434 $req[$_] += $space * $children->[$_]{expand} 1839 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1840 for 0 .. $#children;
1436 } 1841 }
1437 } 1842 }
1438 1843
1439 CFClient::UI::harmonize \@req; 1844 CFPlus::UI::harmonize \@req;
1440 1845
1441 my $pos = 0; 1846 my $pos = 0;
1442 for (0 .. $#$children) { 1847 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1848 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1849 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1850
1446 $pos += $alloc; 1851 $pos += $alloc;
1447 } 1852 }
1448 1853
1449 1 1854 1
1450} 1855}
1451 1856
1452############################################################################# 1857#############################################################################
1453 1858
1454package CFClient::UI::HBox; 1859package CFPlus::UI::HBox;
1455 1860
1456our @ISA = CFClient::UI::Box::; 1861our @ISA = CFPlus::UI::Box::;
1457 1862
1458sub new { 1863sub new {
1459 my $class = shift; 1864 my $class = shift;
1460 1865
1461 $class->SUPER::new ( 1866 $class->SUPER::new (
… …
1464 ) 1869 )
1465} 1870}
1466 1871
1467############################################################################# 1872#############################################################################
1468 1873
1469package CFClient::UI::VBox; 1874package CFPlus::UI::VBox;
1470 1875
1471our @ISA = CFClient::UI::Box::; 1876our @ISA = CFPlus::UI::Box::;
1472 1877
1473sub new { 1878sub new {
1474 my $class = shift; 1879 my $class = shift;
1475 1880
1476 $class->SUPER::new ( 1881 $class->SUPER::new (
… …
1479 ) 1884 )
1480} 1885}
1481 1886
1482############################################################################# 1887#############################################################################
1483 1888
1484package CFClient::UI::Label; 1889package CFPlus::UI::Label;
1485 1890
1486our @ISA = CFClient::UI::DrawBG::; 1891our @ISA = CFPlus::UI::DrawBG::;
1487 1892
1488use CFClient::OpenGL; 1893use CFPlus::OpenGL;
1489 1894
1490sub new { 1895sub new {
1491 my ($class, %arg) = @_; 1896 my ($class, %arg) = @_;
1492 1897
1493 my $self = $class->SUPER::new ( 1898 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1901 #active_bg => none
1497 #font => default_font 1902 #font => default_font
1498 #text => initial text 1903 #text => initial text
1499 #markup => initial narkup 1904 #markup => initial narkup
1500 #max_w => maximum pixel width 1905 #max_w => maximum pixel width
1906 #style => 0, # render flags
1501 ellipsise => 3, # end 1907 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1908 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1909 fontsize => 1,
1504 align => -1, 1910 align => -1,
1505 valign => -1, 1911 valign => -1,
1506 padding_x => 2, 1912 padding_x => 2,
1507 padding_y => 2, 1913 padding_y => 2,
1508 can_events => 0, 1914 can_events => 0,
1509 %arg 1915 %arg
1510 ); 1916 );
1511 1917
1512 if (exists $self->{template}) { 1918 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1919 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1920 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1921 $self->{template} = $layout;
1516 } 1922 }
1517 1923
1518 if (exists $self->{markup}) { 1924 if (exists $self->{markup}) {
… …
1522 } 1928 }
1523 1929
1524 $self 1930 $self
1525} 1931}
1526 1932
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1933sub update {
1538 my ($self) = @_; 1934 my ($self) = @_;
1539 1935
1540 delete $self->{texture}; 1936 delete $self->{texture};
1541 $self->SUPER::update; 1937 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1948 my ($self, $text) = @_;
1553 1949
1554 return if $self->{text} eq "T$text"; 1950 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1951 $self->{text} = "T$text";
1556 1952
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1953 $self->{layout}->set_text ($text);
1559 1954
1560 delete $self->{size_req}; 1955 delete $self->{size_req};
1561 $self->realloc; 1956 $self->realloc;
1562 $self->update; 1957 $self->update;
… …
1568 return if $self->{text} eq "M$markup"; 1963 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1964 $self->{text} = "M$markup";
1570 1965
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1966 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1967
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1968 $self->{layout}->set_markup ($markup);
1575 1969
1576 delete $self->{size_req}; 1970 delete $self->{size_req};
1577 $self->realloc; 1971 $self->realloc;
1578 $self->update; 1972 $self->update;
… …
1590 1984
1591 my ($w, $h) = $self->{layout}->size; 1985 my ($w, $h) = $self->{layout}->size;
1592 1986
1593 if (exists $self->{template}) { 1987 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1988 $self->{template}->set_font ($self->{font}) if $self->{font};
1989 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1990 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1991
1597 my ($w2, $h2) = $self->{template}->size; 1992 my ($w2, $h2) = $self->{template}->size;
1598 1993
1599 $w = List::Util::max $w, $w2; 1994 $w = List::Util::max $w, $w2;
… …
1604 }; 1999 };
1605 2000
1606 @{ $self->{size_req} } 2001 @{ $self->{size_req} }
1607} 2002}
1608 2003
2004sub baseline_shift {
2005 $_[0]{layout}->descent
2006}
2007
1609sub size_allocate { 2008sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 2009 my ($self, $w, $h) = @_;
1611 2010
1612 delete $self->{ox}; 2011 delete $self->{ox};
1613 2012
1614 delete $self->{texture} 2013 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2014 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2015
2016 1
1616} 2017}
1617 2018
1618sub set_fontsize { 2019sub set_fontsize {
1619 my ($self, $fontsize) = @_; 2020 my ($self, $fontsize) = @_;
1620 2021
1621 $self->{fontsize} = $fontsize; 2022 $self->{fontsize} = $fontsize;
2023 delete $self->{size_req};
1622 delete $self->{texture}; 2024 delete $self->{texture};
1623 2025
1624 $self->realloc; 2026 $self->realloc;
1625} 2027}
1626 2028
1627sub reconfigure { 2029sub reconfigure {
1628 my ($self) = @_; 2030 my ($self) = @_;
1629 2031
1630 delete $self->{size_req}; 2032 delete $self->{size_req};
2033 delete $self->{texture};
1631 2034
1632 $self->SUPER::reconfigure; 2035 $self->SUPER::reconfigure;
1633} 2036}
1634 2037
1635sub _draw { 2038sub _draw {
1636 my ($self) = @_; 2039 my ($self) = @_;
1637 2040
1638 $self->SUPER::_draw; # draw background, if applicable 2041 $self->SUPER::_draw; # draw background, if applicable
1639 2042
1640 my $tex = $self->{texture} ||= do { 2043 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 2044 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2045 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 2046 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2047 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2048 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2049 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 2050
1648 new_from_layout CFClient::Texture $self->{layout} 2051 [$self->{layout}->size]
1649 }; 2052 };
1650 2053
1651 unless (exists $self->{ox}) { 2054 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2055 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2056 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 2057 : ($self->{w} - $size->[0]) * 0.5);
1655 2058
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2059 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2060 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 2061 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 2062 };
1660 2063
1661 glEnable GL_TEXTURE_2D;
1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2064 my $w = List::Util::min $self->{w} + 4, $size->[0];
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2065 my $h = List::Util::min $self->{h} + 2, $size->[1];
1665 2066
1666 if ($tex->{format} == GL_ALPHA) { 2067 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668 glColor @{$self->{fg}};
1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673 }
1674
1675 glDisable GL_TEXTURE_2D;
1676} 2068}
1677 2069
1678############################################################################# 2070#############################################################################
1679 2071
1680package CFClient::UI::EntryBase; 2072package CFPlus::UI::EntryBase;
1681 2073
1682our @ISA = CFClient::UI::Label::; 2074our @ISA = CFPlus::UI::Label::;
1683 2075
1684use CFClient::OpenGL; 2076use CFPlus::OpenGL;
1685 2077
1686sub new { 2078sub new {
1687 my $class = shift; 2079 my $class = shift;
1688 2080
1689 $class->SUPER::new ( 2081 $class->SUPER::new (
… …
1693 active_fg => [0, 0, 0], 2085 active_fg => [0, 0, 0],
1694 can_hover => 1, 2086 can_hover => 1,
1695 can_focus => 1, 2087 can_focus => 1,
1696 valign => 0, 2088 valign => 0,
1697 can_events => 1, 2089 can_events => 1,
2090 ellipsise => 0,
1698 #text => ... 2091 #text => ...
1699 #hidden => "*", 2092 #hidden => "*",
1700 @_ 2093 @_
1701 ) 2094 )
1702} 2095}
… …
1713 2106
1714 $text =~ s/./*/g if $self->{hidden}; 2107 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 2108 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 2109 delete $self->{size_req};
1717 2110
1718 $self->_emit (changed => $self->{text}); 2111 $self->emit (changed => $self->{text});
1719 2112
1720 $self->realloc; 2113 $self->realloc;
1721 $self->update; 2114 $self->update;
1722} 2115}
1723 2116
… …
1738 my ($w, $h) = $self->SUPER::size_request; 2131 my ($w, $h) = $self->SUPER::size_request;
1739 2132
1740 ($w + 1, $h) # add 1 for cursor 2133 ($w + 1, $h) # add 1 for cursor
1741} 2134}
1742 2135
1743sub key_down { 2136sub invoke_key_down {
1744 my ($self, $ev) = @_; 2137 my ($self, $ev) = @_;
1745 2138
1746 my $mod = $ev->{mod}; 2139 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 2140 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 2141 my $uni = $ev->{unicode};
1749 2142
1750 my $text = $self->get_text; 2143 my $text = $self->get_text;
2144
2145 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1751 2146
1752 if ($uni == 8) { 2147 if ($uni == 8) {
1753 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2148 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1754 } elsif ($uni == 127) { 2149 } elsif ($uni == 127) {
1755 substr $text, $self->{cursor}, 1, ""; 2150 substr $text, $self->{cursor}, 1, "";
1756 } elsif ($sym == CFClient::SDLK_LEFT) { 2151 } elsif ($sym == CFPlus::SDLK_LEFT) {
1757 --$self->{cursor} if $self->{cursor}; 2152 --$self->{cursor} if $self->{cursor};
1758 } elsif ($sym == CFClient::SDLK_RIGHT) { 2153 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1759 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2154 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1760 } elsif ($sym == CFClient::SDLK_HOME) { 2155 } elsif ($sym == CFPlus::SDLK_HOME) {
2156 # what a hack
2157 $self->{cursor} =
2158 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2159 ? length $1
2160 : 0;
2161 } elsif ($sym == CFPlus::SDLK_END) {
2162 # uh, again
2163 $self->{cursor} =
2164 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2165 ? $self->{cursor} + length $1
2166 : length $self->{text};
2167 } elsif ($uni == 21) { # ctrl-u
2168 $text = "";
1761 $self->{cursor} = 0; 2169 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) {
1763 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 2170 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 2171 $self->emit ('escape');
1766 } elsif ($uni) { 2172 } elsif ($uni == 0x0d) {
2173 substr $text, $self->{cursor}++, 0, "\012";
2174 } elsif ($uni >= 0x20) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 2175 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 2176 } else {
1769 return 0; 2177 return 0;
1770 } 2178 }
1771 2179
1772 $self->_set_text ($text); 2180 $self->_set_text ($text);
1773 2181
1774 $self->realloc; 2182 $self->realloc;
2183 $self->update;
1775 2184
1776 1 2185 1
1777} 2186}
1778 2187
1779sub focus_in { 2188sub invoke_focus_in {
1780 my ($self) = @_; 2189 my ($self) = @_;
1781 2190
1782 $self->{last_activity} = $::NOW; 2191 $self->{last_activity} = $::NOW;
1783 2192
1784 $self->SUPER::focus_in; 2193 $self->SUPER::invoke_focus_in
1785} 2194}
1786 2195
1787sub button_down { 2196sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 2197 my ($self, $ev, $x, $y) = @_;
1789 2198
1790 $self->SUPER::button_down ($ev, $x, $y); 2199 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 2200
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 2201 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 2202
1794 # byte-index to char-index 2203 # byte-index to char-index
1795 my $text = $self->{text}; 2204 my $text = $self->{text};
1796 utf8::encode $text; 2205 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1797 $self->{cursor} = length substr $text, 0, $idx; 2206 $self->{cursor} = length $text;
1798 2207
1799 $self->_set_text ($self->{text}); 2208 $self->_set_text ($self->{text});
1800 $self->update; 2209 $self->update;
1801 2210
1802 1 2211 1
1803} 2212}
1804 2213
1805sub mouse_motion { 2214sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2216# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808 2217
1809 0 2218 1
1810} 2219}
1811 2220
1812sub _draw { 2221sub _draw {
1813 my ($self) = @_; 2222 my ($self) = @_;
1814 2223
… …
1841 utf8::encode $text; 2250 utf8::encode $text;
1842 2251
1843 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2252 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1844 } 2253 }
1845 2254
1846 glColor @{$self->{fg}};
1847 glBegin GL_LINES; 2255 glBegin GL_LINES;
1848 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2256 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1849 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2257 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1850 glEnd; 2258 glEnd;
1851 } 2259 }
1852} 2260}
1853 2261
2262#############################################################################
2263
1854package CFClient::UI::Entry; 2264package CFPlus::UI::Entry;
1855 2265
1856our @ISA = CFClient::UI::EntryBase::; 2266our @ISA = CFPlus::UI::EntryBase::;
1857 2267
1858use CFClient::OpenGL; 2268use CFPlus::OpenGL;
1859 2269
1860sub key_down { 2270sub invoke_key_down {
1861 my ($self, $ev) = @_; 2271 my ($self, $ev) = @_;
1862 2272
1863 my $sym = $ev->{sym}; 2273 my $sym = $ev->{sym};
1864 2274
1865 if ($sym == 13) { 2275 if ($ev->{uni} == 0x0d || $sym == 13) {
1866 unshift @{$self->{history}}, 2276 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 2277 my $txt = $self->get_text;
2278
1868 $self->{history_pointer} = -1; 2279 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 2280 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 2281 $self->emit (activate => $txt);
1871 $self->update; 2282 $self->update;
1872 2283
1873 } elsif ($sym == CFClient::SDLK_UP) { 2284 } elsif ($sym == CFPlus::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 2285 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 2286 $self->{history_saveback} = $self->get_text;
1876 } 2287 }
1877 if (@{$self->{history} || []} > 0) { 2288 if (@{$self->{history} || []} > 0) {
1878 $self->{history_pointer}++; 2289 $self->{history_pointer}++;
… …
1880 $self->{history_pointer} = @{$self->{history} || []} - 1; 2291 $self->{history_pointer} = @{$self->{history} || []} - 1;
1881 } 2292 }
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2293 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } 2294 }
1884 2295
1885 } elsif ($sym == CFClient::SDLK_DOWN) { 2296 } elsif ($sym == CFPlus::SDLK_DOWN) {
1886 $self->{history_pointer}--; 2297 $self->{history_pointer}--;
1887 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2298 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1888 2299
1889 if ($self->{history_pointer} >= 0) { 2300 if ($self->{history_pointer} >= 0) {
1890 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2301 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1891 } else { 2302 } else {
1892 $self->set_text ($self->{history_saveback}); 2303 $self->set_text ($self->{history_saveback});
1893 } 2304 }
1894 2305
1895 } else { 2306 } else {
1896 return $self->SUPER::key_down ($ev) 2307 return $self->SUPER::invoke_key_down ($ev)
1897 } 2308 }
1898 2309
1899 1 2310 1
1900} 2311}
1901 2312
1902############################################################################# 2313#############################################################################
1903 2314
2315package CFPlus::UI::TextEdit;
2316
2317our @ISA = CFPlus::UI::EntryBase::;
2318
2319use CFPlus::OpenGL;
2320
2321sub move_cursor_ver {
2322 my ($self, $dy) = @_;
2323
2324 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2325
2326 $y += $dy;
2327
2328 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2329 $self->{cursor} = $index;
2330 delete $self->{cur_h};
2331 $self->update;
2332 return;
2333 }
2334}
2335
2336sub invoke_key_down {
2337 my ($self, $ev) = @_;
2338
2339 my $sym = $ev->{sym};
2340
2341 if ($sym == CFPlus::SDLK_UP) {
2342 $self->move_cursor_ver (-1);
2343 } elsif ($sym == CFPlus::SDLK_DOWN) {
2344 $self->move_cursor_ver (+1);
2345 } else {
2346 return $self->SUPER::invoke_key_down ($ev)
2347 }
2348
2349 1
2350}
2351
2352#############################################################################
2353
1904package CFClient::UI::Button; 2354package CFPlus::UI::Button;
1905 2355
1906our @ISA = CFClient::UI::Label::; 2356our @ISA = CFPlus::UI::Label::;
1907 2357
1908use CFClient::OpenGL; 2358use CFPlus::OpenGL;
1909 2359
1910my @tex = 2360my @tex =
1911 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1912 qw(b1_button_active.png); 2362 qw(b1_button_inactive.png b1_button_active.png);
1913 2363
1914sub new { 2364sub new {
1915 my $class = shift; 2365 my $class = shift;
1916 2366
1917 $class->SUPER::new ( 2367 $class->SUPER::new (
1918 padding_x => 4, 2368 padding_x => 4,
1919 padding_y => 4, 2369 padding_y => 4,
1920 fg => [1, 1, 1], 2370 fg => [1.0, 1.0, 1.0],
1921 active_fg => [0, 0, 1], 2371 active_fg => [0.8, 0.8, 0.8],
1922 can_hover => 1, 2372 can_hover => 1,
1923 align => 0, 2373 align => 0,
1924 valign => 0, 2374 valign => 0,
1925 can_events => 1, 2375 can_events => 1,
1926 @_ 2376 @_
1927 ) 2377 )
1928} 2378}
1929 2379
1930sub activate { }
1931
1932sub button_up { 2380sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 2381 my ($self, $ev, $x, $y) = @_;
1934 2382
1935 $self->emit ("activate") 2383 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 2384 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 2385 && $y >= 0 && $y < $self->{h};
… …
1946 2394
1947 glEnable GL_TEXTURE_2D; 2395 glEnable GL_TEXTURE_2D;
1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2396 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1949 glColor 0, 0, 0, 1; 2397 glColor 0, 0, 0, 1;
1950 2398
2399 my $tex = $tex[$GRAB == $self];
1951 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2400 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952 2401
1953 glDisable GL_TEXTURE_2D; 2402 glDisable GL_TEXTURE_2D;
1954 2403
1955 $self->SUPER::_draw; 2404 $self->SUPER::_draw;
1956} 2405}
1957 2406
1958############################################################################# 2407#############################################################################
1959 2408
1960package CFClient::UI::CheckBox; 2409package CFPlus::UI::CheckBox;
1961 2410
1962our @ISA = CFClient::UI::DrawBG::; 2411our @ISA = CFPlus::UI::DrawBG::;
1963 2412
1964my @tex = 2413my @tex =
1965 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2414 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1966 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2415 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1967 2416
1968use CFClient::OpenGL; 2417use CFPlus::OpenGL;
1969 2418
1970sub new { 2419sub new {
1971 my $class = shift; 2420 my $class = shift;
1972 2421
1973 $class->SUPER::new ( 2422 $class->SUPER::new (
… …
1987 my ($self) = @_; 2436 my ($self) = @_;
1988 2437
1989 (6) x 2 2438 (6) x 2
1990} 2439}
1991 2440
2441sub toggle {
2442 my ($self) = @_;
2443
2444 $self->{state} = !$self->{state};
2445 $self->emit (changed => $self->{state});
2446 $self->update;
2447}
2448
1992sub button_down { 2449sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2450 my ($self, $ev, $x, $y) = @_;
1994 2451
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2452 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2453 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2454 $self->toggle;
1998 $self->_emit (changed => $self->{state});
1999 } else { 2455 } else {
2000 return 0 2456 return 0
2001 } 2457 }
2002 2458
2003 1 2459 1
… …
2023 glDisable GL_TEXTURE_2D; 2479 glDisable GL_TEXTURE_2D;
2024} 2480}
2025 2481
2026############################################################################# 2482#############################################################################
2027 2483
2028package CFClient::UI::Image; 2484package CFPlus::UI::Image;
2029 2485
2030our @ISA = CFClient::UI::Base::; 2486our @ISA = CFPlus::UI::Base::;
2031 2487
2032use CFClient::OpenGL; 2488use CFPlus::OpenGL;
2033use Carp qw/confess/;
2034 2489
2035our %loaded_images; 2490our %texture_cache;
2036 2491
2037sub new { 2492sub new {
2038 my $class = shift; 2493 my $class = shift;
2039 2494
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2495 my $self = $class->SUPER::new (
2496 can_events => 0,
2497 @_,
2498 );
2041 2499
2042 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2500 $self->{path} || $self->{tex}
2501 or Carp::croak "'path' or 'tex' attributes required";
2043 2502
2044 $loaded_images{$self->{image}} ||= 2503 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2045 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2504 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2046 2505
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2506 CFPlus::weaken $texture_cache{$self->{path}};
2048 2507
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2508 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2509
2053 $self 2510 $self
2054} 2511}
2055 2512
2513sub STORABLE_freeze {
2514 my ($self, $cloning) = @_;
2515
2516 $self->{path}
2517 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2518
2519 $self->{path}
2520}
2521
2522sub STORABLE_attach {
2523 my ($self, $cloning, $path) = @_;
2524
2525 $self->new (path => $path)
2526}
2527
2056sub size_request { 2528sub size_request {
2057 my ($self) = @_; 2529 my ($self) = @_;
2058 2530
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2531 ($self->{tex}{w}, $self->{tex}{h})
2060} 2532}
2061 2533
2062sub _draw { 2534sub _draw {
2063 my ($self) = @_; 2535 my ($self) = @_;
2064 2536
… …
2074 } 2546 }
2075 2547
2076 glEnable GL_TEXTURE_2D; 2548 glEnable GL_TEXTURE_2D;
2077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2549 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2078 2550
2079 $tex->draw_quad_alpha (0, 0, $w, $h); 2551 $tex->draw_quad (0, 0, $w, $h);
2080 2552
2081 glDisable GL_TEXTURE_2D; 2553 glDisable GL_TEXTURE_2D;
2082} 2554}
2083 2555
2084############################################################################# 2556#############################################################################
2085 2557
2558package CFPlus::UI::ImageButton;
2559
2560our @ISA = CFPlus::UI::Image::;
2561
2562use CFPlus::OpenGL;
2563
2564my %textures;
2565
2566sub new {
2567 my $class = shift;
2568
2569 my $self = $class->SUPER::new (
2570 padding_x => 4,
2571 padding_y => 4,
2572 fg => [1, 1, 1],
2573 active_fg => [0, 0, 1],
2574 can_hover => 1,
2575 align => 0,
2576 valign => 0,
2577 can_events => 1,
2578 @_
2579 );
2580}
2581
2582sub invoke_button_up {
2583 my ($self, $ev, $x, $y) = @_;
2584
2585 $self->emit ("activate")
2586 if $x >= 0 && $x < $self->{w}
2587 && $y >= 0 && $y < $self->{h};
2588
2589 1
2590}
2591
2592#############################################################################
2593
2086package CFClient::UI::VGauge; 2594package CFPlus::UI::VGauge;
2087 2595
2088our @ISA = CFClient::UI::Base::; 2596our @ISA = CFPlus::UI::Base::;
2089 2597
2090use List::Util qw(min max); 2598use List::Util qw(min max);
2091 2599
2092use CFClient::OpenGL; 2600use CFPlus::OpenGL;
2093 2601
2094my %tex = ( 2602my %tex = (
2095 food => [ 2603 food => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2604 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2605 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2098 ], 2606 ],
2099 grace => [ 2607 grace => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2608 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2609 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2102 ], 2610 ],
2103 hp => [ 2611 hp => [
2104 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2105 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2613 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2106 ], 2614 ],
2107 mana => [ 2615 mana => [
2108 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2109 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2617 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2110 ], 2618 ],
2111); 2619);
2112 2620
2113# eg. VGauge->new (gauge => 'food'), default gauge: food 2621# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2173 my $ycut1 = max 0, min 1, $ycut; 2681 my $ycut1 = max 0, min 1, $ycut;
2174 my $ycut2 = max 0, min 1, $ycut - 1; 2682 my $ycut2 = max 0, min 1, $ycut - 1;
2175 2683
2176 my $h1 = $self->{h} * (1 - $ycut1); 2684 my $h1 = $self->{h} * (1 - $ycut1);
2177 my $h2 = $self->{h} * (1 - $ycut2); 2685 my $h2 = $self->{h} * (1 - $ycut2);
2686 my $h3 = $self->{h};
2687
2688 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178 2689
2179 glEnable GL_BLEND; 2690 glEnable GL_BLEND;
2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2691 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2692 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182 glEnable GL_TEXTURE_2D; 2693 glEnable GL_TEXTURE_2D;
… …
2201 2712
2202 if ($t3) { 2713 if ($t3) {
2203 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2714 glBindTexture GL_TEXTURE_2D, $t3->{name};
2204 glBegin GL_QUADS; 2715 glBegin GL_QUADS;
2205 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2716 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2717 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2718 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2719 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209 glEnd; 2720 glEnd;
2210 } 2721 }
2211 2722
2212 glDisable GL_BLEND; 2723 glDisable GL_BLEND;
2213 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2214} 2725}
2215 2726
2216############################################################################# 2727#############################################################################
2217 2728
2218package CFClient::UI::Gauge; 2729package CFPlus::UI::Gauge;
2219 2730
2220our @ISA = CFClient::UI::VBox::; 2731our @ISA = CFPlus::UI::VBox::;
2221 2732
2222sub new { 2733sub new {
2223 my ($class, %arg) = @_; 2734 my ($class, %arg) = @_;
2224 2735
2225 my $self = $class->SUPER::new ( 2736 my $self = $class->SUPER::new (
… …
2227 can_hover => 1, 2738 can_hover => 1,
2228 can_events => 1, 2739 can_events => 1,
2229 %arg, 2740 %arg,
2230 ); 2741 );
2231 2742
2232 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2743 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2233 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2744 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2234 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2745 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2235 2746
2236 $self 2747 $self
2237} 2748}
2238 2749
2239sub set_fontsize { 2750sub set_fontsize {
… …
2260 $self->{value}->set_text ($val); 2771 $self->{value}->set_text ($val);
2261} 2772}
2262 2773
2263############################################################################# 2774#############################################################################
2264 2775
2265package CFClient::UI::Slider; 2776package CFPlus::UI::Slider;
2266 2777
2267use strict; 2778use strict;
2268 2779
2269use CFClient::OpenGL; 2780use CFPlus::OpenGL;
2270 2781
2271our @ISA = CFClient::UI::DrawBG::; 2782our @ISA = CFPlus::UI::DrawBG::;
2272 2783
2273my @tex = 2784my @tex =
2274 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2785 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2275 qw(s1_slider.png s1_slider_bg.png); 2786 qw(s1_slider.png s1_slider_bg.png);
2276 2787
2277sub new { 2788sub new {
2278 my $class = shift; 2789 my $class = shift;
2279 2790
… …
2300 $self->update; 2811 $self->update;
2301 2812
2302 $self 2813 $self
2303} 2814}
2304 2815
2305sub changed { }
2306
2307sub set_range { 2816sub set_range {
2308 my ($self, $range) = @_; 2817 my ($self, $range) = @_;
2309 2818
2310 ($range, $self->{range}) = ($self->{range}, $range); 2819 ($range, $self->{range}) = ($self->{range}, $range);
2311 2820
… …
2331 if $unit; 2840 if $unit;
2332 2841
2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2842 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334 2843
2335 if ($value != $old_value) { 2844 if ($value != $old_value) {
2336 $self->_emit (changed => $value); 2845 $self->emit (changed => $value);
2337 $self->update; 2846 $self->update;
2338 } 2847 }
2339} 2848}
2340 2849
2341sub size_request { 2850sub size_request {
2342 my ($self) = @_; 2851 my ($self) = @_;
2343 2852
2344 ($self->{req_w}, $self->{req_h}) 2853 ($self->{req_w}, $self->{req_h})
2345} 2854}
2346 2855
2347sub button_down { 2856sub invoke_button_down {
2348 my ($self, $ev, $x, $y) = @_; 2857 my ($self, $ev, $x, $y) = @_;
2349 2858
2350 $self->SUPER::button_down ($ev, $x, $y); 2859 $self->SUPER::invoke_button_down ($ev, $x, $y);
2351 2860
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2861 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353 2862
2354 $self->mouse_motion ($ev, $x, $y) 2863 $self->invoke_mouse_motion ($ev, $x, $y)
2355} 2864}
2356 2865
2357sub mouse_motion { 2866sub invoke_mouse_motion {
2358 my ($self, $ev, $x, $y) = @_; 2867 my ($self, $ev, $x, $y) = @_;
2359 2868
2360 if ($GRAB == $self) { 2869 if ($GRAB == $self) {
2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2870 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362 2871
… …
2368 } else { 2877 } else {
2369 return 0; 2878 return 0;
2370 } 2879 }
2371 2880
2372 1 2881 1
2882}
2883
2884sub invoke_mouse_wheel {
2885 my ($self, $ev) = @_;
2886
2887 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2888
2889 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2890
2891 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2892
2893 ! ! $delta
2373} 2894}
2374 2895
2375sub update { 2896sub update {
2376 my ($self) = @_; 2897 my ($self) = @_;
2377 2898
… …
2426 glDisable GL_TEXTURE_2D; 2947 glDisable GL_TEXTURE_2D;
2427} 2948}
2428 2949
2429############################################################################# 2950#############################################################################
2430 2951
2431package CFClient::UI::ValSlider; 2952package CFPlus::UI::ValSlider;
2432 2953
2433our @ISA = CFClient::UI::HBox::; 2954our @ISA = CFPlus::UI::HBox::;
2434 2955
2435sub new { 2956sub new {
2436 my ($class, %arg) = @_; 2957 my ($class, %arg) = @_;
2437 2958
2438 my $range = delete $arg{range}; 2959 my $range = delete $arg{range};
2439 2960
2440 my $self = $class->SUPER::new ( 2961 my $self = $class->SUPER::new (
2441 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2962 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2442 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2963 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2443 to_value => sub { shift }, 2964 to_value => sub { shift },
2444 from_value => sub { shift }, 2965 from_value => sub { shift },
2445 %arg, 2966 %arg,
2446 ); 2967 );
2447 2968
… …
2467sub set_range { shift->{slider}->set_range (@_) } 2988sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) } 2989sub set_value { shift->{slider}->set_value (@_) }
2469 2990
2470############################################################################# 2991#############################################################################
2471 2992
2472package CFClient::UI::TextView; 2993package CFPlus::UI::TextScroller;
2473 2994
2474our @ISA = CFClient::UI::HBox::; 2995our @ISA = CFPlus::UI::HBox::;
2475 2996
2476use CFClient::OpenGL; 2997use CFPlus::OpenGL;
2477 2998
2478sub new { 2999sub new {
2479 my $class = shift; 3000 my $class = shift;
2480 3001
2481 my $self = $class->SUPER::new ( 3002 my $self = $class->SUPER::new (
2482 fontsize => 1, 3003 fontsize => 1,
2483 can_events => 0, 3004 can_events => 1,
2484 indent => 0, 3005 indent => 0,
2485 #font => default_font 3006 #font => default_font
2486 @_, 3007 @_,
2487 3008
2488 layout => (new CFClient::Layout 1), 3009 layout => (new CFPlus::Layout),
2489 par => [], 3010 par => [],
3011 max_par => 0,
2490 height => 0, 3012 height => 0,
2491 children => [ 3013 children => [
2492 (new CFClient::UI::Empty expand => 1), 3014 (new CFPlus::UI::Empty expand => 1),
2493 (new CFClient::UI::Slider vertical => 1), 3015 (new CFPlus::UI::Slider vertical => 1),
2494 ], 3016 ],
2495 ); 3017 );
2496 3018
2497 $self->{children}[1]->connect (changed => sub { $self->update }); 3019 $self->{children}[1]->connect (changed => sub { $self->update });
2498 3020
… …
2504 3026
2505 $self->{fontsize} = $fontsize; 3027 $self->{fontsize} = $fontsize;
2506 $self->reflow; 3028 $self->reflow;
2507} 3029}
2508 3030
3031sub size_request {
3032 my ($self) = @_;
3033
3034 my ($empty, $slider) = @{ $self->{children} };
3035
3036 local $self->{children} = [$empty, $slider];
3037 $self->SUPER::size_request
3038}
3039
2509sub size_allocate { 3040sub invoke_size_allocate {
2510 my ($self, $w, $h) = @_; 3041 my ($self, $w, $h) = @_;
2511 3042
2512 $self->SUPER::size_allocate ($w, $h); 3043 my ($empty, $slider, @other) = @{ $self->{children} };
3044 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513 3045
2514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3046 $self->{layout}->set_font ($self->{font}) if $self->{font};
2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3047 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $self->{layout}->set_width ($self->{children}[0]{w}); 3048 $self->{layout}->set_width ($empty->{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3049 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518 3050
2519 $self->reflow; 3051 $self->reflow;
2520}
2521 3052
2522sub text_size { 3053 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::invoke_size_allocate ($w, $h)
3055}
3056
3057sub invoke_mouse_wheel {
2523 my ($self, $text, $indent) = @_; 3058 my ($self, $ev) = @_;
3059
3060 return 0 unless $ev->{dy}; # only vertical movements
3061
3062 $self->{children}[1]->emit (mouse_wheel => $ev);
3063
3064 1
3065}
3066
3067sub get_layout {
3068 my ($self, $para) = @_;
2524 3069
2525 my $layout = $self->{layout}; 3070 my $layout = $self->{layout};
2526 3071
3072 $layout->set_font ($self->{font}) if $self->{font};
3073 $layout->set_foreground (@{$para->{fg}});
2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3074 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528 $layout->set_width ($self->{children}[0]{w} - $indent); 3075 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3076 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530 $layout->set_markup ($text); 3077 $layout->set_markup ($para->{markup});
3078
3079 $layout->set_shapes (
3080 map
3081 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3082 @{$para->{widget}}
2531 3083 );
3084
2532 $layout->size 3085 $layout
2533} 3086}
2534 3087
2535sub reflow { 3088sub reflow {
2536 my ($self) = @_; 3089 my ($self) = @_;
2537 3090
… …
2544 3097
2545 # todo: base offset on lines or so, not on pixels 3098 # todo: base offset on lines or so, not on pixels
2546 $self->{children}[1]->set_value ($offset); 3099 $self->{children}[1]->set_value ($offset);
2547} 3100}
2548 3101
3102sub current_paragraph {
3103 my ($self) = @_;
3104
3105 $self->{top_paragraph} - 1
3106}
3107
3108sub scroll_to {
3109 my ($self, $para) = @_;
3110
3111 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3112
3113 $self->{scroll_to} = $para;
3114 $self->update;
3115}
3116
2549sub clear { 3117sub clear {
2550 my ($self) = @_; 3118 my ($self) = @_;
3119
3120 my (undef, undef, @other) = @{ $self->{children} };
3121 $self->remove ($_) for @other;
2551 3122
2552 $self->{par} = []; 3123 $self->{par} = [];
2553 $self->{height} = 0; 3124 $self->{height} = 0;
2554 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3125 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555} 3126}
2556 3127
2557sub add_paragraph { 3128sub add_paragraph {
2558 my ($self, $color, $text, $indent) = @_; 3129 my $self = shift;
2559 3130
2560 for my $line (split /\n/, $text) { 3131 for my $para (@_) {
2561 my ($w, $h) = $self->text_size ($line); 3132 $para = {
3133 fg => [1, 1, 1, 1],
3134 indent => 0,
3135 markup => "",
3136 widget => [],
3137 ref $para ? %$para : (markup => $para),
3138 w => 1e10,
3139 wrapped => 1,
3140 };
3141
3142 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3143 push @{$self->{par}}, $para;
3144 }
3145
3146 if (my $max = $self->{max_par}) {
3147 shift @{$self->{par}} while @{$self->{par}} > $max;
3148 }
3149
3150 $self->{need_reflow}++;
3151 $self->update;
3152}
3153
3154sub scroll_to_bottom {
3155 my ($self) = @_;
3156
3157 $self->{scroll_to} = $#{$self->{par}};
3158 $self->update;
3159}
3160
3161sub force_uptodate {
3162 my ($self) = @_;
3163
3164 if (delete $self->{need_reflow}) {
3165 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3166
3167 my $height = 0;
3168
3169 for my $para (@{$self->{par}}) {
3170 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3171 my $layout = $self->get_layout ($para);
3172 my ($w, $h) = $layout->size;
3173
3174 $para->{w} = $w + $para->{indent};
3175 $para->{h} = $h;
3176 $para->{wrapped} = $layout->has_wrapped;
3177 }
3178
3179 $para->{y} = $height;
3180 $height += $para->{h};
3181 }
3182
2562 $self->{height} += $h; 3183 $self->{height} = $height;
2563 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3184 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2564 }
2565 3185
2566 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3186 delete $self->{texture};
3187 }
3188
3189 if (my $paridx = delete $self->{scroll_to}) {
3190 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3191 }
2567} 3192}
2568 3193
2569sub update { 3194sub update {
2570 my ($self) = @_; 3195 my ($self) = @_;
2571 3196
… …
2574 return unless $self->{h} > 0; 3199 return unless $self->{h} > 0;
2575 3200
2576 delete $self->{texture}; 3201 delete $self->{texture};
2577 3202
2578 $ROOT->on_post_alloc ($self => sub { 3203 $ROOT->on_post_alloc ($self => sub {
3204 $self->force_uptodate;
3205
2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3206 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580 3207
2581 if (delete $self->{need_reflow}) {
2582 my $height = 0;
2583
2584 my $layout = $self->{layout};
2585
2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588 for (@{$self->{par}}) {
2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($_->[4]);
2593 my ($w, $h) = $layout->size;
2594 $_->[0] = $w + $_->[3];
2595 $_->[1] = $h;
2596 }
2597
2598 $height += $_->[1];
2599 }
2600
2601 $self->{height} = $height;
2602
2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2604
2605 delete $self->{texture};
2606 }
2607
2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3208 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2609 glClearColor 0, 0, 0, 0; 3209 glClearColor 0, 0, 0, 0;
2610 glClear GL_COLOR_BUFFER_BIT; 3210 glClear GL_COLOR_BUFFER_BIT;
2611 3211
3212 package CFPlus::UI::Base;
3213 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3214 (0, 0, $self->{w}, $self->{h});
3215
3216 my $top = int $self->{children}[1]{range}[0];
3217
3218 my $paridx = 0;
3219 my $top_paragraph;
2612 my $top = int $self->{children}[1]{range}[0]; 3220 my $top = int $self->{children}[1]{range}[0];
2613 3221
2614 my $y0 = $top; 3222 my $y0 = $top;
2615 my $y1 = $top + $H; 3223 my $y1 = $top + $H;
2616 3224
2617 my $y = 0;
2618
2619 my $layout = $self->{layout};
2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622
2623 glEnable GL_BLEND;
2624 #TODO# not correct in windows where rgba is forced off
2625 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626
2627 for my $par (@{$self->{par}}) { 3225 for my $para (@{$self->{par}}) {
2628 my $h = $par->[1]; 3226 my $h = $para->{h};
3227 my $y = $para->{y};
2629 3228
2630 if ($y0 < $y + $h && $y < $y1) { 3229 if ($y0 < $y + $h && $y < $y1) {
2631 $layout->set_foreground (@{ $par->[2] }); 3230 my $layout = $self->get_layout ($para);
2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634 $layout->set_markup ($par->[4]);
2635 3231
2636 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3232 $layout->render ($para->{indent}, $y - $y0);
2637 3233
2638 glRasterPos $par->[3], $y - $y0; 3234 if (my @w = @{ $para->{widget} }) {
2639 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3235 my @s = $layout->get_shapes;
3236
3237 for (@w) {
3238 my ($dx, $dy) = splice @s, 0, 2, ();
3239
3240 $_->{x} = $dx + $para->{indent};
3241 $_->{y} = $dy + $y - $y0;
3242
3243 $_->draw;
3244 }
3245 }
2640 } 3246 }
2641 3247
2642 $y += $h; 3248 $paridx++;
3249 $top_paragraph ||= $paridx if $y >= $top;
2643 } 3250 }
2644 3251
2645 glDisable GL_BLEND; 3252 $self->{top_paragraph} = $top_paragraph;
2646 }; 3253 };
2647 }); 3254 });
3255}
3256
3257sub reconfigure {
3258 my ($self) = @_;
3259
3260 $self->SUPER::reconfigure;
3261
3262 $_->{w} = 1e10 for @{ $self->{par} };
3263 $self->reflow;
2648} 3264}
2649 3265
2650sub _draw { 3266sub _draw {
2651 my ($self) = @_; 3267 my ($self) = @_;
2652 3268
… …
2655 glColor 0, 0, 0, 1; 3271 glColor 0, 0, 0, 1;
2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3272 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2657 glDisable GL_TEXTURE_2D; 3273 glDisable GL_TEXTURE_2D;
2658 3274
2659 $self->{children}[1]->draw; 3275 $self->{children}[1]->draw;
2660
2661} 3276}
2662 3277
2663############################################################################# 3278#############################################################################
2664 3279
2665package CFClient::UI::Animator; 3280package CFPlus::UI::Animator;
2666 3281
2667use CFClient::OpenGL; 3282use CFPlus::OpenGL;
2668 3283
2669our @ISA = CFClient::UI::Bin::; 3284our @ISA = CFPlus::UI::Bin::;
2670 3285
2671sub moveto { 3286sub moveto {
2672 my ($self, $x, $y) = @_; 3287 my ($self, $x, $y) = @_;
2673 3288
2674 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3289 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2702 glPopMatrix; 3317 glPopMatrix;
2703} 3318}
2704 3319
2705############################################################################# 3320#############################################################################
2706 3321
2707package CFClient::UI::Flopper; 3322package CFPlus::UI::Flopper;
2708 3323
2709our @ISA = CFClient::UI::Button::; 3324our @ISA = CFPlus::UI::Button::;
2710 3325
2711sub new { 3326sub new {
2712 my $class = shift; 3327 my $class = shift;
2713 3328
2714 my $self = $class->SUPER::new ( 3329 my $self = $class->SUPER::new (
… …
2726 $self->{other}->toggle_visibility; 3341 $self->{other}->toggle_visibility;
2727} 3342}
2728 3343
2729############################################################################# 3344#############################################################################
2730 3345
2731package CFClient::UI::Tooltip; 3346package CFPlus::UI::Tooltip;
2732 3347
2733our @ISA = CFClient::UI::Bin::; 3348our @ISA = CFPlus::UI::Bin::;
2734 3349
2735use CFClient::OpenGL; 3350use CFPlus::OpenGL;
2736 3351
2737sub new { 3352sub new {
2738 my $class = shift; 3353 my $class = shift;
2739 3354
2740 $class->SUPER::new ( 3355 $class->SUPER::new (
… …
2743 ) 3358 )
2744} 3359}
2745 3360
2746sub set_tooltip_from { 3361sub set_tooltip_from {
2747 my ($self, $widget) = @_; 3362 my ($self, $widget) = @_;
3363
3364 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3365 if $widget->{tooltip} =~ /^#(.*)$/;
2748 3366
2749 my $tooltip = $widget->{tooltip}; 3367 my $tooltip = $widget->{tooltip};
2750 3368
2751 if ($ENV{CFPLUS_DEBUG} & 2) { 3369 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n" 3370 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3371 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n" 3372 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}"; 3373 . "visible $widget->{visible}";
2756 } 3374 }
2757 3375
3376 $tooltip =~ s/^\n+//;
3377 $tooltip =~ s/\n+$//;
3378
2758 $self->add (new CFClient::UI::Label 3379 $self->add (new CFPlus::UI::Label
2759 markup => $tooltip, 3380 markup => $tooltip,
2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3381 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761 fontsize => 0.8, 3382 fontsize => 0.8,
2762 fg => [0, 0, 0, 1], 3383 style => 1, # FLAG_INVERSE
2763 ellipsise => 0, 3384 ellipsise => 0,
2764 font => ($widget->{tooltip_font} || $::FONT_PROP), 3385 font => ($widget->{tooltip_font} || $::FONT_PROP),
2765 ); 3386 );
2766} 3387}
2767 3388
… …
2771 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3392 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772 3393
2773 ($w + 4, $h + 4) 3394 ($w + 4, $h + 4)
2774} 3395}
2775 3396
2776sub size_allocate { 3397sub invoke_size_allocate {
2777 my ($self, $w, $h) = @_; 3398 my ($self, $w, $h) = @_;
2778 3399
2779 $self->SUPER::size_allocate ($w - 4, $h - 4); 3400 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780} 3401}
2781 3402
2782sub visibility_change { 3403sub invoke_visibility_change {
2783 my ($self, $visible) = @_; 3404 my ($self, $visible) = @_;
2784 3405
2785 return unless $visible; 3406 return unless $visible;
2786 3407
2787 $self->{root}->on_post_alloc ("move_$self" => sub { 3408 $self->{root}->on_post_alloc ("move_$self" => sub {
2788 my $widget = $self->{owner} 3409 my $widget = $self->{owner}
2789 or return; 3410 or return;
2790 3411
3412 if ($widget->{visible}) {
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3413 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792 3414
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3415 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $self->{root}{w}; 3416 if $x + $self->{w} > $self->{root}{w};
2795 3417
2796 $self->move_abs ($x, $y); 3418 $self->move_abs ($x, $y);
3419 } else {
3420 $self->hide;
3421 }
2797 }); 3422 });
2798} 3423}
2799 3424
2800sub _draw { 3425sub _draw {
2801 my ($self) = @_; 3426 my ($self) = @_;
… …
2825 $self->SUPER::_draw; 3450 $self->SUPER::_draw;
2826} 3451}
2827 3452
2828############################################################################# 3453#############################################################################
2829 3454
2830package CFClient::UI::Face; 3455package CFPlus::UI::Face;
2831 3456
2832our @ISA = CFClient::UI::Base::; 3457our @ISA = CFPlus::UI::DrawBG::;
2833 3458
2834use CFClient::OpenGL; 3459use CFPlus::OpenGL;
2835 3460
2836sub new { 3461sub new {
2837 my $class = shift; 3462 my $class = shift;
2838 3463
2839 my $self = $class->SUPER::new ( 3464 my $self = $class->SUPER::new (
3465 size_w => 32,
3466 size_h => 8,
2840 aspect => 1, 3467 aspect => 1,
2841 can_events => 0, 3468 can_events => 0,
2842 @_, 3469 @_,
2843 ); 3470 );
2844 3471
2845 if ($self->{anim} && $self->{animspeed}) { 3472 if ($self->{anim} && $self->{animspeed}) {
2846 Scalar::Util::weaken (my $widget = $self); 3473 CFPlus::weaken (my $widget = $self);
2847 3474
3475 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3476 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2848 $self->{timer} = Event->timer ( 3477 $self->{timer} = Event->timer (
2849 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2850 hard => 1, 3478 parked => 1,
2851 interval => $self->{animspeed},
2852 cb => sub { 3479 cb => sub {
3480 return unless $::CONN && $widget;
3481
2853 ++$widget->{frame}; 3482 ++$widget->{frame};
3483 $widget->update_face;
2854 $widget->update; 3484 $widget->update;
3485
3486 $widget->update_timer;
2855 }, 3487 },
2856 ); 3488 );
3489
3490 $self->update_face;
3491 $self->update_timer;
2857 } 3492 }
2858 3493
2859 $self 3494 $self
2860} 3495}
2861 3496
3497sub update_timer {
3498 my ($self) = @_;
3499
3500 return unless $self->{timer};
3501
3502 if ($self->{visible}) {
3503 $self->{timer}->at (
3504 $self->{anim_start}
3505 + $self->{animspeed}
3506 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3507 );
3508 $self->{timer}->start;
3509 } else {
3510 $self->{timer}->stop;
3511 }
3512}
3513
3514sub update_face {
3515 my ($self) = @_;
3516
3517 return unless $::CONN;
3518
3519 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3520 if ($anim && @$anim) {
3521 delete $self->{wait_face};
3522 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3523 }
3524 }
3525}
3526
2862sub size_request { 3527sub size_request {
2863 (32, 8) 3528 my ($self) = @_;
3529
3530 if ($::CONN) {
3531 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3532 if (my $tex = $::CONN->{texture}[$faceid]) {
3533 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3534 } else {
3535 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3536 $self->realloc;
3537 });
3538 }
3539 }
3540 }
3541
3542 ($self->{size_w} || 8, $self->{size_h} || 8)
2864} 3543}
2865 3544
2866sub update { 3545sub update {
2867 my ($self) = @_; 3546 my ($self) = @_;
2868 3547
2869 return unless $self->{visible}; 3548 return unless $self->{visible};
2870 3549
2871 $self->SUPER::update; 3550 $self->SUPER::update;
2872} 3551}
2873 3552
3553sub invoke_visibility_change {
3554 my ($self) = @_;
3555
3556 $self->update_timer;
3557
3558 0
3559}
3560
2874sub _draw { 3561sub _draw {
2875 my ($self) = @_; 3562 my ($self) = @_;
2876 3563
2877 return unless $::CONN; 3564 return unless $::CONN;
2878 3565
2879 my $face; 3566 $self->SUPER::_draw;
2880 3567
2881 if ($self->{frame}) {
2882 my $anim = $::CONN->{anim}[$self->{anim}]; 3568 my $faceid = $::CONN->{faceid}[$self->{face}]
2883 3569 or return;
2884 $face = $anim->[ $self->{frame} % @$anim ]
2885 if $anim && @$anim;
2886 }
2887 3570
2888 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3571 my $tex = $::CONN->{texture}[$faceid];
2889 3572
2890 if ($tex) { 3573 if ($tex) {
2891 glEnable GL_TEXTURE_2D; 3574 glEnable GL_TEXTURE_2D;
2892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3575 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2893 glColor 0, 0, 0, 1; 3576 glColor 0, 0, 0, 1;
2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3577 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895 glDisable GL_TEXTURE_2D; 3578 glDisable GL_TEXTURE_2D;
2896 } 3579 }
2897} 3580}
2898 3581
2899sub DESTROY { 3582sub destroy {
2900 my ($self) = @_; 3583 my ($self) = @_;
2901 3584
2902 $self->{timer}->cancel 3585 (delete $self->{timer})->cancel
2903 if $self->{timer}; 3586 if $self->{timer};
2904 3587
2905 $self->SUPER::DESTROY; 3588 $self->SUPER::destroy;
2906} 3589}
2907 3590
2908############################################################################# 3591#############################################################################
2909 3592
2910package CFClient::UI::Buttonbar; 3593package CFPlus::UI::Buttonbar;
2911 3594
2912our @ISA = CFClient::UI::HBox::; 3595our @ISA = CFPlus::UI::HBox::;
2913 3596
2914# TODO: should actualyl wrap buttons and other goodies. 3597# TODO: should actually wrap buttons and other goodies.
2915 3598
2916############################################################################# 3599#############################################################################
2917 3600
2918package CFClient::UI::Menu; 3601package CFPlus::UI::Menu;
2919 3602
2920our @ISA = CFClient::UI::FancyFrame::; 3603our @ISA = CFPlus::UI::Toplevel::;
2921 3604
2922use CFClient::OpenGL; 3605use CFPlus::OpenGL;
2923 3606
2924sub new { 3607sub new {
2925 my $class = shift; 3608 my $class = shift;
2926 3609
2927 my $self = $class->SUPER::new ( 3610 my $self = $class->SUPER::new (
2928 items => [], 3611 items => [],
2929 z => 100, 3612 z => 100,
2930 @_, 3613 @_,
2931 ); 3614 );
2932 3615
2933 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3616 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2934 3617
2935 for my $item (@{ $self->{items} }) { 3618 for my $item (@{ $self->{items} }) {
2936 my ($widget, $cb, $tooltip) = @$item; 3619 my ($widget, $cb, $tooltip) = @$item;
2937 3620
2938 # handle various types of items, only text for now 3621 # handle various types of items, only text for now
2939 if (!ref $widget) { 3622 if (!ref $widget) {
3623 if ($widget =~ /\t/) {
3624 my ($left, $right) = split /\t/, $widget, 2;
3625
2940 $widget = new CFClient::UI::Label 3626 $widget = new CFPlus::UI::HBox
2941 can_hover => 1, 3627 can_hover => 1,
2942 can_events => 1, 3628 can_events => 1,
2943 text => $widget,
2944 tooltip => $tooltip 3629 tooltip => $tooltip,
3630 children => [
3631 (new CFPlus::UI::Label markup => $left, expand => 1),
3632 (new CFPlus::UI::Label markup => $right, align => +1),
3633 ],
3634 ;
3635
3636 } else {
3637 $widget = new CFPlus::UI::Label
3638 can_hover => 1,
3639 can_events => 1,
3640 markup => $widget,
3641 tooltip => $tooltip;
3642 }
2945 } 3643 }
2946 3644
2947 $self->{item}{$widget} = $item; 3645 $self->{item}{$widget} = $item;
2948 3646
2949 $self->{vbox}->add ($widget); 3647 $self->{vbox}->add ($widget);
… …
2954 3652
2955# popup given the event (must be a mouse button down event currently) 3653# popup given the event (must be a mouse button down event currently)
2956sub popup { 3654sub popup {
2957 my ($self, $ev) = @_; 3655 my ($self, $ev) = @_;
2958 3656
2959 $self->_emit ("popdown"); 3657 $self->emit ("popdown");
2960 3658
2961 # maybe save $GRAB? must be careful about events... 3659 # maybe save $GRAB? must be careful about events...
2962 $GRAB = $self; 3660 $GRAB = $self;
2963 $self->{button} = $ev->{button}; 3661 $self->{button} = $ev->{button};
2964 3662
2965 $self->show; 3663 $self->show;
2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3664 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2967} 3665}
2968 3666
2969sub mouse_motion { 3667sub invoke_mouse_motion {
2970 my ($self, $ev, $x, $y) = @_; 3668 my ($self, $ev, $x, $y) = @_;
2971 3669
2972 # TODO: should use vbox->find_widget or so 3670 # TODO: should use vbox->find_widget or so
2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3671 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974 $self->{hover} = $self->{item}{$HOVER}; 3672 $self->{hover} = $self->{item}{$HOVER};
2975 3673
2976 0 3674 0
2977} 3675}
2978 3676
2979sub button_up { 3677sub invoke_button_up {
2980 my ($self, $ev, $x, $y) = @_; 3678 my ($self, $ev, $x, $y) = @_;
2981 3679
2982 if ($ev->{button} == $self->{button}) { 3680 if ($ev->{button} == $self->{button}) {
2983 undef $GRAB; 3681 undef $GRAB;
2984 $self->hide; 3682 $self->hide;
2985 3683
2986 $self->_emit ("popdown"); 3684 $self->emit ("popdown");
2987 $self->{hover}[1]->() if $self->{hover}; 3685 $self->{hover}[1]->() if $self->{hover};
2988 } else { 3686 } else {
2989 return 0 3687 return 0
2990 } 3688 }
2991 3689
2992 1 3690 1
2993} 3691}
2994 3692
2995############################################################################# 3693#############################################################################
2996 3694
2997package CFClient::UI::Multiplexer; 3695package CFPlus::UI::Multiplexer;
2998 3696
2999our @ISA = CFClient::UI::Container::; 3697our @ISA = CFPlus::UI::Container::;
3000 3698
3001sub new { 3699sub new {
3002 my $class = shift; 3700 my $class = shift;
3003 3701
3004 my $self = $class->SUPER::new ( 3702 my $self = $class->SUPER::new (
… …
3018 3716
3019 $self->{current} = $self->{children}[0] 3717 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} }; 3718 if @{ $self->{children} };
3021} 3719}
3022 3720
3721sub get_current_page {
3722 my ($self) = @_;
3723
3724 $self->{current}
3725}
3726
3023sub set_current_page { 3727sub set_current_page {
3024 my ($self, $page_or_widget) = @_; 3728 my ($self, $page_or_widget) = @_;
3025 3729
3026 my $widget = ref $page_or_widget 3730 my $widget = ref $page_or_widget
3027 ? $page_or_widget 3731 ? $page_or_widget
3028 : $self->{children}[$page_or_widget]; 3732 : $self->{children}[$page_or_widget];
3029 3733
3030 $self->{current} = $widget; 3734 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3735 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032 3736
3033 $self->_emit (page_changed => $self->{current}); 3737 $self->emit (page_changed => $self->{current});
3034 3738
3035 $self->realloc; 3739 $self->realloc;
3036} 3740}
3037 3741
3038sub visible_children { 3742sub visible_children {
… …
3043 my ($self) = @_; 3747 my ($self) = @_;
3044 3748
3045 $self->{current}->size_request 3749 $self->{current}->size_request
3046} 3750}
3047 3751
3048sub size_allocate { 3752sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3753 my ($self, $w, $h) = @_;
3050 3754
3051 $self->{current}->configure (0, 0, $w, $h); 3755 $self->{current}->configure (0, 0, $w, $h);
3756
3757 1
3052} 3758}
3053 3759
3054sub _draw { 3760sub _draw {
3055 my ($self) = @_; 3761 my ($self) = @_;
3056 3762
3057 $self->{current}->draw; 3763 $self->{current}->draw;
3058} 3764}
3059 3765
3060############################################################################# 3766#############################################################################
3061 3767
3062package CFClient::UI::Notebook; 3768package CFPlus::UI::Notebook;
3063 3769
3064our @ISA = CFClient::UI::VBox::; 3770our @ISA = CFPlus::UI::VBox::;
3065 3771
3066sub new { 3772sub new {
3067 my $class = shift; 3773 my $class = shift;
3068 3774
3069 my $self = $class->SUPER::new ( 3775 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar), 3776 buttonbar => (new CFPlus::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3777 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self 3778 # filter => # will be put between multiplexer and $self
3073 @_, 3779 @_,
3074 ); 3780 );
3075 3781
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3782 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3080} 3786}
3081 3787
3082sub add { 3788sub add {
3083 my ($self, $title, $widget, $tooltip) = @_; 3789 my ($self, $title, $widget, $tooltip) = @_;
3084 3790
3085 Scalar::Util::weaken $self; 3791 CFPlus::weaken $self;
3086 3792
3087 $self->{buttonbar}->add (new CFClient::UI::Button 3793 $self->{buttonbar}->add (new CFPlus::UI::Button
3088 markup => $title, 3794 markup => $title,
3089 tooltip => $tooltip, 3795 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) }, 3796 on_activate => sub { $self->set_current_page ($widget) },
3091 ); 3797 );
3092 3798
3093 $self->{multiplexer}->add ($widget); 3799 $self->{multiplexer}->add ($widget);
3094} 3800}
3095 3801
3802sub get_current_page {
3803 my ($self) = @_;
3804
3805 $self->{multiplexer}->get_current_page
3806}
3807
3096sub set_current_page { 3808sub set_current_page {
3097 my ($self, $page) = @_; 3809 my ($self, $page) = @_;
3098 3810
3099 $self->{multiplexer}->set_current_page ($page); 3811 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current}); 3812 $self->emit (page_changed => $self->{multiplexer}{current});
3101} 3813}
3102 3814
3103############################################################################# 3815#############################################################################
3104 3816
3105package CFClient::UI::Combobox; 3817package CFPlus::UI::Selector;
3106 3818
3107use utf8; 3819use utf8;
3108 3820
3109our @ISA = CFClient::UI::Button::; 3821our @ISA = CFPlus::UI::Button::;
3110 3822
3111sub new { 3823sub new {
3112 my $class = shift; 3824 my $class = shift;
3113 3825
3114 my $self = $class->SUPER::new ( 3826 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ... 3827 options => [], # [value, title, longdesc], ...
3116 value => undef, 3828 value => undef,
3117 @_, 3829 @_,
3118 ); 3830 );
3119 3831
3120 $self->_set_value ($self->{value}); 3832 $self->_set_value ($self->{value});
3121 3833
3122 $self 3834 $self
3123} 3835}
3124 3836
3125sub button_down { 3837sub invoke_button_down {
3126 my ($self, $ev) = @_; 3838 my ($self, $ev) = @_;
3127 3839
3128 my @menu_items; 3840 my @menu_items;
3129 3841
3130 for (@{ $self->{options} }) { 3842 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_; 3843 my ($value, $title, $tooltip) = @$_;
3132 3844
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3845 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 } 3846 }
3135 3847
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3848 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137} 3849}
3138 3850
3139sub _set_value { 3851sub _set_value {
3140 my ($self, $value) = @_; 3852 my ($self, $value) = @_;
3141 3853
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3854 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143 or return; 3855 or return;
3144 3856
3145 $self->{value} = $item->[1]; 3857 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[0] ⇓"); 3858 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]); 3859 $self->set_tooltip ($item->[2]);
3148} 3860}
3149 3861
3150sub set_value { 3862sub set_value {
3151 my ($self, $value) = @_; 3863 my ($self, $value) = @_;
3152 3864
3153 return unless $self->{value} ne $value; 3865 return unless $self->{value} ne $value;
3154 3866
3155 $self->_set_value ($value); 3867 $self->_set_value ($value);
3156 $self->_emit (changed => $value); 3868 $self->emit (changed => $value);
3157} 3869}
3158 3870
3159############################################################################# 3871#############################################################################
3160 3872
3161package CFClient::UI::Statusbox; 3873package CFPlus::UI::Statusbox;
3162 3874
3163our @ISA = CFClient::UI::VBox::; 3875our @ISA = CFPlus::UI::VBox::;
3164 3876
3165sub new { 3877sub new {
3166 my $class = shift; 3878 my $class = shift;
3167 3879
3168 my $self = $class->SUPER::new ( 3880 my $self = $class->SUPER::new (
3169 fontsize => 0.8, 3881 fontsize => 0.8,
3170 @_, 3882 @_,
3171 ); 3883 );
3172 3884
3173 Scalar::Util::weaken (my $this = $self); 3885 CFPlus::weaken (my $this = $self);
3174 3886
3175 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3887 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3176 3888
3177 $self 3889 $self
3178} 3890}
… …
3180sub reorder { 3892sub reorder {
3181 my ($self) = @_; 3893 my ($self) = @_;
3182 my $NOW = Time::HiRes::time; 3894 my $NOW = Time::HiRes::time;
3183 3895
3184 # freeze display when hovering over any label 3896 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner} 3897 return if $CFPlus::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3898 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} }; 3899 values %{ $self->{item} };
3188 3900
3189 while (my ($k, $v) = each %{ $self->{item} }) { 3901 while (my ($k, $v) = each %{ $self->{item} }) {
3190 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3902 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3191 } 3903 }
… …
3212 for ($short) { 3924 for ($short) {
3213 s/^\s+//; 3925 s/^\s+//;
3214 s/\s+/ /g; 3926 s/\s+/ /g;
3215 } 3927 }
3216 3928
3217 new CFClient::UI::Label 3929 new CFPlus::UI::Label
3218 markup => $short, 3930 markup => $short,
3219 tooltip => $item->{tooltip}, 3931 tooltip => $item->{tooltip},
3220 tooltip_font => $::FONT_PROP, 3932 tooltip_font => $::FONT_PROP,
3221 tooltip_width => 0.67, 3933 tooltip_width => 0.67,
3222 fontsize => $item->{fontsize} || $self->{fontsize}, 3934 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3260 $item->{count}++; 3972 $item->{count}++;
3261 } else { 3973 } else {
3262 $item->{count} = 1; 3974 $item->{count} = 1;
3263 $item->{text} = $item->{tooltip} = $text; 3975 $item->{text} = $item->{tooltip} = $text;
3264 } 3976 }
3265 $item->{id} = ++$self->{id}; 3977 $item->{id} += 0.2;#d#
3266 $item->{timeout} = $timeout; 3978 $item->{timeout} = $timeout;
3267 delete $item->{label}; 3979 delete $item->{label};
3268 } else { 3980 } else {
3269 $self->{item}{$group} = { 3981 $self->{item}{$group} = {
3270 id => ++$self->{id}, 3982 id => ++$self->{id},
… …
3276 count => 1, 3988 count => 1,
3277 %arg, 3989 %arg,
3278 }; 3990 };
3279 } 3991 }
3280 3992
3993 $ROOT->on_refresh (reorder => sub {
3281 $self->reorder; 3994 $self->reorder;
3995 });
3282} 3996}
3283 3997
3284sub reconfigure { 3998sub reconfigure {
3285 my ($self) = @_; 3999 my ($self) = @_;
3286 4000
… …
3289 4003
3290 $self->reorder; 4004 $self->reorder;
3291 $self->SUPER::reconfigure; 4005 $self->SUPER::reconfigure;
3292} 4006}
3293 4007
3294sub DESTROY { 4008sub destroy {
3295 my ($self) = @_; 4009 my ($self) = @_;
3296 4010
3297 $self->{timer}->cancel; 4011 $self->{timer}->cancel;
3298 4012
3299 $self->SUPER::DESTROY; 4013 $self->SUPER::destroy;
3300} 4014}
3301 4015
3302############################################################################# 4016#############################################################################
3303 4017
3304package CFClient::UI::Inventory;
3305
3306our @ISA = CFClient::UI::ScrolledWindow::;
3307
3308sub new {
3309 my $class = shift;
3310
3311 my $self = $class->SUPER::new (
3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3313 @_,
3314 );
3315
3316 $self
3317}
3318
3319sub set_items {
3320 my ($self, $items) = @_;
3321
3322 $self->{child}->clear;
3323 return unless $items;
3324
3325 my @items = sort {
3326 ($a->{type} <=> $b->{type})
3327 or ($a->{name} cmp $b->{name})
3328 } @$items;
3329
3330 $self->{real_items} = \@items;
3331
3332 my $row = 0;
3333 for my $item (@items) {
3334 CFClient::Item::update_widgets $item;
3335
3336 $self->{child}->add (0, $row, $item->{face_widget});
3337 $self->{child}->add (1, $row, $item->{desc_widget});
3338 $self->{child}->add (2, $row, $item->{weight_widget});
3339
3340 $row++;
3341 }
3342}
3343
3344#############################################################################
3345
3346package CFClient::UI::BindEditor;
3347
3348our @ISA = CFClient::UI::FancyFrame::;
3349
3350sub new {
3351 my $class = shift;
3352
3353 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355 $self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359 text => "start recording",
3360 tooltip => "Start/Stops recording of actions."
3361 ."All subsequent actions after the recording started will be captured."
3362 ."The actions are displayed after the record was stopped."
3363 ."To bind the action you have to click on the 'Bind' button",
3364 on_activate => sub {
3365 unless ($self->{recording}) {
3366 $self->start;
3367 } else {
3368 $self->stop;
3369 }
3370 });
3371
3372 $vb->add (new CFClient::UI::Label text => "Actions:");
3373 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3376 $vb->add (my $hb = new CFClient::UI::HBox);
3377 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378 $hb->add (new CFClient::UI::Button
3379 text => "bind",
3380 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381 on_activate => sub {
3382 $self->ask_for_bind;
3383 });
3384
3385 $vb->add (my $hb = new CFClient::UI::HBox);
3386 $hb->add (new CFClient::UI::Button
3387 text => "ok",
3388 expand => 1,
3389 tooltip => "This closes the binding editor and saves the binding",
3390 on_activate => sub {
3391 $self->hide;
3392 $self->commit;
3393 });
3394
3395 $hb->add (new CFClient::UI::Button
3396 text => "cancel",
3397 expand => 1,
3398 tooltip => "This closes the binding editor without saving",
3399 on_activate => sub {
3400 $self->hide;
3401 $self->{binding_cancel}->()
3402 if $self->{binding_cancel};
3403 });
3404
3405 $self->update_binding_widgets;
3406
3407 $self
3408}
3409
3410sub commit {
3411 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415 ."'. Don't forget 'Save Config'!");
3416 $self->{binding_change}->($mod, $sym, $cmds)
3417 if $self->{binding_change};
3418 } else {
3419 $::STATUSBOX->add ("No action bound, no key or action specified!");
3420 $self->{binding_cancel}->()
3421 if $self->{binding_cancel};
3422 }
3423}
3424
3425sub start {
3426 my ($self) = @_;
3427
3428 $self->{rec_btn}->set_text ("stop recording");
3429 $self->{recording} = 1;
3430 $self->clear_command_list;
3431 $::CONN->start_record if $::CONN;
3432}
3433
3434sub stop {
3435 my ($self) = @_;
3436
3437 $self->{rec_btn}->set_text ("start recording");
3438 $self->{recording} = 0;
3439
3440 my $rec;
3441 $rec = $::CONN->stop_record if $::CONN;
3442 return unless ref $rec eq 'ARRAY';
3443 $self->set_command_list ($rec);
3444}
3445
3446
3447sub ask_for_bind_and_commit {
3448 my ($self) = @_;
3449 $self->ask_for_bind (1);
3450}
3451
3452sub ask_for_bind {
3453 my ($self, $commit) = @_;
3454
3455 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets;
3459 $self->commit if $commit;
3460 });
3461}
3462
3463# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands)
3465# $cb is the callback that is executed on OK
3466# $ccb is the callback that is executed on CANCEL and
3467# when the binding was unsuccessful on OK
3468sub set_binding {
3469 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471 $self->clear_command_list;
3472 $self->{recording} = 0;
3473 $self->{rec_btn}->set_text ("start recording");
3474
3475 $self->{binding} = [$mod, $sym];
3476 $self->{commands} = $cmds;
3477
3478 $self->{binding_change} = $cb;
3479 $self->{binding_cancel} = $ccb;
3480
3481 $self->update_binding_widgets;
3482}
3483
3484# this is a shortcut method that asks for a binding
3485# and then just binds it.
3486sub do_quick_binding {
3487 my ($self, $cmds) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub {
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1);
3492}
3493
3494sub update_binding_widgets {
3495 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding;
3497 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498 $self->set_command_list ($cmds);
3499}
3500
3501sub get_binding {
3502 my ($self) = @_;
3503 return (
3504 $self->{binding}->[0],
3505 $self->{binding}->[1],
3506 [ grep { defined $_ } @{$self->{commands}} ]
3507 );
3508}
3509
3510sub clear_command_list {
3511 my ($self) = @_;
3512 $self->{cmdbox}->clear ();
3513}
3514
3515sub set_command_list {
3516 my ($self, $cmds) = @_;
3517
3518 $self->{cmdbox}->clear ();
3519 $self->{commands} = $cmds;
3520
3521 my $idx = 0;
3522
3523 for (@$cmds) {
3524 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526 my $i = $idx;
3527 $hb->add (new CFClient::UI::Label text => $_);
3528 $hb->add (new CFClient::UI::Button
3529 text => "delete",
3530 tooltip => "Deletes the action from the record",
3531 on_activate => sub {
3532 $self->{cmdbox}->remove ($hb);
3533 $cmds->[$i] = undef;
3534 });
3535
3536
3537 $idx++
3538 }
3539}
3540
3541#############################################################################
3542
3543package CFClient::UI::SpellList;
3544
3545our @ISA = CFClient::UI::Table::;
3546
3547sub new {
3548 my $class = shift;
3549
3550 my $self = $class->SUPER::new (
3551 binding => [],
3552 commands => [],
3553 @_,
3554 )
3555}
3556
3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3563
3564sub rebuild_spell_list {
3565 my ($self) = @_;
3566
3567 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear;
3569
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574
3575 my $row = 0;
3576
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_};
3579
3580 $row++;
3581
3582 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face},
3584 can_hover => 1,
3585 can_events => 1,
3586 tooltip => $spell->{message},
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $spell->{message},
3595 );
3596
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 }
3608 });
3609}
3610
3611sub add_spell {
3612 my ($self, $spell) = @_;
3613
3614 $self->{spell}->{$spell->{name}} = $spell;
3615 $self->rebuild_spell_list;
3616}
3617
3618sub remove_spell {
3619 my ($self, $spell) = @_;
3620
3621 delete $self->{spell}->{$spell->{name}};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3627package CFClient::UI::Root; 4018package CFPlus::UI::Root;
3628 4019
3629our @ISA = CFClient::UI::Container::; 4020our @ISA = CFPlus::UI::Container::;
3630 4021
3631use List::Util qw(min max); 4022use List::Util qw(min max);
3632 4023
3633use CFClient::OpenGL; 4024use CFPlus::OpenGL;
3634 4025
3635sub new { 4026sub new {
3636 my $class = shift; 4027 my $class = shift;
3637 4028
3638 my $self = $class->SUPER::new ( 4029 my $self = $class->SUPER::new (
3639 visible => 1, 4030 visible => 1,
3640 @_, 4031 @_,
3641 ); 4032 );
3642 4033
3643 Scalar::Util::weaken ($self->{root} = $self); 4034 CFPlus::weaken ($self->{root} = $self);
3644 4035
3645 $self 4036 $self
3646} 4037}
3647 4038
3648sub size_request { 4039sub size_request {
… …
3663 $coord = $max - $size if $coord > $max - $size; 4054 $coord = $max - $size if $coord > $max - $size;
3664 4055
3665 int $coord + 0.5 4056 int $coord + 0.5
3666} 4057}
3667 4058
3668sub size_allocate { 4059sub invoke_size_allocate {
3669 my ($self, $w, $h) = @_; 4060 my ($self, $w, $h) = @_;
3670 4061
3671 for my $child ($self->children) { 4062 for my $child ($self->children) {
3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4063 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3673 4064
… …
3677 $X = _to_pixel $X, $W, $self->{w}; 4068 $X = _to_pixel $X, $W, $self->{w};
3678 $Y = _to_pixel $Y, $H, $self->{h}; 4069 $Y = _to_pixel $Y, $H, $self->{h};
3679 4070
3680 $child->configure ($X, $Y, $W, $H); 4071 $child->configure ($X, $Y, $W, $H);
3681 } 4072 }
4073
4074 1
3682} 4075}
3683 4076
3684sub coord2local { 4077sub coord2local {
3685 my ($self, $x, $y) = @_; 4078 my ($self, $x, $y) = @_;
3686 4079
… …
3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4205 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3813 4206
3814 $w = 0 if $w < 0; 4207 $w = 0 if $w < 0;
3815 $h = 0 if $h < 0; 4208 $h = 0 if $h < 0;
3816 4209
4210 $w = max $widget->{min_w}, $w;
4211 $h = max $widget->{min_h}, $h;
4212
4213# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4214# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4215
4216 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4217 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4218
3817 $w = int $w + 0.5; 4219 $w = int $w + 0.5;
3818 $h = int $h + 0.5; 4220 $h = int $h + 0.5;
3819 4221
3820 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4222 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821 $widget->{old_w} = $widget->{w}; 4223 $widget->{old_w} = $widget->{w};
… …
3831 4233
3832 while ($self->{post_alloc_hook}) { 4234 while ($self->{post_alloc_hook}) {
3833 $_->() 4235 $_->()
3834 for values %{delete $self->{post_alloc_hook}}; 4236 for values %{delete $self->{post_alloc_hook}};
3835 } 4237 }
3836
3837 4238
3838 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4239 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3839 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4240 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3840 glClear GL_COLOR_BUFFER_BIT; 4241 glClear GL_COLOR_BUFFER_BIT;
3841 4242
… …
3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4245 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3845 glMatrixMode GL_MODELVIEW; 4246 glMatrixMode GL_MODELVIEW;
3846 glLoadIdentity; 4247 glLoadIdentity;
3847 4248
3848 { 4249 {
3849 package CFClient::UI::Base; 4250 package CFPlus::UI::Base;
3850 4251
3851 ($draw_x, $draw_y, $draw_w, $draw_h) = 4252 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h}); 4253 (0, 0, $self->{w}, $self->{h});
3853 }
3854 4254
3855 $self->_draw; 4255 $self->_draw;
4256 }
3856} 4257}
3857 4258
3858############################################################################# 4259#############################################################################
3859 4260
3860package CFClient::UI; 4261package CFPlus::UI;
3861 4262
3862$ROOT = new CFClient::UI::Root; 4263$ROOT = new CFPlus::UI::Root;
3863$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4264$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3864 4265
38651 42661
3866 4267

Diff Legend

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