ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 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 my $focus = $FOCUS; $FOCUS = $self;
413 429
414 $self->_emit (focus_in => $focus);
415
416 $focus->update if $focus; 430 $focus->update if $focus;
417 $FOCUS->update; 431 $FOCUS->update;
418}
419 432
433 0
434}
435
420sub focus_out { 436sub invoke_focus_out {
421 my ($self) = @_; 437 my ($self) = @_;
422 438
423 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
424 440
425 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
426 442
427 $self->_emit (focus_out => $focus);
428
429 $focus->update if $focus; #? 443 $focus->update if $focus; #?
430 444
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
432 unless $FOCUS; 446 unless $FOCUS;
433}
434 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526 550
527 glPushMatrix; 551 glPushMatrix;
528 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
529 $self->_draw;
530 glPopMatrix;
531 553
532 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
533 my ($x, $y) = @$self{qw(x y)};
534
535 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536 glEnable GL_BLEND; 556 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glBegin GL_QUADS; 558 glBegin GL_QUADS;
539 glVertex $x , $y; 559 glVertex 0 , 0;
540 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
541 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
542 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
543 glEnd; 563 glEnd;
544 glDisable GL_BLEND; 564 glDisable GL_BLEND;
545 } 565 }
546 566
547 if ($ENV{CFPLUS_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 568 glPushMatrix;
549 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
551 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 572 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
556 glEnd; 576 glEnd;
557 glPopMatrix; 577 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
560} 583}
561 584
562sub _draw { 585sub _draw {
563 my ($self) = @_; 586 my ($self) = @_;
564 587
… …
567 590
568sub DESTROY { 591sub DESTROY {
569 my ($self) = @_; 592 my ($self) = @_;
570 593
571 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
572 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
573} 598}
574 599
575############################################################################# 600#############################################################################
576 601
577package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
602 627
603 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
604 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
605 630
606 glEnable GL_BLEND; 631 glEnable GL_BLEND;
607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608 glColor @$color; 633 glColor_premultiply @$color;
609 634
610 glBegin GL_QUADS; 635 glBegin GL_QUADS;
611 glVertex 0 , 0; 636 glVertex 0 , 0;
612 glVertex 0 , $h; 637 glVertex 0 , $h;
613 glVertex $w, $h; 638 glVertex $w, $h;
… …
644our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
645 670
646sub new { 671sub new {
647 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
648 673
649 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
650 675
651 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
652 children => [], 677 children => [],
653 can_events => 0, 678 can_events => 0,
654 %arg, 679 %arg,
655 ); 680 );
681
656 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
657 684
658 $self 685 $self
659} 686}
660 687
661sub add { 688sub add {
… …
709 $x -= $self->{x}; 736 $x -= $self->{x};
710 $y -= $self->{y}; 737 $y -= $self->{y};
711 738
712 my $res; 739 my $res;
713 740
714 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
715 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
716 and return $res; 743 and return $res;
717 } 744 }
718 745
719 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
740} 767}
741 768
742sub add { 769sub add {
743 my ($self, $child) = @_; 770 my ($self, $child) = @_;
744 771
745 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
746
747 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
748} 774}
749 775
750sub remove { 776sub remove {
751 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
760 786
761sub size_request { 787sub size_request {
762 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
763} 789}
764 790
765sub size_allocate { 791sub invoke_size_allocate {
766 my ($self, $w, $h, $changed) = @_; 792 my ($self, $w, $h) = @_;
767 793
768 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
769} 797}
770 798
771############################################################################# 799#############################################################################
800
801# back-buffered drawing area
772 802
773package CFClient::UI::Window; 803package CFClient::UI::Window;
774 804
775our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
776 806
… …
787 817
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 819 $self->SUPER::update;
790} 820}
791 821
792sub size_allocate { 822sub invoke_size_allocate {
793 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
794 824
795 $self->SUPER::size_allocate ($w, $h, $changed);
796 $self->update 825 $self->update;
797 if $changed; 826
827 $self->SUPER::invoke_size_allocate ($w, $h)
798} 828}
799 829
800sub _render { 830sub _render {
831 my ($self) = @_;
832
801 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
802} 834}
803 835
804sub render_child { 836sub render_child {
805 my ($self) = @_; 837 my ($self) = @_;
806 838
807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
809 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
810 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
811 $self->_render; 850 $self->_render;
812 }; 851 };
813} 852}
814 853
815sub _draw { 854sub _draw {
816 my ($self) = @_; 855 my ($self) = @_;
817 856
818 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
819 858
820 my $tex = $self->{texture} 859 my $tex = $self->{texture}
821 or return; 860 or return;
822 861
823 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
826 865
827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828 867
829 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
830} 869}
… …
846} 885}
847 886
848sub size_request { 887sub size_request {
849 my ($self) = @_; 888 my ($self) = @_;
850 889
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 891
853 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
855 894
856 ($w, $h) 895 ($w, $h)
857} 896}
858 897
859sub size_allocate { 898sub invoke_size_allocate {
860 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
861 900
901 my $child = $self->child;
902
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 905
865 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
866 $self->update; 907 $self->update;
908
909 1
867} 910}
868 911
869sub set_offset { 912sub set_offset {
870 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
871 914
… …
904} 947}
905 948
906sub _render { 949sub _render {
907 my ($self) = @_; 950 my ($self) = @_;
908 951
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
954
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910 956
911 $self->SUPER::_render; 957 $self->SUPER::_render;
912} 958}
913 959
… …
916package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
917 963
918our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
919 965
920sub new { 966sub new {
921 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
922 970
923 my $self; 971 my $self;
924 972
925 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
926 vertical => 1, 974 vertical => 1,
… …
931 ; 979 ;
932 980
933 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1), 982 vp => (new CFClient::UI::ViewPort expand => 1),
935 slider => $slider, 983 slider => $slider,
936 @_, 984 %arg,
937 ); 985 );
938 986
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
942 989
943 $self 990 $self
991}
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
944} 997}
945 998
946sub update { 999sub update {
947 my ($self) = @_; 1000 my ($self) = @_;
948 1001
… …
951 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
952 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954} 1007}
955 1008
956sub size_allocate { 1009sub invoke_size_allocate {
957 my ($self, $w, $h, $changed) = @_; 1010 my ($self, $w, $h) = @_;
958
959 $self->SUPER::size_allocate ($w, $h, $changed);
960 1011
961 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
963} 1016}
964 1017
965#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
966# update viewport offset on scroll 1019# update viewport offset on scroll
967 1020
… …
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 is_toplevel => 1,
1032 can_events => 1, 1084 can_events => 1,
1033 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
1034 ); 1088 );
1035 1089
1036 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
1037 align => 0, 1091 align => 0,
1038 valign => 1, 1092 valign => 1,
1039 text => $self->{title}, 1093 text => $self->{title},
1040 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->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1041 1105
1042 $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};
1043} 1115}
1044 1116
1045sub border { 1117sub border {
1046 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
1047} 1119}
1048 1120
1049sub size_request { 1121sub size_request {
1050 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};
1051 1129
1052 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1053 1131
1054 ( 1132 (
1055 $w + $self->border * 2, 1133 $w + $self->border * 2,
1056 $h + $self->border * 2, 1134 $h + $self->border * 2,
1057 ) 1135 )
1058} 1136}
1059 1137
1060sub size_allocate { 1138sub invoke_size_allocate {
1061 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
1062 1140
1063 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 }
1064 1146
1147 my $border = $self->border;
1148
1065 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1066 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1067 1151
1068 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1069 if $self->{title};
1070
1071 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1072}
1073 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1074sub button_down { 1160sub invoke_button_down {
1075 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1076 1162
1077 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1078 my $border = $self->border; 1164 my $border = $self->border;
1079 1165
… …
1095 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
1096 1182
1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1099 1185
1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1100 $self->realloc; 1187 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1102 }; 1188 };
1103 1189
1104 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1105 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1106 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1109 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1110 1196
1111 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1112 1198
1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1114 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1115 } 1207 1
1116} 1208}
1117 1209
1118sub button_up { 1210sub invoke_button_up {
1119 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1120 1212
1121 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1122} 1214}
1123 1215
1124sub mouse_motion { 1216sub invoke_mouse_motion {
1125 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1126 1218
1127 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1128} 1222}
1129 1223
1130sub _draw { 1224sub _draw {
1131 my ($self) = @_; 1225 my ($self) = @_;
1132 1226
1227 my $child = $self->{children}[0];
1228
1133 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1134 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1135 1231
1136 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1138 1234
1139 my $border = $self->border; 1235 my $border = $self->border;
… …
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1251 }
1156 1252
1157 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1158 1254
1159 $self->{title}->draw if $self->{title};
1160
1161 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1162} 1266}
1163 1267
1164############################################################################# 1268#############################################################################
1165 1269
1166package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1189 1293
1190 $child->set_parent ($self); 1294 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1192 1296
1193 $self->realloc; 1297 $self->realloc;
1298}
1299
1300sub remove {
1301 my ($self, $child) = @_;
1302
1303 # TODO: not yet implemented
1194} 1304}
1195 1305
1196# TODO: move to container class maybe? send children a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1197sub clear { 1307sub clear {
1198 my ($self) = @_; 1308 my ($self) = @_;
… …
1239 (sum @$ws), 1349 (sum @$ws),
1240 (sum @$hs), 1350 (sum @$hs),
1241 ) 1351 )
1242} 1352}
1243 1353
1244sub size_allocate { 1354sub invoke_size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1355 my ($self, $w, $h) = @_;
1246 1356
1247 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1248 1358
1249 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1360 my $req_h = (sum @$hs) || 1;
… …
1281 } 1391 }
1282 1392
1283 $y += $row_h; 1393 $y += $row_h;
1284 } 1394 }
1285 1395
1396 1
1286} 1397}
1287 1398
1288sub find_widget { 1399sub find_widget {
1289 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1290 1401
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1440 )
1330} 1441}
1331 1442
1332sub size_allocate { 1443sub invoke_size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1444 my ($self, $w, $h) = @_;
1334 1445
1335 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1337 1448
1338 my @req; 1449 my @req;
1339 1450
1340 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1342 } else { 1453 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1345 1456
1346 if ($req > $space) { 1457 if ($req > $space) {
1347 # ah well, not enough space 1458 # ah well, not enough space
1348 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1349 } else { 1460 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351 1462
1352 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1353 1464
1354 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1355 for 0 .. $#$children; 1466 for 0 .. $#children;
1356 } 1467 }
1357 } 1468 }
1358 1469
1359 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1360 1471
1361 my $pos = 0; 1472 my $pos = 0;
1362 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1363 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1365 1476
1366 $pos += $alloc; 1477 $pos += $alloc;
1367 } 1478 }
1368 1479
1369 1 1480 1
… …
1421 ellipsise => 3, # end 1532 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1423 fontsize => 1, 1534 fontsize => 1,
1424 align => -1, 1535 align => -1,
1425 valign => -1, 1536 valign => -1,
1426 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1427 can_events => 0, 1539 can_events => 0,
1428 %arg 1540 %arg
1429 ); 1541 );
1430 1542
1431 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1458 1570
1459 delete $self->{texture}; 1571 delete $self->{texture};
1460 $self->SUPER::update; 1572 $self->SUPER::update;
1461} 1573}
1462 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1463sub set_text { 1582sub set_text {
1464 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1465 1584
1466 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1468 1587
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1471 1590
1591 delete $self->{size_req};
1472 $self->realloc; 1592 $self->realloc;
1473 $self->update; 1593 $self->update;
1474} 1594}
1475 1595
1476sub set_markup { 1596sub set_markup {
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1603
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1486 1606
1607 delete $self->{size_req};
1487 $self->realloc; 1608 $self->realloc;
1488 $self->update; 1609 $self->update;
1489} 1610}
1490 1611
1491sub size_request { 1612sub size_request {
1492 my ($self) = @_; 1613 my ($self) = @_;
1493 1614
1615 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1621
1500 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1501 1623
1502 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1627
1506 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1507 1629
1508 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1510 } 1635 };
1511 1636
1512 ( 1637 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1638}
1517 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1518sub size_allocate { 1644sub invoke_size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1645 my ($self, $w, $h) = @_;
1646
1647 delete $self->{ox};
1520 1648
1521 delete $self->{texture} 1649 delete $self->{texture}
1522 if $changed; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1523} 1653}
1524 1654
1525sub set_fontsize { 1655sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1527 1657
1528 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1529 delete $self->{texture}; 1659 delete $self->{texture};
1530 1660
1531 $self->realloc; 1661 $self->realloc;
1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1532} 1670}
1533 1671
1534sub _draw { 1672sub _draw {
1535 my ($self) = @_; 1673 my ($self) = @_;
1536 1674
… …
1542 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1684
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1548 1687
1688 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1552 1692
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1696 };
1559 1697
1560 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1562 1702
1563 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1564 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1566 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1568 } 1710 }
1569 1711
1570 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1571} 1713}
1572 1714
… …
1589 can_hover => 1, 1731 can_hover => 1,
1590 can_focus => 1, 1732 can_focus => 1,
1591 valign => 0, 1733 valign => 0,
1592 can_events => 1, 1734 can_events => 1,
1593 #text => ... 1735 #text => ...
1736 #hidden => "*",
1594 @_ 1737 @_
1595 ) 1738 )
1596} 1739}
1597 1740
1598sub _set_text { 1741sub _set_text {
… …
1600 1743
1601 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1602 1745
1603 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1604 1747
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1749 $self->{text} = $text;
1609 1750
1610 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1612 1754
1613 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1614} 1759}
1615 1760
1616sub set_text { 1761sub set_text {
1617 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1618 1763
1619 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1765 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1766}
1624 1767
1625sub get_text { 1768sub get_text {
1626 $_[0]{text} 1769 $_[0]{text}
1627} 1770}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1633 1776
1634 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1635} 1778}
1636 1779
1637sub key_down { 1780sub invoke_key_down {
1638 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1639 1782
1640 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1655 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1657 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1802 $self->emit ('escape');
1660 } elsif ($uni) { 1803 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1662 } 1807 }
1663 1808
1664 $self->_set_text ($text); 1809 $self->_set_text ($text);
1665 1810
1666 $self->realloc; 1811 $self->realloc;
1667}
1668 1812
1813 1
1814}
1815
1669sub focus_in { 1816sub invoke_focus_in {
1670 my ($self) = @_; 1817 my ($self) = @_;
1671 1818
1672 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1673 1820
1674 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1675} 1822}
1676 1823
1677sub button_down { 1824sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1679 1826
1680 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1828
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1830
1684 # byte-index to char-index 1831 # byte-index to char-index
1685 my $text = $self->{text}; 1832 my $text = $self->{text};
1686 utf8::encode $text; 1833 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1688 1835
1689 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1690 $self->update; 1837 $self->update;
1838
1839 1
1691} 1840}
1692 1841
1693sub mouse_motion { 1842sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1696} 1847}
1697 1848
1698sub _draw { 1849sub _draw {
1699 my ($self) = @_; 1850 my ($self) = @_;
1700 1851
1701 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1702 1853
1703 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1706 } else { 1857 } else {
1707 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1708 } 1859 }
1709 1860
1710 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1864 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1741 1892
1742our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1743 1894
1744use CFClient::OpenGL; 1895use CFClient::OpenGL;
1745 1896
1746sub key_down { 1897sub invoke_key_down {
1747 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1748 1899
1749 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1750 1901
1751 if ($sym == 13) { 1902 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1754 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1757 $self->update; 1909 $self->update;
1758 1910
1759 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1777 } else { 1929 } else {
1778 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1779 } 1931 }
1780 1932
1781 } else { 1933 } else {
1782 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1783 } 1937 1
1784
1785} 1938}
1786 1939
1787############################################################################# 1940#############################################################################
1788 1941
1789package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1798 1951
1799sub new { 1952sub new {
1800 my $class = shift; 1953 my $class = shift;
1801 1954
1802 $class->SUPER::new ( 1955 $class->SUPER::new (
1803 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1804 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1806 can_hover => 1, 1960 can_hover => 1,
1807 align => 0, 1961 align => 0,
1808 valign => 0, 1962 valign => 0,
1809 can_events => 1, 1963 can_events => 1,
1810 @_ 1964 @_
1811 ) 1965 )
1812} 1966}
1813 1967
1814sub activate { }
1815
1816sub button_up { 1968sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1818 1970
1819 $self->emit ("activate") 1971 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
1974
1975 1
1822} 1976}
1823 1977
1824sub _draw { 1978sub _draw {
1825 my ($self) = @_; 1979 my ($self) = @_;
1826 1980
1827 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1982
1833 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1836 1986
… …
1841 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1842} 1992}
1843 1993
1844############################################################################# 1994#############################################################################
1845 1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
2028}
2029
2030#############################################################################
2031
1846package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1847 2033
1848our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1849 2035
1850my @tex = 2036my @tex =
… …
1855 2041
1856sub new { 2042sub new {
1857 my $class = shift; 2043 my $class = shift;
1858 2044
1859 $class->SUPER::new ( 2045 $class->SUPER::new (
1860 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1861 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2050 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2051 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2052 state => 0,
… …
1869} 2056}
1870 2057
1871sub size_request { 2058sub size_request {
1872 my ($self) = @_; 2059 my ($self) = @_;
1873 2060
1874 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1875} 2062}
1876 2063
1877sub button_down { 2064sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1879 2066
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1884 } 2075 1
1885} 2076}
1886 2077
1887sub _draw { 2078sub _draw {
1888 my ($self) = @_; 2079 my ($self) = @_;
1889 2080
1890 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1891 2082
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2084
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2088
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2090
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2092
… …
1907package CFClient::UI::Image; 2100package CFClient::UI::Image;
1908 2101
1909our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1910 2103
1911use CFClient::OpenGL; 2104use CFClient::OpenGL;
1912use Carp qw/confess/;
1913 2105
1914our %loaded_images; 2106our %texture_cache;
1915 2107
1916sub new { 2108sub new {
1917 my $class = shift; 2109 my $class = shift;
1918 2110
1919 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1920 2115
1921 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1922 2118
1923 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1924 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1925 2121
1926 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1927 2123
1928 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930 $self->{aspect} = $tex->{w} / $tex->{h};
1931 2125
1932 $self 2126 $self
1933} 2127}
1934 2128
1935sub size_request { 2129sub size_request {
1936 my ($self) = @_; 2130 my ($self) = @_;
1937 2131
1938 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1939} 2133}
1940 2134
1941sub _draw { 2135sub _draw {
1942 my ($self) = @_; 2136 my ($self) = @_;
1943 2137
… …
2054 2248
2055 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
2057 2251
2058 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2257
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2361 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2362 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2363 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2364 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2365 min_h => $::WIDTH / 80,
2171 vertical => 0, 2366 vertical => 0,
2172 can_hover => 1, 2367 can_hover => 1,
2173 inner_pad => 0.02, 2368 inner_pad => 0.02,
2174 @_ 2369 @_
2175 ); 2370 );
… …
2178 $self->update; 2373 $self->update;
2179 2374
2180 $self 2375 $self
2181} 2376}
2182 2377
2183sub changed { }
2184
2185sub set_range { 2378sub set_range {
2186 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2187 2380
2188 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2189 2382
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2192} 2387}
2193 2388
2194sub set_value { 2389sub set_value {
2195 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2196 2391
… …
2207 if $unit; 2402 if $unit;
2208 2403
2209 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2210 2405
2211 if ($value != $old_value) { 2406 if ($value != $old_value) {
2212 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2213 $self->update; 2408 $self->update;
2214 } 2409 }
2215} 2410}
2216 2411
2217sub size_request { 2412sub size_request {
2218 my ($self) = @_; 2413 my ($self) = @_;
2219 2414
2220 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2416}
2225 2417
2226sub button_down { 2418sub invoke_button_down {
2227 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2228 2420
2229 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2230 2422
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2424
2233 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2234} 2426}
2235 2427
2236sub mouse_motion { 2428sub invoke_mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2238 2430
2239 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2240 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2241 2433
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2435
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2437
2246 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2247 } 2443 1
2248} 2444}
2249 2445
2250sub update { 2446sub update {
2251 my ($self) = @_; 2447 my ($self) = @_;
2252 2448
2253 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2254 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2255 2458
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2460 my $range = ($hi - $page - $lo) || 1e-100;
2258 2461
… …
2264 $value = ($value - $lo) / $range; 2467 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2468 $value = $value * $self->{scale} + $self->{offset};
2266 2469
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2471 $self->{knob_w} = $knob_w;
2269 }); 2472 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2473
2277 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2278 2475
2279 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2280 2477
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2538sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2539sub set_value { shift->{slider}->set_value (@_) }
2343 2540
2344############################################################################# 2541#############################################################################
2345 2542
2346package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2347 2544
2348our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2349 2546
2350use CFClient::OpenGL; 2547use CFClient::OpenGL;
2351 2548
… …
2353 my $class = shift; 2550 my $class = shift;
2354 2551
2355 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2356 fontsize => 1, 2553 fontsize => 1,
2357 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2358 #font => default_font 2556 #font => default_font
2359 @_, 2557 @_,
2360 2558
2361 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2362 par => [], 2560 par => [],
… …
2377 2575
2378 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2577 $self->reflow;
2380} 2578}
2381 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2382sub size_allocate { 2586sub invoke_size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2587 my ($self, $w, $h) = @_;
2384 2588
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2386 2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2387 return unless $changed;
2388 2591
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2392 2596
2393 $self->reflow; 2597 $self->reflow;
2394}
2395 2598
2396sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2397 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2398 2604
2399 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2400 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2403 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2404 2618 );
2619
2405 $layout->size 2620 $layout
2406} 2621}
2407 2622
2408sub reflow { 2623sub reflow {
2409 my ($self) = @_; 2624 my ($self) = @_;
2410 2625
… …
2419 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2420} 2635}
2421 2636
2422sub clear { 2637sub clear {
2423 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2424 2642
2425 $self->{par} = []; 2643 $self->{par} = [];
2426 $self->{height} = 0; 2644 $self->{height} = 0;
2427 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2428} 2646}
2429 2647
2430sub add_paragraph { 2648sub add_paragraph {
2431 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2432 2650
2433 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2434 my ($w, $h) = $self->text_size ($line); 2652
2435 $self->{height} += $h; 2653 $para = {
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2437 } 2660 };
2438 2661
2439 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2440} 2674}
2441 2675
2442sub update { 2676sub update {
2443 my ($self) = @_; 2677 my ($self) = @_;
2444 2678
… …
2446 2680
2447 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2448 2682
2449 delete $self->{texture}; 2683 delete $self->{texture};
2450 2684
2451 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2687
2454 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2689 my $height = 0;
2456 2690
2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2461 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2463 $layout->set_width ($W - $_->[3]); 2693 my $layout = $self->get_layout ($para);
2464 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2694 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2695
2467 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2468 } 2699 }
2469 2700
2470 $height += $_->[1]; 2701 $height += $para->{h};
2471 } 2702 }
2472 2703
2473 $self->{height} = $height; 2704 $self->{height} = $height;
2474 2705
2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2476 2707
2477 delete $self->{texture}; 2708 delete $self->{texture};
2478 } 2709 }
2479 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2716 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2483 2718
2484 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2485 2720
2486 my $y0 = $top; 2721 my $y0 = $top;
2487 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2488 2723
2489 my $y = 0; 2724 my $y = 0;
2490
2491 my $layout = $self->{layout};
2492
2493 $layout->set_font ($self->{font}) if $self->{font};
2494 2725
2495 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2498 2729
2499 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2500 my $h = $par->[1]; 2731 my $h = $para->{h};
2501 2732
2502 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] }); 2734
2504 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2505 $layout->set_markup ($par->[4]);
2506 2736
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2508 2738
2509 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2510 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2511 } 2754 }
2512 2755
2513 $y += $h; 2756 $y += $h;
2514 } 2757 }
2515 2758
2516 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2517 }; 2760 };
2518 }); 2761 });
2519} 2762}
2520 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2521sub _draw { 2773sub _draw {
2522 my ($self) = @_; 2774 my ($self) = @_;
2523 2775
2524 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2527 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2528 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2529 2781
2530 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2531
2532} 2783}
2533 2784
2534############################################################################# 2785#############################################################################
2535 2786
2536package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2615} 2866}
2616 2867
2617sub set_tooltip_from { 2868sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2869 my ($self, $widget) = @_;
2619 2870
2871 my $tooltip = $widget->{tooltip};
2872
2873 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n"
2875 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2876 . "req $widget->{req_w} $widget->{req_h}\n"
2877 . "visible $widget->{visible}";
2878 }
2879
2880 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//;
2882
2620 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2884 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2886 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2887 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2888 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2889 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2634 2897
2635 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2636} 2899}
2637 2900
2638sub size_allocate { 2901sub invoke_size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2902 my ($self, $w, $h) = @_;
2640 2903
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2644} 2905}
2645 2906
2646sub visibility_change { 2907sub invoke_visibility_change {
2647 my ($self, $visible) = @_; 2908 my ($self, $visible) = @_;
2648 2909
2649 return unless $visible; 2910 return unless $visible;
2650 2911
2651 $self->{root}->on_post_alloc ("move_$self" => sub { 2912 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2653 or return; 2914 or return;
2654 2915
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656 2917
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH; 2919 if $x + $self->{w} > $self->{root}{w};
2659 2920
2660 $self->move_abs ($x, $y); 2921 $self->move_abs ($x, $y);
2661 }); 2922 });
2662} 2923}
2663 2924
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 3014
2754 if ($tex) { 3015 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2760 } 3021 }
2761} 3022}
2762 3023
2763sub DESTROY { 3024sub destroy {
2764 my ($self) = @_; 3025 my ($self) = @_;
2765 3026
2766 $self->{timer}->cancel 3027 $self->{timer}->cancel
2767 if $self->{timer}; 3028 if $self->{timer};
2768 3029
2769 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2770} 3031}
2771 3032
2772############################################################################# 3033#############################################################################
2773 3034
2774package CFClient::UI::Inventory; 3035package CFClient::UI::Buttonbar;
2775 3036
2776our @ISA = CFClient::UI::ScrolledWindow::; 3037our @ISA = CFClient::UI::HBox::;
2777 3038
2778sub new { 3039# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813 3040
2814############################################################################# 3041#############################################################################
2815 3042
2816package CFClient::UI::Menu; 3043package CFClient::UI::Menu;
2817 3044
… …
2829 ); 3056 );
2830 3057
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832 3059
2833 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2835 3062
2836 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2837 if (!ref $widget) { 3064 if (!ref $widget) {
2838 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2839 can_hover => 1, 3066 can_hover => 1,
2840 can_events => 1, 3067 can_events => 1,
2841 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2842 } 3070 }
2843 3071
2844 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2845 3073
2846 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
… …
2851 3079
2852# popup given the event (must be a mouse button down event currently) 3080# popup given the event (must be a mouse button down event currently)
2853sub popup { 3081sub popup {
2854 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
2855 3083
2856 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
2857 3085
2858 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 3087 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2861 3089
2862 $self->show; 3090 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 3092}
2865 3093
2866sub mouse_motion { 3094sub invoke_mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2868 3096
2869 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2872}
2873 3100
3101 0
3102}
3103
2874sub button_up { 3104sub invoke_button_up {
2875 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2876 3106
2877 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 3108 undef $GRAB;
2879 $self->hide; 3109 $self->hide;
2880 3110
2881 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3113 } else {
3114 return 0
3115 }
3116
2883 } 3117 1
2884} 3118}
2885 3119
2886############################################################################# 3120#############################################################################
2887 3121
2888package CFClient::UI::Statusbox; 3122package CFClient::UI::Multiplexer;
2889 3123
2890our @ISA = CFClient::UI::VBox::; 3124our @ISA = CFClient::UI::Container::;
2891 3125
2892sub new { 3126sub new {
2893 my $class = shift; 3127 my $class = shift;
2894 3128
2895 $class->SUPER::new ( 3129 my $self = $class->SUPER::new (
3130 @_,
3131 );
3132
3133 $self->{current} = $self->{children}[0]
3134 if @{ $self->{children} };
3135
3136 $self
3137}
3138
3139sub add {
3140 my ($self, @widgets) = @_;
3141
3142 $self->SUPER::add (@widgets);
3143
3144 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} };
3146}
3147
3148sub set_current_page {
3149 my ($self, $page_or_widget) = @_;
3150
3151 my $widget = ref $page_or_widget
3152 ? $page_or_widget
3153 : $self->{children}[$page_or_widget];
3154
3155 $self->{current} = $widget;
3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3157
3158 $self->emit (page_changed => $self->{current});
3159
3160 $self->realloc;
3161}
3162
3163sub visible_children {
3164 $_[0]{current}
3165}
3166
3167sub size_request {
3168 my ($self) = @_;
3169
3170 $self->{current}->size_request
3171}
3172
3173sub invoke_size_allocate {
3174 my ($self, $w, $h) = @_;
3175
3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3179}
3180
3181sub _draw {
3182 my ($self) = @_;
3183
3184 $self->{current}->draw;
3185}
3186
3187#############################################################################
3188
3189package CFClient::UI::Notebook;
3190
3191our @ISA = CFClient::UI::VBox::;
3192
3193sub new {
3194 my $class = shift;
3195
3196 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self
3200 @_,
3201 );
3202
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3204 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3205
3206 $self
3207}
3208
3209sub add {
3210 my ($self, $title, $widget, $tooltip) = @_;
3211
3212 Scalar::Util::weaken $self;
3213
3214 $self->{buttonbar}->add (new CFClient::UI::Button
3215 markup => $title,
3216 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) },
3218 );
3219
3220 $self->{multiplexer}->add ($widget);
3221}
3222
3223sub set_current_page {
3224 my ($self, $page) = @_;
3225
3226 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current});
3228}
3229
3230#############################################################################
3231
3232package CFClient::UI::Combobox;
3233
3234use utf8;
3235
3236our @ISA = CFClient::UI::Button::;
3237
3238sub new {
3239 my $class = shift;
3240
3241 my $self = $class->SUPER::new (
3242 options => [], # [value, title, longdesc], ...
3243 value => undef,
3244 @_,
3245 );
3246
3247 $self->_set_value ($self->{value});
3248
3249 $self
3250}
3251
3252sub invoke_button_down {
3253 my ($self, $ev) = @_;
3254
3255 my @menu_items;
3256
3257 for (@{ $self->{options} }) {
3258 my ($value, $title, $tooltip) = @$_;
3259
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 }
3262
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264}
3265
3266sub _set_value {
3267 my ($self, $value) = @_;
3268
3269 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3270 or return;
3271
3272 $self->{value} = $item->[0];
3273 $self->set_markup ("$item->[1] ⇓");
3274 $self->set_tooltip ($item->[2]);
3275}
3276
3277sub set_value {
3278 my ($self, $value) = @_;
3279
3280 return unless $self->{value} ne $value;
3281
3282 $self->_set_value ($value);
3283 $self->emit (changed => $value);
3284}
3285
3286#############################################################################
3287
3288package CFClient::UI::Statusbox;
3289
3290our @ISA = CFClient::UI::VBox::;
3291
3292sub new {
3293 my $class = shift;
3294
3295 my $self = $class->SUPER::new (
2896 fontsize => 0.8, 3296 fontsize => 0.8,
2897 @_, 3297 @_,
2898 ) 3298 );
3299
3300 Scalar::Util::weaken (my $this = $self);
3301
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303
3304 $self
2899} 3305}
2900 3306
2901sub reorder { 3307sub reorder {
2902 my ($self) = @_; 3308 my ($self) = @_;
2903 my $NOW = time; 3309 my $NOW = Time::HiRes::time;
3310
3311 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} };
2904 3315
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3318 }
2908 3319
… …
2911 my @items = sort { 3322 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3323 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3324 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3325 } values %{ $self->{item} };
2915 3326
3327 $self->{timer}->interval (1);
3328
2916 my $count = 10 + 1; 3329 my $count = 10 + 1;
2917 for my $item (@items) { 3330 for my $item (@items) {
2918 last unless --$count; 3331 last unless --$count;
2919 3332
2920 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3335 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3336 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3337 : $item->{text};
2925 3338
… …
2933 tooltip => $item->{tooltip}, 3346 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3347 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3348 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3349 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3350 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3351 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3352 can_events => 1,
2940 can_hover => 1 3353 can_hover => 1
2941 }; 3354 };
3355
3356 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3357 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3358 $label->update;
3359 $label->set_max_size (undef, $label->{req_h} * $diff)
3360 if $diff < 1;
3361 $self->{timer}->interval (1/30);
3362 } else {
3363 $label->{fg}[3] = $item->{fg}[3] || 1;
3364 }
3365
3366 push @widgets, $label;
2942 } 3367 }
2943 3368
2944 $self->clear; 3369 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3370 $self->SUPER::add (reverse @widgets);
2946} 3371}
… …
2951 $text =~ s/^\s+//; 3376 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3377 $text =~ s/\s+$//;
2953 3378
2954 return unless $text; 3379 return unless $text;
2955 3380
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3381 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3382
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3383 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3384
2960 if (my $item = $self->{item}{$group}) { 3385 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3386 if ($item->{text} eq $text) {
2962 $item->{count}++; 3387 $item->{count}++;
2963 } else { 3388 } else {
2964 $item->{count} = 1; 3389 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
2966 } 3391 }
2967 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3394 delete $item->{label};
2970 } else { 3395 } else {
2971 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3397 id => ++$self->{id},
… …
2991 3416
2992 $self->reorder; 3417 $self->reorder;
2993 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
2994} 3419}
2995 3420
3421sub destroy {
3422 my ($self) = @_;
3423
3424 $self->{timer}->cancel;
3425
3426 $self->SUPER::destroy;
3427}
3428
2996############################################################################# 3429#############################################################################
2997 3430
3431package CFClient::UI::Inventory;
3432
3433our @ISA = CFClient::UI::ScrolledWindow::;
3434
3435sub new {
3436 my $class = shift;
3437
3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
3691 @_,
3692 )
3693}
3694
3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3696
3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3707
3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
3781 my ($self, $spell) = @_;
3782
3783 $self->{spell}->{$spell->{name}} = $spell;
3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
2998package CFClient::UI::Root; 3803package CFClient::UI::Root;
2999 3804
3000our @ISA = CFClient::UI::Container::; 3805our @ISA = CFClient::UI::Container::;
3806
3807use List::Util qw(min max);
3001 3808
3002use CFClient::OpenGL; 3809use CFClient::OpenGL;
3003 3810
3004sub new { 3811sub new {
3005 my $class = shift; 3812 my $class = shift;
… …
3012 Scalar::Util::weaken ($self->{root} = $self); 3819 Scalar::Util::weaken ($self->{root} = $self);
3013 3820
3014 $self 3821 $self
3015} 3822}
3016 3823
3017sub configure {
3018 my ($self, $x, $y, $w, $h) = @_;
3019
3020 $self->{w} = $w;
3021 $self->{h} = $h;
3022}
3023
3024sub reconfigure {
3025 my ($self) = @_;
3026
3027 $self->SUPER::reconfigure;
3028
3029 $self->size_allocate ($self->{w}, $self->{h}, 1)
3030 if $self->{w};
3031}
3032
3033sub size_request { 3824sub size_request {
3034 my ($self) = @_; 3825 my ($self) = @_;
3035 3826
3036 ($self->{w}, $self->{h}) 3827 ($self->{w}, $self->{h})
3037} 3828}
… …
3048 $coord = $max - $size if $coord > $max - $size; 3839 $coord = $max - $size if $coord > $max - $size;
3049 3840
3050 int $coord + 0.5 3841 int $coord + 0.5
3051} 3842}
3052 3843
3053sub size_allocate { 3844sub invoke_size_allocate {
3054 my ($self, $w, $h, $changed) = @_; 3845 my ($self, $w, $h) = @_;
3055 3846
3056 for my $child ($self->children) { 3847 for my $child ($self->children) {
3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3058 3849
3059 $X = $child->{force_x} if exists $child->{force_x}; 3850 $X = $child->{force_x} if exists $child->{force_x};
… …
3062 $X = _to_pixel $X, $W, $self->{w}; 3853 $X = _to_pixel $X, $W, $self->{w};
3063 $Y = _to_pixel $Y, $H, $self->{h}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
3064 3855
3065 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3066 } 3857 }
3858
3859 1
3067} 3860}
3068 3861
3069sub coord2local { 3862sub coord2local {
3070 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3071 3864
… …
3127 $_->() 3920 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3921 for values %{delete $self->{refresh_hook}};
3129 } 3922 }
3130 3923
3131 if ($self->{realloc}) { 3924 if ($self->{realloc}) {
3925 my %queue;
3132 my @queue; 3926 my @queue;
3927 my $widget;
3133 3928
3929 outer:
3134 while () { 3930 while () {
3135 if ($self->{realloc}) { 3931 if (my $realloc = delete $self->{realloc}) {
3136 #TODO use array-of-depth approach 3932 for $widget (values %$realloc) {
3933 $widget->{visible} or next; # do not resize invisible widgets
3137 3934
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3935 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{realloc}}; 3936
3937 push @{ $queue[$widget->{visible}] }, $widget;
3938 }
3140 } 3939 }
3141 3940
3941 while () {
3942 @queue or last outer;
3943
3944 $widget = pop @{ $queue[-1] || [] }
3945 and last;
3946
3947 pop @queue;
3948 }
3949
3950 delete $queue{$widget+0};
3951
3952 my ($w, $h) = $widget->size_request;
3953
3954 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3955 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3956
3957 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3958 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3959
3960 $w = $widget->{force_w} if exists $widget->{force_w};
3961 $h = $widget->{force_h} if exists $widget->{force_h};
3962
3963 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3964 || delete $widget->{force_realloc}) {
3965 $widget->{req_w} = $w;
3966 $widget->{req_h} = $h;
3967
3968 $self->{size_alloc}{$widget+0} = $widget;
3969
3970 if (my $parent = $widget->{parent}) {
3971 $self->{realloc}{$parent+0} = $parent
3972 unless $queue{$parent+0};
3973
3974 $parent->{force_size_alloc} = 1;
3975 $self->{size_alloc}{$parent+0} = $parent;
3976 }
3977 }
3978
3979 delete $self->{realloc}{$widget+0};
3980 }
3981 }
3982
3983 while (my $size_alloc = delete $self->{size_alloc}) {
3984 my @queue = sort { $b->{visible} <=> $a->{visible} }
3985 values %$size_alloc;
3986
3987 while () {
3142 my $widget = pop @queue || last; 3988 my $widget = pop @queue || last;
3143 3989
3144 $widget->{visible} or last; # do not resize invisible widgets 3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3145
3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3147 ? @$widget{qw(force_w force_h)}
3148 : $widget->size_request;
3149
3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3151
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3155 $widget->{req_w} = $w;
3156 $widget->{req_h} = $h;
3157
3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3159
3160 push @queue, $widget->{parent}
3161 if $widget->{parent};
3162 }
3163 }
3164
3165 while (my $size_alloc = delete $self->{size_alloc}) {
3166 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3167 values %$size_alloc;
3168
3169 while () {
3170 my ($widget, $w, $h) = @{ pop @queue or last };
3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174 3991
3175 $w = 0 if $w < 0; 3992 $w = 0 if $w < 0;
3176 $h = 0 if $h < 0; 3993 $h = 0 if $h < 0;
3177 3994
3178 $w = int $w + 0.5; 3995 $w = int $w + 0.5;
3179 $h = int $h + 0.5; 3996 $h = int $h + 0.5;
3180 3997
3181 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w};
4000 $widget->{old_h} = $widget->{h};
3182 4001
3183 $widget->{w} = $w; 4002 $widget->{w} = $w;
3184 $widget->{h} = $h; 4003 $widget->{h} = $h;
3185 4004
3186 $widget->emit (size_allocate => $w, $h, $changed); 4005 $widget->emit (size_allocate => $w, $h);
4006 }
3187 } 4007 }
3188 } 4008 }
3189 4009
3190 while ($self->{post_alloc_hook}) { 4010 while ($self->{post_alloc_hook}) {
3191 $_->() 4011 $_->()
3192 for values %{delete $self->{post_alloc_hook}}; 4012 for values %{delete $self->{post_alloc_hook}};
3193 } 4013 }
4014
3194 4015
3195 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4016 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3196 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3197 glClear GL_COLOR_BUFFER_BIT; 4018 glClear GL_COLOR_BUFFER_BIT;
3198 4019
… …
3200 glLoadIdentity; 4021 glLoadIdentity;
3201 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3202 glMatrixMode GL_MODELVIEW; 4023 glMatrixMode GL_MODELVIEW;
3203 glLoadIdentity; 4024 glLoadIdentity;
3204 4025
4026 {
4027 package CFClient::UI::Base;
4028
4029 ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h});
4031 }
4032
3205 $self->_draw; 4033 $self->_draw;
3206} 4034}
3207 4035
3208############################################################################# 4036#############################################################################
3209 4037

Diff Legend

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