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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.308 by root, Mon Jun 19 05:18:14 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
219 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
220 } 222 }
221 } 223 }
222 224
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x}; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y}; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w}; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h}; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228 230
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 233
232 $self->show if $layout->{show}; 234 $self->show if $layout->{show};
… …
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
287} 288}
288 289
289sub set_visibility { 290sub set_visibility {
290 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
313} 314}
314 315
315sub move_abs { 316sub move_abs {
316 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
317 318
318 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
321 322
322 $self->update; 323 $self->update;
323} 324}
324 325
… …
355 $self->{x} = $x; 356 $self->{x} = $x;
356 $self->{y} = $y; 357 $self->{y} = $y;
357 $self->update; 358 $self->update;
358 } 359 }
359 360
360 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 362 return unless $self->{visible};
362 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
364 } 368 }
365}
366
367sub size_allocate {
368 # nothing to be done
369} 369}
370 370
371sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
372} 377}
373 378
374sub set_max_size { 379sub set_max_size {
375 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
376 381
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
379} 386}
380 387
381sub set_tooltip { 388sub set_tooltip {
382 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
383 390
… …
388 395
389 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
390 397
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
394 } 401 }
395} 402}
396 403
397# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
398sub coord2local { 405sub coord2local {
… …
406 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
407 414
408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409} 416}
410 417
411sub focus_in { 418sub invoke_focus_in {
412 my ($self) = @_; 419 my ($self) = @_;
413 420
414 return if $FOCUS == $self; 421 return if $FOCUS == $self;
415 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
416 423
417 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
418 425
419 $self->_emit (focus_in => $focus);
420
421 $focus->update if $focus; 426 $focus->update if $focus;
422 $FOCUS->update; 427 $FOCUS->update;
423}
424 428
429 0
430}
431
425sub focus_out { 432sub invoke_focus_out {
426 my ($self) = @_; 433 my ($self) = @_;
427 434
428 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
429 436
430 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
431 438
432 $self->_emit (focus_out => $focus);
433
434 $focus->update if $focus; #? 439 $focus->update if $focus; #?
435 440
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
437 unless $FOCUS; 442 unless $FOCUS;
438}
439 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
440sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
441sub button_up { } 454sub invoke_button_up { 1 }
442sub key_down { } 455sub invoke_key_down { 1 }
443sub key_up { } 456sub invoke_key_up { 1 }
444 457
445sub button_down { 458sub invoke_button_down {
446 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
447 460
448 $self->focus_in; 461 $self->grab_focus;
449}
450 462
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
456 480
457sub find_widget { 481sub find_widget {
458 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
459 483
460 return () unless $self->{can_events}; 484 return () unless $self->{can_events};
… …
471 495
472 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
474} 498}
475 499
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc { 500sub realloc {
500 my ($self) = @_; 501 my ($self) = @_;
501 502
502 if ($self->{visible}) { 503 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 504 return if $self->{root}{realloc}{$self+0};
504 505
505 $self->{root}{realloc}{$self} = $self; 506 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 507 $self->{root}->update;
507 } else { 508 } else {
508 delete $self->{req_w}; 509 delete $self->{req_w};
510 delete $self->{req_h};
509 } 511 }
510} 512}
511 513
512sub update { 514sub update {
513 my ($self) = @_; 515 my ($self) = @_;
… …
521 523
522 $self->realloc; 524 $self->realloc;
523 $self->update; 525 $self->update;
524} 526}
525 527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531
526sub draw { 532sub draw {
527 my ($self) = @_; 533 my ($self) = @_;
528 534
529 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530 546
531 glPushMatrix; 547 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 549
536 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 552 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 554 glBegin GL_QUADS;
543 glVertex $x , $y; 555 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
547 glEnd; 559 glEnd;
548 glDisable GL_BLEND; 560 glDisable GL_BLEND;
549 } 561 }
550 562
551 if ($ENV{CFPLUS_DEBUG}) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 564 glPushMatrix;
553 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 568 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
560 glEnd; 572 glEnd;
561 glPopMatrix; 573 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
564} 579}
565 580
566sub _draw { 581sub _draw {
567 my ($self) = @_; 582 my ($self) = @_;
568 583
… …
571 586
572sub DESTROY { 587sub DESTROY {
573 my ($self) = @_; 588 my ($self) = @_;
574 589
575 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
576 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
577} 594}
578 595
579############################################################################# 596#############################################################################
580 597
581package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
606 623
607 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
609 626
610 glEnable GL_BLEND; 627 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 629 glColor_premultiply @$color;
613 630
614 glBegin GL_QUADS; 631 glBegin GL_QUADS;
615 glVertex 0 , 0; 632 glVertex 0 , 0;
616 glVertex 0 , $h; 633 glVertex 0 , $h;
617 glVertex $w, $h; 634 glVertex $w, $h;
… …
648our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
649 666
650sub new { 667sub new {
651 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
652 669
653 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
654 671
655 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
656 children => [], 673 children => [],
657 can_events => 0, 674 can_events => 0,
658 %arg, 675 %arg,
659 ); 676 );
677
660 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
661 680
662 $self 681 $self
663} 682}
664 683
665sub add { 684sub add {
… …
713 $x -= $self->{x}; 732 $x -= $self->{x};
714 $y -= $self->{y}; 733 $y -= $self->{y};
715 734
716 my $res; 735 my $res;
717 736
718 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
720 and return $res; 739 and return $res;
721 } 740 }
722 741
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
744} 763}
745 764
746sub add { 765sub add {
747 my ($self, $child) = @_; 766 my ($self, $child) = @_;
748 767
749 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
750
751 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
752} 770}
753 771
754sub remove { 772sub remove {
755 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
764 782
765sub size_request { 783sub size_request {
766 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
767} 785}
768 786
769sub size_allocate { 787sub invoke_size_allocate {
770 my ($self, $w, $h, $changed) = @_; 788 my ($self, $w, $h) = @_;
771 789
772 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
773} 793}
774 794
775############################################################################# 795#############################################################################
796
797# back-buffered drawing area
776 798
777package CFClient::UI::Window; 799package CFClient::UI::Window;
778 800
779our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
780 802
… …
791 813
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 815 $self->SUPER::update;
794} 816}
795 817
796sub size_allocate { 818sub invoke_size_allocate {
797 my ($self, $w, $h, $changed) = @_; 819 my ($self, $w, $h) = @_;
798 820
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update 821 $self->update;
801 if $changed; 822
823 $self->SUPER::invoke_size_allocate ($w, $h)
802} 824}
803 825
804sub _render { 826sub _render {
827 my ($self) = @_;
828
805 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
806} 830}
807 831
808sub render_child { 832sub render_child {
809 my ($self) = @_; 833 my ($self) = @_;
810 834
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
814 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
815 $self->_render; 846 $self->_render;
816 }; 847 };
817} 848}
818 849
819sub _draw { 850sub _draw {
820 my ($self) = @_; 851 my ($self) = @_;
821 852
822 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
823 854
824 my $tex = $self->{texture} 855 my $tex = $self->{texture}
825 or return; 856 or return;
826 857
827 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
830 861
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832 863
833 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
834} 865}
… …
850} 881}
851 882
852sub size_request { 883sub size_request {
853 my ($self) = @_; 884 my ($self) = @_;
854 885
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 887
857 $w = 10 if $self->{scroll_x}; 888 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
859 890
860 ($w, $h) 891 ($w, $h)
861} 892}
862 893
863sub size_allocate { 894sub invoke_size_allocate {
864 my ($self, $w, $h, $changed) = @_; 895 my ($self, $w, $h) = @_;
865 896
897 my $child = $self->child;
898
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 901
869 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
870 $self->update; 903 $self->update;
904
905 1
871} 906}
872 907
873sub set_offset { 908sub set_offset {
874 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
875 910
… …
908} 943}
909 944
910sub _render { 945sub _render {
911 my ($self) = @_; 946 my ($self) = @_;
912 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 952
915 $self->SUPER::_render; 953 $self->SUPER::_render;
916} 954}
917 955
… …
920package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
921 959
922our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
923 961
924sub new { 962sub new {
925 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
926 966
927 my $self; 967 my $self;
928 968
929 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
930 vertical => 1, 970 vertical => 1,
… …
935 ; 975 ;
936 976
937 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider, 979 slider => $slider,
940 @_, 980 %arg,
941 ); 981 );
942 982
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
946 985
947 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
948} 993}
949 994
950sub update { 995sub update {
951 my ($self) = @_; 996 my ($self) = @_;
952 997
… …
955 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
956 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1003}
959 1004
960sub size_allocate { 1005sub invoke_size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1006 my ($self, $w, $h) = @_;
962
963 $self->SUPER::size_allocate ($w, $h, $changed);
964 1007
965 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
967} 1012}
968 1013
969#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll 1015# update viewport offset on scroll
971 1016
… …
991 1036
992 if ($self->{bg}) { 1037 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
994 1039
995 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
998 1043
999 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1045 glVertex 0 , 0;
1001 glVertex 0 , $h; 1046 glVertex 0 , $h;
1002 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1024my @border = 1069my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1072
1028sub new { 1073sub new {
1029 my $class = shift; 1074 my ($class, %arg) = @_;
1030 1075
1031 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1079 border => 0.6,
1035 can_events => 1, 1080 can_events => 1,
1036 min_w => 16, 1081 min_w => 16,
1037 min_h => 16, 1082 min_h => 16,
1038 @_ 1083 %arg,
1039 ); 1084 );
1040 1085
1041 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1042 align => 0, 1087 align => 0,
1043 valign => 1, 1088 valign => 1,
1044 text => $self->{title}, 1089 text => $self->{title},
1045 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 image => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1046 1101
1047 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048} 1111}
1049 1112
1050sub border { 1113sub border {
1051 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1052} 1115}
1053 1116
1054sub size_request { 1117sub size_request {
1055 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1056 1125
1057 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1058 1127
1059 ( 1128 (
1060 $w + $self->border * 2, 1129 $w + $self->border * 2,
1061 $h + $self->border * 2, 1130 $h + $self->border * 2,
1062 ) 1131 )
1063} 1132}
1064 1133
1065sub size_allocate { 1134sub invoke_size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1135 my ($self, $w, $h) = @_;
1067 1136
1068 return unless $changed; 1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1069 1142
1143 my $border = $self->border;
1144
1070 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1072 1147
1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074 if $self->{title};
1075
1076 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1077}
1078 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1079sub button_down { 1156sub invoke_button_down {
1080 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1081 1158
1082 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1083 my $border = $self->border; 1160 my $border = $self->border;
1084 1161
… …
1100 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1101 1178
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1183 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1184 };
1108 1185
1109 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1115 1192
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1194
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1120 } 1203 1
1121} 1204}
1122 1205
1123sub button_up { 1206sub invoke_button_up {
1124 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1125 1208
1126 delete $self->{motion}; 1209 ! ! delete $self->{motion}
1127} 1210}
1128 1211
1129sub mouse_motion { 1212sub invoke_mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1131 1214
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
1133} 1218}
1134 1219
1135sub _draw { 1220sub _draw {
1136 my ($self) = @_; 1221 my ($self) = @_;
1137 1222
1223 my $child = $self->{children}[0];
1224
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1227
1141 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1230
1144 my $border = $self->border; 1231 my $border = $self->border;
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1247 }
1161 1248
1162 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1163 1250
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1167} 1262}
1168 1263
1169############################################################################# 1264#############################################################################
1170 1265
1171package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1194 1289
1195 $child->set_parent ($self); 1290 $child->set_parent ($self);
1196 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1197 1292
1198 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1199} 1300}
1200 1301
1201# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1202sub clear { 1303sub clear {
1203 my ($self) = @_; 1304 my ($self) = @_;
… …
1244 (sum @$ws), 1345 (sum @$ws),
1245 (sum @$hs), 1346 (sum @$hs),
1246 ) 1347 )
1247} 1348}
1248 1349
1249sub size_allocate { 1350sub invoke_size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1351 my ($self, $w, $h) = @_;
1251 1352
1252 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1253 1354
1254 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1356 my $req_h = (sum @$hs) || 1;
… …
1286 } 1387 }
1287 1388
1288 $y += $row_h; 1389 $y += $row_h;
1289 } 1390 }
1290 1391
1392 1
1291} 1393}
1292 1394
1293sub find_widget { 1395sub find_widget {
1294 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1295 1397
… …
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1436 )
1335} 1437}
1336 1438
1337sub size_allocate { 1439sub invoke_size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1440 my ($self, $w, $h) = @_;
1339 1441
1340 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1443 my $children = $self->{children};
1342 1444
1343 my @req; 1445 my @req;
… …
1464 1566
1465 delete $self->{texture}; 1567 delete $self->{texture};
1466 $self->SUPER::update; 1568 $self->SUPER::update;
1467} 1569}
1468 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1469sub set_text { 1578sub set_text {
1470 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1471 1580
1472 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1474 1583
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1477 1586
1587 delete $self->{size_req};
1478 $self->realloc; 1588 $self->realloc;
1479 $self->update; 1589 $self->update;
1480} 1590}
1481 1591
1482sub set_markup { 1592sub set_markup {
… …
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 1599
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1492 1602
1603 delete $self->{size_req};
1493 $self->realloc; 1604 $self->realloc;
1494 $self->update; 1605 $self->update;
1495} 1606}
1496 1607
1497sub size_request { 1608sub size_request {
1498 my ($self) = @_; 1609 my ($self) = @_;
1499 1610
1611 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1617
1506 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1507 1619
1508 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1623
1512 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1513 1625
1514 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1516 } 1631 };
1517 1632
1518 ($w, $h) 1633 @{ $self->{size_req} }
1519} 1634}
1520 1635
1521sub size_allocate { 1636sub invoke_size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1637 my ($self, $w, $h) = @_;
1638
1639 delete $self->{ox};
1523 1640
1524 delete $self->{texture} 1641 delete $self->{texture}
1525 if $changed; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1526} 1645}
1527 1646
1528sub set_fontsize { 1647sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1530 1649
1531 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1532 delete $self->{texture}; 1651 delete $self->{texture};
1533 1652
1534 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1535} 1662}
1536 1663
1537sub _draw { 1664sub _draw {
1538 my ($self) = @_; 1665 my ($self) = @_;
1539 1666
… …
1545 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1676
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1551 1679
1680 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1555 1684
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1559
1560 $tex
1561 }; 1688 };
1562 1689
1563 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1565 1694
1566 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1567 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1569 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1571 } 1702 }
1572 1703
1573 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1574} 1705}
1575 1706
… …
1592 can_hover => 1, 1723 can_hover => 1,
1593 can_focus => 1, 1724 can_focus => 1,
1594 valign => 0, 1725 valign => 0,
1595 can_events => 1, 1726 can_events => 1,
1596 #text => ... 1727 #text => ...
1728 #hidden => "*",
1597 @_ 1729 @_
1598 ) 1730 )
1599} 1731}
1600 1732
1601sub _set_text { 1733sub _set_text {
… …
1603 1735
1604 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1605 1737
1606 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1607 1739
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1741 $self->{text} = $text;
1612 1742
1613 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1615 1746
1616 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1617} 1751}
1618 1752
1619sub set_text { 1753sub set_text {
1620 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1621 1755
1622 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 1757 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 1758}
1627 1759
1628sub get_text { 1760sub get_text {
1629 $_[0]{text} 1761 $_[0]{text}
1630} 1762}
… …
1635 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1636 1768
1637 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1638} 1770}
1639 1771
1640sub key_down { 1772sub invoke_key_down {
1641 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1642 1774
1643 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1644 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1645 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1657 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1658 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1659 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1660 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1794 $self->emit ('escape');
1663 } elsif ($uni) { 1795 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1665 } 1799 }
1666 1800
1667 $self->_set_text ($text); 1801 $self->_set_text ($text);
1668 1802
1669 $self->realloc; 1803 $self->realloc;
1670}
1671 1804
1805 1
1806}
1807
1672sub focus_in { 1808sub invoke_focus_in {
1673 my ($self) = @_; 1809 my ($self) = @_;
1674 1810
1675 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1676 1812
1677 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1678} 1814}
1679 1815
1680sub button_down { 1816sub invoke_button_down {
1681 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1682 1818
1683 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1684 1820
1685 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1686 1822
1687 # byte-index to char-index 1823 # byte-index to char-index
1688 my $text = $self->{text}; 1824 my $text = $self->{text};
1689 utf8::encode $text; 1825 utf8::encode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1691 1827
1692 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1693 $self->update; 1829 $self->update;
1830
1831 1
1694} 1832}
1695 1833
1696sub mouse_motion { 1834sub invoke_mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1699} 1839}
1700 1840
1701sub _draw { 1841sub _draw {
1702 my ($self) = @_; 1842 my ($self) = @_;
1703 1843
1704 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1705 1845
1706 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1709 } else { 1849 } else {
1710 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1711 } 1851 }
1712 1852
1713 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1856 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1744 1884
1745our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1746 1886
1747use CFClient::OpenGL; 1887use CFClient::OpenGL;
1748 1888
1749sub key_down { 1889sub invoke_key_down {
1750 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1751 1891
1752 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1753 1893
1754 if ($sym == 13) { 1894 if ($sym == 13) {
1755 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1756 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1757 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1759 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1760 $self->update; 1901 $self->update;
1761 1902
1762 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1780 } else { 1921 } else {
1781 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1782 } 1923 }
1783 1924
1784 } else { 1925 } else {
1785 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1786 } 1929 1
1787
1788} 1930}
1789 1931
1790############################################################################# 1932#############################################################################
1791 1933
1792package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1813 can_events => 1, 1955 can_events => 1,
1814 @_ 1956 @_
1815 ) 1957 )
1816} 1958}
1817 1959
1818sub activate { }
1819
1820sub button_up { 1960sub invoke_button_up {
1821 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1822 1962
1823 $self->emit ("activate") 1963 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
1966
1967 1
1826} 1968}
1827 1969
1828sub _draw { 1970sub _draw {
1829 my ($self) = @_; 1971 my ($self) = @_;
1830 1972
1831 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1974
1837 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1840 1978
1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1842 1980
1843 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1844 1982
1845 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1846} 2020}
1847 2021
1848############################################################################# 2022#############################################################################
1849 2023
1850package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1877 my ($self) = @_; 2051 my ($self) = @_;
1878 2052
1879 (6) x 2 2053 (6) x 2
1880} 2054}
1881 2055
1882sub button_down { 2056sub invoke_button_down {
1883 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1884 2058
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1888 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1889 } 2067 1
1890} 2068}
1891 2069
1892sub _draw { 2070sub _draw {
1893 my ($self) = @_; 2071 my ($self) = @_;
1894 2072
… …
2061 2239
2062 my $h1 = $self->{h} * (1 - $ycut1); 2240 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2241 my $h2 = $self->{h} * (1 - $ycut2);
2064 2242
2065 glEnable GL_BLEND; 2243 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2244 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2245 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2246 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2248
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2249 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2250 glBegin GL_QUADS;
… …
2185 $self->update; 2364 $self->update;
2186 2365
2187 $self 2366 $self
2188} 2367}
2189 2368
2190sub changed { }
2191
2192sub set_range { 2369sub set_range {
2193 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2194 2371
2195 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2196 2373
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2374 if ("@$range" ne "@{$self->{range}}") {
2375 $self->update;
2376 $self->set_value ($self->{range}[0]);
2377 }
2199} 2378}
2200 2379
2201sub set_value { 2380sub set_value {
2202 my ($self, $value) = @_; 2381 my ($self, $value) = @_;
2203 2382
… …
2214 if $unit; 2393 if $unit;
2215 2394
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217 2396
2218 if ($value != $old_value) { 2397 if ($value != $old_value) {
2219 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2220 $self->update; 2399 $self->update;
2221 } 2400 }
2222} 2401}
2223 2402
2224sub size_request { 2403sub size_request {
2225 my ($self) = @_; 2404 my ($self) = @_;
2226 2405
2227 ($self->{req_w}, $self->{req_h}) 2406 ($self->{req_w}, $self->{req_h})
2228} 2407}
2229 2408
2230sub button_down { 2409sub invoke_button_down {
2231 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2232 2411
2233 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2234 2413
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2415
2237 $self->mouse_motion ($ev, $x, $y); 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2238} 2417}
2239 2418
2240sub mouse_motion { 2419sub invoke_mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2242 2421
2243 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245 2424
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2425 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2426
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2427 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2428
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2429 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2430 } else {
2431 return 0;
2432 }
2433
2251 } 2434 1
2252} 2435}
2253 2436
2254sub update { 2437sub update {
2255 my ($self) = @_; 2438 my ($self) = @_;
2256 2439
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2440 delete $self->{knob_w};
2441 $self->SUPER::update;
2442}
2443
2444sub _draw {
2445 my ($self) = @_;
2446
2447 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2448 $self->set_value ($self->{range}[0]);
2259 2449
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2450 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2451 my $range = ($hi - $page - $lo) || 1e-100;
2262 2452
… …
2268 $value = ($value - $lo) / $range; 2458 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2459 $value = $value * $self->{scale} + $self->{offset};
2270 2460
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2461 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2462 $self->{knob_w} = $knob_w;
2273 }); 2463 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2464
2281 $self->SUPER::_draw (); 2465 $self->SUPER::_draw ();
2282 2466
2283 glScale $self->{w}, $self->{h}; 2467 glScale $self->{w}, $self->{h};
2284 2468
… …
2345sub set_range { shift->{slider}->set_range (@_) } 2529sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) } 2530sub set_value { shift->{slider}->set_value (@_) }
2347 2531
2348############################################################################# 2532#############################################################################
2349 2533
2350package CFClient::UI::TextView; 2534package CFClient::UI::TextScroller;
2351 2535
2352our @ISA = CFClient::UI::HBox::; 2536our @ISA = CFClient::UI::HBox::;
2353 2537
2354use CFClient::OpenGL; 2538use CFClient::OpenGL;
2355 2539
… …
2357 my $class = shift; 2541 my $class = shift;
2358 2542
2359 my $self = $class->SUPER::new ( 2543 my $self = $class->SUPER::new (
2360 fontsize => 1, 2544 fontsize => 1,
2361 can_events => 0, 2545 can_events => 0,
2546 indent => 0,
2362 #font => default_font 2547 #font => default_font
2363 @_, 2548 @_,
2364 2549
2365 layout => (new CFClient::Layout 1), 2550 layout => (new CFClient::Layout 1),
2366 par => [], 2551 par => [],
… …
2381 2566
2382 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2568 $self->reflow;
2384} 2569}
2385 2570
2386sub size_allocate { 2571sub invoke_size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2572 my ($self, $w, $h) = @_;
2388
2389 $self->SUPER::size_allocate ($w, $h, $changed);
2390
2391 return unless $changed;
2392 2573
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2578
2397 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2398} 2582}
2399 2583
2400sub text_size { 2584sub text_size {
2401 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2402 2586
2403 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2404 2588
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2589 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2590 $layout->set_width ($self->{children}[0]{w} - $indent);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2592 $layout->set_markup ($text);
2408 2593
2409 $layout->size 2594 $layout->size
2410} 2595}
2411 2596
… …
2450 2635
2451 return unless $self->{h} > 0; 2636 return unless $self->{h} > 0;
2452 2637
2453 delete $self->{texture}; 2638 delete $self->{texture};
2454 2639
2455 $ROOT->on_post_alloc ($self, sub { 2640 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2641 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2642
2458 if (delete $self->{need_reflow}) { 2643 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2644 my $height = 0;
2460 2645
… …
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2648 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464 2649
2465 for (@{$self->{par}}) { 2650 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2651 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]); 2652 $layout->set_width ($W - $_->[3]);
2653 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2468 $layout->set_markup ($_->[4]); 2654 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2655 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2656 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h; 2657 $_->[1] = $h;
2472 } 2658 }
… …
2475 } 2661 }
2476 2662
2477 $self->{height} = $height; 2663 $self->{height} = $height;
2478 2664
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2665 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480 2666
2481 delete $self->{texture}; 2667 delete $self->{texture};
2482 } 2668 }
2483 2669
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2670 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2671 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2672 glClear GL_COLOR_BUFFER_BIT;
2487 2673
2488 my $top = int $self->{children}[1]{range}[0]; 2674 my $top = int $self->{children}[1]{range}[0];
2489 2675
2490 my $y0 = $top; 2676 my $y0 = $top;
… …
2504 my $h = $par->[1]; 2690 my $h = $par->[1];
2505 2691
2506 if ($y0 < $y + $h && $y < $y1) { 2692 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] }); 2693 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]); 2694 $layout->set_width ($W - $par->[3]);
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2509 $layout->set_markup ($par->[4]); 2696 $layout->set_markup ($par->[4]);
2510 2697
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2698 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512 2699
2513 glRasterPos $par->[3], $y - $y0; 2700 glRasterPos $par->[3], $y - $y0;
… …
2525sub _draw { 2712sub _draw {
2526 my ($self) = @_; 2713 my ($self) = @_;
2527 2714
2528 glEnable GL_TEXTURE_2D; 2715 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2717 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2718 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2719 glDisable GL_TEXTURE_2D;
2533 2720
2534 $self->{children}[1]->draw; 2721 $self->{children}[1]->draw;
2535 2722
2536} 2723}
… …
2619} 2806}
2620 2807
2621sub set_tooltip_from { 2808sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2809 my ($self, $widget) = @_;
2623 2810
2811 my $tooltip = $widget->{tooltip};
2812
2813 if ($ENV{CFPLUS_DEBUG} & 2) {
2814 $tooltip .= "\n\n" . (ref $widget) . "\n"
2815 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2816 . "req $widget->{req_w} $widget->{req_h}\n"
2817 . "visible $widget->{visible}";
2818 }
2819
2820 $tooltip =~ s/^\n+//;
2821 $tooltip =~ s/\n+$//;
2822
2624 $self->add (new CFClient::UI::Label 2823 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2824 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2825 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2826 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2827 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2828 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2829 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638 2837
2639 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2640} 2839}
2641 2840
2642sub size_allocate { 2841sub invoke_size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2842 my ($self, $w, $h) = @_;
2644 2843
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648} 2845}
2649 2846
2650sub visibility_change { 2847sub invoke_visibility_change {
2651 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2652 2849
2653 return unless $visible; 2850 return unless $visible;
2654 2851
2655 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2657 or return; 2854 or return;
2658 2855
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2856 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 2857
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2858 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 2859 if $x + $self->{w} > $self->{root}{w};
2663 2860
2664 $self->move_abs ($x, $y); 2861 $self->move_abs ($x, $y);
2665 }); 2862 });
2666} 2863}
2667 2864
… …
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2953 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 2954
2758 if ($tex) { 2955 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 2956 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 2958 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2959 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 2960 glDisable GL_TEXTURE_2D;
2764 } 2961 }
2765} 2962}
2766 2963
2767sub DESTROY { 2964sub destroy {
2768 my ($self) = @_; 2965 my ($self) = @_;
2769 2966
2770 $self->{timer}->cancel 2967 $self->{timer}->cancel
2771 if $self->{timer}; 2968 if $self->{timer};
2772 2969
2773 $self->SUPER::DESTROY; 2970 $self->SUPER::destroy;
2774} 2971}
2775 2972
2776############################################################################# 2973#############################################################################
2777 2974
2778package CFClient::UI::Inventory; 2975package CFClient::UI::Buttonbar;
2779 2976
2780our @ISA = CFClient::UI::ScrolledWindow::; 2977our @ISA = CFClient::UI::HBox::;
2781 2978
2782sub new { 2979# TODO: should actualyl wrap buttons and other goodies.
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817 2980
2818############################################################################# 2981#############################################################################
2819 2982
2820package CFClient::UI::Menu; 2983package CFClient::UI::Menu;
2821 2984
… …
2833 ); 2996 );
2834 2997
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2998 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836 2999
2837 for my $item (@{ $self->{items} }) { 3000 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 3001 my ($widget, $cb, $tooltip) = @$item;
2839 3002
2840 # handle various types of items, only text for now 3003 # handle various types of items, only text for now
2841 if (!ref $widget) { 3004 if (!ref $widget) {
2842 $widget = new CFClient::UI::Label 3005 $widget = new CFClient::UI::Label
2843 can_hover => 1, 3006 can_hover => 1,
2844 can_events => 1, 3007 can_events => 1,
2845 text => $widget; 3008 markup => $widget,
3009 tooltip => $tooltip
2846 } 3010 }
2847 3011
2848 $self->{item}{$widget} = $item; 3012 $self->{item}{$widget} = $item;
2849 3013
2850 $self->{vbox}->add ($widget); 3014 $self->{vbox}->add ($widget);
… …
2855 3019
2856# popup given the event (must be a mouse button down event currently) 3020# popup given the event (must be a mouse button down event currently)
2857sub popup { 3021sub popup {
2858 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2859 3023
2860 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2861 3025
2862 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self; 3027 $GRAB = $self;
2864 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2865 3029
2866 $self->show; 3030 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868} 3032}
2869 3033
2870sub mouse_motion { 3034sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2872 3036
2873 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2876}
2877 3040
3041 0
3042}
3043
2878sub button_up { 3044sub invoke_button_up {
2879 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2880 3046
2881 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB; 3048 undef $GRAB;
2883 $self->hide; 3049 $self->hide;
2884 3050
2885 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
3053 } else {
3054 return 0
3055 }
3056
2887 } 3057 1
2888} 3058}
2889 3059
2890############################################################################# 3060#############################################################################
2891 3061
2892package CFClient::UI::Statusbox; 3062package CFClient::UI::Multiplexer;
2893 3063
2894our @ISA = CFClient::UI::VBox::; 3064our @ISA = CFClient::UI::Container::;
2895 3065
2896sub new { 3066sub new {
2897 my $class = shift; 3067 my $class = shift;
2898 3068
2899 $class->SUPER::new ( 3069 my $self = $class->SUPER::new (
3070 @_,
3071 );
3072
3073 $self->{current} = $self->{children}[0]
3074 if @{ $self->{children} };
3075
3076 $self
3077}
3078
3079sub add {
3080 my ($self, @widgets) = @_;
3081
3082 $self->SUPER::add (@widgets);
3083
3084 $self->{current} = $self->{children}[0]
3085 if @{ $self->{children} };
3086}
3087
3088sub set_current_page {
3089 my ($self, $page_or_widget) = @_;
3090
3091 my $widget = ref $page_or_widget
3092 ? $page_or_widget
3093 : $self->{children}[$page_or_widget];
3094
3095 $self->{current} = $widget;
3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3097
3098 $self->emit (page_changed => $self->{current});
3099
3100 $self->realloc;
3101}
3102
3103sub visible_children {
3104 $_[0]{current}
3105}
3106
3107sub size_request {
3108 my ($self) = @_;
3109
3110 $self->{current}->size_request
3111}
3112
3113sub invoke_size_allocate {
3114 my ($self, $w, $h) = @_;
3115
3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3119}
3120
3121sub _draw {
3122 my ($self) = @_;
3123
3124 $self->{current}->draw;
3125}
3126
3127#############################################################################
3128
3129package CFClient::UI::Notebook;
3130
3131our @ISA = CFClient::UI::VBox::;
3132
3133sub new {
3134 my $class = shift;
3135
3136 my $self = $class->SUPER::new (
3137 buttonbar => (new CFClient::UI::Buttonbar),
3138 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3139 # filter => # will be put between multiplexer and $self
3140 @_,
3141 );
3142
3143 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3144 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3145
3146 $self
3147}
3148
3149sub add {
3150 my ($self, $title, $widget, $tooltip) = @_;
3151
3152 Scalar::Util::weaken $self;
3153
3154 $self->{buttonbar}->add (new CFClient::UI::Button
3155 markup => $title,
3156 tooltip => $tooltip,
3157 on_activate => sub { $self->set_current_page ($widget) },
3158 );
3159
3160 $self->{multiplexer}->add ($widget);
3161}
3162
3163sub set_current_page {
3164 my ($self, $page) = @_;
3165
3166 $self->{multiplexer}->set_current_page ($page);
3167 $self->emit (page_changed => $self->{multiplexer}{current});
3168}
3169
3170#############################################################################
3171
3172package CFClient::UI::Combobox;
3173
3174use utf8;
3175
3176our @ISA = CFClient::UI::Button::;
3177
3178sub new {
3179 my $class = shift;
3180
3181 my $self = $class->SUPER::new (
3182 options => [], # [value, title, longdesc], ...
3183 value => undef,
3184 @_,
3185 );
3186
3187 $self->_set_value ($self->{value});
3188
3189 $self
3190}
3191
3192sub invoke_button_down {
3193 my ($self, $ev) = @_;
3194
3195 my @menu_items;
3196
3197 for (@{ $self->{options} }) {
3198 my ($value, $title, $tooltip) = @$_;
3199
3200 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3201 }
3202
3203 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3204}
3205
3206sub _set_value {
3207 my ($self, $value) = @_;
3208
3209 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3210 or return;
3211
3212 $self->{value} = $item->[0];
3213 $self->set_markup ("$item->[1] ⇓");
3214 $self->set_tooltip ($item->[2]);
3215}
3216
3217sub set_value {
3218 my ($self, $value) = @_;
3219
3220 return unless $self->{value} ne $value;
3221
3222 $self->_set_value ($value);
3223 $self->emit (changed => $value);
3224}
3225
3226#############################################################################
3227
3228package CFClient::UI::Statusbox;
3229
3230our @ISA = CFClient::UI::VBox::;
3231
3232sub new {
3233 my $class = shift;
3234
3235 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3236 fontsize => 0.8,
2901 @_, 3237 @_,
2902 ) 3238 );
3239
3240 Scalar::Util::weaken (my $this = $self);
3241
3242 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3243
3244 $self
2903} 3245}
2904 3246
2905sub reorder { 3247sub reorder {
2906 my ($self) = @_; 3248 my ($self) = @_;
2907 my $NOW = time; 3249 my $NOW = Time::HiRes::time;
3250
3251 # freeze display when hovering over any label
3252 return if $CFClient::UI::TOOLTIP->{owner}
3253 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3254 values %{ $self->{item} };
2908 3255
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3256 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3257 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3258 }
2912 3259
… …
2915 my @items = sort { 3262 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3263 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3264 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3265 } values %{ $self->{item} };
2919 3266
3267 $self->{timer}->interval (1);
3268
2920 my $count = 10 + 1; 3269 my $count = 10 + 1;
2921 for my $item (@items) { 3270 for my $item (@items) {
2922 last unless --$count; 3271 last unless --$count;
2923 3272
2924 push @widgets, $item->{label} ||= do { 3273 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3274 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3275 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3276 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3277 : $item->{text};
2929 3278
… …
2937 tooltip => $item->{tooltip}, 3286 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3287 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3288 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3289 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3290 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3291 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3292 can_events => 1,
2944 can_hover => 1 3293 can_hover => 1
2945 }; 3294 };
3295
3296 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3297 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3298 $label->update;
3299 $label->set_max_size (undef, $label->{req_h} * $diff)
3300 if $diff < 1;
3301 $self->{timer}->interval (1/30);
3302 } else {
3303 $label->{fg}[3] = $item->{fg}[3] || 1;
3304 }
3305
3306 push @widgets, $label;
2946 } 3307 }
2947 3308
2948 $self->clear; 3309 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3310 $self->SUPER::add (reverse @widgets);
2950} 3311}
… …
2955 $text =~ s/^\s+//; 3316 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3317 $text =~ s/\s+$//;
2957 3318
2958 return unless $text; 3319 return unless $text;
2959 3320
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3321 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3322
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3323 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3324
2964 if (my $item = $self->{item}{$group}) { 3325 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3326 if ($item->{text} eq $text) {
2966 $item->{count}++; 3327 $item->{count}++;
2967 } else { 3328 } else {
2968 $item->{count} = 1; 3329 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text; 3330 $item->{text} = $item->{tooltip} = $text;
2970 } 3331 }
2971 $item->{id} = ++$self->{id}; 3332 $item->{id} += 0.2;#d#
2972 $item->{timeout} = $timeout; 3333 $item->{timeout} = $timeout;
2973 delete $item->{label}; 3334 delete $item->{label};
2974 } else { 3335 } else {
2975 $self->{item}{$group} = { 3336 $self->{item}{$group} = {
2976 id => ++$self->{id}, 3337 id => ++$self->{id},
… …
2995 3356
2996 $self->reorder; 3357 $self->reorder;
2997 $self->SUPER::reconfigure; 3358 $self->SUPER::reconfigure;
2998} 3359}
2999 3360
3361sub destroy {
3362 my ($self) = @_;
3363
3364 $self->{timer}->cancel;
3365
3366 $self->SUPER::destroy;
3367}
3368
3000############################################################################# 3369#############################################################################
3001 3370
3371package CFClient::UI::Inventory;
3372
3373our @ISA = CFClient::UI::ScrolledWindow::;
3374
3375sub new {
3376 my $class = shift;
3377
3378 my $self = $class->SUPER::new (
3379 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3380 @_,
3381 );
3382
3383 $self
3384}
3385
3386sub set_items {
3387 my ($self, $items) = @_;
3388
3389 $self->{child}->clear;
3390 return unless $items;
3391
3392 my @items = sort {
3393 ($a->{type} <=> $b->{type})
3394 or ($a->{name} cmp $b->{name})
3395 } @$items;
3396
3397 $self->{real_items} = \@items;
3398
3399 my $row = 0;
3400 for my $item (@items) {
3401 CFClient::Item::update_widgets $item;
3402
3403 $self->{child}->add (0, $row, $item->{face_widget});
3404 $self->{child}->add (1, $row, $item->{desc_widget});
3405 $self->{child}->add (2, $row, $item->{weight_widget});
3406
3407 $row++;
3408 }
3409}
3410
3411#############################################################################
3412
3413package CFClient::UI::BindEditor;
3414
3415our @ISA = CFClient::UI::FancyFrame::;
3416
3417sub new {
3418 my $class = shift;
3419
3420 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3421
3422 $self->add (my $vb = new CFClient::UI::VBox);
3423
3424
3425 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3426 text => "start recording",
3427 tooltip => "Start/Stops recording of actions."
3428 ."All subsequent actions after the recording started will be captured."
3429 ."The actions are displayed after the record was stopped."
3430 ."To bind the action you have to click on the 'Bind' button",
3431 on_activate => sub {
3432 unless ($self->{recording}) {
3433 $self->start;
3434 } else {
3435 $self->stop;
3436 }
3437 });
3438
3439 $vb->add (new CFClient::UI::Label text => "Actions:");
3440 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3441
3442 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3443 $vb->add (my $hb = new CFClient::UI::HBox);
3444 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3445 $hb->add (new CFClient::UI::Button
3446 text => "bind",
3447 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3448 on_activate => sub {
3449 $self->ask_for_bind;
3450 });
3451
3452 $vb->add (my $hb = new CFClient::UI::HBox);
3453 $hb->add (new CFClient::UI::Button
3454 text => "ok",
3455 expand => 1,
3456 tooltip => "This closes the binding editor and saves the binding",
3457 on_activate => sub {
3458 $self->hide;
3459 $self->commit;
3460 });
3461
3462 $hb->add (new CFClient::UI::Button
3463 text => "cancel",
3464 expand => 1,
3465 tooltip => "This closes the binding editor without saving",
3466 on_activate => sub {
3467 $self->hide;
3468 $self->{binding_cancel}->()
3469 if $self->{binding_cancel};
3470 });
3471
3472 $self->update_binding_widgets;
3473
3474 $self
3475}
3476
3477sub commit {
3478 my ($self) = @_;
3479 my ($mod, $sym, $cmds) = $self->get_binding;
3480 if ($sym != 0 && @$cmds > 0) {
3481 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3482 ."'. Don't forget 'Save Config'!");
3483 $self->{binding_change}->($mod, $sym, $cmds)
3484 if $self->{binding_change};
3485 } else {
3486 $::STATUSBOX->add ("No action bound, no key or action specified!");
3487 $self->{binding_cancel}->()
3488 if $self->{binding_cancel};
3489 }
3490}
3491
3492sub start {
3493 my ($self) = @_;
3494
3495 $self->{rec_btn}->set_text ("stop recording");
3496 $self->{recording} = 1;
3497 $self->clear_command_list;
3498 $::CONN->start_record if $::CONN;
3499}
3500
3501sub stop {
3502 my ($self) = @_;
3503
3504 $self->{rec_btn}->set_text ("start recording");
3505 $self->{recording} = 0;
3506
3507 my $rec;
3508 $rec = $::CONN->stop_record if $::CONN;
3509 return unless ref $rec eq 'ARRAY';
3510 $self->set_command_list ($rec);
3511}
3512
3513
3514sub ask_for_bind_and_commit {
3515 my ($self) = @_;
3516 $self->ask_for_bind (1);
3517}
3518
3519sub ask_for_bind {
3520 my ($self, $commit, $end_cb) = @_;
3521
3522 CFClient::Binder::open_binding_dialog (sub {
3523 my ($mod, $sym) = @_;
3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3525 $self->update_binding_widgets;
3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3528 });
3529}
3530
3531# $mod and $sym are the modifiers and key symbol
3532# $cmds is a array ref of strings (the commands)
3533# $cb is the callback that is executed on OK
3534# $ccb is the callback that is executed on CANCEL and
3535# when the binding was unsuccessful on OK
3536sub set_binding {
3537 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3538
3539 $self->clear_command_list;
3540 $self->{recording} = 0;
3541 $self->{rec_btn}->set_text ("start recording");
3542
3543 $self->{binding} = [$mod, $sym];
3544 $self->{commands} = $cmds;
3545
3546 $self->{binding_change} = $cb;
3547 $self->{binding_cancel} = $ccb;
3548
3549 $self->update_binding_widgets;
3550}
3551
3552# this is a shortcut method that asks for a binding
3553# and then just binds it.
3554sub do_quick_binding {
3555 my ($self, $cmds, $end_cb) = @_;
3556 $self->set_binding (undef, undef, $cmds, sub {
3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3558 });
3559 $self->ask_for_bind (1, $end_cb);
3560}
3561
3562sub update_binding_widgets {
3563 my ($self) = @_;
3564 my ($mod, $sym, $cmds) = $self->get_binding;
3565 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3566 $self->set_command_list ($cmds);
3567}
3568
3569sub get_binding {
3570 my ($self) = @_;
3571 return (
3572 $self->{binding}->[0],
3573 $self->{binding}->[1],
3574 [ grep { defined $_ } @{$self->{commands}} ]
3575 );
3576}
3577
3578sub clear_command_list {
3579 my ($self) = @_;
3580 $self->{cmdbox}->clear ();
3581}
3582
3583sub set_command_list {
3584 my ($self, $cmds) = @_;
3585
3586 $self->{cmdbox}->clear ();
3587 $self->{commands} = $cmds;
3588
3589 my $idx = 0;
3590
3591 for (@$cmds) {
3592 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3593
3594 my $i = $idx;
3595 $hb->add (new CFClient::UI::Label text => $_);
3596 $hb->add (new CFClient::UI::Button
3597 text => "delete",
3598 tooltip => "Deletes the action from the record",
3599 on_activate => sub {
3600 $self->{cmdbox}->remove ($hb);
3601 $cmds->[$i] = undef;
3602 });
3603
3604
3605 $idx++
3606 }
3607}
3608
3609#############################################################################
3610
3611package CFClient::UI::SpellList;
3612
3613our @ISA = CFClient::UI::Table::;
3614
3615sub new {
3616 my $class = shift;
3617
3618 my $self = $class->SUPER::new (
3619 binding => [],
3620 commands => [],
3621 @_,
3622 )
3623}
3624
3625my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3626
3627my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3629my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3633my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3635my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3636 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3637
3638sub rebuild_spell_list {
3639 my ($self) = @_;
3640
3641 $CFClient::UI::ROOT->on_refresh ($self => sub {
3642 $self->clear;
3643
3644 return unless $::CONN;
3645
3646 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3647 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3648 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3649 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3650 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3651
3652 my $row = 0;
3653
3654 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3655 my $spell = $self->{spell}{$_};
3656
3657 $row++;
3658
3659 my $spell_cb = sub {
3660 my ($widget, $ev) = @_;
3661
3662 if ($ev->{button} == 1) {
3663 $::CONN->user_send ("cast $spell->{name}");
3664 } elsif ($ev->{button} == 2) {
3665 $::CONN->user_send ("invoke $spell->{name}");
3666 } elsif ($ev->{button} == 3) {
3667 (new CFClient::UI::Menu
3668 items => [
3669 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3670 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3671 ],
3672 )->popup ($ev);
3673 } else {
3674 return 0;
3675 }
3676
3677 1
3678 };
3679
3680 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3681
3682 #TODO: add path info to tooltip
3683 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3684
3685 $self->add (0, $row, new CFClient::UI::Face
3686 face => $spell->{face},
3687 can_hover => 1,
3688 can_events => 1,
3689 tooltip => $tooltip,
3690 on_button_down => $spell_cb,
3691 );
3692
3693 $self->add (1, $row, new CFClient::UI::Label
3694 expand => 1,
3695 text => $spell->{name},
3696 can_hover => 1,
3697 can_events => 1,
3698 tooltip => $tooltip,
3699 on_button_down => $spell_cb,
3700 );
3701
3702 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3703 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3704 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3705 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3706 }
3707 });
3708}
3709
3710sub add_spell {
3711 my ($self, $spell) = @_;
3712
3713 $self->{spell}->{$spell->{name}} = $spell;
3714 $self->rebuild_spell_list;
3715}
3716
3717sub remove_spell {
3718 my ($self, $spell) = @_;
3719
3720 delete $self->{spell}->{$spell->{name}};
3721 $self->rebuild_spell_list;
3722}
3723
3724sub clear_spells {
3725 my ($self) = @_;
3726
3727 $self->{spell} = {};
3728 $self->rebuild_spell_list;
3729}
3730
3731#############################################################################
3732
3002package CFClient::UI::Root; 3733package CFClient::UI::Root;
3003 3734
3004our @ISA = CFClient::UI::Container::; 3735our @ISA = CFClient::UI::Container::;
3736
3737use List::Util qw(min max);
3005 3738
3006use CFClient::OpenGL; 3739use CFClient::OpenGL;
3007 3740
3008sub new { 3741sub new {
3009 my $class = shift; 3742 my $class = shift;
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3749 Scalar::Util::weaken ($self->{root} = $self);
3017 3750
3018 $self 3751 $self
3019} 3752}
3020 3753
3021sub configure {
3022 my ($self, $x, $y, $w, $h) = @_;
3023
3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request { 3754sub size_request {
3038 my ($self) = @_; 3755 my ($self) = @_;
3039 3756
3040 ($self->{w}, $self->{h}) 3757 ($self->{w}, $self->{h})
3041} 3758}
… …
3052 $coord = $max - $size if $coord > $max - $size; 3769 $coord = $max - $size if $coord > $max - $size;
3053 3770
3054 int $coord + 0.5 3771 int $coord + 0.5
3055} 3772}
3056 3773
3057sub size_allocate { 3774sub invoke_size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3775 my ($self, $w, $h) = @_;
3059 3776
3060 for my $child ($self->children) { 3777 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3778 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3779
3063 $X = $child->{force_x} if exists $child->{force_x}; 3780 $X = $child->{force_x} if exists $child->{force_x};
… …
3066 $X = _to_pixel $X, $W, $self->{w}; 3783 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
3068 3785
3069 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
3070 } 3787 }
3788
3789 1
3071} 3790}
3072 3791
3073sub coord2local { 3792sub coord2local {
3074 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
3075 3794
… …
3131 $_->() 3850 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3851 for values %{delete $self->{refresh_hook}};
3133 } 3852 }
3134 3853
3135 if ($self->{realloc}) { 3854 if ($self->{realloc}) {
3855 my %queue;
3136 my @queue; 3856 my @queue;
3857 my $widget;
3137 3858
3859 outer:
3138 while () { 3860 while () {
3139 if ($self->{realloc}) { 3861 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3862 for $widget (values %$realloc) {
3863 $widget->{visible} or next; # do not resize invisible widgets
3141 3864
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3865 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3866
3867 push @{ $queue[$widget->{visible}] }, $widget;
3868 }
3144 } 3869 }
3145 3870
3871 while () {
3872 @queue or last outer;
3873
3146 my $widget = pop @queue || last; 3874 $widget = pop @{ $queue[-1] || [] }
3875 and last;
3876
3877 pop @queue;
3878 }
3147 3879
3148 $widget->{visible} or last; # do not resize invisible widgets 3880 delete $queue{$widget+0};
3149 3881
3150 my ($w, $h) = $widget->size_request; 3882 my ($w, $h) = $widget->size_request;
3151 3883
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3884 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3885 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3886
3887 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3888 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3889
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3890 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3891 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3892
3893 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3894 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3895 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3896 $widget->{req_h} = $h;
3160 3897
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3898 $self->{size_alloc}{$widget+0} = $widget;
3162 3899
3163 push @queue, $widget->{parent} 3900 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3901 $self->{realloc}{$parent+0} = $parent
3902 unless $queue{$parent+0};
3903
3904 $parent->{force_size_alloc} = 1;
3905 $self->{size_alloc}{$parent+0} = $parent;
3906 }
3907 }
3908
3909 delete $self->{realloc}{$widget+0};
3165 } 3910 }
3166 } 3911 }
3167 3912
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3913 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3914 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3915 values %$size_alloc;
3171 3916
3172 while () { 3917 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3918 my $widget = pop @queue || last;
3174 3919
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3921
3178 $w = 0 if $w < 0; 3922 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3923 $h = 0 if $h < 0;
3180 3924
3181 $w = int $w + 0.5; 3925 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3926 $h = int $h + 0.5;
3183 3927
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w};
3930 $widget->{old_h} = $widget->{h};
3185 3931
3186 $widget->{w} = $w; 3932 $widget->{w} = $w;
3187 $widget->{h} = $h; 3933 $widget->{h} = $h;
3188 3934
3189 $widget->emit (size_allocate => $w, $h, $changed); 3935 $widget->emit (size_allocate => $w, $h);
3936 }
3190 } 3937 }
3191 } 3938 }
3192 3939
3193 while ($self->{post_alloc_hook}) { 3940 while ($self->{post_alloc_hook}) {
3194 $_->() 3941 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 3942 for values %{delete $self->{post_alloc_hook}};
3196 } 3943 }
3944
3197 3945
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3946 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3947 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 3948 glClear GL_COLOR_BUFFER_BIT;
3201 3949
… …
3203 glLoadIdentity; 3951 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3952 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 3953 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 3954 glLoadIdentity;
3207 3955
3956 {
3957 package CFClient::UI::Base;
3958
3959 ($draw_x, $draw_y, $draw_w, $draw_h) =
3960 (0, 0, $self->{w}, $self->{h});
3961 }
3962
3208 $self->_draw; 3963 $self->_draw;
3209} 3964}
3210 3965
3211############################################################################# 3966#############################################################################
3212 3967

Diff Legend

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