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.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

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