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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 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 return unless $self->{visible}; 272 return unless $self->{visible};
259 273
260 # broken show/hide model 274 $_->set_invisible for $self->children;
261 275
262 delete $self->{root}; 276 delete $self->{root};
263 delete $self->{visible}; 277 delete $self->{visible};
264 278
265 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
267 281
268 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
270 284
271 $self->focus_out; 285 $self->focus_out;
272 286
273 $self->emit (visibility_change => 0); 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;
274} 305}
275 306
276sub hide { 307sub hide {
277 my ($self) = @_; 308 my ($self) = @_;
278 309
… …
280 311
281 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
282 if $self->{parent}; 313 if $self->{parent};
283} 314}
284 315
285sub move { 316sub move_abs {
286 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
287 318
288 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
289 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
290 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
291 322
292 $self->update; 323 $self->update;
293} 324}
294 325
295sub set_size { 326sub set_size {
296 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
297 328
298 $self->{user_w} = $w; 329 $self->{force_w} = $w;
299 $self->{user_h} = $h; 330 $self->{force_h} = $h;
300 331
301 $self->check_size; 332 $self->realloc;
302} 333}
303 334
304sub size_request { 335sub size_request {
305 require Carp; 336 require Carp;
306 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
308 339
309sub configure { 340sub configure {
310 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
311 342
312 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
313 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
314 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
315 348
316 # use alignment to adjust x, y 349 # use alignment to adjust x, y
317 350
318 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
319 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
320
321 ($w, $h) = ($w2, $h2);
322 } 353 }
323 354
324 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
325 $self->{x} = $x; 356 $self->{x} = $x;
326 $self->{y} = $y; 357 $self->{y} = $y;
327 $self->update; 358 $self->update;
328 } 359 }
329 360
330 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331 $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;
332 } 368 }
333} 369}
334 370
335sub size_allocate { 371sub size_allocate {
336 # nothing to be done 372 # nothing to be done
337} 373}
338 374
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
346sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
347} 381}
348 382
349sub set_max_size { 383sub set_max_size {
350 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
351 385
352 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
353 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388
389 $self->realloc;
354} 390}
355 391
356sub set_tooltip { 392sub set_tooltip {
357 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
358 394
… …
410 446
411 $::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
412 unless $FOCUS; 448 unless $FOCUS;
413} 449}
414 450
415sub mouse_motion { } 451sub mouse_motion { 0 }
416sub button_up { } 452sub button_up { 0 }
417sub key_down { } 453sub key_down { 0 }
418sub key_up { } 454sub key_up { 0 }
419 455
420sub button_down { 456sub button_down {
421 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
422 458
423 $self->focus_in; 459 $self->focus_in;
424}
425 460
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
430sub 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
431 537
432sub draw { 538sub draw {
433 my ($self) = @_; 539 my ($self) = @_;
434 540
435 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);
436 552
437 glPushMatrix; 553 glPushMatrix;
438 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
439 $self->_draw;
440 glPopMatrix;
441 555
442 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
443 my ($x, $y) = @$self{qw(x y)};
444
445 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
446 glEnable GL_BLEND; 558 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
448 glBegin GL_QUADS; 560 glBegin GL_QUADS;
449 glVertex $x , $y; 561 glVertex 0 , 0;
450 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
451 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
452 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
453 glEnd; 565 glEnd;
454 glDisable GL_BLEND; 566 glDisable GL_BLEND;
455 } 567 }
456 568
457 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
458 glPushMatrix; 570 glPushMatrix;
459 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
461 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0; 574 glVertex 0 , 0;
463 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
464 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
465 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
466 glEnd; 578 glEnd;
467 glPopMatrix; 579 glPopMatrix;
468 #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;
469 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
470} 585}
471 586
472sub _draw { 587sub _draw {
473 my ($self) = @_; 588 my ($self) = @_;
474 589
475 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
476}
477
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545} 591}
546 592
547sub DESTROY { 593sub DESTROY {
548 my ($self) = @_; 594 my ($self) = @_;
549 595
… …
581 627
582 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
583 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
584 630
585 glEnable GL_BLEND; 631 glEnable GL_BLEND;
586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
587 glColor @$color; 633 glColor_premultiply @$color;
588 634
589 glBegin GL_QUADS; 635 glBegin GL_QUADS;
590 glVertex 0 , 0; 636 glVertex 0 , 0;
591 glVertex 0 , $h; 637 glVertex 0 , $h;
592 glVertex $w, $h; 638 glVertex $w, $h;
… …
607 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
608 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
609} 655}
610 656
611sub size_request { 657sub size_request {
612 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
613} 661}
614 662
615sub draw { } 663sub draw { }
616 664
617############################################################################# 665#############################################################################
… …
621our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
622 670
623sub new { 671sub new {
624 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
625 673
626 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
627 675
628 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
629 children => [], 677 children => [],
630 can_events => 0, 678 can_events => 0,
631 %arg, 679 %arg,
632 ); 680 );
681
633 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
634 684
635 $self 685 $self
636} 686}
637 687
638sub add { 688sub add {
… …
646 $self->{children} = [ 696 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
649 ]; 699 ];
650 700
651 $self->check_size (1); 701 $self->realloc;
652 $self->update;
653} 702}
654 703
655sub children { 704sub children {
656 @{ $_[0]{children} } 705 @{ $_[0]{children} }
657} 706}
… …
662 delete $child->{parent}; 711 delete $child->{parent};
663 $child->hide; 712 $child->hide;
664 713
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 715
667 $self->check_size (1); 716 $self->realloc;
668 $self->update;
669} 717}
670 718
671sub clear { 719sub clear {
672 my ($self) = @_; 720 my ($self) = @_;
673 721
… …
677 for (@$children) { 725 for (@$children) {
678 delete $_->{parent}; 726 delete $_->{parent};
679 $_->hide; 727 $_->hide;
680 } 728 }
681 729
682 $self->check_size; 730 $self->realloc;
683 $self->update;
684} 731}
685 732
686sub find_widget { 733sub find_widget {
687 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
688 735
689 $x -= $self->{x}; 736 $x -= $self->{x};
690 $y -= $self->{y}; 737 $y -= $self->{y};
691 738
692 my $res; 739 my $res;
693 740
694 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
695 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
696 and return $res; 743 and return $res;
697 } 744 }
698 745
699 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
749} 796}
750 797
751############################################################################# 798#############################################################################
752 799
800# back-buffered drawing area
801
753package CFClient::UI::Window; 802package CFClient::UI::Window;
754 803
755our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
756 805
757use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
775 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
776 $self->update; 825 $self->update;
777} 826}
778 827
779sub _render { 828sub _render {
829 my ($self) = @_;
830
780 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
781} 832}
782 833
783sub render_child { 834sub render_child {
784 my ($self) = @_; 835 my ($self) = @_;
785 836
786 $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 {
787 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
788 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
789 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
790 $self->_render; 848 $self->_render;
791 }; 849 };
792} 850}
793 851
794sub _draw { 852sub _draw {
795 my ($self) = @_; 853 my ($self) = @_;
796 854
797 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
798 856
799 my $tex = $self->{texture} 857 my $tex = $self->{texture}
800 or return; 858 or return;
801 859
802 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
804 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
805 863
806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
807 865
808 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
809} 867}
… …
825} 883}
826 884
827sub size_request { 885sub size_request {
828 my ($self) = @_; 886 my ($self) = @_;
829 887
830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831 889
832 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
833} 894}
834 895
835sub size_allocate { 896sub size_allocate {
836 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
837 898
899 my $child = $self->child;
900
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840 903
841 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
842 $self->update; 905 $self->update;
843} 906}
844 907
… …
880} 943}
881 944
882sub _render { 945sub _render {
883 my ($self) = @_; 946 my ($self) = @_;
884 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
885 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886 952
887 $self->SUPER::_render; 953 $self->SUPER::_render;
888} 954}
889 955
… …
892package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
893 959
894our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
895 961
896sub new { 962sub new {
897 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
898 966
899 my $self; 967 my $self;
900 968
901 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
902 vertical => 1, 970 vertical => 1,
… …
907 ; 975 ;
908 976
909 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
910 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
911 slider => $slider, 979 slider => $slider,
912 @_, 980 %arg,
913 ); 981 );
914 982
915 $self->{vp}->add ($self->{scrolled});
916 $self->add ($self->{vp});
917 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
918 985
919 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
920} 993}
921 994
922sub update { 995sub update {
923 my ($self) = @_; 996 my ($self) = @_;
924 997
… …
963 1036
964 if ($self->{bg}) { 1037 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
966 1039
967 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
969 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
970 1043
971 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
972 glVertex 0 , 0; 1045 glVertex 0 , 0;
973 glVertex 0 , $h; 1046 glVertex 0 , $h;
974 glVertex $w, $h; 1047 glVertex $w, $h;
… …
987 1060
988our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
989 1062
990use CFClient::OpenGL; 1063use CFClient::OpenGL;
991 1064
992my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 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);
995 1072
996sub new { 1073sub new {
997 my $class = shift; 1074 my ($class, %arg) = @_;
998 1075
999 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
1000 1077
1001 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1081 border => 0.6,
1005 is_toplevel => 1,
1006 can_events => 1, 1082 can_events => 1,
1007 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1008 ); 1086 );
1009 1087
1010 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
1011 align => 0, 1089 align => 0,
1012 valign => 1, 1090 valign => 1,
1013 text => $self->{title}, 1091 text => $title,
1014 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1015 1094
1016 $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};
1017} 1103}
1018 1104
1019sub border { 1105sub border {
1020 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1021} 1107}
1022 1108
1023sub size_request { 1109sub size_request {
1024 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1025 1114
1026 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1027 1116
1028 ( 1117 (
1029 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1032} 1121}
1033 1122
1034sub size_allocate { 1123sub size_allocate {
1035 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1036 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
1037 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1038 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1039 1136
1040 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041 if $self->{title};
1042
1043 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1044} 1138}
1045 1139
1046sub button_down { 1140sub button_down {
1047 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1048 1142
… …
1064 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1065 1159
1066 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1068 1162
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1165
1074 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1075 }; 1168 };
1076 1169
1077 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1081 $self->{motion} = sub { 1174 $self->{motion} = sub {
1082 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1083 1176
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1178
1086 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1088 $self->move ($self->{user_x}, $self->{user_y}); 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1089 $self->update;
1090 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1091 } 1187 1
1092} 1188}
1093 1189
1094sub button_up { 1190sub button_up {
1095 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1096 1192
1097 delete $self->{motion}; 1193 !!delete $self->{motion}
1098} 1194}
1099 1195
1100sub mouse_motion { 1196sub mouse_motion {
1101 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1102 1198
1103 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1104} 1202}
1105 1203
1106sub _draw { 1204sub _draw {
1107 my ($self) = @_; 1205 my ($self) = @_;
1108 1206
1207 my $child = $self->{children}[0];
1208
1109 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1111 1211
1112 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114 1214
1115 my $border = $self->border; 1215 my $border = $self->border;
1116 1216
1117 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122 1222
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1125 1225
1126 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1127 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1128 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1129
1130 glColor @{ $self->{bg} };
1131
1132 $bg->{s} = $rep_x;
1133 $bg->{t} = $rep_y;
1134 $bg->{wrap_mode} = 1;
1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 } 1231 }
1137 1232
1138 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1139 1234
1140 $self->{title}->draw if $self->{title};
1141
1142 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1143} 1241}
1144 1242
1145############################################################################# 1243#############################################################################
1146 1244
1147package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1169 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1170 1268
1171 $child->set_parent ($self); 1269 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1173 1271
1174 $self->check_size (1); 1272 $self->realloc;
1175} 1273}
1176 1274
1177# 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?
1178sub clear { 1276sub clear {
1179 my ($self) = @_; 1277 my ($self) = @_;
… …
1184 for (@children) { 1282 for (@children) {
1185 delete $_->{parent}; 1283 delete $_->{parent};
1186 $_->hide; 1284 $_->hide;
1187 } 1285 }
1188 1286
1189 $self->check_size (1); 1287 $self->realloc;
1190 $self->update;
1191} 1288}
1192 1289
1193sub get_wh { 1290sub get_wh {
1194 my ($self) = @_; 1291 my ($self) = @_;
1195 1292
… …
1291 } 1388 }
1292} 1389}
1293 1390
1294############################################################################# 1391#############################################################################
1295 1392
1296package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1297
1298# TODO: wrap into common Box base class
1299 1394
1300our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1301 1396
1302sub size_request { 1397sub size_request {
1303 my ($self) = @_; 1398 my ($self) = @_;
1304 1399
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1306 1401 ? (
1307 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1308 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309 (List::Util::max map $_->[1], @alloc), 1404 )
1310 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1311} 1409}
1312 1410
1313sub size_allocate { 1411sub size_allocate {
1314 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1315 1413
1316 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1317
1318 my $children = $self->{children}; 1415 my $children = $self->{children};
1319 1416
1320 my @h = map $_->{req_w}, @$children; 1417 my @req;
1321 1418
1322 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1323 1420 @req = ($space / (@$children || 1)) x @$children;
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } 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 {
1328 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329 $exp ||= 1;
1330 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1331 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 } 1435 }
1338 } 1436 }
1339 1437
1340 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1341 1439
1342 my $y = 0; 1440 my $pos = 0;
1343 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1346 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347 1444
1348 $y += $h; 1445 $pos += $alloc;
1349 } 1446 }
1350 1447
1351 1 1448 1
1352} 1449}
1353 1450
1354############################################################################# 1451#############################################################################
1355 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
1356package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1357 1469
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1361 1471
1362sub size_request { 1472sub new {
1363 my ($self) = @_; 1473 my $class = shift;
1364 1474
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1366 1476 vertical => 1,
1367 ( 1477 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1478 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1479}
1411 1480
1412############################################################################# 1481#############################################################################
1413 1482
1414package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1431 ellipsise => 3, # end 1500 ellipsise => 3, # end
1432 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1433 fontsize => 1, 1502 fontsize => 1,
1434 align => -1, 1503 align => -1,
1435 valign => -1, 1504 valign => -1,
1436 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1437 can_events => 0, 1507 can_events => 0,
1438 %arg 1508 %arg
1439 ); 1509 );
1440 1510
1441 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1477 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1478 1548
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1481 1551
1552 $self->realloc;
1482 $self->update; 1553 $self->update;
1483 $self->check_size;
1484} 1554}
1485 1555
1486sub set_markup { 1556sub set_markup {
1487 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1488 1558
… …
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1563
1494 $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;
1495 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1496 1566
1567 $self->realloc;
1497 $self->update; 1568 $self->update;
1498 $self->check_size;
1499} 1569}
1500 1570
1501sub size_request { 1571sub size_request {
1502 my ($self) = @_; 1572 my ($self) = @_;
1503 1573
… …
1517 1587
1518 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1520 } 1590 }
1521 1591
1522 ( 1592 ($w, $h)
1523 $w + $self->{padding} * 2,
1524 $h + $self->{padding} * 2,
1525 )
1526} 1593}
1527 1594
1528sub size_allocate { 1595sub size_allocate {
1529 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1530 1597
1598 delete $self->{ox};
1599
1531 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532} 1602}
1533 1603
1534sub set_fontsize { 1604sub set_fontsize {
1535 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1536 1606
1537 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1608 delete $self->{texture};
1539 1609
1540 $self->update; 1610 $self->realloc;
1541 $self->check_size;
1542} 1611}
1543 1612
1544sub _draw { 1613sub _draw {
1545 my ($self) = @_; 1614 my ($self) = @_;
1546 1615
… …
1552 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1553 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556 1625
1557 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1558 1628
1629 unless (exists $self->{ox}) {
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1562 1633
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1566
1567 $tex
1568 }; 1637 };
1569 1638
1570 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572 1641
1642 glColor_premultiply @{$self->{fg}}
1573 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1574 glColor @{$self->{fg}}; 1644
1575 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1576 } else {
1577 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1578 }
1579 1646
1580 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1581} 1648}
1582 1649
1583############################################################################# 1650#############################################################################
… …
1610 1677
1611 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1612 1679
1613 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1614 1681
1615 delete $self->{texture};
1616
1617 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1618 $self->{text} = $text; 1683 $self->{text} = $text;
1619 1684
1620 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1621 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1622 1687
1623 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1624} 1690}
1625 1691
1626sub set_text { 1692sub set_text {
1627 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1628 1694
1629 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1696 $self->_set_text ($text);
1631 $self->update; 1697
1632 $self->check_size; 1698 $self->realloc;
1633} 1699}
1634 1700
1635sub get_text { 1701sub get_text {
1636 $_[0]{text} 1702 $_[0]{text}
1637} 1703}
… …
1667 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1668 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1669 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1670 } elsif ($uni) { 1736 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1672 } 1740 }
1673 1741
1674 $self->_set_text ($text); 1742 $self->_set_text ($text);
1675 $self->update; 1743
1676 $self->check_size; 1744 $self->realloc;
1745
1746 1
1677} 1747}
1678 1748
1679sub focus_in { 1749sub focus_in {
1680 my ($self) = @_; 1750 my ($self) = @_;
1681 1751
… …
1696 utf8::encode $text; 1766 utf8::encode $text;
1697 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1698 1768
1699 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1700 $self->update; 1770 $self->update;
1771
1772 1
1701} 1773}
1702 1774
1703sub mouse_motion { 1775sub mouse_motion {
1704 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1705# 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
1706} 1780}
1707 1781
1708sub _draw { 1782sub _draw {
1709 my ($self) = @_; 1783 my ($self) = @_;
1710 1784
1711 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1712 1786
1713 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1714 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1715 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1716 } else { 1790 } else {
1717 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1718 } 1792 }
1719 1793
1720 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1722 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1723 glVertex 0 , 0; 1797 glVertex 0 , 0;
1724 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1725 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1726 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1787 } else { 1861 } else {
1788 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1789 } 1863 }
1790 1864
1791 } else { 1865 } else {
1792 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1793 } 1869 1
1794
1795} 1870}
1796 1871
1797############################################################################# 1872#############################################################################
1798 1873
1799package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1808 1883
1809sub new { 1884sub new {
1810 my $class = shift; 1885 my $class = shift;
1811 1886
1812 $class->SUPER::new ( 1887 $class->SUPER::new (
1813 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1814 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1815 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1816 can_hover => 1, 1892 can_hover => 1,
1817 align => 0, 1893 align => 0,
1818 valign => 0, 1894 valign => 0,
… …
1827 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1828 1904
1829 $self->emit ("activate") 1905 $self->emit ("activate")
1830 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1831 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1832} 1910}
1833 1911
1834sub _draw { 1912sub _draw {
1835 my ($self) = @_; 1913 my ($self) = @_;
1836 1914
1837 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1838
1839 if ($GRAB == $self) {
1840 $self->{fg} = $self->{active_fg};
1841 }
1842 1916
1843 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1845 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1846 1920
… …
1865 1939
1866sub new { 1940sub new {
1867 my $class = shift; 1941 my $class = shift;
1868 1942
1869 $class->SUPER::new ( 1943 $class->SUPER::new (
1870 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1871 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1872 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1875 state => 0, 1950 state => 0,
… …
1879} 1954}
1880 1955
1881sub size_request { 1956sub size_request {
1882 my ($self) = @_; 1957 my ($self) = @_;
1883 1958
1884 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1885} 1960}
1886 1961
1887sub button_down { 1962sub button_down {
1888 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1889 1964
1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1893 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1894 } 1973 1
1895} 1974}
1896 1975
1897sub _draw { 1976sub _draw {
1898 my ($self) = @_; 1977 my ($self) = @_;
1899 1978
1900 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1901 1980
1902 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903 1982
1904 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;
1905 1986
1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907 1988
1908 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909 1990
… …
2064 2145
2065 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2067 2148
2068 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2069 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;
2070 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2154
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2174 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2175 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2178 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2179 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2180 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2181 vertical => 0, 2263 vertical => 0,
2182 can_hover => 1, 2264 can_hover => 1,
2183 inner_pad => 0.02, 2265 inner_pad => 0.02,
2184 @_ 2266 @_
2185 ); 2267 );
… …
2188 $self->update; 2270 $self->update;
2189 2271
2190 $self 2272 $self
2191} 2273}
2192 2274
2275sub changed { }
2276
2193sub set_range { 2277sub set_range {
2194 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2195 2279
2196 ($range, $self->{range}) = ($self->{range}, $range); 2280 ($range, $self->{range}) = ($self->{range}, $range);
2197 2281
… …
2223} 2307}
2224 2308
2225sub size_request { 2309sub size_request {
2226 my ($self) = @_; 2310 my ($self) = @_;
2227 2311
2228 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2229 my $h = $self->{req_h};
2230
2231 $self->{vertical} ? ($h, $w) : ($w, $h)
2232} 2313}
2233 2314
2234sub button_down { 2315sub button_down {
2235 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2236 2317
2237 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2238 2319
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2321
2241 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2242} 2323}
2243 2324
2244sub mouse_motion { 2325sub mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2246 2327
… …
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2332
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2334
2254 $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
2255 } 2340 1
2256} 2341}
2257 2342
2258sub update { 2343sub update {
2259 my ($self) = @_; 2344 my ($self) = @_;
2260 2345
2261 $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}) {
2262 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2263 2355
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2266 2358
… …
2272 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2274 2366
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2277 }); 2369 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2370
2285 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2286 2372
2287 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2288 2374
… …
2482 2568
2483 delete $self->{texture}; 2569 delete $self->{texture};
2484 } 2570 }
2485 2571
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2489 2575
2490 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2491 2577
2492 my $y0 = $top; 2578 my $y0 = $top;
… …
2527sub _draw { 2613sub _draw {
2528 my ($self) = @_; 2614 my ($self) = @_;
2529 2615
2530 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2533 $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});
2534 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2535 2621
2536 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2537 2623
2538} 2624}
… …
2592 state => 0, 2678 state => 0,
2593 on_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2594 @_ 2680 @_
2595 ); 2681 );
2596 2682
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2683 $self
2603} 2684}
2604 2685
2605sub toggle_flopper { 2686sub toggle_flopper {
2606 my ($self) = @_; 2687 my ($self) = @_;
2607 2688
2608 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2690}
2620 2691
2621############################################################################# 2692#############################################################################
2622 2693
2623package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2636} 2707}
2637 2708
2638sub set_tooltip_from { 2709sub set_tooltip_from {
2639 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2640 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
2641 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2642 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8, 2724 fontsize => 0.8,
2645 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2646 ellipsise => 0, 2726 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2658 2738
2659sub size_allocate { 2739sub size_allocate {
2660 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2661 2741
2662 $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 });
2663} 2761}
2664 2762
2665sub _draw { 2763sub _draw {
2666 my ($self) = @_; 2764 my ($self) = @_;
2667 2765
… …
2684 glVertex $w, $h; 2782 glVertex $w, $h;
2685 glVertex $w, 0; 2783 glVertex $w, 0;
2686 glEnd; 2784 glEnd;
2687 2785
2688 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2689 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2690} 2789}
2691 2790
2692############################################################################# 2791#############################################################################
2693 2792
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 2852
2754 if ($tex) { 2853 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2760 } 2859 }
2761} 2860}
2762 2861
… …
2769 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2770} 2869}
2771 2870
2772############################################################################# 2871#############################################################################
2773 2872
2774package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2775 2874
2776our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2777 2876
2778sub new { 2877# 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
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817}
2818 2878
2819############################################################################# 2879#############################################################################
2820 2880
2821package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2822 2882
… …
2863 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2864 $GRAB = $self; 2924 $GRAB = $self;
2865 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2866 2926
2867 $self->show; 2927 $self->show;
2868 $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);
2869} 2929}
2870 2930
2871sub mouse_motion { 2931sub mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2873 2933
2874 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2877} 2939}
2878 2940
2879sub button_up { 2941sub button_up {
2880 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2881 2943
… …
2883 undef $GRAB; 2945 undef $GRAB;
2884 $self->hide; 2946 $self->hide;
2885 2947
2886 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2887 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2888 } 2954 1
2889} 2955}
2890 2956
2891############################################################################# 2957#############################################################################
2892 2958
2893package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2894 2960
2895our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2896 2962
2897sub new { 2963sub new {
2898 my $class = shift; 2964 my $class = shift;
2899 2965
2900 $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 (
2901 fontsize => 0.8, 3075 fontsize => 0.8,
2902 @_, 3076 @_,
2903 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
2904} 3087}
2905 3088
2906sub reorder { 3089sub reorder {
2907 my ($self) = @_; 3090 my ($self) = @_;
2908 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2909 3092
2910 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2911 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2912 } 3095 }
2913 3096
… …
2915 3098
2916 my @items = sort { 3099 my @items = sort {
2917 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2918 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2919 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2920 3105
2921 my $count = 10 + 1; 3106 my $count = 10 + 1;
2922 for my $item (@items) { 3107 for my $item (@items) {
2923 last unless --$count; 3108 last unless --$count;
2924 3109
… …
2939 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2940 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2941 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2942 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2943 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2944 can_events => 1, 3130 can_events => 1,
2945 can_hover => 1 3131 can_hover => 1
2946 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2947 } 3143 }
2948 3144
2949 $self->clear; 3145 $self->clear;
2950 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2951} 3147}
… …
2956 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2957 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2958 3154
2959 return unless $text; 3155 return unless $text;
2960 3156
2961 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2962 3158
2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2964 3160
2965 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2966 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
2996 3192
2997 $self->reorder; 3193 $self->reorder;
2998 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
2999} 3195}
3000 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
3001############################################################################# 3205#############################################################################
3002 3206
3003package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
3004 3208
3005our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007use CFClient::OpenGL;
3008 3210
3009sub new { 3211sub new {
3010 my $class = shift; 3212 my $class = shift;
3011 3213
3012 $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
3456 @_,
3457 )
3458}
3459
3460# XXX: Do sorting? Argl...
3461sub add_spell {
3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
3464
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root;
3503
3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3507
3508use CFClient::OpenGL;
3509
3510sub new {
3511 my $class = shift;
3512
3513 my $self = $class->SUPER::new (
3013 visible => 1, 3514 visible => 1,
3014 @_, 3515 @_,
3015 ) 3516 );
3016}
3017 3517
3018sub configure { 3518 Scalar::Util::weaken ($self->{root} = $self);
3019 my ($self, $x, $y, $w, $h) = @_;
3020 3519
3021 $self->{w} = $w; 3520 $self
3022 $self->{h} = $h;
3023}
3024
3025sub check_size {
3026 my ($self) = @_;
3027
3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
3030} 3521}
3031 3522
3032sub size_request { 3523sub size_request {
3033 my ($self) = @_; 3524 my ($self) = @_;
3034 3525
3035 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
3036} 3541}
3037 3542
3038sub size_allocate { 3543sub size_allocate {
3039 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
3040 3545
3041 for my $child ($self->children) { 3546 for my $child ($self->children) {
3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043 3548
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
3045 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3046 3551
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
3048 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055 3554
3056 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
3057 } 3556 }
3058} 3557}
3059 3558
… …
3070} 3569}
3071 3570
3072sub update { 3571sub update {
3073 my ($self) = @_; 3572 my ($self) = @_;
3074 3573
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3077} 3575}
3078 3576
3079sub add { 3577sub add {
3080 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3081 3579
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3580 $_->{is_toplevel} = 1
3090 3581 for @children;
3091 # integerise window positions
3092 $child->{x} = int $child->{x};
3093 $child->{y} = int $child->{y};
3094 }
3095 3582
3096 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3097} 3584}
3098 3585
3099sub remove { 3586sub remove {
3100 my ($self, @children) = @_; 3587 my ($self, @children) = @_;
3101 3588
3102 $self->SUPER::remove (@children); 3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3103 3593
3104 while (@children) { 3594 while (@children) {
3105 my $w = pop @children; 3595 my $w = pop @children;
3106 push @children, $w->children; 3596 push @children, $w->children;
3107 $w->set_invisible; 3597 $w->set_invisible;
… …
3126 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3127 $_->() 3617 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3129 } 3619 }
3130 3620
3131 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3622 my %queue;
3132 my @queue; 3623 my @queue;
3624 my $widget;
3133 3625
3134 for (;;) { 3626 outer:
3135 if ($self->{check_size}) { 3627 while () {
3136 #TODO use array-of-depth approach 3628 if (my $realloc = delete $self->{realloc}) {
3629 for $widget (values %$realloc) {
3630 $widget->{visible} or next; # do not resize invisible widgets
3137 3631
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3632 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{check_size}}; 3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
3140 } 3636 }
3141 3637
3638 while () {
3639 @queue or last outer;
3640
3142 my $widget = pop @queue || last; 3641 $widget = pop @{ $queue[-1] || [] }
3143 3642 and last;
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147 ? @$widget{qw(user_w user_h)}
3148 : $widget->size_request;
3149
3150 if (delete $widget->{force_alloc}
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153 3643
3644 pop @queue;
3645 }
3646
3647 delete $queue{$widget+0};
3648
3649 my ($w, $h) = $widget->size_request;
3650
3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656
3657 $w = $widget->{force_w} if exists $widget->{force_w};
3658 $h = $widget->{force_h} if exists $widget->{force_h};
3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
3154 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3156 3664
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3158 3666
3159 $widget->{parent}->check_size
3160 if $widget->{parent}; 3667 if (my $parent = $widget->{parent}) {
3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
3161 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3162 } 3677 }
3163 } 3678 }
3164 3679
3165 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3167 my ($widget, $w, $h) = @$_; 3682 values %$size_alloc;
3683
3684 while () {
3685 my $widget = pop @queue || last;
3686
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168 3688
3169 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3171 3691
3692 $w = int $w + 0.5;
3693 $h = int $h + 0.5;
3694
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3698
3172 $widget->{w} = $w; 3699 $widget->{w} = $w;
3173 $widget->{h} = $h; 3700 $widget->{h} = $h;
3701
3174 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3175 } 3704 }
3176 } 3705 }
3177 3706
3178 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3179 $_->() 3708 $_->()
3180 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3181 } 3710 }
3711
3182 3712
3183 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3186 3716
… …
3188 glLoadIdentity; 3718 glLoadIdentity;
3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3191 glLoadIdentity; 3721 glLoadIdentity;
3192 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
3193 $self->_draw; 3730 $self->_draw;
3194} 3731}
3195 3732
3196############################################################################# 3733#############################################################################
3197 3734

Diff Legend

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