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.308 by root, Mon Jun 19 05:18:14 2006 UTC

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

Diff Legend

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