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

Diff Legend

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