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

Diff Legend

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