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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
185 } 189 }
186 } 190 }
187 191
188 reconfigure_widgets; 192 reconfigure_widgets;
189} 193}
… …
198 202
199sub new { 203sub new {
200 my $class = shift; 204 my $class = shift;
201 205
202 my $self = bless { 206 my $self = bless {
203 x => 0, 207 x => "center",
204 y => 0, 208 y => "center",
205 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
206 can_events => 1, 212 can_events => 1,
207 @_ 213 @_
208 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
213 } 221 }
214 } 222 }
215 223
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
223 } 234 }
224 235
225 $self 236 $self
226} 237}
227 238
… …
232 %$self = (); 243 %$self = ();
233} 244}
234 245
235sub show { 246sub show {
236 my ($self) = @_; 247 my ($self) = @_;
248
237 return if $self->{parent}; 249 return if $self->{parent};
238 250
239 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
240} 252}
241 253
242sub show_centered { 254sub set_visible {
243 my ($self) = @_; 255 my ($self) = @_;
256
244 return if $self->{parent}; 257 return if $self->{visible};
245 258
246 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
247 261
248 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 263
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
251 }, 265
252 ); 266 $_->set_visible for $self->children;
253} 267}
254 268
255sub set_invisible { 269sub set_invisible {
256 my ($self) = @_; 270 my ($self) = @_;
257 271
258 # broken show/hide model 272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
259 275
260 delete $self->{root}; 276 delete $self->{root};
261 delete $self->{visible}; 277 delete $self->{visible};
262 278
263 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
265 281
266 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
268 284
269 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
270} 305}
271 306
272sub hide { 307sub hide {
273 my ($self) = @_; 308 my ($self) = @_;
274 309
… …
276 311
277 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
278 if $self->{parent}; 313 if $self->{parent};
279} 314}
280 315
281sub move { 316sub move_abs {
282 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
283 318
284 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
287 322
288 $self->update; 323 $self->update;
289} 324}
290 325
291sub set_size { 326sub set_size {
292 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
293 328
294 $self->{user_w} = $w; 329 $self->{force_w} = $w;
295 $self->{user_h} = $h; 330 $self->{force_h} = $h;
296 331
297 $self->check_size; 332 $self->realloc;
298} 333}
299 334
300sub size_request { 335sub size_request {
301 require Carp; 336 require Carp;
302 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
304 339
305sub configure { 340sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
307 342
308 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
311 348
312 # use alignment to adjust x, y 349 # use alignment to adjust x, y
313 350
314 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 353 }
319 354
320 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 356 $self->{x} = $x;
322 $self->{y} = $y; 357 $self->{y} = $y;
323 $self->update; 358 $self->update;
324 } 359 }
325 360
326 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
328 } 368 }
329} 369}
330 370
331sub size_allocate { 371sub size_allocate {
332 # nothing to be done 372 # nothing to be done
333} 373}
334 374
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
343} 381}
344 382
345sub set_max_size { 383sub set_max_size {
346 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
347 385
348 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
350} 390}
351 391
352sub set_tooltip { 392sub set_tooltip {
353 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
354 394
… …
406 446
407 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
408 unless $FOCUS; 448 unless $FOCUS;
409} 449}
410 450
411sub mouse_motion { } 451sub mouse_motion { 0 }
412sub button_up { } 452sub button_up { 0 }
413sub key_down { } 453sub key_down { 0 }
414sub key_up { } 454sub key_up { 0 }
415 455
416sub button_down { 456sub button_down {
417 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
418 458
419 $self->focus_in; 459 $self->focus_in;
420}
421 460
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
426sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427 537
428sub draw { 538sub draw {
429 my ($self) = @_; 539 my ($self) = @_;
430 540
431 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432 552
433 glPushMatrix; 553 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 555
438 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 558 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 560 glBegin GL_QUADS;
445 glVertex $x , $y; 561 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
449 glEnd; 565 glEnd;
450 glDisable GL_BLEND; 566 glDisable GL_BLEND;
451 } 567 }
452 568
453 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 570 glPushMatrix;
455 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 574 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
462 glEnd; 578 glEnd;
463 glPopMatrix; 579 glPopMatrix;
464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
465 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
466} 585}
467 586
468sub _draw { 587sub _draw {
469 my ($self) = @_; 588 my ($self) = @_;
470 589
471 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
472}
473
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532} 591}
533 592
534sub DESTROY { 593sub DESTROY {
535 my ($self) = @_; 594 my ($self) = @_;
536 595
… …
568 627
569 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
571 630
572 glEnable GL_BLEND; 631 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 633 glColor_premultiply @$color;
575 634
576 glBegin GL_QUADS; 635 glBegin GL_QUADS;
577 glVertex 0 , 0; 636 glVertex 0 , 0;
578 glVertex 0 , $h; 637 glVertex 0 , $h;
579 glVertex $w, $h; 638 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
596} 655}
597 656
598sub size_request { 657sub size_request {
599 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
600} 661}
601 662
602sub draw { } 663sub draw { }
603 664
604############################################################################# 665#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
609 670
610sub new { 671sub new {
611 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
612 673
613 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
614 675
615 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
616 children => [], 677 children => [],
617 can_events => 0, 678 can_events => 0,
618 %arg, 679 %arg,
619 ); 680 );
681
620 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
621 684
622 $self 685 $self
623} 686}
624 687
625sub add { 688sub add {
… …
633 $self->{children} = [ 696 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
636 ]; 699 ];
637 700
638 $self->check_size (1); 701 $self->realloc;
639 $self->update;
640} 702}
641 703
642sub children { 704sub children {
643 @{ $_[0]{children} } 705 @{ $_[0]{children} }
644} 706}
… …
649 delete $child->{parent}; 711 delete $child->{parent};
650 $child->hide; 712 $child->hide;
651 713
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 715
654 $self->check_size (1); 716 $self->realloc;
655 $self->update;
656} 717}
657 718
658sub clear { 719sub clear {
659 my ($self) = @_; 720 my ($self) = @_;
660 721
… …
664 for (@$children) { 725 for (@$children) {
665 delete $_->{parent}; 726 delete $_->{parent};
666 $_->hide; 727 $_->hide;
667 } 728 }
668 729
669 $self->check_size; 730 $self->realloc;
670 $self->update;
671} 731}
672 732
673sub find_widget { 733sub find_widget {
674 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
675 735
676 $x -= $self->{x}; 736 $x -= $self->{x};
677 $y -= $self->{y}; 737 $y -= $self->{y};
678 738
679 my $res; 739 my $res;
680 740
681 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
683 and return $res; 743 and return $res;
684 } 744 }
685 745
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
736} 796}
737 797
738############################################################################# 798#############################################################################
739 799
800# back-buffered drawing area
801
740package CFClient::UI::Window; 802package CFClient::UI::Window;
741 803
742our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
743 805
744use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
762 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 825 $self->update;
764} 826}
765 827
766sub _render { 828sub _render {
829 my ($self) = @_;
830
767 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
768} 832}
769 833
770sub render_child { 834sub render_child {
771 my ($self) = @_; 835 my ($self) = @_;
772 836
773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
776 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
777 $self->_render; 848 $self->_render;
778 }; 849 };
779} 850}
780 851
781sub _draw { 852sub _draw {
782 my ($self) = @_; 853 my ($self) = @_;
783 854
784 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
785 856
786 my $tex = $self->{texture} 857 my $tex = $self->{texture}
787 or return; 858 or return;
788 859
789 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
792 863
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 865
795 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
796} 867}
… …
812} 883}
813 884
814sub size_request { 885sub size_request {
815 my ($self) = @_; 886 my ($self) = @_;
816 887
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 889
819 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
820} 894}
821 895
822sub size_allocate { 896sub size_allocate {
823 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
824 898
899 my $child = $self->child;
900
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 903
828 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
829 $self->update; 905 $self->update;
830} 906}
831 907
… …
867} 943}
868 944
869sub _render { 945sub _render {
870 my ($self) = @_; 946 my ($self) = @_;
871 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 952
874 $self->SUPER::_render; 953 $self->SUPER::_render;
875} 954}
876 955
… …
879package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
880 959
881our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
882 961
883sub new { 962sub new {
884 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
885 966
886 my $self; 967 my $self;
887 968
888 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
889 vertical => 1, 970 vertical => 1,
… …
894 ; 975 ;
895 976
896 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 979 slider => $slider,
899 @_, 980 %arg,
900 ); 981 );
901 982
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
905 985
906 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
907} 993}
908 994
909sub update { 995sub update {
910 my ($self) = @_; 996 my ($self) = @_;
911 997
… …
950 1036
951 if ($self->{bg}) { 1037 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
953 1039
954 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
957 1043
958 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
959 glVertex 0 , 0; 1045 glVertex 0 , 0;
960 glVertex 0 , $h; 1046 glVertex 0 , $h;
961 glVertex $w, $h; 1047 glVertex $w, $h;
… …
974 1060
975our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
976 1062
977use CFClient::OpenGL; 1063use CFClient::OpenGL;
978 1064
979my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1072
983sub new { 1073sub new {
984 my $class = shift; 1074 my ($class, %arg) = @_;
985 1075
986 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
987 1077
988 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1081 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1082 can_events => 1,
994 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
995 ); 1086 );
996 1087
997 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
998 align => 0, 1089 align => 0,
999 valign => 1, 1090 valign => 1,
1000 text => $self->{title}, 1091 text => $title,
1001 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1002 1094
1003 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004} 1103}
1005 1104
1006sub border { 1105sub border {
1007 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1008} 1107}
1009 1108
1010sub size_request { 1109sub size_request {
1011 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1012 1114
1013 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1014 1116
1015 ( 1117 (
1016 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1019} 1121}
1020 1122
1021sub size_allocate { 1123sub size_allocate {
1022 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1023 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1024 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1026 1136
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1031} 1138}
1032 1139
1033sub button_down { 1140sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1035 1142
… …
1051 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1052 1159
1053 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1055 1162
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1165
1061 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1062 }; 1168 };
1063 1169
1064 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1174 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1070 1176
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1178
1073 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1075 $self->move ($self->{user_x}, $self->{user_y}); 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1076 $self->update;
1077 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1078 } 1187 1
1079} 1188}
1080 1189
1081sub button_up { 1190sub button_up {
1082 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1083 1192
1084 delete $self->{motion}; 1193 !!delete $self->{motion}
1085} 1194}
1086 1195
1087sub mouse_motion { 1196sub mouse_motion {
1088 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1089 1198
1090 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1091} 1202}
1092 1203
1093sub _draw { 1204sub _draw {
1094 my ($self) = @_; 1205 my ($self) = @_;
1095 1206
1207 my $child = $self->{children}[0];
1208
1096 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1098 1211
1099 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1214
1102 my $border = $self->border; 1215 my $border = $self->border;
1103 1216
1104 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1222
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1112 1225
1113 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1116
1117 glColor @{ $self->{bg} };
1118
1119 $bg->{s} = $rep_x;
1120 $bg->{t} = $rep_y;
1121 $bg->{wrap_mode} = 1;
1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1231 }
1124 1232
1125 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1126 1234
1127 $self->{title}->draw if $self->{title};
1128
1129 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1130} 1241}
1131 1242
1132############################################################################# 1243#############################################################################
1133 1244
1134package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1156 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1157 1268
1158 $child->set_parent ($self); 1269 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1160 1271
1161 $self->check_size (1); 1272 $self->realloc;
1162} 1273}
1163 1274
1164# TODO: move to container class maybe? send children a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1165sub clear { 1276sub clear {
1166 my ($self) = @_; 1277 my ($self) = @_;
… …
1171 for (@children) { 1282 for (@children) {
1172 delete $_->{parent}; 1283 delete $_->{parent};
1173 $_->hide; 1284 $_->hide;
1174 } 1285 }
1175 1286
1176 $self->check_size (1); 1287 $self->realloc;
1177 $self->update;
1178} 1288}
1179 1289
1180sub get_wh { 1290sub get_wh {
1181 my ($self) = @_; 1291 my ($self) = @_;
1182 1292
… …
1278 } 1388 }
1279} 1389}
1280 1390
1281############################################################################# 1391#############################################################################
1282 1392
1283package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1284
1285# TODO: wrap into common Box base class
1286 1394
1287our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1288 1396
1289sub size_request { 1397sub size_request {
1290 my ($self) = @_; 1398 my ($self) = @_;
1291 1399
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1293 1401 ? (
1294 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1295 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296 (List::Util::max map $_->[1], @alloc), 1404 )
1297 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1298} 1409}
1299 1410
1300sub size_allocate { 1411sub size_allocate {
1301 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1302 1413
1303 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1304
1305 my $children = $self->{children}; 1415 my $children = $self->{children};
1306 1416
1307 my @h = map $_->{req_w}, @$children; 1417 my @req;
1308 1418
1309 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1310 1420 @req = ($space / (@$children || 1)) x @$children;
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } else { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1315 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316 $exp ||= 1;
1317 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1318 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 } 1435 }
1325 } 1436 }
1326 1437
1327 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1328 1439
1329 my $y = 0; 1440 my $pos = 0;
1330 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1333 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334 1444
1335 $y += $h; 1445 $pos += $alloc;
1336 } 1446 }
1337 1447
1338 1 1448 1
1339} 1449}
1340 1450
1341############################################################################# 1451#############################################################################
1342 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1343package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1344 1469
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1348 1471
1349sub size_request { 1472sub new {
1350 my ($self) = @_; 1473 my $class = shift;
1351 1474
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1353 1476 vertical => 1,
1354 ( 1477 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1478 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1479}
1398 1480
1399############################################################################# 1481#############################################################################
1400 1482
1401package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1418 ellipsise => 3, # end 1500 ellipsise => 3, # end
1419 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1420 fontsize => 1, 1502 fontsize => 1,
1421 align => -1, 1503 align => -1,
1422 valign => -1, 1504 valign => -1,
1423 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1424 can_events => 0, 1507 can_events => 0,
1425 %arg 1508 %arg
1426 ); 1509 );
1427 1510
1428 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1464 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1465 1548
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1468 1551
1552 $self->realloc;
1469 $self->update; 1553 $self->update;
1470 $self->check_size;
1471} 1554}
1472 1555
1473sub set_markup { 1556sub set_markup {
1474 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1475 1558
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1563
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1483 1566
1567 $self->realloc;
1484 $self->update; 1568 $self->update;
1485 $self->check_size;
1486} 1569}
1487 1570
1488sub size_request { 1571sub size_request {
1489 my ($self) = @_; 1572 my ($self) = @_;
1490 1573
… …
1504 1587
1505 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1507 } 1590 }
1508 1591
1509 ( 1592 ($w, $h)
1510 $w + $self->{padding} * 2,
1511 $h + $self->{padding} * 2,
1512 )
1513} 1593}
1514 1594
1515sub size_allocate { 1595sub size_allocate {
1516 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1517 1597
1598 delete $self->{ox};
1599
1518 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519} 1602}
1520 1603
1521sub set_fontsize { 1604sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1523 1606
1524 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1608 delete $self->{texture};
1526 1609
1527 $self->update; 1610 $self->realloc;
1528 $self->check_size;
1529} 1611}
1530 1612
1531sub _draw { 1613sub _draw {
1532 my ($self) = @_; 1614 my ($self) = @_;
1533 1615
… …
1539 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543 1625
1544 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1545 1628
1629 unless (exists $self->{ox}) {
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1549 1633
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1555 }; 1637 };
1556 1638
1557 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 1641
1642 glColor_premultiply @{$self->{fg}}
1560 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1561 glColor @{$self->{fg}}; 1644
1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1563 } else {
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1565 }
1566 1646
1567 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1568} 1648}
1569 1649
1570############################################################################# 1650#############################################################################
… …
1597 1677
1598 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1599 1679
1600 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1601 1681
1602 delete $self->{texture};
1603
1604 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1605 $self->{text} = $text; 1683 $self->{text} = $text;
1606 1684
1607 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1608 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1609 1687
1610 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1611} 1690}
1612 1691
1613sub set_text { 1692sub set_text {
1614 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1615 1694
1616 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1696 $self->_set_text ($text);
1618 $self->update; 1697
1619 $self->check_size; 1698 $self->realloc;
1620} 1699}
1621 1700
1622sub get_text { 1701sub get_text {
1623 $_[0]{text} 1702 $_[0]{text}
1624} 1703}
… …
1654 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1655 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1656 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1657 } elsif ($uni) { 1736 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1659 } 1740 }
1660 1741
1661 $self->_set_text ($text); 1742 $self->_set_text ($text);
1662 $self->update; 1743
1663 $self->check_size; 1744 $self->realloc;
1745
1746 1
1664} 1747}
1665 1748
1666sub focus_in { 1749sub focus_in {
1667 my ($self) = @_; 1750 my ($self) = @_;
1668 1751
… …
1683 utf8::encode $text; 1766 utf8::encode $text;
1684 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1685 1768
1686 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1687 $self->update; 1770 $self->update;
1771
1772 1
1688} 1773}
1689 1774
1690sub mouse_motion { 1775sub mouse_motion {
1691 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1692# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1693} 1780}
1694 1781
1695sub _draw { 1782sub _draw {
1696 my ($self) = @_; 1783 my ($self) = @_;
1697 1784
1698 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1699 1786
1700 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1701 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1702 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1703 } else { 1790 } else {
1704 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1705 } 1792 }
1706 1793
1707 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1708 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1709 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1710 glVertex 0 , 0; 1797 glVertex 0 , 0;
1711 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1712 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1713 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1774 } else { 1861 } else {
1775 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1776 } 1863 }
1777 1864
1778 } else { 1865 } else {
1779 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1780 } 1869 1
1781
1782} 1870}
1783 1871
1784############################################################################# 1872#############################################################################
1785 1873
1786package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1795 1883
1796sub new { 1884sub new {
1797 my $class = shift; 1885 my $class = shift;
1798 1886
1799 $class->SUPER::new ( 1887 $class->SUPER::new (
1800 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1801 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1802 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1803 can_hover => 1, 1892 can_hover => 1,
1804 align => 0, 1893 align => 0,
1805 valign => 0, 1894 valign => 0,
… …
1814 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1815 1904
1816 $self->emit ("activate") 1905 $self->emit ("activate")
1817 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1818 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1819} 1910}
1820 1911
1821sub _draw { 1912sub _draw {
1822 my ($self) = @_; 1913 my ($self) = @_;
1823 1914
1824 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1825
1826 if ($GRAB == $self) {
1827 $self->{fg} = $self->{active_fg};
1828 }
1829 1916
1830 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1832 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1833 1920
… …
1852 1939
1853sub new { 1940sub new {
1854 my $class = shift; 1941 my $class = shift;
1855 1942
1856 $class->SUPER::new ( 1943 $class->SUPER::new (
1857 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1858 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1859 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1862 state => 0, 1950 state => 0,
… …
1866} 1954}
1867 1955
1868sub size_request { 1956sub size_request {
1869 my ($self) = @_; 1957 my ($self) = @_;
1870 1958
1871 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1872} 1960}
1873 1961
1874sub button_down { 1962sub button_down {
1875 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1876 1964
1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1880 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1881 } 1973 1
1882} 1974}
1883 1975
1884sub _draw { 1976sub _draw {
1885 my ($self) = @_; 1977 my ($self) = @_;
1886 1978
1887 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1888 1980
1889 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890 1982
1891 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1892 1986
1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894 1988
1895 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896 1990
… …
2051 2145
2052 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2054 2148
2055 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2056 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2057 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2059 2154
2060 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2061 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2161 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2168 vertical => 0, 2263 vertical => 0,
2169 can_hover => 1, 2264 can_hover => 1,
2170 inner_pad => 0.02, 2265 inner_pad => 0.02,
2171 @_ 2266 @_
2172 ); 2267 );
… …
2175 $self->update; 2270 $self->update;
2176 2271
2177 $self 2272 $self
2178} 2273}
2179 2274
2275sub changed { }
2276
2180sub set_range { 2277sub set_range {
2181 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2182 2279
2183 ($range, $self->{range}) = ($self->{range}, $range); 2280 ($range, $self->{range}) = ($self->{range}, $range);
2184 2281
… …
2210} 2307}
2211 2308
2212sub size_request { 2309sub size_request {
2213 my ($self) = @_; 2310 my ($self) = @_;
2214 2311
2215 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2313}
2220 2314
2221sub button_down { 2315sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2223 2317
2224 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2225 2319
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2321
2228 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2229} 2323}
2230 2324
2231sub mouse_motion { 2325sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2233 2327
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2332
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2334
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2242 } 2340 1
2243} 2341}
2244 2342
2245sub update { 2343sub update {
2246 my ($self) = @_; 2344 my ($self) = @_;
2247 2345
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2250 2355
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2253 2358
… …
2259 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2261 2366
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2264 }); 2369 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2370
2272 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2273 2372
2274 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2275 2374
… …
2469 2568
2470 delete $self->{texture}; 2569 delete $self->{texture};
2471 } 2570 }
2472 2571
2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2474 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2475 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2476 2575
2477 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2478 2577
2479 my $y0 = $top; 2578 my $y0 = $top;
… …
2514sub _draw { 2613sub _draw {
2515 my ($self) = @_; 2614 my ($self) = @_;
2516 2615
2517 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2520 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2521 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2522 2621
2523 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2524 2623
2525} 2624}
… …
2579 state => 0, 2678 state => 0,
2580 on_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2581 @_ 2680 @_
2582 ); 2681 );
2583 2682
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2683 $self
2590} 2684}
2591 2685
2592sub toggle_flopper { 2686sub toggle_flopper {
2593 my ($self) = @_; 2687 my ($self) = @_;
2594 2688
2595 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2690}
2607 2691
2608############################################################################# 2692#############################################################################
2609 2693
2610package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2623} 2707}
2624 2708
2625sub set_tooltip_from { 2709sub set_tooltip_from {
2626 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2627 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2628 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8, 2724 fontsize => 0.8,
2632 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2633 ellipsise => 0, 2726 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2645 2738
2646sub size_allocate { 2739sub size_allocate {
2647 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2648 2741
2649 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2650} 2761}
2651 2762
2652sub _draw { 2763sub _draw {
2653 my ($self) = @_; 2764 my ($self) = @_;
2654 2765
… …
2671 glVertex $w, $h; 2782 glVertex $w, $h;
2672 glVertex $w, 0; 2783 glVertex $w, 0;
2673 glEnd; 2784 glEnd;
2674 2785
2675 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2676 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2677} 2789}
2678 2790
2679############################################################################# 2791#############################################################################
2680 2792
… …
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740 2852
2741 if ($tex) { 2853 if ($tex) {
2742 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2747 } 2859 }
2748} 2860}
2749 2861
… …
2756 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2757} 2869}
2758 2870
2759############################################################################# 2871#############################################################################
2760 2872
2761package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2762 2874
2763our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2764 2876
2765sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805 2878
2806############################################################################# 2879#############################################################################
2807 2880
2808package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2809 2882
… …
2850 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self; 2924 $GRAB = $self;
2852 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2853 2926
2854 $self->show; 2927 $self->show;
2855 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856} 2929}
2857 2930
2858sub mouse_motion { 2931sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2860 2933
2861 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2864} 2939}
2865 2940
2866sub button_up { 2941sub button_up {
2867 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2868 2943
… …
2870 undef $GRAB; 2945 undef $GRAB;
2871 $self->hide; 2946 $self->hide;
2872 2947
2873 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2875 } 2954 1
2876} 2955}
2877 2956
2878############################################################################# 2957#############################################################################
2879 2958
2880package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2881 2960
2882our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2883 2962
2884sub new { 2963sub new {
2885 my $class = shift; 2964 my $class = shift;
2886 2965
2887 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2888 fontsize => 0.8, 3075 fontsize => 0.8,
2889 @_, 3076 @_,
2890 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082
3083 $self
2891} 3084}
2892 3085
2893sub reorder { 3086sub reorder {
2894 my ($self) = @_; 3087 my ($self) = @_;
2895 my $NOW = time; 3088 my $NOW = Time::HiRes::time;
3089
3090 # freeze display when hovering over any label
3091 return if $CFClient::UI::TOOLTIP->{owner}
3092 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3093 values %{ $self->{item} };
2896 3094
2897 while (my ($k, $v) = each %{ $self->{item} }) { 3095 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3096 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 } 3097 }
2900 3098
… …
2903 my @items = sort { 3101 my @items = sort {
2904 $a->{pri} <=> $b->{pri} 3102 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id} 3103 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} }; 3104 } values %{ $self->{item} };
2907 3105
3106 $self->{timer}->interval (1);
3107
2908 my $count = 10 + 1; 3108 my $count = 10 + 1;
2909 for my $item (@items) { 3109 for my $item (@items) {
2910 last unless --$count; 3110 last unless --$count;
2911 3111
2912 push @widgets, $item->{label} ||= do { 3112 my $label = $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all) 3113 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1 3114 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}" 3115 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text}; 3116 : $item->{text};
2917 3117
… …
2925 tooltip => $item->{tooltip}, 3125 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP, 3126 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67, 3127 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize}, 3128 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44, 3129 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg}, 3130 fg => [@{ $item->{fg} }],
2931 can_events => 1, 3131 can_events => 1,
2932 can_hover => 1 3132 can_hover => 1
2933 }; 3133 };
3134
3135 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3136 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3137 $label->update;
3138 $label->set_max_size (undef, $label->{req_h} * $diff)
3139 if $diff < 1;
3140 $self->{timer}->interval (1/30);
3141 } else {
3142 $label->{fg}[3] = $item->{fg}[3] || 1;
3143 }
3144
3145 push @widgets, $label;
2934 } 3146 }
2935 3147
2936 $self->clear; 3148 $self->clear;
2937 $self->SUPER::add (reverse @widgets); 3149 $self->SUPER::add (reverse @widgets);
2938} 3150}
… …
2943 $text =~ s/^\s+//; 3155 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//; 3156 $text =~ s/\s+$//;
2945 3157
2946 return unless $text; 3158 return unless $text;
2947 3159
2948 my $timeout = time + ((delete $arg{timeout}) || 60); 3160 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2949 3161
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3162 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951 3163
2952 if (my $item = $self->{item}{$group}) { 3164 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) { 3165 if ($item->{text} eq $text) {
… …
2983 3195
2984 $self->reorder; 3196 $self->reorder;
2985 $self->SUPER::reconfigure; 3197 $self->SUPER::reconfigure;
2986} 3198}
2987 3199
3200sub DESTROY {
3201 my ($self) = @_;
3202
3203 $self->{timer}->cancel;
3204
3205 $self->SUPER::DESTROY;
3206}
3207
2988############################################################################# 3208#############################################################################
2989 3209
2990package CFClient::UI::Root; 3210package CFClient::UI::Inventory;
2991 3211
2992our @ISA = CFClient::UI::Container::; 3212our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994use CFClient::OpenGL;
2995 3213
2996sub new { 3214sub new {
2997 my $class = shift; 3215 my $class = shift;
2998 3216
2999 $class->SUPER::new ( 3217 my $self = $class->SUPER::new (
3218 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3219 @_,
3220 );
3221
3222 $self
3223}
3224
3225sub set_items {
3226 my ($self, $items) = @_;
3227
3228 $self->{child}->clear;
3229 return unless $items;
3230
3231 my @items = sort {
3232 ($a->{type} <=> $b->{type})
3233 or ($a->{name} cmp $b->{name})
3234 } @$items;
3235
3236 $self->{real_items} = \@items;
3237
3238 my $row = 0;
3239 for my $item (@items) {
3240 CFClient::Item::update_widgets $item;
3241
3242 $self->{child}->add (0, $row, $item->{face_widget});
3243 $self->{child}->add (1, $row, $item->{desc_widget});
3244 $self->{child}->add (2, $row, $item->{weight_widget});
3245
3246 $row++;
3247 }
3248}
3249
3250#############################################################################
3251
3252package CFClient::UI::BindEditor;
3253
3254our @ISA = CFClient::UI::FancyFrame::;
3255
3256sub new {
3257 my $class = shift;
3258
3259 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3260
3261 $self->add (my $vb = new CFClient::UI::VBox);
3262
3263
3264 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3265 text => "start recording",
3266 tooltip => "Start/Stops recording of actions."
3267 ."All subsequent actions after the recording started will be captured."
3268 ."The actions are displayed after the record was stopped."
3269 ."To bind the action you have to click on the 'Bind' button",
3270 on_activate => sub {
3271 unless ($self->{recording}) {
3272 $self->start;
3273 } else {
3274 $self->stop;
3275 }
3276 });
3277
3278 $vb->add (new CFClient::UI::Label text => "Actions:");
3279 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3280
3281 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3282 $vb->add (my $hb = new CFClient::UI::HBox);
3283 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3284 $hb->add (new CFClient::UI::Button
3285 text => "bind",
3286 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3287 on_activate => sub {
3288 $self->ask_for_bind;
3289 });
3290
3291 $vb->add (my $hb = new CFClient::UI::HBox);
3292 $hb->add (new CFClient::UI::Button
3293 text => "ok",
3294 expand => 1,
3295 tooltip => "This closes the binding editor and saves the binding",
3296 on_activate => sub {
3297 $self->hide;
3298 $self->commit;
3299 });
3300
3301 $hb->add (new CFClient::UI::Button
3302 text => "cancel",
3303 expand => 1,
3304 tooltip => "This closes the binding editor without saving",
3305 on_activate => sub {
3306 $self->hide;
3307 $self->{binding_cancel}->()
3308 if $self->{binding_cancel};
3309 });
3310
3311 $self->update_binding_widgets;
3312
3313 $self
3314}
3315
3316sub commit {
3317 my ($self) = @_;
3318 my ($mod, $sym, $cmds) = $self->get_binding;
3319 if ($sym != 0 && @$cmds > 0) {
3320 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3321 ."'. Don't forget 'Save Config'!");
3322 $self->{binding_change}->($mod, $sym, $cmds)
3323 if $self->{binding_change};
3324 } else {
3325 $::STATUSBOX->add ("No action bound, no key or action specified!");
3326 $self->{binding_cancel}->()
3327 if $self->{binding_cancel};
3328 }
3329}
3330
3331sub start {
3332 my ($self) = @_;
3333
3334 $self->{rec_btn}->set_text ("stop recording");
3335 $self->{recording} = 1;
3336 $self->clear_command_list;
3337 $::CONN->start_record if $::CONN;
3338}
3339
3340sub stop {
3341 my ($self) = @_;
3342
3343 $self->{rec_btn}->set_text ("start recording");
3344 $self->{recording} = 0;
3345
3346 my $rec;
3347 $rec = $::CONN->stop_record if $::CONN;
3348 return unless ref $rec eq 'ARRAY';
3349 $self->set_command_list ($rec);
3350}
3351
3352
3353sub ask_for_bind_and_commit {
3354 my ($self) = @_;
3355 $self->ask_for_bind (1);
3356}
3357
3358sub ask_for_bind {
3359 my ($self, $commit) = @_;
3360
3361 CFClient::Binder::open_binding_dialog (sub {
3362 my ($mod, $sym) = @_;
3363 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3364 $self->update_binding_widgets;
3365 $self->commit if $commit;
3366 });
3367}
3368
3369# $mod and $sym are the modifiers and key symbol
3370# $cmds is a array ref of strings (the commands)
3371# $cb is the callback that is executed on OK
3372# $ccb is the callback that is executed on CANCEL and
3373# when the binding was unsuccessful on OK
3374sub set_binding {
3375 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3376
3377 $self->clear_command_list;
3378 $self->{recording} = 0;
3379 $self->{rec_btn}->set_text ("start recording");
3380
3381 $self->{binding} = [$mod, $sym];
3382 $self->{commands} = $cmds;
3383
3384 $self->{binding_change} = $cb;
3385 $self->{binding_cancel} = $ccb;
3386
3387 $self->update_binding_widgets;
3388}
3389
3390# this is a shortcut method that asks for a binding
3391# and then just binds it.
3392sub do_quick_binding {
3393 my ($self, $cmds) = @_;
3394 $self->set_binding (undef, undef, $cmds, sub {
3395 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3396 });
3397 $self->ask_for_bind (1);
3398}
3399
3400sub update_binding_widgets {
3401 my ($self) = @_;
3402 my ($mod, $sym, $cmds) = $self->get_binding;
3403 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3404 $self->set_command_list ($cmds);
3405}
3406
3407sub get_binding {
3408 my ($self) = @_;
3409 return (
3410 $self->{binding}->[0],
3411 $self->{binding}->[1],
3412 [ grep { defined $_ } @{$self->{commands}} ]
3413 );
3414}
3415
3416sub clear_command_list {
3417 my ($self) = @_;
3418 $self->{cmdbox}->clear ();
3419}
3420
3421sub set_command_list {
3422 my ($self, $cmds) = @_;
3423
3424 $self->{cmdbox}->clear ();
3425 $self->{commands} = $cmds;
3426
3427 my $idx = 0;
3428
3429 for (@$cmds) {
3430 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3431
3432 my $i = $idx;
3433 $hb->add (new CFClient::UI::Label text => $_);
3434 $hb->add (new CFClient::UI::Button
3435 text => "delete",
3436 tooltip => "Deletes the action from the record",
3437 on_activate => sub {
3438 $self->{cmdbox}->remove ($hb);
3439 $cmds->[$i] = undef;
3440 });
3441
3442
3443 $idx++
3444 }
3445}
3446
3447#############################################################################
3448
3449package CFClient::UI::SpellList;
3450
3451our @ISA = CFClient::UI::Table::;
3452
3453sub new {
3454 my $class = shift;
3455
3456 my $self = $class->SUPER::new (
3457 binding => [],
3458 commands => [],
3459 @_,
3460 )
3461}
3462
3463# XXX: Do sorting? Argl...
3464sub add_spell {
3465 my ($self, $spell) = @_;
3466 $self->{spells}->{$spell->{name}} = $spell;
3467
3468 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3469 face => $spell->{face},
3470 can_hover => 1,
3471 can_events => 1,
3472 tooltip => $spell->{message});
3473
3474 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3475 text => $spell->{name},
3476 can_hover => 1,
3477 can_events => 1,
3478 tooltip => $spell->{message},
3479 expand => 1);
3480
3481 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3482 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3483 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3484 expand => 1);
3485
3486 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3487 text => "bind to key",
3488 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3489}
3490
3491sub rebuild_spell_list {
3492 my ($self) = @_;
3493 $self->{tbl_idx} = 0;
3494 $self->add_spell ($_) for values %{$self->{spells}};
3495}
3496
3497sub remove_spell {
3498 my ($self, $spell) = @_;
3499 delete $self->{spells}->{$spell->{name}};
3500 $self->rebuild_spell_list;
3501}
3502
3503#############################################################################
3504
3505package CFClient::UI::Root;
3506
3507our @ISA = CFClient::UI::Container::;
3508
3509use List::Util qw(min max);
3510
3511use CFClient::OpenGL;
3512
3513sub new {
3514 my $class = shift;
3515
3516 my $self = $class->SUPER::new (
3000 visible => 1, 3517 visible => 1,
3001 @_, 3518 @_,
3002 ) 3519 );
3003}
3004 3520
3005sub configure { 3521 Scalar::Util::weaken ($self->{root} = $self);
3006 my ($self, $x, $y, $w, $h) = @_;
3007 3522
3008 $self->{w} = $w; 3523 $self
3009 $self->{h} = $h;
3010}
3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017} 3524}
3018 3525
3019sub size_request { 3526sub size_request {
3020 my ($self) = @_; 3527 my ($self) = @_;
3021 3528
3022 ($self->{w}, $self->{h}) 3529 ($self->{w}, $self->{h})
3530}
3531
3532sub _to_pixel {
3533 my ($coord, $size, $max) = @_;
3534
3535 $coord =
3536 $coord eq "center" ? ($max - $size) * 0.5
3537 : $coord eq "max" ? $max
3538 : $coord;
3539
3540 $coord = 0 if $coord < 0;
3541 $coord = $max - $size if $coord > $max - $size;
3542
3543 int $coord + 0.5
3023} 3544}
3024 3545
3025sub size_allocate { 3546sub size_allocate {
3026 my ($self, $w, $h) = @_; 3547 my ($self, $w, $h) = @_;
3027 3548
3028 for my $child ($self->children) { 3549 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3550 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 3551
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3552 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3553 $Y = $child->{force_y} if exists $child->{force_y};
3033 3554
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3555 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3556 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3557
3040 $child->configure ($X, $Y, $W, $H); 3558 $child->configure ($X, $Y, $W, $H);
3041 } 3559 }
3042} 3560}
3043 3561
… …
3054} 3572}
3055 3573
3056sub update { 3574sub update {
3057 my ($self) = @_; 3575 my ($self) = @_;
3058 3576
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3577 $::WANT_REFRESH++;
3061} 3578}
3062 3579
3063sub add { 3580sub add {
3064 my ($self, @children) = @_; 3581 my ($self, @children) = @_;
3065 3582
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3583 $_->{is_toplevel} = 1
3074 3584 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3585
3080 $self->SUPER::add (@children); 3586 $self->SUPER::add (@children);
3081} 3587}
3082 3588
3083sub remove { 3589sub remove {
3084 my ($self, @children) = @_; 3590 my ($self, @children) = @_;
3085 3591
3086 $self->SUPER::remove (@children); 3592 $self->SUPER::remove (@children);
3593
3594 delete $self->{is_toplevel}
3595 for @children;
3087 3596
3088 while (@children) { 3597 while (@children) {
3089 my $w = pop @children; 3598 my $w = pop @children;
3090 push @children, $w->children; 3599 push @children, $w->children;
3091 $w->set_invisible; 3600 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3619 while ($self->{refresh_hook}) {
3111 $_->() 3620 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3621 for values %{delete $self->{refresh_hook}};
3113 } 3622 }
3114 3623
3115 if ($self->{check_size}) { 3624 if ($self->{realloc}) {
3625 my %queue;
3116 my @queue; 3626 my @queue;
3627 my $widget;
3117 3628
3118 for (;;) { 3629 outer:
3119 if ($self->{check_size}) { 3630 while () {
3120 #TODO use array-of-depth approach 3631 if (my $realloc = delete $self->{realloc}) {
3632 for $widget (values %$realloc) {
3633 $widget->{visible} or next; # do not resize invisible widgets
3121 3634
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3635 $queue{$widget+0}++ and next; # duplicates are common
3123 @queue, values %{delete $self->{check_size}}; 3636
3637 push @{ $queue[$widget->{visible}] }, $widget;
3638 }
3124 } 3639 }
3125 3640
3641 while () {
3642 @queue or last outer;
3643
3126 my $widget = pop @queue || last; 3644 $widget = pop @{ $queue[-1] || [] }
3127 3645 and last;
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request;
3133
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137 3646
3647 pop @queue;
3648 }
3649
3650 delete $queue{$widget+0};
3651
3652 my ($w, $h) = $widget->size_request;
3653
3654 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3655 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3656
3657 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3658 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3659
3660 $w = $widget->{force_w} if exists $widget->{force_w};
3661 $h = $widget->{force_h} if exists $widget->{force_h};
3662
3663 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3664 || delete $widget->{force_realloc}) {
3138 $widget->{req_w} = $w; 3665 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3666 $widget->{req_h} = $h;
3140 3667
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3668 $self->{size_alloc}{$widget+0} = $widget;
3142 3669
3143 $widget->{parent}->check_size
3144 if $widget->{parent}; 3670 if (my $parent = $widget->{parent}) {
3671 $self->{realloc}{$parent+0} = $parent
3672 unless $queue{$parent+0};
3673
3674 $parent->{force_size_alloc} = 1;
3675 $self->{size_alloc}{$parent+0} = $parent;
3676 }
3145 } 3677 }
3678
3679 delete $self->{realloc}{$widget+0};
3146 } 3680 }
3147 } 3681 }
3148 3682
3149 while ($self->{size_alloc}) { 3683 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3684 my @queue = sort { $b->{visible} <=> $a->{visible} }
3151 my ($widget, $w, $h) = @$_; 3685 values %$size_alloc;
3686
3687 while () {
3688 my $widget = pop @queue || last;
3689
3690 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3152 3691
3153 $w = 0 if $w < 0; 3692 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3693 $h = 0 if $h < 0;
3155 3694
3695 $w = int $w + 0.5;
3696 $h = int $h + 0.5;
3697
3698 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3699 $widget->{old_w} = $widget->{w};
3700 $widget->{old_h} = $widget->{h};
3701
3156 $widget->{w} = $w; 3702 $widget->{w} = $w;
3157 $widget->{h} = $h; 3703 $widget->{h} = $h;
3704
3158 $widget->emit (size_allocate => $w, $h); 3705 $widget->emit (size_allocate => $w, $h);
3706 }
3159 } 3707 }
3160 } 3708 }
3161 3709
3162 while ($self->{post_alloc_hook}) { 3710 while ($self->{post_alloc_hook}) {
3163 $_->() 3711 $_->()
3164 for values %{delete $self->{post_alloc_hook}}; 3712 for values %{delete $self->{post_alloc_hook}};
3165 } 3713 }
3714
3166 3715
3167 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3716 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3717 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169 glClear GL_COLOR_BUFFER_BIT; 3718 glClear GL_COLOR_BUFFER_BIT;
3170 3719
… …
3172 glLoadIdentity; 3721 glLoadIdentity;
3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3722 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174 glMatrixMode GL_MODELVIEW; 3723 glMatrixMode GL_MODELVIEW;
3175 glLoadIdentity; 3724 glLoadIdentity;
3176 3725
3726 {
3727 package CFClient::UI::Base;
3728
3729 ($draw_x, $draw_y, $draw_w, $draw_h) =
3730 (0, 0, $self->{w}, $self->{h});
3731 }
3732
3177 $self->_draw; 3733 $self->_draw;
3178} 3734}
3179 3735
3180############################################################################# 3736#############################################################################
3181 3737

Diff Legend

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