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.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.319 by root, Sun Jul 2 21:07:26 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
327} 333}
328 334
329sub size_request { 335sub size_request {
330 require Carp; 336 require Carp;
331 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
332} 342}
333 343
334sub configure { 344sub configure {
335 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
336 346
350 $self->{x} = $x; 360 $self->{x} = $x;
351 $self->{y} = $y; 361 $self->{y} = $y;
352 $self->update; 362 $self->update;
353 } 363 }
354 364
355 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356 return unless $self->{visible}; 366 return unless $self->{visible};
357 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
359 } 372 }
360}
361
362sub size_allocate {
363 # nothing to be done
364} 373}
365 374
366sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
367} 381}
368 382
369sub set_max_size { 383sub set_max_size {
370 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
371 385
372 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
373 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
374} 390}
375 391
376sub set_tooltip { 392sub set_tooltip {
377 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
378 394
383 399
384 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
385 401
386 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
387 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
388 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
389 } 405 }
390} 406}
391 407
392# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
393sub coord2local { 409sub coord2local {
401 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
402 418
403 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
404} 420}
405 421
406sub focus_in { 422sub invoke_focus_in {
407 my ($self) = @_; 423 my ($self) = @_;
408 424
409 return if $FOCUS == $self; 425 return if $FOCUS == $self;
410 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
411 427
412 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
413 429
414 $self->_emit (focus_in => $focus); 430 $self->update;
415 431
416 $focus->update if $focus; 432 0
417 $FOCUS->update;
418} 433}
419 434
420sub focus_out { 435sub invoke_focus_out {
421 my ($self) = @_; 436 my ($self) = @_;
422 437
423 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
424 439
425 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
426 441
427 $self->_emit (focus_out => $focus); 442 $self->update;
428 443
429 $focus->update if $focus; #?
430
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
432 unless $FOCUS; 445 unless $FOCUS;
433}
434 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
435sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
436sub button_up { } 458sub invoke_button_up { 1 }
437sub key_down { } 459sub invoke_key_down { 1 }
438sub key_up { } 460sub invoke_key_up { 1 }
439 461
440sub button_down { 462sub invoke_button_down {
441 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
442 464
443 $self->focus_in; 465 $self->grab_focus;
444}
445 466
446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
451 484
452sub find_widget { 485sub find_widget {
453 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
454 487
455 return () unless $self->{can_events}; 488 return () unless $self->{can_events};
463 496
464sub set_parent { 497sub set_parent {
465 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
466 499
467 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
470} 502}
471 503
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 { 504sub realloc {
496 my ($self) = @_; 505 my ($self) = @_;
497 506
498 if ($self->{visible}) { 507 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 508 return if $self->{root}{realloc}{$self+0};
500 509
501 $self->{root}{realloc}{$self} = $self; 510 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 511 $self->{root}->update;
503 } else { 512 } else {
504 delete $self->{req_w}; 513 delete $self->{req_w};
514 delete $self->{req_h};
505 } 515 }
506} 516}
507 517
508sub update { 518sub update {
509 my ($self) = @_; 519 my ($self) = @_;
517 527
518 $self->realloc; 528 $self->realloc;
519 $self->update; 529 $self->update;
520} 530}
521 531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
535
522sub draw { 536sub draw {
523 my ($self) = @_; 537 my ($self) = @_;
524 538
525 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526 548
527 glPushMatrix; 549 glPushMatrix;
528 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
529 $self->_draw;
530 glPopMatrix;
531 551
532 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
533 my ($x, $y) = @$self{qw(x y)};
534
535 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536 glEnable GL_BLEND; 554 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glBegin GL_QUADS; 556 glBegin GL_QUADS;
539 glVertex $x , $y; 557 glVertex 0 , 0;
540 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
541 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
542 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
543 glEnd; 561 glEnd;
544 glDisable GL_BLEND; 562 glDisable GL_BLEND;
545 } 563 }
546 564
547 if ($ENV{CFPLUS_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 566 glPushMatrix;
549 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
551 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 570 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
556 glEnd; 574 glEnd;
557 glPopMatrix; 575 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
560} 581}
561 582
562sub _draw { 583sub _draw {
563 my ($self) = @_; 584 my ($self) = @_;
564 585
567 588
568sub DESTROY { 589sub DESTROY {
569 my ($self) = @_; 590 my ($self) = @_;
570 591
571 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
572 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
573} 596}
574 597
575############################################################################# 598#############################################################################
576 599
577package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
602 625
603 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
604 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
605 628
606 glEnable GL_BLEND; 629 glEnable GL_BLEND;
607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608 glColor @$color; 631 glColor_premultiply @$color;
609 632
610 glBegin GL_QUADS; 633 glBegin GL_QUADS;
611 glVertex 0 , 0; 634 glVertex 0 , 0;
612 glVertex 0 , $h; 635 glVertex 0 , $h;
613 glVertex $w, $h; 636 glVertex $w, $h;
644our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
645 668
646sub new { 669sub new {
647 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
648 671
649 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
650 673
651 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
652 children => [], 675 children => [],
653 can_events => 0, 676 can_events => 0,
654 %arg, 677 %arg,
655 ); 678 );
679
656 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
657 682
658 $self 683 $self
659} 684}
660 685
661sub add { 686sub add {
709 $x -= $self->{x}; 734 $x -= $self->{x};
710 $y -= $self->{y}; 735 $y -= $self->{y};
711 736
712 my $res; 737 my $res;
713 738
714 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
715 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
716 and return $res; 741 and return $res;
717 } 742 }
718 743
719 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
740} 765}
741 766
742sub add { 767sub add {
743 my ($self, $child) = @_; 768 my ($self, $child) = @_;
744 769
745 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
746
747 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
748} 772}
749 773
750sub remove { 774sub remove {
751 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
760 784
761sub size_request { 785sub size_request {
762 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
763} 787}
764 788
765sub size_allocate { 789sub invoke_size_allocate {
766 my ($self, $w, $h, $changed) = @_; 790 my ($self, $w, $h) = @_;
767 791
768 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
769} 795}
770 796
771############################################################################# 797#############################################################################
798
799# back-buffered drawing area
772 800
773package CFClient::UI::Window; 801package CFClient::UI::Window;
774 802
775our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
776 804
787 815
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 817 $self->SUPER::update;
790} 818}
791 819
792sub size_allocate { 820sub invoke_size_allocate {
793 my ($self, $w, $h, $changed) = @_; 821 my ($self, $w, $h) = @_;
794 822
795 $self->SUPER::size_allocate ($w, $h, $changed);
796 $self->update 823 $self->update;
797 if $changed; 824
825 $self->SUPER::invoke_size_allocate ($w, $h)
798} 826}
799 827
800sub _render { 828sub _render {
829 my ($self) = @_;
830
801 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
802} 832}
803 833
804sub render_child { 834sub render_child {
805 my ($self) = @_; 835 my ($self) = @_;
806 836
807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
809 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
810 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
811 $self->_render; 848 $self->_render;
812 }; 849 };
813} 850}
814 851
815sub _draw { 852sub _draw {
816 my ($self) = @_; 853 my ($self) = @_;
817 854
818 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
819 856
820 my $tex = $self->{texture} 857 my $tex = $self->{texture}
821 or return; 858 or return;
822 859
823 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
826 863
827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828 865
829 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
830} 867}
846} 883}
847 884
848sub size_request { 885sub size_request {
849 my ($self) = @_; 886 my ($self) = @_;
850 887
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 889
853 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
855 892
856 ($w, $h) 893 ($w, $h)
857} 894}
858 895
859sub size_allocate { 896sub invoke_size_allocate {
860 my ($self, $w, $h, $changed) = @_; 897 my ($self, $w, $h) = @_;
861 898
899 my $child = $self->child;
900
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 903
865 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
866 $self->update; 905 $self->update;
906
907 1
867} 908}
868 909
869sub set_offset { 910sub set_offset {
870 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
871 912
904} 945}
905 946
906sub _render { 947sub _render {
907 my ($self) = @_; 948 my ($self) = @_;
908 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910 954
911 $self->SUPER::_render; 955 $self->SUPER::_render;
912} 956}
913 957
916package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
917 961
918our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
919 963
920sub new { 964sub new {
921 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
922 968
923 my $self; 969 my $self;
924 970
925 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
926 vertical => 1, 972 vertical => 1,
931 ; 977 ;
932 978
933 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
935 slider => $slider, 981 slider => $slider,
936 @_, 982 %arg,
937 ); 983 );
938 984
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
942 987
943 $self 988 $self
944} 989}
945 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
946sub update { 1005sub update {
947 my ($self) = @_; 1006 my ($self) = @_;
948 1007
949 $self->SUPER::update; 1008 $self->SUPER::update;
950 1009
951 # todo: overwrite size_allocate of child 1010 $self->update_slider;
952 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954} 1011}
955 1012
956sub size_allocate { 1013sub invoke_size_allocate {
957 my ($self, $w, $h, $changed) = @_; 1014 my ($self, $w, $h) = @_;
958 1015
1016 $self->update_slider;
1017
959 $self->SUPER::size_allocate ($w, $h, $changed); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
960
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1019}
964
965#TODO# update range on size_allocate depending on child
966# update viewport offset on scroll
967 1020
968############################################################################# 1021#############################################################################
969 1022
970package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
971 1024
987 1040
988 if ($self->{bg}) { 1041 if ($self->{bg}) {
989 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
990 1043
991 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
994 1047
995 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
996 glVertex 0 , 0; 1049 glVertex 0 , 0;
997 glVertex 0 , $h; 1050 glVertex 0 , $h;
998 glVertex $w, $h; 1051 glVertex $w, $h;
1020my @border = 1073my @border =
1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 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); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023 1076
1024sub new { 1077sub new {
1025 my $class = shift; 1078 my ($class, %arg) = @_;
1026 1079
1027 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1083 border => 0.6,
1031 can_events => 1, 1084 can_events => 1,
1032 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
1033 ); 1088 );
1034 1089
1035 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1036 align => 0, 1091 align => 0,
1037 valign => 1, 1092 valign => 1,
1038 text => $self->{title}, 1093 text => $self->{title},
1039 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1040 1105
1041 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1042} 1115}
1043 1116
1044sub border { 1117sub border {
1045 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1046} 1119}
1047 1120
1048sub size_request { 1121sub size_request {
1049 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1050 1129
1051 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1052 1131
1053 ( 1132 (
1054 $w + $self->border * 2, 1133 $w + $self->border * 2,
1055 $h + $self->border * 2, 1134 $h + $self->border * 2,
1056 ) 1135 )
1057} 1136}
1058 1137
1059sub size_allocate { 1138sub invoke_size_allocate {
1060 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
1061 1140
1062 return unless $changed; 1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1063 1146
1147 my $border = $self->border;
1148
1064 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1065 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1066 1151
1067 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068 if $self->{title};
1069
1070 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1071}
1072 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1073sub button_down { 1168sub invoke_button_down {
1074 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1075 1170
1076 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1077 my $border = $self->border; 1172 my $border = $self->border;
1078 1173
1094 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1095 1190
1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098 1193
1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1099 $self->realloc; 1195 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1101 }; 1196 };
1102 1197
1103 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1104 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1105 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
1108 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1109 1204
1110 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1111 1206
1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1113 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1114 } 1215 1
1115} 1216}
1116 1217
1117sub button_up { 1218sub invoke_button_up {
1118 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1119 1220
1120 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1121} 1222}
1122 1223
1123sub mouse_motion { 1224sub invoke_mouse_motion {
1124 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1125 1226
1126 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1127} 1230}
1128 1231
1129sub _draw { 1232sub _draw {
1130 my ($self) = @_; 1233 my ($self) = @_;
1131 1234
1235 my $child = $self->{children}[0];
1236
1132 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1133 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1134 1239
1135 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137 1242
1138 my $border = $self->border; 1243 my $border = $self->border;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1259 }
1155 1260
1156 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1157 1262
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1161} 1274}
1162 1275
1163############################################################################# 1276#############################################################################
1164 1277
1165package CFClient::UI::Table; 1278package CFClient::UI::Table;
1188 1301
1189 $child->set_parent ($self); 1302 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1191 1304
1192 $self->realloc; 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1193} 1312}
1194 1313
1195# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1315sub clear {
1197 my ($self) = @_; 1316 my ($self) = @_;
1238 (sum @$ws), 1357 (sum @$ws),
1239 (sum @$hs), 1358 (sum @$hs),
1240 ) 1359 )
1241} 1360}
1242 1361
1243sub size_allocate { 1362sub invoke_size_allocate {
1244 my ($self, $w, $h, $changed) = @_; 1363 my ($self, $w, $h) = @_;
1245 1364
1246 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1247 1366
1248 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
1249 my $req_h = (sum @$hs) || 1; 1368 my $req_h = (sum @$hs) || 1;
1280 } 1399 }
1281 1400
1282 $y += $row_h; 1401 $y += $row_h;
1283 } 1402 }
1284 1403
1404 1
1285} 1405}
1286 1406
1287sub find_widget { 1407sub find_widget {
1288 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1289 1409
1326 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1327 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1328 ) 1448 )
1329} 1449}
1330 1450
1331sub size_allocate { 1451sub invoke_size_allocate {
1332 my ($self, $w, $h, $changed) = @_; 1452 my ($self, $w, $h) = @_;
1333 1453
1334 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1335 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1336 1456
1337 my @req; 1457 my @req;
1338 1458
1339 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1340 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1341 } else { 1461 } else {
1342 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1343 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1344 1464
1345 if ($req > $space) { 1465 if ($req > $space) {
1346 # ah well, not enough space 1466 # ah well, not enough space
1347 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1348 } else { 1468 } else {
1349 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1350 1470
1351 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1352 1472
1353 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1354 for 0 .. $#$children; 1474 for 0 .. $#children;
1355 } 1475 }
1356 } 1476 }
1357 1477
1358 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1359 1479
1360 my $pos = 0; 1480 my $pos = 0;
1361 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1362 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1363 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1364 1484
1365 $pos += $alloc; 1485 $pos += $alloc;
1366 } 1486 }
1367 1487
1368 1 1488 1
1420 ellipsise => 3, # end 1540 ellipsise => 3, # end
1421 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout),
1422 fontsize => 1, 1542 fontsize => 1,
1423 align => -1, 1543 align => -1,
1424 valign => -1, 1544 valign => -1,
1425 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1426 can_events => 0, 1547 can_events => 0,
1427 %arg 1548 %arg
1428 ); 1549 );
1429 1550
1430 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1457 1578
1458 delete $self->{texture}; 1579 delete $self->{texture};
1459 $self->SUPER::update; 1580 $self->SUPER::update;
1460} 1581}
1461 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1462sub set_text { 1590sub set_text {
1463 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1464 1592
1465 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1466 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1467 1595
1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1469 $self->{layout}->set_text ($text); 1597 $self->{layout}->set_text ($text);
1470 1598
1599 delete $self->{size_req};
1471 $self->realloc; 1600 $self->realloc;
1472 $self->update; 1601 $self->update;
1473} 1602}
1474 1603
1475sub set_markup { 1604sub set_markup {
1481 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1610 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1482 1611
1483 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1484 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1485 1614
1615 delete $self->{size_req};
1486 $self->realloc; 1616 $self->realloc;
1487 $self->update; 1617 $self->update;
1488} 1618}
1489 1619
1490sub size_request { 1620sub size_request {
1491 my ($self) = @_; 1621 my ($self) = @_;
1492 1622
1623 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1629
1499 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1500 1631
1501 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1635
1505 my ($w2, $h2) = $self->{template}->size; 1636 my ($w2, $h2) = $self->{template}->size;
1506 1637
1507 $w = List::Util::max $w, $w2; 1638 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1639 $h = List::Util::max $h, $h2;
1640 }
1641
1642 [$w, $h]
1509 } 1643 };
1510 1644
1511 ( 1645 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1646}
1516 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1517sub size_allocate { 1652sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1653 my ($self, $w, $h) = @_;
1654
1655 delete $self->{ox};
1519 1656
1520 delete $self->{texture} 1657 delete $self->{texture}
1521 if $changed; 1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1522} 1661}
1523 1662
1524sub set_fontsize { 1663sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1526 1665
1527 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1528 delete $self->{texture}; 1668 delete $self->{texture};
1529 1669
1530 $self->realloc; 1670 $self->realloc;
1671}
1672
1673sub reconfigure {
1674 my ($self) = @_;
1675
1676 delete $self->{size_req};
1677
1678 $self->SUPER::reconfigure;
1531} 1679}
1532 1680
1533sub _draw { 1681sub _draw {
1534 my ($self) = @_; 1682 my ($self) = @_;
1535 1683
1541 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1693
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1694 new_from_layout CFClient::Texture $self->{layout}
1695 };
1547 1696
1697 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $tex->{w}) * 0.5);
1551 1701
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1705 };
1558 1706
1559 glEnable GL_TEXTURE_2D; 1707 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1561 1711
1562 if ($tex->{format} == GL_ALPHA) { 1712 if ($tex->{format} == GL_ALPHA) {
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1714 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1565 } else { 1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1567 } 1719 }
1568 1720
1569 glDisable GL_TEXTURE_2D; 1721 glDisable GL_TEXTURE_2D;
1570} 1722}
1571 1723
1588 can_hover => 1, 1740 can_hover => 1,
1589 can_focus => 1, 1741 can_focus => 1,
1590 valign => 0, 1742 valign => 0,
1591 can_events => 1, 1743 can_events => 1,
1592 #text => ... 1744 #text => ...
1745 #hidden => "*",
1593 @_ 1746 @_
1594 ) 1747 )
1595} 1748}
1596 1749
1597sub _set_text { 1750sub _set_text {
1599 1752
1600 delete $self->{cur_h}; 1753 delete $self->{cur_h};
1601 1754
1602 return if $self->{text} eq $text; 1755 return if $self->{text} eq $text;
1603 1756
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1757 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1758 $self->{text} = $text;
1608 1759
1609 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1762 delete $self->{size_req};
1611 1763
1612 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1765
1766 $self->realloc;
1767 $self->update;
1613} 1768}
1614 1769
1615sub set_text { 1770sub set_text {
1616 my ($self, $text) = @_; 1771 my ($self, $text) = @_;
1617 1772
1618 $self->{cursor} = length $text; 1773 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1774 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1775}
1623 1776
1624sub get_text { 1777sub get_text {
1625 $_[0]{text} 1778 $_[0]{text}
1626} 1779}
1631 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1632 1785
1633 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1634} 1787}
1635 1788
1636sub key_down { 1789sub invoke_key_down {
1637 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1638 1791
1639 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
1653 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1654 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1811 $self->emit ('escape');
1659 } elsif ($uni) { 1812 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1814 } else {
1815 return 0;
1661 } 1816 }
1662 1817
1663 $self->_set_text ($text); 1818 $self->_set_text ($text);
1664 1819
1665 $self->realloc; 1820 $self->realloc;
1666}
1667 1821
1822 1
1823}
1824
1668sub focus_in { 1825sub invoke_focus_in {
1669 my ($self) = @_; 1826 my ($self) = @_;
1670 1827
1671 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1672 1829
1673 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1674} 1831}
1675 1832
1676sub button_down { 1833sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1678 1835
1679 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 1837
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 1839
1683 # byte-index to char-index 1840 # byte-index to char-index
1684 my $text = $self->{text}; 1841 my $text = $self->{text};
1685 utf8::encode $text; 1842 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1843 $self->{cursor} = length substr $text, 0, $idx;
1687 1844
1688 $self->_set_text ($self->{text}); 1845 $self->_set_text ($self->{text});
1689 $self->update; 1846 $self->update;
1847
1848 1
1690} 1849}
1691 1850
1692sub mouse_motion { 1851sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1854
1855 1
1695} 1856}
1696 1857
1697sub _draw { 1858sub _draw {
1698 my ($self) = @_; 1859 my ($self) = @_;
1699 1860
1700 local $self->{fg} = $self->{fg}; 1861 local $self->{fg} = $self->{fg};
1701 1862
1702 if ($FOCUS == $self) { 1863 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1864 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1865 $self->{fg} = $self->{active_fg};
1705 } else { 1866 } else {
1706 glColor @{$self->{bg}}; 1867 glColor_premultiply @{$self->{bg}};
1707 } 1868 }
1708 1869
1709 glEnable GL_BLEND; 1870 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1871 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1872 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1873 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1874 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1875 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1876 glVertex $self->{w}, 0;
1740 1901
1741our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1742 1903
1743use CFClient::OpenGL; 1904use CFClient::OpenGL;
1744 1905
1745sub key_down { 1906sub invoke_key_down {
1746 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1747 1908
1748 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1749 1910
1750 if ($sym == 13) { 1911 if ($sym == 13) {
1751 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1753 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1756 $self->update; 1918 $self->update;
1757 1919
1758 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
1776 } else { 1938 } else {
1777 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1778 } 1940 }
1779 1941
1780 } else { 1942 } else {
1781 $self->SUPER::key_down ($ev); 1943 return $self->SUPER::invoke_key_down ($ev)
1944 }
1945
1782 } 1946 1
1783
1784} 1947}
1785 1948
1786############################################################################# 1949#############################################################################
1787 1950
1788package CFClient::UI::Button; 1951package CFClient::UI::Button;
1797 1960
1798sub new { 1961sub new {
1799 my $class = shift; 1962 my $class = shift;
1800 1963
1801 $class->SUPER::new ( 1964 $class->SUPER::new (
1802 padding => 4, 1965 padding_x => 4,
1966 padding_y => 4,
1803 fg => [1, 1, 1], 1967 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1968 active_fg => [0, 0, 1],
1805 can_hover => 1, 1969 can_hover => 1,
1806 align => 0, 1970 align => 0,
1807 valign => 0, 1971 valign => 0,
1808 can_events => 1, 1972 can_events => 1,
1809 @_ 1973 @_
1810 ) 1974 )
1811} 1975}
1812 1976
1813sub activate { }
1814
1815sub button_up { 1977sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1817 1979
1818 $self->emit ("activate") 1980 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
1983
1984 1
1821} 1985}
1822 1986
1823sub _draw { 1987sub _draw {
1824 my ($self) = @_; 1988 my ($self) = @_;
1825 1989
1826 local $self->{fg} = $self->{fg}; 1990 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1991
1832 glEnable GL_TEXTURE_2D; 1992 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1994 glColor 0, 0, 0, 1;
1835 1995
1840 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
1841} 2001}
1842 2002
1843############################################################################# 2003#############################################################################
1844 2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
2037}
2038
2039#############################################################################
2040
1845package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
1846 2042
1847our @ISA = CFClient::UI::DrawBG::; 2043our @ISA = CFClient::UI::DrawBG::;
1848 2044
1849my @tex = 2045my @tex =
1854 2050
1855sub new { 2051sub new {
1856 my $class = shift; 2052 my $class = shift;
1857 2053
1858 $class->SUPER::new ( 2054 $class->SUPER::new (
1859 padding => 2, 2055 padding_x => 2,
2056 padding_y => 2,
1860 fg => [1, 1, 1], 2057 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2058 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2059 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2060 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2061 state => 0,
1868} 2065}
1869 2066
1870sub size_request { 2067sub size_request {
1871 my ($self) = @_; 2068 my ($self) = @_;
1872 2069
1873 ($self->{padding} * 2 + 6) x 2 2070 (6) x 2
1874} 2071}
1875 2072
2073sub toggle {
2074 my ($self) = @_;
2075
2076 $self->{state} = !$self->{state};
2077 $self->emit (changed => $self->{state});
2078 $self->update;
2079}
2080
1876sub button_down { 2081sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2082 my ($self, $ev, $x, $y) = @_;
1878 2083
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2084 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2085 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2086 $self->toggle;
1882 $self->_emit (changed => $self->{state}); 2087 } else {
2088 return 0
2089 }
2090
1883 } 2091 1
1884} 2092}
1885 2093
1886sub _draw { 2094sub _draw {
1887 my ($self) = @_; 2095 my ($self) = @_;
1888 2096
1889 $self->SUPER::_draw; 2097 $self->SUPER::_draw;
1890 2098
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2099 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2100
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2101 my ($w, $h) = @$self{qw(w h)};
2102
2103 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2104
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2105 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2106
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2107 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2108
1906package CFClient::UI::Image; 2116package CFClient::UI::Image;
1907 2117
1908our @ISA = CFClient::UI::Base::; 2118our @ISA = CFClient::UI::Base::;
1909 2119
1910use CFClient::OpenGL; 2120use CFClient::OpenGL;
1911use Carp qw/confess/;
1912 2121
1913our %loaded_images; 2122our %texture_cache;
1914 2123
1915sub new { 2124sub new {
1916 my $class = shift; 2125 my $class = shift;
1917 2126
1918 my $self = $class->SUPER::new (can_events => 0, @_); 2127 my $self = $class->SUPER::new (
2128 can_events => 0,
2129 @_,
2130 );
1919 2131
1920 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2132 $self->{path}
2133 or Carp::croak "required attribute 'path' not set";
1921 2134
1922 $loaded_images{$self->{image}} ||= 2135 $self->{tex} = $texture_cache{$self->{path}} ||=
1923 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1924 2137
1925 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2138 Scalar::Util::weaken $texture_cache{$self->{path}};
1926 2139
1927 Scalar::Util::weaken $loaded_images{$self->{image}}; 2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929 $self->{aspect} = $tex->{w} / $tex->{h};
1930 2141
1931 $self 2142 $self
1932} 2143}
1933 2144
1934sub size_request { 2145sub size_request {
1935 my ($self) = @_; 2146 my ($self) = @_;
1936 2147
1937 ($self->{tex}->{w}, $self->{tex}->{h}) 2148 ($self->{tex}{w}, $self->{tex}{h})
1938} 2149}
1939 2150
1940sub _draw { 2151sub _draw {
1941 my ($self) = @_; 2152 my ($self) = @_;
1942 2153
2051 my $ycut1 = max 0, min 1, $ycut; 2262 my $ycut1 = max 0, min 1, $ycut;
2052 my $ycut2 = max 0, min 1, $ycut - 1; 2263 my $ycut2 = max 0, min 1, $ycut - 1;
2053 2264
2054 my $h1 = $self->{h} * (1 - $ycut1); 2265 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2266 my $h2 = $self->{h} * (1 - $ycut2);
2267 my $h3 = $self->{h};
2268
2269 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2056 2270
2057 glEnable GL_BLEND; 2271 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2272 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2273 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2274 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2275 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2276
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2277 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2278 glBegin GL_QUADS;
2078 2293
2079 if ($t3) { 2294 if ($t3) {
2080 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2295 glBindTexture GL_TEXTURE_2D, $t3->{name};
2081 glBegin GL_QUADS; 2296 glBegin GL_QUADS;
2082 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2297 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2083 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2298 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2084 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2299 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2085 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2300 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2086 glEnd; 2301 glEnd;
2087 } 2302 }
2088 2303
2089 glDisable GL_BLEND; 2304 glDisable GL_BLEND;
2177 $self->update; 2392 $self->update;
2178 2393
2179 $self 2394 $self
2180} 2395}
2181 2396
2182sub changed { }
2183
2184sub set_range { 2397sub set_range {
2185 my ($self, $range) = @_; 2398 my ($self, $range) = @_;
2186 2399
2187 ($range, $self->{range}) = ($self->{range}, $range); 2400 ($range, $self->{range}) = ($self->{range}, $range);
2188 2401
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2402 if ("@$range" ne "@{$self->{range}}") {
2403 $self->update;
2404 $self->set_value ($self->{range}[0]);
2405 }
2191} 2406}
2192 2407
2193sub set_value { 2408sub set_value {
2194 my ($self, $value) = @_; 2409 my ($self, $value) = @_;
2195 2410
2206 if $unit; 2421 if $unit;
2207 2422
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2423 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 2424
2210 if ($value != $old_value) { 2425 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 2426 $self->emit (changed => $value);
2212 $self->update; 2427 $self->update;
2213 } 2428 }
2214} 2429}
2215 2430
2216sub size_request { 2431sub size_request {
2217 my ($self) = @_; 2432 my ($self) = @_;
2218 2433
2219 ($self->{req_w}, $self->{req_h}) 2434 ($self->{req_w}, $self->{req_h})
2220} 2435}
2221 2436
2222sub button_down { 2437sub invoke_button_down {
2223 my ($self, $ev, $x, $y) = @_; 2438 my ($self, $ev, $x, $y) = @_;
2224 2439
2225 $self->SUPER::button_down ($ev, $x, $y); 2440 $self->SUPER::invoke_button_down ($ev, $x, $y);
2226 2441
2227 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2442 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228 2443
2229 $self->mouse_motion ($ev, $x, $y); 2444 $self->invoke_mouse_motion ($ev, $x, $y)
2230} 2445}
2231 2446
2232sub mouse_motion { 2447sub invoke_mouse_motion {
2233 my ($self, $ev, $x, $y) = @_; 2448 my ($self, $ev, $x, $y) = @_;
2234 2449
2235 if ($GRAB == $self) { 2450 if ($GRAB == $self) {
2236 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2451 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2237 2452
2238 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2453 my (undef, $lo, $hi, $page) = @{$self->{range}};
2239 2454
2240 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2455 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241 2456
2242 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2457 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2458 } else {
2459 return 0;
2460 }
2461
2243 } 2462 1
2244} 2463}
2245 2464
2246sub update { 2465sub update {
2247 my ($self) = @_; 2466 my ($self) = @_;
2248 2467
2249 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2468 delete $self->{knob_w};
2469 $self->SUPER::update;
2470}
2471
2472sub _draw {
2473 my ($self) = @_;
2474
2475 unless ($self->{knob_w}) {
2250 $self->set_value ($self->{range}[0]); 2476 $self->set_value ($self->{range}[0]);
2251 2477
2252 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2478 my ($value, $lo, $hi, $page) = @{$self->{range}};
2253 my $range = ($hi - $page - $lo) || 1e-100; 2479 my $range = ($hi - $page - $lo) || 1e-100;
2254 2480
2260 $value = ($value - $lo) / $range; 2486 $value = ($value - $lo) / $range;
2261 $value = $value * $self->{scale} + $self->{offset}; 2487 $value = $value * $self->{scale} + $self->{offset};
2262 2488
2263 $self->{knob_x} = $value - $knob_w * 0.5; 2489 $self->{knob_x} = $value - $knob_w * 0.5;
2264 $self->{knob_w} = $knob_w; 2490 $self->{knob_w} = $knob_w;
2265 }); 2491 }
2266
2267 $self->SUPER::update;
2268}
2269
2270sub _draw {
2271 my ($self) = @_;
2272 2492
2273 $self->SUPER::_draw (); 2493 $self->SUPER::_draw ();
2274 2494
2275 glScale $self->{w}, $self->{h}; 2495 glScale $self->{w}, $self->{h};
2276 2496
2337sub set_range { shift->{slider}->set_range (@_) } 2557sub set_range { shift->{slider}->set_range (@_) }
2338sub set_value { shift->{slider}->set_value (@_) } 2558sub set_value { shift->{slider}->set_value (@_) }
2339 2559
2340############################################################################# 2560#############################################################################
2341 2561
2342package CFClient::UI::TextView; 2562package CFClient::UI::TextScroller;
2343 2563
2344our @ISA = CFClient::UI::HBox::; 2564our @ISA = CFClient::UI::HBox::;
2345 2565
2346use CFClient::OpenGL; 2566use CFClient::OpenGL;
2347 2567
2349 my $class = shift; 2569 my $class = shift;
2350 2570
2351 my $self = $class->SUPER::new ( 2571 my $self = $class->SUPER::new (
2352 fontsize => 1, 2572 fontsize => 1,
2353 can_events => 0, 2573 can_events => 0,
2574 indent => 0,
2354 #font => default_font 2575 #font => default_font
2355 @_, 2576 @_,
2356 2577
2357 layout => (new CFClient::Layout 1), 2578 layout => (new CFClient::Layout 1),
2358 par => [], 2579 par => [],
2373 2594
2374 $self->{fontsize} = $fontsize; 2595 $self->{fontsize} = $fontsize;
2375 $self->reflow; 2596 $self->reflow;
2376} 2597}
2377 2598
2599sub size_request {
2600 my ($self) = @_;
2601
2602 my ($empty, $slider) = @{ $self->{children} };
2603
2604 local $self->{children} = [$empty, $slider];
2605 $self->SUPER::size_request
2606}
2607
2378sub size_allocate { 2608sub invoke_size_allocate {
2379 my ($self, $w, $h, $changed) = @_; 2609 my ($self, $w, $h) = @_;
2380 2610
2381 $self->SUPER::size_allocate ($w, $h, $changed); 2611 my ($empty, $slider, @other) = @{ $self->{children} };
2382 2612 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2383 return unless $changed;
2384 2613
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2614 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w}); 2616 $self->{layout}->set_width ($empty->{w});
2617 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2388 2618
2389 $self->reflow; 2619 $self->reflow;
2390}
2391 2620
2392sub text_size { 2621 local $self->{children} = [$empty, $slider];
2393 my ($self, $text, $indent) = @_; 2622 $self->SUPER::invoke_size_allocate ($w, $h)
2623}
2624
2625sub get_layout {
2626 my ($self, $para) = @_;
2394 2627
2395 my $layout = $self->{layout}; 2628 my $layout = $self->{layout};
2396 2629
2630 $layout->set_font ($self->{font}) if $self->{font};
2631 $layout->set_foreground (@{$para->{fg}});
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2632 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent); 2633 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2634 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2399 $layout->set_markup ($text); 2635 $layout->set_markup ($para->{markup});
2636
2637 $layout->set_shapes (
2638 map
2639 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2640 @{$para->{widget}}
2400 2641 );
2642
2401 $layout->size 2643 $layout
2402} 2644}
2403 2645
2404sub reflow { 2646sub reflow {
2405 my ($self) = @_; 2647 my ($self) = @_;
2406 2648
2415 $self->{children}[1]->set_value ($offset); 2657 $self->{children}[1]->set_value ($offset);
2416} 2658}
2417 2659
2418sub clear { 2660sub clear {
2419 my ($self) = @_; 2661 my ($self) = @_;
2662
2663 my (undef, undef, @other) = @{ $self->{children} };
2664 $self->remove ($_) for @other;
2420 2665
2421 $self->{par} = []; 2666 $self->{par} = [];
2422 $self->{height} = 0; 2667 $self->{height} = 0;
2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2668 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424} 2669}
2425 2670
2426sub add_paragraph { 2671sub add_paragraph {
2427 my ($self, $color, $text, $indent) = @_; 2672 my ($self, $color, $para, $indent) = @_;
2428 2673
2429 for my $line (split /\n/, $text) { 2674 my ($text, @w) = ref $para ? @$para : $para;
2430 my ($w, $h) = $self->text_size ($line); 2675
2431 $self->{height} += $h; 2676 $para = {
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2677 w => 1e10,
2678 wrapped => 1,
2679 fg => $color,
2680 indent => $indent,
2681 markup => $text,
2682 widget => \@w,
2433 } 2683 };
2434 2684
2435 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2685 $self->add (@w) if @w;
2686 push @{$self->{par}}, $para;
2687
2688 $self->{need_reflow}++;
2689 $self->update;
2690}
2691
2692sub scroll_to_bottom {
2693 my ($self) = @_;
2694
2695 $self->{scroll_to_bottom} = 1;
2696 $self->update;
2436} 2697}
2437 2698
2438sub update { 2699sub update {
2439 my ($self) = @_; 2700 my ($self) = @_;
2440 2701
2442 2703
2443 return unless $self->{h} > 0; 2704 return unless $self->{h} > 0;
2444 2705
2445 delete $self->{texture}; 2706 delete $self->{texture};
2446 2707
2447 $ROOT->on_post_alloc ($self, sub { 2708 $ROOT->on_post_alloc ($self => sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2709 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449 2710
2450 if (delete $self->{need_reflow}) { 2711 if (delete $self->{need_reflow}) {
2451 my $height = 0; 2712 my $height = 0;
2452 2713
2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2457 for (@{$self->{par}}) { 2714 for my $para (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2715 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2459 $layout->set_width ($W - $_->[3]); 2716 my $layout = $self->get_layout ($para);
2460 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size; 2717 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3]; 2718
2463 $_->[1] = $h; 2719 $para->{w} = $w + $para->{indent};
2720 $para->{h} = $h;
2721 $para->{wrapped} = $layout->has_wrapped;
2464 } 2722 }
2465 2723
2466 $height += $_->[1]; 2724 $height += $para->{h};
2467 } 2725 }
2468 2726
2469 $self->{height} = $height; 2727 $self->{height} = $height;
2470 2728
2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2729 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2472 2730
2473 delete $self->{texture}; 2731 delete $self->{texture};
2474 } 2732 }
2475 2733
2734 if (delete $self->{scroll_to_bottom}) {
2735 $self->{children}[1]->set_value (1e10);
2736 }
2737
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2738 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2739 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2740 glClear GL_COLOR_BUFFER_BIT;
2479 2741
2480 my $top = int $self->{children}[1]{range}[0]; 2742 my $top = int $self->{children}[1]{range}[0];
2481 2743
2482 my $y0 = $top; 2744 my $y0 = $top;
2483 my $y1 = $top + $H; 2745 my $y1 = $top + $H;
2484 2746
2485 my $y = 0; 2747 my $y = 0;
2486
2487 my $layout = $self->{layout};
2488
2489 $layout->set_font ($self->{font}) if $self->{font};
2490 2748
2491 glEnable GL_BLEND; 2749 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off 2750 #TODO# not correct in windows where rgba is forced off
2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2494 2752
2495 for my $par (@{$self->{par}}) { 2753 for my $para (@{$self->{par}}) {
2496 my $h = $par->[1]; 2754 my $h = $para->{h};
2497 2755
2498 if ($y0 < $y + $h && $y < $y1) { 2756 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] }); 2757
2500 $layout->set_width ($W - $par->[3]); 2758 my $layout = $self->get_layout ($para);
2501 $layout->set_markup ($par->[4]);
2502 2759
2503 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2504 2761
2505 glRasterPos $par->[3], $y - $y0; 2762 glRasterPos $para->{indent}, $y - $y0;
2506 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764
2765 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes;
2767
2768 glDisable GL_BLEND;
2769 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, ();
2771
2772 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0;
2774
2775 $_->draw;
2776 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 }
2507 } 2780 }
2508 2781
2509 $y += $h; 2782 $y += $h;
2510 } 2783 }
2511 2784
2512 glDisable GL_BLEND; 2785 glDisable GL_BLEND;
2513 }; 2786 };
2514 }); 2787 });
2515} 2788}
2516 2789
2790sub reconfigure {
2791 my ($self) = @_;
2792
2793 $self->SUPER::reconfigure;
2794
2795 $_->{w} = 1e10 for @{ $self->{par} };
2796 $self->reflow;
2797}
2798
2517sub _draw { 2799sub _draw {
2518 my ($self) = @_; 2800 my ($self) = @_;
2519 2801
2520 glEnable GL_TEXTURE_2D; 2802 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2804 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2805 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2525 2807
2526 $self->{children}[1]->draw; 2808 $self->{children}[1]->draw;
2527
2528} 2809}
2529 2810
2530############################################################################# 2811#############################################################################
2531 2812
2532package CFClient::UI::Animator; 2813package CFClient::UI::Animator;
2611} 2892}
2612 2893
2613sub set_tooltip_from { 2894sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2895 my ($self, $widget) = @_;
2615 2896
2897 my $tooltip = $widget->{tooltip};
2898
2899 if ($ENV{CFPLUS_DEBUG} & 2) {
2900 $tooltip .= "\n\n" . (ref $widget) . "\n"
2901 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2902 . "req $widget->{req_w} $widget->{req_h}\n"
2903 . "visible $widget->{visible}";
2904 }
2905
2906 $tooltip =~ s/^\n+//;
2907 $tooltip =~ s/\n+$//;
2908
2616 $self->add (new CFClient::UI::Label 2909 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2910 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2911 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2912 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2913 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2914 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2915 font => ($widget->{tooltip_font} || $::FONT_PROP),
2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2922 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2630 2923
2631 ($w + 4, $h + 4) 2924 ($w + 4, $h + 4)
2632} 2925}
2633 2926
2634sub size_allocate { 2927sub invoke_size_allocate {
2635 my ($self, $w, $h, $changed) = @_; 2928 my ($self, $w, $h) = @_;
2636 2929
2637 return unless $changed;
2638
2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2930 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2640} 2931}
2641 2932
2642sub visibility_change { 2933sub invoke_visibility_change {
2643 my ($self, $visible) = @_; 2934 my ($self, $visible) = @_;
2644 2935
2645 return unless $visible; 2936 return unless $visible;
2646 2937
2647 $self->{root}->on_post_alloc ("move_$self" => sub { 2938 $self->{root}->on_post_alloc ("move_$self" => sub {
2649 or return; 2940 or return;
2650 2941
2651 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2942 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652 2943
2653 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2944 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654 if $x + $self->{w} > $::WIDTH; 2945 if $x + $self->{w} > $self->{root}{w};
2655 2946
2656 $self->move_abs ($x, $y); 2947 $self->move_abs ($x, $y);
2657 }); 2948 });
2658} 2949}
2659 2950
2748 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3039 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2749 3040
2750 if ($tex) { 3041 if ($tex) {
2751 glEnable GL_TEXTURE_2D; 3042 glEnable GL_TEXTURE_2D;
2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3043 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2753 glColor 1, 1, 1, 1; 3044 glColor 0, 0, 0, 1;
2754 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3045 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2755 glDisable GL_TEXTURE_2D; 3046 glDisable GL_TEXTURE_2D;
2756 } 3047 }
2757} 3048}
2758 3049
2759sub DESTROY { 3050sub destroy {
2760 my ($self) = @_; 3051 my ($self) = @_;
2761 3052
2762 $self->{timer}->cancel 3053 $self->{timer}->cancel
2763 if $self->{timer}; 3054 if $self->{timer};
2764 3055
2765 $self->SUPER::DESTROY; 3056 $self->SUPER::destroy;
2766} 3057}
2767 3058
2768############################################################################# 3059#############################################################################
2769 3060
2770package CFClient::UI::Inventory; 3061package CFClient::UI::Buttonbar;
2771 3062
2772our @ISA = CFClient::UI::ScrolledWindow::; 3063our @ISA = CFClient::UI::HBox::;
2773 3064
2774sub new { 3065# TODO: should actualyl wrap buttons and other goodies.
2775 my $class = shift;
2776
2777 my $self = $class->SUPER::new (
2778 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779 @_,
2780 );
2781
2782 $self
2783}
2784
2785sub set_items {
2786 my ($self, $items) = @_;
2787
2788 $self->{scrolled}->clear;
2789 return unless $items;
2790
2791 my @items = sort {
2792 ($a->{type} <=> $b->{type})
2793 or ($a->{name} cmp $b->{name})
2794 } @$items;
2795
2796 $self->{real_items} = \@items;
2797
2798 my $row = 0;
2799 for my $item (@items) {
2800 CFClient::Item::update_widgets $item;
2801
2802 $self->{scrolled}->add (0, $row, $item->{face_widget});
2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806 $row++;
2807 }
2808}
2809 3066
2810############################################################################# 3067#############################################################################
2811 3068
2812package CFClient::UI::Menu; 3069package CFClient::UI::Menu;
2813 3070
2825 ); 3082 );
2826 3083
2827 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3084 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2828 3085
2829 for my $item (@{ $self->{items} }) { 3086 for my $item (@{ $self->{items} }) {
2830 my ($widget, $cb) = @$item; 3087 my ($widget, $cb, $tooltip) = @$item;
2831 3088
2832 # handle various types of items, only text for now 3089 # handle various types of items, only text for now
2833 if (!ref $widget) { 3090 if (!ref $widget) {
2834 $widget = new CFClient::UI::Label 3091 $widget = new CFClient::UI::Label
2835 can_hover => 1, 3092 can_hover => 1,
2836 can_events => 1, 3093 can_events => 1,
2837 text => $widget; 3094 markup => $widget,
3095 tooltip => $tooltip
2838 } 3096 }
2839 3097
2840 $self->{item}{$widget} = $item; 3098 $self->{item}{$widget} = $item;
2841 3099
2842 $self->{vbox}->add ($widget); 3100 $self->{vbox}->add ($widget);
2847 3105
2848# popup given the event (must be a mouse button down event currently) 3106# popup given the event (must be a mouse button down event currently)
2849sub popup { 3107sub popup {
2850 my ($self, $ev) = @_; 3108 my ($self, $ev) = @_;
2851 3109
2852 $self->_emit ("popdown"); 3110 $self->emit ("popdown");
2853 3111
2854 # maybe save $GRAB? must be careful about events... 3112 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 3113 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 3114 $self->{button} = $ev->{button};
2857 3115
2858 $self->show; 3116 $self->show;
2859 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3117 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860} 3118}
2861 3119
2862sub mouse_motion { 3120sub invoke_mouse_motion {
2863 my ($self, $ev, $x, $y) = @_; 3121 my ($self, $ev, $x, $y) = @_;
2864 3122
2865 # TODO: should use vbox->find_widget or so 3123 # TODO: should use vbox->find_widget or so
2866 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3124 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867 $self->{hover} = $self->{item}{$HOVER}; 3125 $self->{hover} = $self->{item}{$HOVER};
2868}
2869 3126
3127 0
3128}
3129
2870sub button_up { 3130sub invoke_button_up {
2871 my ($self, $ev, $x, $y) = @_; 3131 my ($self, $ev, $x, $y) = @_;
2872 3132
2873 if ($ev->{button} == $self->{button}) { 3133 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 3134 undef $GRAB;
2875 $self->hide; 3135 $self->hide;
2876 3136
2877 $self->_emit ("popdown"); 3137 $self->emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 3138 $self->{hover}[1]->() if $self->{hover};
3139 } else {
3140 return 0
3141 }
3142
2879 } 3143 1
2880} 3144}
2881 3145
2882############################################################################# 3146#############################################################################
2883 3147
2884package CFClient::UI::Statusbox; 3148package CFClient::UI::Multiplexer;
2885 3149
2886our @ISA = CFClient::UI::VBox::; 3150our @ISA = CFClient::UI::Container::;
2887 3151
2888sub new { 3152sub new {
2889 my $class = shift; 3153 my $class = shift;
2890 3154
2891 $class->SUPER::new ( 3155 my $self = $class->SUPER::new (
3156 @_,
3157 );
3158
3159 $self->{current} = $self->{children}[0]
3160 if @{ $self->{children} };
3161
3162 $self
3163}
3164
3165sub add {
3166 my ($self, @widgets) = @_;
3167
3168 $self->SUPER::add (@widgets);
3169
3170 $self->{current} = $self->{children}[0]
3171 if @{ $self->{children} };
3172}
3173
3174sub get_current_page {
3175 my ($self) = @_;
3176
3177 $self->{current}
3178}
3179
3180sub set_current_page {
3181 my ($self, $page_or_widget) = @_;
3182
3183 my $widget = ref $page_or_widget
3184 ? $page_or_widget
3185 : $self->{children}[$page_or_widget];
3186
3187 $self->{current} = $widget;
3188 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3189
3190 $self->emit (page_changed => $self->{current});
3191
3192 $self->realloc;
3193}
3194
3195sub visible_children {
3196 $_[0]{current}
3197}
3198
3199sub size_request {
3200 my ($self) = @_;
3201
3202 $self->{current}->size_request
3203}
3204
3205sub invoke_size_allocate {
3206 my ($self, $w, $h) = @_;
3207
3208 $self->{current}->configure (0, 0, $w, $h);
3209
3210 1
3211}
3212
3213sub _draw {
3214 my ($self) = @_;
3215
3216 $self->{current}->draw;
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::Notebook;
3222
3223our @ISA = CFClient::UI::VBox::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (
3229 buttonbar => (new CFClient::UI::Buttonbar),
3230 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3231 # filter => # will be put between multiplexer and $self
3232 @_,
3233 );
3234
3235 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3236 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3237
3238 $self
3239}
3240
3241sub add {
3242 my ($self, $title, $widget, $tooltip) = @_;
3243
3244 Scalar::Util::weaken $self;
3245
3246 $self->{buttonbar}->add (new CFClient::UI::Button
3247 markup => $title,
3248 tooltip => $tooltip,
3249 on_activate => sub { $self->set_current_page ($widget) },
3250 );
3251
3252 $self->{multiplexer}->add ($widget);
3253}
3254
3255sub get_current_page {
3256 my ($self) = @_;
3257
3258 $self->{multiplexer}->get_current_page
3259}
3260
3261sub set_current_page {
3262 my ($self, $page) = @_;
3263
3264 $self->{multiplexer}->set_current_page ($page);
3265 $self->emit (page_changed => $self->{multiplexer}{current});
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::Combobox;
3271
3272use utf8;
3273
3274our @ISA = CFClient::UI::Button::;
3275
3276sub new {
3277 my $class = shift;
3278
3279 my $self = $class->SUPER::new (
3280 options => [], # [value, title, longdesc], ...
3281 value => undef,
3282 @_,
3283 );
3284
3285 $self->_set_value ($self->{value});
3286
3287 $self
3288}
3289
3290sub invoke_button_down {
3291 my ($self, $ev) = @_;
3292
3293 my @menu_items;
3294
3295 for (@{ $self->{options} }) {
3296 my ($value, $title, $tooltip) = @$_;
3297
3298 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3299 }
3300
3301 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3302}
3303
3304sub _set_value {
3305 my ($self, $value) = @_;
3306
3307 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3308 or return;
3309
3310 $self->{value} = $item->[0];
3311 $self->set_markup ("$item->[1] ⇓");
3312 $self->set_tooltip ($item->[2]);
3313}
3314
3315sub set_value {
3316 my ($self, $value) = @_;
3317
3318 return unless $self->{value} ne $value;
3319
3320 $self->_set_value ($value);
3321 $self->emit (changed => $value);
3322}
3323
3324#############################################################################
3325
3326package CFClient::UI::Statusbox;
3327
3328our @ISA = CFClient::UI::VBox::;
3329
3330sub new {
3331 my $class = shift;
3332
3333 my $self = $class->SUPER::new (
2892 fontsize => 0.8, 3334 fontsize => 0.8,
2893 @_, 3335 @_,
2894 ) 3336 );
3337
3338 Scalar::Util::weaken (my $this = $self);
3339
3340 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3341
3342 $self
2895} 3343}
2896 3344
2897sub reorder { 3345sub reorder {
2898 my ($self) = @_; 3346 my ($self) = @_;
2899 my $NOW = time; 3347 my $NOW = Time::HiRes::time;
3348
3349 # freeze display when hovering over any label
3350 return if $CFClient::UI::TOOLTIP->{owner}
3351 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3352 values %{ $self->{item} };
2900 3353
2901 while (my ($k, $v) = each %{ $self->{item} }) { 3354 while (my ($k, $v) = each %{ $self->{item} }) {
2902 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3355 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2903 } 3356 }
2904 3357
2907 my @items = sort { 3360 my @items = sort {
2908 $a->{pri} <=> $b->{pri} 3361 $a->{pri} <=> $b->{pri}
2909 or $b->{id} <=> $a->{id} 3362 or $b->{id} <=> $a->{id}
2910 } values %{ $self->{item} }; 3363 } values %{ $self->{item} };
2911 3364
3365 $self->{timer}->interval (1);
3366
2912 my $count = 10 + 1; 3367 my $count = 10 + 1;
2913 for my $item (@items) { 3368 for my $item (@items) {
2914 last unless --$count; 3369 last unless --$count;
2915 3370
2916 push @widgets, $item->{label} ||= do { 3371 my $label = $item->{label} ||= do {
2917 # TODO: doesn't handle markup well (read as: at all) 3372 # TODO: doesn't handle markup well (read as: at all)
2918 my $short = $item->{count} > 1 3373 my $short = $item->{count} > 1
2919 ? "<b>$item->{count} ×</b> $item->{text}" 3374 ? "<b>$item->{count} ×</b> $item->{text}"
2920 : $item->{text}; 3375 : $item->{text};
2921 3376
2929 tooltip => $item->{tooltip}, 3384 tooltip => $item->{tooltip},
2930 tooltip_font => $::FONT_PROP, 3385 tooltip_font => $::FONT_PROP,
2931 tooltip_width => 0.67, 3386 tooltip_width => 0.67,
2932 fontsize => $item->{fontsize} || $self->{fontsize}, 3387 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44, 3388 max_w => $::WIDTH * 0.44,
2934 fg => $item->{fg}, 3389 fg => [@{ $item->{fg} }],
2935 can_events => 1, 3390 can_events => 1,
2936 can_hover => 1 3391 can_hover => 1
2937 }; 3392 };
3393
3394 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3395 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3396 $label->update;
3397 $label->set_max_size (undef, $label->{req_h} * $diff)
3398 if $diff < 1;
3399 $self->{timer}->interval (1/30);
3400 } else {
3401 $label->{fg}[3] = $item->{fg}[3] || 1;
3402 }
3403
3404 push @widgets, $label;
2938 } 3405 }
2939 3406
2940 $self->clear; 3407 $self->clear;
2941 $self->SUPER::add (reverse @widgets); 3408 $self->SUPER::add (reverse @widgets);
2942} 3409}
2947 $text =~ s/^\s+//; 3414 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 3415 $text =~ s/\s+$//;
2949 3416
2950 return unless $text; 3417 return unless $text;
2951 3418
2952 my $timeout = time + ((delete $arg{timeout}) || 60); 3419 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2953 3420
2954 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3421 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2955 3422
2956 if (my $item = $self->{item}{$group}) { 3423 if (my $item = $self->{item}{$group}) {
2957 if ($item->{text} eq $text) { 3424 if ($item->{text} eq $text) {
2958 $item->{count}++; 3425 $item->{count}++;
2959 } else { 3426 } else {
2960 $item->{count} = 1; 3427 $item->{count} = 1;
2961 $item->{text} = $item->{tooltip} = $text; 3428 $item->{text} = $item->{tooltip} = $text;
2962 } 3429 }
2963 $item->{id} = ++$self->{id}; 3430 $item->{id} += 0.2;#d#
2964 $item->{timeout} = $timeout; 3431 $item->{timeout} = $timeout;
2965 delete $item->{label}; 3432 delete $item->{label};
2966 } else { 3433 } else {
2967 $self->{item}{$group} = { 3434 $self->{item}{$group} = {
2968 id => ++$self->{id}, 3435 id => ++$self->{id},
2974 count => 1, 3441 count => 1,
2975 %arg, 3442 %arg,
2976 }; 3443 };
2977 } 3444 }
2978 3445
3446 $ROOT->on_refresh (reorder => sub {
2979 $self->reorder; 3447 $self->reorder;
3448 });
2980} 3449}
2981 3450
2982sub reconfigure { 3451sub reconfigure {
2983 my ($self) = @_; 3452 my ($self) = @_;
2984 3453
2987 3456
2988 $self->reorder; 3457 $self->reorder;
2989 $self->SUPER::reconfigure; 3458 $self->SUPER::reconfigure;
2990} 3459}
2991 3460
3461sub destroy {
3462 my ($self) = @_;
3463
3464 $self->{timer}->cancel;
3465
3466 $self->SUPER::destroy;
3467}
3468
2992############################################################################# 3469#############################################################################
2993 3470
3471package CFClient::UI::Inventory;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 col_expand => [0, 1, 0],
3480 @_,
3481 );
3482
3483 $self
3484}
3485
3486sub set_items {
3487 my ($self, $items) = @_;
3488
3489 $self->clear;
3490 return unless $items;
3491
3492 my @items = sort {
3493 ($a->{type} <=> $b->{type})
3494 or ($a->{name} cmp $b->{name})
3495 } values %$items;
3496
3497 $self->{real_items} = \@items;
3498
3499 my $row = 0;
3500 for my $item (@items) {
3501 CFClient::Item::update_widgets $item;
3502
3503 $self->add (0, $row, $item->{face_widget});
3504 $self->add (1, $row, $item->{desc_widget});
3505 $self->add (2, $row, $item->{weight_widget});
3506
3507 $row++;
3508 }
3509}
3510
3511#############################################################################
3512
3513package CFClient::UI::SpellList;
3514
3515our @ISA = CFClient::UI::Table::;
3516
3517sub new {
3518 my $class = shift;
3519
3520 my $self = $class->SUPER::new (
3521 binding => [],
3522 commands => [],
3523 @_,
3524 )
3525}
3526
3527my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3528
3529my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3531my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3533my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3537my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3539
3540sub rebuild_spell_list {
3541 my ($self) = @_;
3542
3543 $CFClient::UI::ROOT->on_refresh ($self => sub {
3544 $self->clear;
3545
3546 return unless $::CONN;
3547
3548 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3549 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3550 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3551 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3552 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3553
3554 my $row = 0;
3555
3556 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3557 my $spell = $self->{spell}{$_};
3558
3559 $row++;
3560
3561 my $spell_cb = sub {
3562 my ($widget, $ev) = @_;
3563
3564 if ($ev->{button} == 1) {
3565 $::CONN->user_send ("cast $spell->{name}");
3566 } elsif ($ev->{button} == 2) {
3567 $::CONN->user_send ("invoke $spell->{name}");
3568 } elsif ($ev->{button} == 3) {
3569 (new CFClient::UI::Menu
3570 items => [
3571 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3572 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3573 ],
3574 )->popup ($ev);
3575 } else {
3576 return 0;
3577 }
3578
3579 1
3580 };
3581
3582 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3583
3584 #TODO: add path info to tooltip
3585 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3586
3587 $self->add (0, $row, new CFClient::UI::Face
3588 face => $spell->{face},
3589 can_hover => 1,
3590 can_events => 1,
3591 tooltip => $tooltip,
3592 on_button_down => $spell_cb,
3593 );
3594
3595 $self->add (1, $row, new CFClient::UI::Label
3596 expand => 1,
3597 text => $spell->{name},
3598 can_hover => 1,
3599 can_events => 1,
3600 tooltip => $tooltip,
3601 on_button_down => $spell_cb,
3602 );
3603
3604 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3605 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3606 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3607 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3608 }
3609 });
3610}
3611
3612sub add_spell {
3613 my ($self, $spell) = @_;
3614
3615 $self->{spell}->{$spell->{name}} = $spell;
3616 $self->rebuild_spell_list;
3617}
3618
3619sub remove_spell {
3620 my ($self, $spell) = @_;
3621
3622 delete $self->{spell}->{$spell->{name}};
3623 $self->rebuild_spell_list;
3624}
3625
3626sub clear_spells {
3627 my ($self) = @_;
3628
3629 $self->{spell} = {};
3630 $self->rebuild_spell_list;
3631}
3632
3633#############################################################################
3634
2994package CFClient::UI::Root; 3635package CFClient::UI::Root;
2995 3636
2996our @ISA = CFClient::UI::Container::; 3637our @ISA = CFClient::UI::Container::;
3638
3639use List::Util qw(min max);
2997 3640
2998use CFClient::OpenGL; 3641use CFClient::OpenGL;
2999 3642
3000sub new { 3643sub new {
3001 my $class = shift; 3644 my $class = shift;
3008 Scalar::Util::weaken ($self->{root} = $self); 3651 Scalar::Util::weaken ($self->{root} = $self);
3009 3652
3010 $self 3653 $self
3011} 3654}
3012 3655
3013sub configure {
3014 my ($self, $x, $y, $w, $h) = @_;
3015
3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
3019
3020sub reconfigure {
3021 my ($self) = @_;
3022
3023 $self->SUPER::reconfigure;
3024
3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
3026 if $self->{w};
3027}
3028
3029sub size_request { 3656sub size_request {
3030 my ($self) = @_; 3657 my ($self) = @_;
3031 3658
3032 ($self->{w}, $self->{h}) 3659 ($self->{w}, $self->{h})
3033} 3660}
3044 $coord = $max - $size if $coord > $max - $size; 3671 $coord = $max - $size if $coord > $max - $size;
3045 3672
3046 int $coord + 0.5 3673 int $coord + 0.5
3047} 3674}
3048 3675
3049sub size_allocate { 3676sub invoke_size_allocate {
3050 my ($self, $w, $h, $changed) = @_; 3677 my ($self, $w, $h) = @_;
3051 3678
3052 for my $child ($self->children) { 3679 for my $child ($self->children) {
3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3680 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054 3681
3055 $X = $child->{force_x} if exists $child->{force_x}; 3682 $X = $child->{force_x} if exists $child->{force_x};
3058 $X = _to_pixel $X, $W, $self->{w}; 3685 $X = _to_pixel $X, $W, $self->{w};
3059 $Y = _to_pixel $Y, $H, $self->{h}; 3686 $Y = _to_pixel $Y, $H, $self->{h};
3060 3687
3061 $child->configure ($X, $Y, $W, $H); 3688 $child->configure ($X, $Y, $W, $H);
3062 } 3689 }
3690
3691 1
3063} 3692}
3064 3693
3065sub coord2local { 3694sub coord2local {
3066 my ($self, $x, $y) = @_; 3695 my ($self, $x, $y) = @_;
3067 3696
3123 $_->() 3752 $_->()
3124 for values %{delete $self->{refresh_hook}}; 3753 for values %{delete $self->{refresh_hook}};
3125 } 3754 }
3126 3755
3127 if ($self->{realloc}) { 3756 if ($self->{realloc}) {
3757 my %queue;
3128 my @queue; 3758 my @queue;
3759 my $widget;
3129 3760
3761 outer:
3130 while () { 3762 while () {
3131 if ($self->{realloc}) { 3763 if (my $realloc = delete $self->{realloc}) {
3132 #TODO use array-of-depth approach 3764 for $widget (values %$realloc) {
3765 $widget->{visible} or next; # do not resize invisible widgets
3133 3766
3134 @queue = sort { $a->{visible} <=> $b->{visible} } 3767 $queue{$widget+0}++ and next; # duplicates are common
3135 @queue, values %{delete $self->{realloc}}; 3768
3769 push @{ $queue[$widget->{visible}] }, $widget;
3770 }
3136 } 3771 }
3137 3772
3773 while () {
3774 @queue or last outer;
3775
3138 my $widget = pop @queue || last; 3776 $widget = pop @{ $queue[-1] || [] }
3777 and last;
3778
3779 pop @queue;
3780 }
3139 3781
3140 $widget->{visible} or last; # do not resize invisible widgets 3782 delete $queue{$widget+0};
3141 3783
3142 my ($w, $h) = $widget->size_request; 3784 my ($w, $h) = $widget->size_request;
3143 3785
3144 my $min_size = $widget->{is_toplevel} ? 16 : 0; 3786 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3787 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3145 3788
3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w; 3789 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h; 3790 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148 3791
3149 $w = $widget->{force_w} if exists $widget->{force_w}; 3792 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h}; 3793 $h = $widget->{force_h} if exists $widget->{force_h};
3151 3794
3795 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3796 || delete $widget->{force_realloc}) {
3152 $widget->{req_w} = $w; 3797 $widget->{req_w} = $w;
3153 $widget->{req_h} = $h; 3798 $widget->{req_h} = $h;
3154 3799
3155 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3800 $self->{size_alloc}{$widget+0} = $widget;
3156 3801
3157 push @queue, $widget->{parent} 3802 if (my $parent = $widget->{parent}) {
3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3803 $self->{realloc}{$parent+0} = $parent
3804 unless $queue{$parent+0};
3805
3806 $parent->{force_size_alloc} = 1;
3807 $self->{size_alloc}{$parent+0} = $parent;
3808 }
3809 }
3810
3811 delete $self->{realloc}{$widget+0};
3159 } 3812 }
3160 } 3813 }
3161 3814
3162 while (my $size_alloc = delete $self->{size_alloc}) { 3815 while (my $size_alloc = delete $self->{size_alloc}) {
3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3816 my @queue = sort { $b->{visible} <=> $a->{visible} }
3164 values %$size_alloc; 3817 values %$size_alloc;
3165 3818
3166 while () { 3819 while () {
3167 my ($widget, $w, $h) = @{ pop @queue or last }; 3820 my $widget = pop @queue || last;
3168 3821
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3171 3823
3172 $w = 0 if $w < 0; 3824 $w = 0 if $w < 0;
3173 $h = 0 if $h < 0; 3825 $h = 0 if $h < 0;
3174 3826
3175 $w = int $w + 0.5; 3827 $w = int $w + 0.5;
3176 $h = int $h + 0.5; 3828 $h = int $h + 0.5;
3177 3829
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w};
3832 $widget->{old_h} = $widget->{h};
3179 3833
3180 $widget->{w} = $w; 3834 $widget->{w} = $w;
3181 $widget->{h} = $h; 3835 $widget->{h} = $h;
3182 3836
3183 $widget->emit (size_allocate => $w, $h, $changed); 3837 $widget->emit (size_allocate => $w, $h);
3838 }
3184 } 3839 }
3185 } 3840 }
3186 3841
3187 while ($self->{post_alloc_hook}) { 3842 while ($self->{post_alloc_hook}) {
3188 $_->() 3843 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3844 for values %{delete $self->{post_alloc_hook}};
3190 } 3845 }
3846
3191 3847
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3848 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3849 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 3850 glClear GL_COLOR_BUFFER_BIT;
3195 3851
3197 glLoadIdentity; 3853 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3854 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 3855 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 3856 glLoadIdentity;
3201 3857
3858 {
3859 package CFClient::UI::Base;
3860
3861 ($draw_x, $draw_y, $draw_w, $draw_h) =
3862 (0, 0, $self->{w}, $self->{h});
3863 }
3864
3202 $self->_draw; 3865 $self->_draw;
3203} 3866}
3204 3867
3205############################################################################# 3868#############################################################################
3206 3869

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines