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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
183 } 189 }
184 } 190 }
185 191
186 reconfigure_widgets; 192 reconfigure_widgets;
187} 193}
196 202
197sub new { 203sub new {
198 my $class = shift; 204 my $class = shift;
199 205
200 my $self = bless { 206 my $self = bless {
201 x => 0, 207 x => "center",
202 y => 0, 208 y => "center",
203 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
204 can_events => 1, 212 can_events => 1,
205 @_ 213 @_
206 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 217
208 for (keys %$self) { 218 for (keys %$self) {
209 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
211 } 221 }
212 } 222 }
213 223
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
221 } 234 }
222 235
223 $self 236 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 237}
235 238
236sub destroy { 239sub destroy {
237 my ($self) = @_; 240 my ($self) = @_;
238 241
240 %$self = (); 243 %$self = ();
241} 244}
242 245
243sub show { 246sub show {
244 my ($self) = @_; 247 my ($self) = @_;
248
245 return if $self->{parent}; 249 return if $self->{parent};
246 250
247 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
248}
249
250sub center {
251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260} 252}
261 253
262sub set_visible { 254sub set_visible {
263 my ($self) = @_; 255 my ($self) = @_;
264 256
265 return if $self->{visible}; 257 return if $self->{visible};
266 258
267 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
269 261
270 $self->emit (visibility_change => 1) 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
271} 267}
272 268
273sub set_invisible { 269sub set_invisible {
274 my ($self) = @_; 270 my ($self) = @_;
275 271
276 return unless $self->{visible}; 272 return unless $self->{visible};
277 273
278 # broken show/hide model 274 $_->set_invisible for $self->children;
279 275
280 delete $self->{root}; 276 delete $self->{root};
281 delete $self->{visible}; 277 delete $self->{visible};
282 278
283 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
284 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
285 281
286 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
287 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
288 284
289 $self->focus_out; 285 $self->focus_out;
290 286
291 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
292} 305}
293 306
294sub hide { 307sub hide {
295 my ($self) = @_; 308 my ($self) = @_;
296 309
298 311
299 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
300 if $self->{parent}; 313 if $self->{parent};
301} 314}
302 315
303sub move { 316sub move_abs {
304 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
305 318
306 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
307 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
308 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
309 322
310 $self->update; 323 $self->update;
311} 324}
312 325
313sub set_size { 326sub set_size {
314 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
315 328
316 $self->{def_w} = $w; 329 $self->{force_w} = $w;
317 $self->{def_h} = $h; 330 $self->{force_h} = $h;
318 331
319 $self->check_size; 332 $self->realloc;
320} 333}
321 334
322sub size_request { 335sub size_request {
323 require Carp; 336 require Carp;
324 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
326 339
327sub configure { 340sub configure {
328 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
329 342
330 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
331 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
332 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
333 348
334 # use alignment to adjust x, y 349 # use alignment to adjust x, y
335 350
336 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
337 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
338
339 ($w, $h) = ($w2, $h2);
340 } 353 }
341 354
342 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
343 $self->{x} = $x; 356 $self->{x} = $x;
344 $self->{y} = $y; 357 $self->{y} = $y;
345 $self->update; 358 $self->update;
346 } 359 }
347 360
348 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
350 } 368 }
351} 369}
352 370
353sub size_allocate { 371sub size_allocate {
354 # nothing to be done 372 # nothing to be done
355} 373}
356 374
357sub reconfigure {
358 my ($self) = @_;
359
360 $self->check_size (1);
361 $self->update;
362}
363
364sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
365} 381}
366 382
367sub set_max_size { 383sub set_max_size {
368 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
369 385
428 444
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 446 unless $FOCUS;
431} 447}
432 448
433sub mouse_motion { } 449sub mouse_motion { 0 }
434sub button_up { } 450sub button_up { 0 }
435sub key_down { } 451sub key_down { 0 }
436sub key_up { } 452sub key_up { 0 }
437 453
438sub button_down { 454sub button_down {
439 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
440 456
441 $self->focus_in; 457 $self->focus_in;
442}
443 458
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
449 535
450sub draw { 536sub draw {
451 my ($self) = @_; 537 my ($self) = @_;
452 538
453 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
454 550
455 glPushMatrix; 551 glPushMatrix;
456 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
457 $self->_draw; 553 $self->_draw;
458 glPopMatrix; 554 glPopMatrix;
470 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
471 glEnd; 567 glEnd;
472 glDisable GL_BLEND; 568 glDisable GL_BLEND;
473 } 569 }
474 570
475 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
476 glPushMatrix; 572 glPushMatrix;
477 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
479 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0; 576 glVertex 0 , 0;
491 my ($self) = @_; 587 my ($self) = @_;
492 588
493 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
494} 590}
495 591
496sub find_widget {
497 my ($self, $x, $y) = @_;
498
499 return () unless $self->{can_events};
500
501 return $self
502 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505 ()
506}
507
508sub set_parent {
509 my ($self, $parent) = @_;
510
511 Scalar::Util::weaken ($self->{parent} = $parent);
512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515 $self->check_size;
516}
517
518sub check_size {
519 my ($self, $forced) = @_;
520
521 $self->{force_alloc} = 1 if $forced;
522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
523}
524
525sub update {
526 my ($self) = @_;
527
528 $self->{parent}->update
529 if $self->{parent};
530}
531
532sub connect {
533 my ($self, $signal, $cb) = @_;
534
535 push @{ $self->{signal_cb}{$signal} }, $cb;
536}
537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
544sub emit {
545 my ($self, $signal, @args) = @_;
546
547 $self->_emit ($signal, @args)
548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
553}
554
555sub DESTROY { 592sub DESTROY {
556 my ($self) = @_; 593 my ($self) = @_;
557 594
558 delete $WIDGET{$self+0}; 595 delete $WIDGET{$self+0};
559 #$self->deactivate; 596 #$self->deactivate;
615 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
616 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
617} 654}
618 655
619sub size_request { 656sub size_request {
620 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
621} 660}
622 661
623sub draw { } 662sub draw { }
624 663
625############################################################################# 664#############################################################################
629our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
630 669
631sub new { 670sub new {
632 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
633 672
634 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
635 674
636 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
637 children => [], 676 children => [],
638 can_events => 0, 677 can_events => 0,
639 %arg, 678 %arg,
640 ); 679 );
680
641 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
642 683
643 $self 684 $self
644} 685}
645 686
646sub add { 687sub add {
654 $self->{children} = [ 695 $self->{children} = [
655 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
656 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
657 ]; 698 ];
658 699
659 $self->check_size (1); 700 $self->realloc;
660 $self->update;
661} 701}
662 702
663sub children { 703sub children {
664 @{ $_[0]{children} } 704 @{ $_[0]{children} }
665} 705}
670 delete $child->{parent}; 710 delete $child->{parent};
671 $child->hide; 711 $child->hide;
672 712
673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674 714
675 $self->check_size (1); 715 $self->realloc;
676 $self->update;
677} 716}
678 717
679sub clear { 718sub clear {
680 my ($self) = @_; 719 my ($self) = @_;
681 720
685 for (@$children) { 724 for (@$children) {
686 delete $_->{parent}; 725 delete $_->{parent};
687 $_->hide; 726 $_->hide;
688 } 727 }
689 728
690 $self->check_size; 729 $self->realloc;
691 $self->update;
692} 730}
693 731
694sub find_widget { 732sub find_widget {
695 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
696 734
697 $x -= $self->{x}; 735 $x -= $self->{x};
698 $y -= $self->{y}; 736 $y -= $self->{y};
699 737
700 my $res; 738 my $res;
701 739
702 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
703 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
704 and return $res; 742 and return $res;
705 } 743 }
706 744
707 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
783 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
784 $self->update; 822 $self->update;
785} 823}
786 824
787sub _render { 825sub _render {
826 my ($self) = @_;
827
788 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
789} 829}
790 830
791sub render_child { 831sub render_child {
792 my ($self) = @_; 832 my ($self) = @_;
793 833
794 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
795 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
796 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
797 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
798 $self->_render; 845 $self->_render;
799 }; 846 };
800} 847}
801 848
802sub _draw { 849sub _draw {
803 my ($self) = @_; 850 my ($self) = @_;
804 851
805 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
806 853
807 my $tex = $self->{texture} 854 my $tex = $self->{texture}
808 or return; 855 or return;
809 856
810 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
833} 880}
834 881
835sub size_request { 882sub size_request {
836 my ($self) = @_; 883 my ($self) = @_;
837 884
838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
839 886
840 $w = 10 if $self->{scroll_x}; 887 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
842 889
843 ($w, $h) 890 ($w, $h)
844} 891}
845 892
846sub size_allocate { 893sub size_allocate {
847 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
848 895
896 my $child = $self->child;
897
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851 900
852 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
853 $self->update; 902 $self->update;
854} 903}
855 904
890 } 939 }
891} 940}
892 941
893sub _render { 942sub _render {
894 my ($self) = @_; 943 my ($self) = @_;
944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
895 947
896 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897 949
898 $self->SUPER::_render; 950 $self->SUPER::_render;
899} 951}
998 1050
999our @ISA = CFClient::UI::Bin::; 1051our @ISA = CFClient::UI::Bin::;
1000 1052
1001use CFClient::OpenGL; 1053use CFClient::OpenGL;
1002 1054
1003my @tex = 1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1006 1062
1007sub new { 1063sub new {
1008 my $class = shift; 1064 my ($class, %arg) = @_;
1065
1066 my $title = delete $arg{title};
1009 1067
1010 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1071 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1072 can_events => 1,
1016 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
1017 ); 1076 );
1018 1077
1019 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
1020 align => 0, 1079 align => 0,
1021 valign => 1, 1080 valign => 1,
1022 text => $self->{title}, 1081 text => $title,
1023 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
1024 1084
1025 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1026} 1093}
1027 1094
1028sub border { 1095sub border {
1029 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
1030} 1097}
1031 1098
1032sub size_request { 1099sub size_request {
1033 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
1034 1104
1035 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
1036 1106
1037 ( 1107 (
1038 $w + $self->border * 2, 1108 $w + $self->border * 2,
1041} 1111}
1042 1112
1043sub size_allocate { 1113sub size_allocate {
1044 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
1045 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
1046 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
1048 1126
1049 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1050 if $self->{title};
1051
1052 $self->child->configure ($self->border, $self->border, $w, $h); 1127 $self->child->configure ($border, $border, $w, $h);
1053} 1128}
1054 1129
1055sub button_down { 1130sub button_down {
1056 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
1057 1132
1073 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
1074 1149
1075 my $dx = $ev->{x} - $ox; 1150 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1151 my $dy = $ev->{y} - $oy;
1077 1152
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1155
1083 $self->check_size; 1156 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1084 }; 1158 };
1085 1159
1086 } elsif ($lr ^ $td) { 1160 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
1090 $self->{motion} = sub { 1164 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
1092 1166
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1168
1095 $self->{user_x} = $bx + $x - $ox; 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy;
1097
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
1101 } 1175 1
1102} 1176}
1103 1177
1104sub button_up { 1178sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
1106 1180
1107 delete $self->{motion}; 1181 !!delete $self->{motion}
1108} 1182}
1109 1183
1110sub mouse_motion { 1184sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
1112 1186
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
1114} 1190}
1115 1191
1116sub _draw { 1192sub _draw {
1117 my ($self) = @_; 1193 my ($self) = @_;
1118 1194
1195 my $child = $self->{children}[0];
1196
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1199
1122 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1202
1125 my $border = $self->border; 1203 my $border = $self->border;
1126 1204
1127 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1210
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1212 glColor @{ $self->{bg} };
1135 1213
1136 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
1215 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1216 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1217 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1219 }
1147 1220
1148 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1149 1222
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1153} 1229}
1154 1230
1155############################################################################# 1231#############################################################################
1156 1232
1157package CFClient::UI::Table; 1233package CFClient::UI::Table;
1179 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
1180 1256
1181 $child->set_parent ($self); 1257 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
1183 1259
1184 $self->check_size (1); 1260 $self->realloc;
1185} 1261}
1186 1262
1187# TODO: move to container class maybe? send children a signal on removal? 1263# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1264sub clear {
1189 my ($self) = @_; 1265 my ($self) = @_;
1194 for (@children) { 1270 for (@children) {
1195 delete $_->{parent}; 1271 delete $_->{parent};
1196 $_->hide; 1272 $_->hide;
1197 } 1273 }
1198 1274
1199 $self->check_size (1); 1275 $self->realloc;
1200 $self->update;
1201} 1276}
1202 1277
1203sub get_wh { 1278sub get_wh {
1204 my ($self) = @_; 1279 my ($self) = @_;
1205 1280
1413 ellipsise => 3, # end 1488 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1489 layout => (new CFClient::Layout),
1415 fontsize => 1, 1490 fontsize => 1,
1416 align => -1, 1491 align => -1,
1417 valign => -1, 1492 valign => -1,
1418 padding => 2, 1493 padding_x => 2,
1494 padding_y => 2,
1419 can_events => 0, 1495 can_events => 0,
1420 %arg 1496 %arg
1421 ); 1497 );
1422 1498
1423 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
1459 $self->{text} = "T$text"; 1535 $self->{text} = "T$text";
1460 1536
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1463 1539
1540 $self->realloc;
1464 $self->update; 1541 $self->update;
1465 $self->check_size;
1466} 1542}
1467 1543
1468sub set_markup { 1544sub set_markup {
1469 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1470 1546
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1551
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1478 1554
1555 $self->realloc;
1479 $self->update; 1556 $self->update;
1480 $self->check_size;
1481} 1557}
1482 1558
1483sub size_request { 1559sub size_request {
1484 my ($self) = @_; 1560 my ($self) = @_;
1485 1561
1499 1575
1500 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1502 } 1578 }
1503 1579
1504 ( 1580 ($w, $h)
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1581}
1509 1582
1510sub size_allocate { 1583sub size_allocate {
1511 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1512 1585
1586 delete $self->{ox};
1587
1513 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514} 1590}
1515 1591
1516sub set_fontsize { 1592sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1518 1594
1519 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1596 delete $self->{texture};
1521 1597
1522 $self->update; 1598 $self->realloc;
1523 $self->check_size;
1524} 1599}
1525 1600
1526sub _draw { 1601sub _draw {
1527 my ($self) = @_; 1602 my ($self) = @_;
1528 1603
1534 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1613
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1540 1616
1617 unless (exists $self->{ox}) {
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1544 1621
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1625 };
1551 1626
1552 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1629
1608sub set_text { 1683sub set_text {
1609 my ($self, $text) = @_; 1684 my ($self, $text) = @_;
1610 1685
1611 $self->{cursor} = length $text; 1686 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1687 $self->_set_text ($text);
1613 $self->update; 1688
1614 $self->check_size; 1689 $self->realloc;
1615} 1690}
1616 1691
1617sub get_text { 1692sub get_text {
1618 $_[0]{text} 1693 $_[0]{text}
1619} 1694}
1649 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1726 $self->_emit ('escape');
1652 } elsif ($uni) { 1727 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1654 } 1731 }
1655 1732
1656 $self->_set_text ($text); 1733 $self->_set_text ($text);
1657 $self->update; 1734
1658 $self->check_size; 1735 $self->realloc;
1736
1737 1
1659} 1738}
1660 1739
1661sub focus_in { 1740sub focus_in {
1662 my ($self) = @_; 1741 my ($self) = @_;
1663 1742
1678 utf8::encode $text; 1757 utf8::encode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1680 1759
1681 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1682 $self->update; 1761 $self->update;
1762
1763 1
1683} 1764}
1684 1765
1685sub mouse_motion { 1766sub mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1687# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1688} 1771}
1689 1772
1690sub _draw { 1773sub _draw {
1691 my ($self) = @_; 1774 my ($self) = @_;
1692 1775
1769 } else { 1852 } else {
1770 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1771 } 1854 }
1772 1855
1773 } else { 1856 } else {
1774 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1775 } 1860 1
1776
1777} 1861}
1778 1862
1779############################################################################# 1863#############################################################################
1780 1864
1781package CFClient::UI::Button; 1865package CFClient::UI::Button;
1790 1874
1791sub new { 1875sub new {
1792 my $class = shift; 1876 my $class = shift;
1793 1877
1794 $class->SUPER::new ( 1878 $class->SUPER::new (
1795 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1796 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1798 can_hover => 1, 1883 can_hover => 1,
1799 align => 0, 1884 align => 0,
1800 valign => 0, 1885 valign => 0,
1809 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1810 1895
1811 $self->emit ("activate") 1896 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1898 && $y >= 0 && $y < $self->{h};
1899
1900 1
1814} 1901}
1815 1902
1816sub _draw { 1903sub _draw {
1817 my ($self) = @_; 1904 my ($self) = @_;
1818 1905
1847 1934
1848sub new { 1935sub new {
1849 my $class = shift; 1936 my $class = shift;
1850 1937
1851 $class->SUPER::new ( 1938 $class->SUPER::new (
1852 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1853 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 1943 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 1944 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 1945 state => 0,
1861} 1949}
1862 1950
1863sub size_request { 1951sub size_request {
1864 my ($self) = @_; 1952 my ($self) = @_;
1865 1953
1866 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1867} 1955}
1868 1956
1869sub button_down { 1957sub button_down {
1870 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1871 1959
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1876 } 1968 1
1877} 1969}
1878 1970
1879sub _draw { 1971sub _draw {
1880 my ($self) = @_; 1972 my ($self) = @_;
1881 1973
1882 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1883 1975
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 1977
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1978 my ($w, $h) = @$self{qw(w h)};
1979
1980 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 1981
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 1983
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 1985
2156 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2252 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2253 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2254 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2255 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2256 min_h => $::WIDTH / 80,
2163 vertical => 0, 2257 vertical => 0,
2164 can_hover => 1, 2258 can_hover => 1,
2165 inner_pad => 0.02, 2259 inner_pad => 0.02,
2166 @_ 2260 @_
2167 ); 2261 );
2170 $self->update; 2264 $self->update;
2171 2265
2172 $self 2266 $self
2173} 2267}
2174 2268
2269sub changed { }
2270
2175sub set_range { 2271sub set_range {
2176 my ($self, $range) = @_; 2272 my ($self, $range) = @_;
2177 2273
2178 ($range, $self->{range}) = ($self->{range}, $range); 2274 ($range, $self->{range}) = ($self->{range}, $range);
2179 2275
2205} 2301}
2206 2302
2207sub size_request { 2303sub size_request {
2208 my ($self) = @_; 2304 my ($self) = @_;
2209 2305
2210 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2307}
2215 2308
2216sub button_down { 2309sub button_down {
2217 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
2218 2311
2219 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2220 2313
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2315
2223 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2224} 2317}
2225 2318
2226sub mouse_motion { 2319sub mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2228 2321
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2326
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2328
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2237 } 2334 1
2238} 2335}
2239 2336
2240sub update { 2337sub update {
2241 my ($self) = @_; 2338 my ($self) = @_;
2242 2339
2603} 2700}
2604 2701
2605sub set_tooltip_from { 2702sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2703 my ($self, $widget) = @_;
2607 2704
2705 my $tooltip = $widget->{tooltip};
2706
2707 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}";
2712 }
2713
2608 $self->add (new CFClient::UI::Label 2714 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2715 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2717 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2718 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2719 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
2625 2731
2626sub size_allocate { 2732sub size_allocate {
2627 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2628 2734
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2736}
2737
2738sub visibility_change {
2739 my ($self, $visible) = @_;
2740
2741 return unless $visible;
2742
2743 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner}
2745 or return;
2746
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH;
2751
2752 $self->move_abs ($x, $y);
2753 });
2630} 2754}
2631 2755
2632sub _draw { 2756sub _draw {
2633 my ($self) = @_; 2757 my ($self) = @_;
2634 2758
2651 glVertex $w, $h; 2775 glVertex $w, $h;
2652 glVertex $w, 0; 2776 glVertex $w, 0;
2653 glEnd; 2777 glEnd;
2654 2778
2655 glTranslate 2 - 0.375, 2 - 0.375; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2780
2656 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2657} 2782}
2658 2783
2659############################################################################# 2784#############################################################################
2660 2785
2736 $self->SUPER::DESTROY; 2861 $self->SUPER::DESTROY;
2737} 2862}
2738 2863
2739############################################################################# 2864#############################################################################
2740 2865
2741package CFClient::UI::Inventory; 2866package CFClient::UI::Buttonbar;
2742 2867
2743our @ISA = CFClient::UI::ScrolledWindow::; 2868our @ISA = CFClient::UI::HBox::;
2744 2869
2745sub new { 2870# TODO: should actualyl wrap buttons and other goodies.
2746 my $class = shift;
2747
2748 my $self = $class->SUPER::new (
2749 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750 @_,
2751 );
2752
2753 $self
2754}
2755
2756sub set_items {
2757 my ($self, $items) = @_;
2758
2759 $self->{scrolled}->clear;
2760 return unless $items;
2761
2762 my @items = sort {
2763 ($a->{type} <=> $b->{type})
2764 or ($a->{name} cmp $b->{name})
2765 } @$items;
2766
2767 $self->{real_items} = \@items;
2768
2769 my $row = 0;
2770 for my $item (@items) {
2771 CFClient::Item::update_widgets $item;
2772
2773 $self->{scrolled}->add (0, $row, $item->{face_widget});
2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777 $row++;
2778 }
2779}
2780 2871
2781############################################################################# 2872#############################################################################
2782 2873
2783package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2784 2875
2825 # maybe save $GRAB? must be careful about events... 2916 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 2917 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 2918 $self->{button} = $ev->{button};
2828 2919
2829 $self->show; 2920 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 2922}
2832 2923
2833sub mouse_motion { 2924sub mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2835 2926
2836 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2839} 2932}
2840 2933
2841sub button_up { 2934sub button_up {
2842 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2843 2936
2845 undef $GRAB; 2938 undef $GRAB;
2846 $self->hide; 2939 $self->hide;
2847 2940
2848 $self->_emit ("popdown"); 2941 $self->_emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2850 } 2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
2851} 3054}
2852 3055
2853############################################################################# 3056#############################################################################
2854 3057
2855package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
2960 $self->SUPER::reconfigure; 3163 $self->SUPER::reconfigure;
2961} 3164}
2962 3165
2963############################################################################# 3166#############################################################################
2964 3167
2965package CFClient::UI::Root; 3168package CFClient::UI::Inventory;
2966 3169
2967our @ISA = CFClient::UI::Container::; 3170our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969use CFClient::OpenGL;
2970 3171
2971sub new { 3172sub new {
2972 my $class = shift; 3173 my $class = shift;
2973 3174
2974 $class->SUPER::new ( 3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_,
3419 )
3420}
3421
3422# XXX: Do sorting? Argl...
3423sub add_spell {
3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
3426
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root;
3465
3466our @ISA = CFClient::UI::Container::;
3467
3468use CFClient::OpenGL;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
2975 visible => 1, 3474 visible => 1,
2976 @_, 3475 @_,
2977 ) 3476 );
2978}
2979 3477
2980sub configure { 3478 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3479
2983 $self->{w} = $w; 3480 $self
2984 $self->{h} = $h;
2985}
2986
2987sub check_size {
2988 my ($self) = @_;
2989
2990 $self->size_allocate ($self->{w}, $self->{h})
2991 if $self->{w};
2992} 3481}
2993 3482
2994sub size_request { 3483sub size_request {
2995 my ($self) = @_; 3484 my ($self) = @_;
2996 3485
2997 ($self->{w}, $self->{h}) 3486 ($self->{w}, $self->{h})
3487}
3488
3489sub _to_pixel {
3490 my ($coord, $size, $max) = @_;
3491
3492 $coord =
3493 $coord eq "center" ? ($max - $size) * 0.5
3494 : $coord eq "max" ? $max
3495 : $coord;
3496
3497 $coord = 0 if $coord < 0;
3498 $coord = $max - $size if $coord > $max - $size;
3499
3500 int $coord + 0.5
2998} 3501}
2999 3502
3000sub size_allocate { 3503sub size_allocate {
3001 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
3002 3505
3003 for my $child ($self->children) { 3506 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3508
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3509 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3510 $Y = $child->{force_y} if exists $child->{force_y};
3008 3511
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3512 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3513 $Y = _to_pixel $Y, $H, $self->{h};
3011
3012 delete @$child{qw(req_x req_y)};
3013
3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016 3514
3017 $child->configure ($X, $Y, $W, $H); 3515 $child->configure ($X, $Y, $W, $H);
3018 } 3516 }
3019} 3517}
3020 3518
3031} 3529}
3032 3530
3033sub update { 3531sub update {
3034 my ($self) = @_; 3532 my ($self) = @_;
3035 3533
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3534 $::WANT_REFRESH++;
3038} 3535}
3039 3536
3040sub add { 3537sub add {
3041 my ($self, @children) = @_; 3538 my ($self, @children) = @_;
3042 3539
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3540 $_->{is_toplevel} = 1
3045 3541 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3542
3051 $self->SUPER::add (@children); 3543 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058} 3544}
3059 3545
3060sub remove { 3546sub remove {
3061 my ($self, @children) = @_; 3547 my ($self, @children) = @_;
3062 3548
3063 $self->SUPER::remove (@children); 3549 $self->SUPER::remove (@children);
3550
3551 delete $self->{is_toplevel}
3552 for @children;
3064 3553
3065 while (@children) { 3554 while (@children) {
3066 my $w = pop @children; 3555 my $w = pop @children;
3067 push @children, $w->children; 3556 push @children, $w->children;
3068 $w->set_invisible; 3557 $w->set_invisible;
3087 while ($self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
3088 $_->() 3577 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
3090 } 3579 }
3091 3580
3092 if ($self->{check_size}) { 3581 if ($self->{realloc}) {
3582 my %queue;
3093 my @queue; 3583 my @queue;
3584 my $widget;
3094 3585
3095 for (;;) { 3586 outer:
3096 if ($self->{check_size}) { 3587 while () {
3097 #TODO use array-of-depth approach 3588 if (my $realloc = delete $self->{realloc}) {
3589 for $widget (values %$realloc) {
3590 $widget->{visible} or next; # do not resize invisible widgets
3098 3591
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3592 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3593
3594 push @{ $queue[$widget->{visible}] }, $widget;
3595 }
3101 } 3596 }
3102 3597
3598 while () {
3599 @queue or last outer;
3600
3103 my $widget = pop @queue || last; 3601 $widget = pop @{ $queue[-1] || [] }
3104 3602 and last;
3105 defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108 ? @$widget{qw(def_w def_h)}
3109 : $widget->size_request;
3110
3111 if (delete $widget->{force_alloc}
3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114 3603
3604 pop @queue;
3605 }
3606
3607 delete $queue{$widget+0};
3608
3609 my ($w, $h) = $widget->size_request;
3610
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3613
3614 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h};
3616
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3618 || delete $widget->{force_realloc}) {
3115 $widget->{req_w} = $w; 3619 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
3117 3621
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3622 $self->{size_alloc}{$widget+0} = $widget;
3119 3623
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 3624 if (my $parent = $widget->{parent}) {
3625 $self->{realloc}{$parent+0} = $parent
3626 unless $queue{$parent+0};
3627
3628 $parent->{force_size_alloc} = 1;
3629 $self->{size_alloc}{$parent+0} = $parent;
3630 }
3122 } 3631 }
3632
3633 delete $self->{realloc}{$widget+0};
3123 } 3634 }
3124 } 3635 }
3125 3636
3126 while ($self->{size_alloc}) { 3637 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3639 values %$size_alloc;
3640
3641 while () {
3642 my $widget = pop @queue || last;
3643
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3645
3130 $w = 0 if $w < 0; 3646 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3647 $h = 0 if $h < 0;
3132 3648
3649 $w = int $w + 0.5;
3650 $h = int $h + 0.5;
3651
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
3133 $widget->{w} = $w; 3656 $widget->{w} = $w;
3134 $widget->{h} = $h; 3657 $widget->{h} = $h;
3658
3135 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3660 }
3136 } 3661 }
3137 } 3662 }
3138 3663
3139 while ($self->{post_alloc_hook}) { 3664 while ($self->{post_alloc_hook}) {
3140 $_->() 3665 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3666 for values %{delete $self->{post_alloc_hook}};
3142 } 3667 }
3668
3143 3669
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
3147 3673
3149 glLoadIdentity; 3675 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 3678 glLoadIdentity;
3153 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
3154 $self->_draw; 3687 $self->_draw;
3155} 3688}
3156 3689
3157############################################################################# 3690#############################################################################
3158 3691

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines