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.248 by root, Sun May 28 01:37:45 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->{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.]+$/;
181 $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};
182 $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};
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
183 } 189 }
184 } 190 }
185 191
186 reconfigure_widgets; 192 reconfigure_widgets;
187} 193}
… …
196 202
197sub new { 203sub new {
198 my $class = shift; 204 my $class = shift;
199 205
200 my $self = bless { 206 my $self = bless {
201 x => 0, 207 x => "center",
202 y => 0, 208 y => "center",
203 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
204 can_events => 1, 212 can_events => 1,
205 @_ 213 @_
206 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 217
208 for (keys %$self) { 218 for (keys %$self) {
209 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
211 } 221 }
212 } 222 }
213 223
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_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};
221 } 234 }
222 235
223 $self 236 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 237}
235 238
236sub destroy { 239sub destroy {
237 my ($self) = @_; 240 my ($self) = @_;
238 241
… …
246 return if $self->{parent}; 249 return if $self->{parent};
247 250
248 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
249} 252}
250 253
251sub center {
252 my ($self) = @_;
253
254 $CFClient::UI::ROOT->on_post_alloc (
255 "center_$self" => sub {
256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257 },
258 );
259
260 $self->update;
261}
262
263sub set_visible { 254sub set_visible {
264 my ($self) = @_; 255 my ($self) = @_;
265 256
266 return if $self->{visible}; 257 return if $self->{visible};
267 258
268 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
270 261
271 $self->emit (visibility_change => 1); 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
272} 267}
273 268
274sub set_invisible { 269sub set_invisible {
275 my ($self) = @_; 270 my ($self) = @_;
276 271
277 return unless $self->{visible}; 272 return unless $self->{visible};
278 273
279 # broken show/hide model 274 $_->set_invisible for $self->children;
280 275
281 delete $self->{root}; 276 delete $self->{root};
282 delete $self->{visible}; 277 delete $self->{visible};
283 278
284 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
286 281
287 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
289 284
290 $self->focus_out; 285 $self->focus_out;
291 286
292 $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;
293} 305}
294 306
295sub hide { 307sub hide {
296 my ($self) = @_; 308 my ($self) = @_;
297 309
… …
299 311
300 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
301 if $self->{parent}; 313 if $self->{parent};
302} 314}
303 315
304sub move { 316sub move_abs {
305 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
306 318
307 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
308 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
309 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
310 322
311 $self->update; 323 $self->update;
312} 324}
313 325
314sub set_size { 326sub set_size {
315 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
316 328
317 $self->{def_w} = $w; 329 $self->{force_w} = $w;
318 $self->{def_h} = $h; 330 $self->{force_h} = $h;
319 331
320 $self->check_size; 332 $self->realloc;
321} 333}
322 334
323sub size_request { 335sub size_request {
324 require Carp; 336 require Carp;
325 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
327 339
328sub configure { 340sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
330 342
331 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
334 348
335 # use alignment to adjust x, y 349 # use alignment to adjust x, y
336 350
337 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 353 }
342 354
343 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 356 $self->{x} = $x;
345 $self->{y} = $y; 357 $self->{y} = $y;
346 $self->update; 358 $self->update;
347 } 359 }
348 360
349 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $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;
351 } 368 }
352} 369}
353 370
354sub size_allocate { 371sub size_allocate {
355 # nothing to be done 372 # nothing to be done
356} 373}
357 374
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
365sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
366} 381}
367 382
368sub set_max_size { 383sub set_max_size {
369 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
370 385
371 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
372 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;
373} 390}
374 391
375sub set_tooltip { 392sub set_tooltip {
376 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
377 394
… …
429 446
430 $::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
431 unless $FOCUS; 448 unless $FOCUS;
432} 449}
433 450
434sub mouse_motion { } 451sub mouse_motion { 0 }
435sub button_up { } 452sub button_up { 0 }
436sub key_down { } 453sub key_down { 0 }
437sub key_up { } 454sub key_up { 0 }
438 455
439sub button_down { 456sub button_down {
440 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
441 458
442 $self->focus_in; 459 $self->focus_in;
443}
444 460
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
449sub 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
450 537
451sub draw { 538sub draw {
452 my ($self) = @_; 539 my ($self) = @_;
453 540
454 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);
455 552
456 glPushMatrix; 553 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 555
461 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 558 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 560 glBegin GL_QUADS;
468 glVertex $x , $y; 561 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
472 glEnd; 565 glEnd;
473 glDisable GL_BLEND; 566 glDisable GL_BLEND;
474 } 567 }
475 568
476 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 570 glPushMatrix;
478 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 574 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
485 glEnd; 578 glEnd;
486 glPopMatrix; 579 glPopMatrix;
487 #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;
488 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
489} 585}
490 586
491sub _draw { 587sub _draw {
492 my ($self) = @_; 588 my ($self) = @_;
493 589
494 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
495}
496
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516 $self->check_size;
517}
518
519sub check_size {
520 my ($self, $forced) = @_;
521
522 $self->{force_alloc} = 1 if $forced;
523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
524}
525
526sub update {
527 my ($self) = @_;
528
529 $self->{parent}->update
530 if $self->{parent};
531}
532
533sub connect {
534 my ($self, $signal, $cb) = @_;
535
536 push @{ $self->{signal_cb}{$signal} }, $cb;
537}
538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
545sub emit {
546 my ($self, $signal, @args) = @_;
547
548 $self->_emit ($signal, @args)
549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
554} 591}
555 592
556sub DESTROY { 593sub DESTROY {
557 my ($self) = @_; 594 my ($self) = @_;
558 595
… …
590 627
591 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
592 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
593 630
594 glEnable GL_BLEND; 631 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596 glColor @$color; 633 glColor_premultiply @$color;
597 634
598 glBegin GL_QUADS; 635 glBegin GL_QUADS;
599 glVertex 0 , 0; 636 glVertex 0 , 0;
600 glVertex 0 , $h; 637 glVertex 0 , $h;
601 glVertex $w, $h; 638 glVertex $w, $h;
… …
616 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
617 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
618} 655}
619 656
620sub size_request { 657sub size_request {
621 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
622} 661}
623 662
624sub draw { } 663sub draw { }
625 664
626############################################################################# 665#############################################################################
… …
630our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
631 670
632sub new { 671sub new {
633 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
634 673
635 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
636 675
637 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
638 children => [], 677 children => [],
639 can_events => 0, 678 can_events => 0,
640 %arg, 679 %arg,
641 ); 680 );
681
642 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
643 684
644 $self 685 $self
645} 686}
646 687
647sub add { 688sub add {
… …
655 $self->{children} = [ 696 $self->{children} = [
656 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
657 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
658 ]; 699 ];
659 700
660 $self->check_size (1); 701 $self->realloc;
661 $self->update;
662} 702}
663 703
664sub children { 704sub children {
665 @{ $_[0]{children} } 705 @{ $_[0]{children} }
666} 706}
… …
671 delete $child->{parent}; 711 delete $child->{parent};
672 $child->hide; 712 $child->hide;
673 713
674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675 715
676 $self->check_size (1); 716 $self->realloc;
677 $self->update;
678} 717}
679 718
680sub clear { 719sub clear {
681 my ($self) = @_; 720 my ($self) = @_;
682 721
… …
686 for (@$children) { 725 for (@$children) {
687 delete $_->{parent}; 726 delete $_->{parent};
688 $_->hide; 727 $_->hide;
689 } 728 }
690 729
691 $self->check_size; 730 $self->realloc;
692 $self->update;
693} 731}
694 732
695sub find_widget { 733sub find_widget {
696 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
697 735
698 $x -= $self->{x}; 736 $x -= $self->{x};
699 $y -= $self->{y}; 737 $y -= $self->{y};
700 738
701 my $res; 739 my $res;
702 740
703 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
705 and return $res; 743 and return $res;
706 } 744 }
707 745
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
757 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
758} 796}
759 797
760############################################################################# 798#############################################################################
761 799
800# back-buffered drawing area
801
762package CFClient::UI::Window; 802package CFClient::UI::Window;
763 803
764our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
765 805
766use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
784 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
785 $self->update; 825 $self->update;
786} 826}
787 827
788sub _render { 828sub _render {
829 my ($self) = @_;
830
789 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
790} 832}
791 833
792sub render_child { 834sub render_child {
793 my ($self) = @_; 835 my ($self) = @_;
794 836
795 $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 {
796 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
797 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
798 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
799 $self->_render; 848 $self->_render;
800 }; 849 };
801} 850}
802 851
803sub _draw { 852sub _draw {
804 my ($self) = @_; 853 my ($self) = @_;
805 854
806 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
807 856
808 my $tex = $self->{texture} 857 my $tex = $self->{texture}
809 or return; 858 or return;
810 859
811 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
813 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
814 863
815 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
816 865
817 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
818} 867}
… …
834} 883}
835 884
836sub size_request { 885sub size_request {
837 my ($self) = @_; 886 my ($self) = @_;
838 887
839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
840 889
841 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
843 892
844 ($w, $h) 893 ($w, $h)
845} 894}
846 895
847sub size_allocate { 896sub size_allocate {
848 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
849 898
899 my $child = $self->child;
900
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852 903
853 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
854 $self->update; 905 $self->update;
855} 906}
856 907
… …
892} 943}
893 944
894sub _render { 945sub _render {
895 my ($self) = @_; 946 my ($self) = @_;
896 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
897 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898 952
899 $self->SUPER::_render; 953 $self->SUPER::_render;
900} 954}
901 955
… …
904package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
905 959
906our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
907 961
908sub new { 962sub new {
909 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
910 966
911 my $self; 967 my $self;
912 968
913 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
914 vertical => 1, 970 vertical => 1,
… …
919 ; 975 ;
920 976
921 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
922 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
923 slider => $slider, 979 slider => $slider,
924 @_, 980 %arg,
925 ); 981 );
926 982
927 $self->{vp}->add ($self->{scrolled});
928 $self->add ($self->{vp});
929 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
930 985
931 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
932} 993}
933 994
934sub update { 995sub update {
935 my ($self) = @_; 996 my ($self) = @_;
936 997
… …
975 1036
976 if ($self->{bg}) { 1037 if ($self->{bg}) {
977 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
978 1039
979 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
981 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
982 1043
983 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
984 glVertex 0 , 0; 1045 glVertex 0 , 0;
985 glVertex 0 , $h; 1046 glVertex 0 , $h;
986 glVertex $w, $h; 1047 glVertex $w, $h;
… …
999 1060
1000our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
1001 1062
1002use CFClient::OpenGL; 1063use CFClient::OpenGL;
1003 1064
1004my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1006 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);
1007 1072
1008sub new { 1073sub new {
1009 my $class = shift; 1074 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1010 1077
1011 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1081 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1082 can_events => 1,
1017 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1018 ); 1086 );
1019 1087
1020 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
1021 align => 0, 1089 align => 0,
1022 valign => 1, 1090 valign => 1,
1023 text => $self->{title}, 1091 text => $title,
1024 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1025 1094
1026 $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};
1027} 1103}
1028 1104
1029sub border { 1105sub border {
1030 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1031} 1107}
1032 1108
1033sub size_request { 1109sub size_request {
1034 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1035 1114
1036 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1037 1116
1038 ( 1117 (
1039 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1042} 1121}
1043 1122
1044sub size_allocate { 1123sub size_allocate {
1045 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1046 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
1047 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1049 1136
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1054} 1138}
1055 1139
1056sub button_down { 1140sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1058 1142
… …
1074 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1075 1159
1076 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1078 1162
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1165
1084 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1085 }; 1168 };
1086 1169
1087 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1174 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1093 1176
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1178
1096 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1098 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->move ($self->{user_x}, $self->{user_y});
1100 $self->update;
1101 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1102 } 1187 1
1103} 1188}
1104 1189
1105sub button_up { 1190sub button_up {
1106 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1107 1192
1108 delete $self->{motion}; 1193 !!delete $self->{motion}
1109} 1194}
1110 1195
1111sub mouse_motion { 1196sub mouse_motion {
1112 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1113 1198
1114 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1115} 1202}
1116 1203
1117sub _draw { 1204sub _draw {
1118 my ($self) = @_; 1205 my ($self) = @_;
1119 1206
1207 my $child = $self->{children}[0];
1208
1120 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1121 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1122 1211
1123 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125 1214
1126 my $border = $self->border; 1215 my $border = $self->border;
1127 1216
1128 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133 1222
1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1136 1225
1137 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1138 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1139 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1140
1141 glColor @{ $self->{bg} };
1142
1143 $bg->{s} = $rep_x;
1144 $bg->{t} = $rep_y;
1145 $bg->{wrap_mode} = 1;
1146 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 } 1231 }
1148 1232
1149 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1150 1234
1151 $self->{title}->draw if $self->{title};
1152
1153 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1154} 1241}
1155 1242
1156############################################################################# 1243#############################################################################
1157 1244
1158package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1180 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1181 1268
1182 $child->set_parent ($self); 1269 $child->set_parent ($self);
1183 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1184 1271
1185 $self->check_size (1); 1272 $self->realloc;
1186} 1273}
1187 1274
1188# 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?
1189sub clear { 1276sub clear {
1190 my ($self) = @_; 1277 my ($self) = @_;
… …
1195 for (@children) { 1282 for (@children) {
1196 delete $_->{parent}; 1283 delete $_->{parent};
1197 $_->hide; 1284 $_->hide;
1198 } 1285 }
1199 1286
1200 $self->check_size (1); 1287 $self->realloc;
1201 $self->update;
1202} 1288}
1203 1289
1204sub get_wh { 1290sub get_wh {
1205 my ($self) = @_; 1291 my ($self) = @_;
1206 1292
… …
1414 ellipsise => 3, # end 1500 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1416 fontsize => 1, 1502 fontsize => 1,
1417 align => -1, 1503 align => -1,
1418 valign => -1, 1504 valign => -1,
1419 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1420 can_events => 0, 1507 can_events => 0,
1421 %arg 1508 %arg
1422 ); 1509 );
1423 1510
1424 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1460 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1461 1548
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1464 1551
1552 $self->realloc;
1465 $self->update; 1553 $self->update;
1466 $self->check_size;
1467} 1554}
1468 1555
1469sub set_markup { 1556sub set_markup {
1470 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1471 1558
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1563
1477 $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;
1478 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1479 1566
1567 $self->realloc;
1480 $self->update; 1568 $self->update;
1481 $self->check_size;
1482} 1569}
1483 1570
1484sub size_request { 1571sub size_request {
1485 my ($self) = @_; 1572 my ($self) = @_;
1486 1573
… …
1500 1587
1501 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1503 } 1590 }
1504 1591
1505 ( 1592 ($w, $h)
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1593}
1510 1594
1511sub size_allocate { 1595sub size_allocate {
1512 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1513 1597
1598 delete $self->{ox};
1599
1514 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1602}
1516 1603
1517sub set_fontsize { 1604sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1519 1606
1520 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1608 delete $self->{texture};
1522 1609
1523 $self->update; 1610 $self->realloc;
1524 $self->check_size;
1525} 1611}
1526 1612
1527sub _draw { 1613sub _draw {
1528 my ($self) = @_; 1614 my ($self) = @_;
1529 1615
… …
1535 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1625
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1541 1628
1629 unless (exists $self->{ox}) {
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1545 1633
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1551 }; 1637 };
1552 1638
1553 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555 1641
1642 glColor_premultiply @{$self->{fg}}
1556 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1557 glColor @{$self->{fg}}; 1644
1558 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1559 } else {
1560 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1561 }
1562 1646
1563 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1564} 1648}
1565 1649
1566############################################################################# 1650#############################################################################
… …
1593 1677
1594 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1595 1679
1596 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1597 1681
1598 delete $self->{texture};
1599
1600 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1601 $self->{text} = $text; 1683 $self->{text} = $text;
1602 1684
1603 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1604 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1605 1687
1606 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1607} 1690}
1608 1691
1609sub set_text { 1692sub set_text {
1610 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1611 1694
1612 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1696 $self->_set_text ($text);
1614 $self->update; 1697
1615 $self->check_size; 1698 $self->realloc;
1616} 1699}
1617 1700
1618sub get_text { 1701sub get_text {
1619 $_[0]{text} 1702 $_[0]{text}
1620} 1703}
… …
1650 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1651 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1652 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1653 } elsif ($uni) { 1736 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1655 } 1740 }
1656 1741
1657 $self->_set_text ($text); 1742 $self->_set_text ($text);
1658 $self->update; 1743
1659 $self->check_size; 1744 $self->realloc;
1745
1746 1
1660} 1747}
1661 1748
1662sub focus_in { 1749sub focus_in {
1663 my ($self) = @_; 1750 my ($self) = @_;
1664 1751
… …
1679 utf8::encode $text; 1766 utf8::encode $text;
1680 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1681 1768
1682 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1683 $self->update; 1770 $self->update;
1771
1772 1
1684} 1773}
1685 1774
1686sub mouse_motion { 1775sub mouse_motion {
1687 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1688# 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
1689} 1780}
1690 1781
1691sub _draw { 1782sub _draw {
1692 my ($self) = @_; 1783 my ($self) = @_;
1693 1784
1694 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1695 1786
1696 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1697 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1698 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1699 } else { 1790 } else {
1700 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1701 } 1792 }
1702 1793
1703 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1705 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1706 glVertex 0 , 0; 1797 glVertex 0 , 0;
1707 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1708 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1709 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1770 } else { 1861 } else {
1771 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1772 } 1863 }
1773 1864
1774 } else { 1865 } else {
1775 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1776 } 1869 1
1777
1778} 1870}
1779 1871
1780############################################################################# 1872#############################################################################
1781 1873
1782package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1791 1883
1792sub new { 1884sub new {
1793 my $class = shift; 1885 my $class = shift;
1794 1886
1795 $class->SUPER::new ( 1887 $class->SUPER::new (
1796 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1797 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1799 can_hover => 1, 1892 can_hover => 1,
1800 align => 0, 1893 align => 0,
1801 valign => 0, 1894 valign => 0,
… …
1810 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1811 1904
1812 $self->emit ("activate") 1905 $self->emit ("activate")
1813 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1814 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1815} 1910}
1816 1911
1817sub _draw { 1912sub _draw {
1818 my ($self) = @_; 1913 my ($self) = @_;
1819 1914
1820 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1821
1822 if ($GRAB == $self) {
1823 $self->{fg} = $self->{active_fg};
1824 }
1825 1916
1826 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1828 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1829 1920
… …
1848 1939
1849sub new { 1940sub new {
1850 my $class = shift; 1941 my $class = shift;
1851 1942
1852 $class->SUPER::new ( 1943 $class->SUPER::new (
1853 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1854 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1950 state => 0,
… …
1862} 1954}
1863 1955
1864sub size_request { 1956sub size_request {
1865 my ($self) = @_; 1957 my ($self) = @_;
1866 1958
1867 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1868} 1960}
1869 1961
1870sub button_down { 1962sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1872 1964
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1877 } 1973 1
1878} 1974}
1879 1975
1880sub _draw { 1976sub _draw {
1881 my ($self) = @_; 1977 my ($self) = @_;
1882 1978
1883 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1884 1980
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 1982
1887 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;
1888 1986
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 1988
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 1990
… …
2047 2145
2048 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2049 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2050 2148
2051 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2052 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;
2053 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2154
2056 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2057 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2157 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2164 vertical => 0, 2263 vertical => 0,
2165 can_hover => 1, 2264 can_hover => 1,
2166 inner_pad => 0.02, 2265 inner_pad => 0.02,
2167 @_ 2266 @_
2168 ); 2267 );
… …
2171 $self->update; 2270 $self->update;
2172 2271
2173 $self 2272 $self
2174} 2273}
2175 2274
2275sub changed { }
2276
2176sub set_range { 2277sub set_range {
2177 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2178 2279
2179 ($range, $self->{range}) = ($self->{range}, $range); 2280 ($range, $self->{range}) = ($self->{range}, $range);
2180 2281
… …
2206} 2307}
2207 2308
2208sub size_request { 2309sub size_request {
2209 my ($self) = @_; 2310 my ($self) = @_;
2210 2311
2211 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2313}
2216 2314
2217sub button_down { 2315sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2219 2317
2220 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2221 2319
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223 2321
2224 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2225} 2323}
2226 2324
2227sub mouse_motion { 2325sub mouse_motion {
2228 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2229 2327
… …
2233 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234 2332
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236 2334
2237 $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
2238 } 2340 1
2239} 2341}
2240 2342
2241sub update { 2343sub update {
2242 my ($self) = @_; 2344 my ($self) = @_;
2243 2345
2244 $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}) {
2245 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2246 2355
2247 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2249 2358
… …
2255 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2256 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2257 2366
2258 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2259 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2260 }); 2369 }
2261
2262 $self->SUPER::update;
2263}
2264
2265sub _draw {
2266 my ($self) = @_;
2267 2370
2268 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2269 2372
2270 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2271 2374
… …
2465 2568
2466 delete $self->{texture}; 2569 delete $self->{texture};
2467 } 2570 }
2468 2571
2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2470 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2471 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2472 2575
2473 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2474 2577
2475 my $y0 = $top; 2578 my $y0 = $top;
… …
2510sub _draw { 2613sub _draw {
2511 my ($self) = @_; 2614 my ($self) = @_;
2512 2615
2513 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2516 $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});
2517 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2518 2621
2519 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2520 2623
2521} 2624}
… …
2604} 2707}
2605 2708
2606sub set_tooltip_from { 2709sub set_tooltip_from {
2607 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2608 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
2609 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2610 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612 fontsize => 0.8, 2724 fontsize => 0.8,
2613 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2614 ellipsise => 0, 2726 ellipsise => 0,
2615 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2626 2738
2627sub size_allocate { 2739sub size_allocate {
2628 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2629 2741
2630 $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 });
2631} 2761}
2632 2762
2633sub _draw { 2763sub _draw {
2634 my ($self) = @_; 2764 my ($self) = @_;
2635 2765
… …
2652 glVertex $w, $h; 2782 glVertex $w, $h;
2653 glVertex $w, 0; 2783 glVertex $w, 0;
2654 glEnd; 2784 glEnd;
2655 2785
2656 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2657 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2658} 2789}
2659 2790
2660############################################################################# 2791#############################################################################
2661 2792
… …
2720 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2721 2852
2722 if ($tex) { 2853 if ($tex) {
2723 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2725 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2726 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2727 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2728 } 2859 }
2729} 2860}
2730 2861
… …
2737 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2738} 2869}
2739 2870
2740############################################################################# 2871#############################################################################
2741 2872
2742package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2743 2874
2744our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2745 2876
2746sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2747 my $class = shift;
2748
2749 my $self = $class->SUPER::new (
2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2751 @_,
2752 );
2753
2754 $self
2755}
2756
2757sub set_items {
2758 my ($self, $items) = @_;
2759
2760 $self->{scrolled}->clear;
2761 return unless $items;
2762
2763 my @items = sort {
2764 ($a->{type} <=> $b->{type})
2765 or ($a->{name} cmp $b->{name})
2766 } @$items;
2767
2768 $self->{real_items} = \@items;
2769
2770 my $row = 0;
2771 for my $item (@items) {
2772 CFClient::Item::update_widgets $item;
2773
2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2777
2778 $row++;
2779 }
2780}
2781 2878
2782############################################################################# 2879#############################################################################
2783 2880
2784package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2785 2882
… …
2826 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2827 $GRAB = $self; 2924 $GRAB = $self;
2828 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2829 2926
2830 $self->show; 2927 $self->show;
2831 $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);
2832} 2929}
2833 2930
2834sub mouse_motion { 2931sub mouse_motion {
2835 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2836 2933
2837 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2838 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2839 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2840} 2939}
2841 2940
2842sub button_up { 2941sub button_up {
2843 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2844 2943
… …
2846 undef $GRAB; 2945 undef $GRAB;
2847 $self->hide; 2946 $self->hide;
2848 2947
2849 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2850 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2851 } 2954 1
2852} 2955}
2853 2956
2854############################################################################# 2957#############################################################################
2855 2958
2856package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2857 2960
2858our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2859 2962
2860sub new { 2963sub new {
2861 my $class = shift; 2964 my $class = shift;
2862 2965
2863 $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 (
2864 fontsize => 0.8, 3075 fontsize => 0.8,
2865 @_, 3076 @_,
2866 ) 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
2867} 3087}
2868 3088
2869sub reorder { 3089sub reorder {
2870 my ($self) = @_; 3090 my ($self) = @_;
2871 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2872 3092
2873 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2874 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2875 } 3095 }
2876 3096
… …
2878 3098
2879 my @items = sort { 3099 my @items = sort {
2880 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2881 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2882 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2883 3105
2884 my $count = 10 + 1; 3106 my $count = 10 + 1;
2885 for my $item (@items) { 3107 for my $item (@items) {
2886 last unless --$count; 3108 last unless --$count;
2887 3109
… …
2902 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2903 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2904 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2905 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2906 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2907 can_events => 1, 3130 can_events => 1,
2908 can_hover => 1 3131 can_hover => 1
2909 }; 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 }
2910 } 3143 }
2911 3144
2912 $self->clear; 3145 $self->clear;
2913 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2914} 3147}
… …
2919 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2920 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2921 3154
2922 return unless $text; 3155 return unless $text;
2923 3156
2924 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2925 3158
2926 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2927 3160
2928 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2929 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
2959 3192
2960 $self->reorder; 3193 $self->reorder;
2961 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
2962} 3195}
2963 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
2964############################################################################# 3205#############################################################################
2965 3206
2966package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
2967 3208
2968our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970use CFClient::OpenGL;
2971 3210
2972sub new { 3211sub new {
2973 my $class = shift; 3212 my $class = shift;
2974 3213
2975 $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 (
2976 visible => 1, 3514 visible => 1,
2977 @_, 3515 @_,
2978 ) 3516 );
2979}
2980 3517
2981sub configure { 3518 Scalar::Util::weaken ($self->{root} = $self);
2982 my ($self, $x, $y, $w, $h) = @_;
2983 3519
2984 $self->{w} = $w; 3520 $self
2985 $self->{h} = $h;
2986}
2987
2988sub check_size {
2989 my ($self) = @_;
2990
2991 $self->size_allocate ($self->{w}, $self->{h})
2992 if $self->{w};
2993} 3521}
2994 3522
2995sub size_request { 3523sub size_request {
2996 my ($self) = @_; 3524 my ($self) = @_;
2997 3525
2998 ($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
2999} 3541}
3000 3542
3001sub size_allocate { 3543sub size_allocate {
3002 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
3003 3545
3004 for my $child ($self->children) { 3546 for my $child ($self->children) {
3005 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)};
3006 3548
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
3008 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3009 3551
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
3011 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
3012
3013 delete @$child{qw(req_x req_y)};
3014
3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017 3554
3018 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
3019 } 3556 }
3020} 3557}
3021 3558
… …
3032} 3569}
3033 3570
3034sub update { 3571sub update {
3035 my ($self) = @_; 3572 my ($self) = @_;
3036 3573
3037 $self->check_size;
3038 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3039} 3575}
3040 3576
3041sub add { 3577sub add {
3042 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3043 3579
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1; 3580 $_->{is_toplevel} = 1
3046 3581 for @children;
3047 # integerise window positions
3048 $child->{x} = int $child->{x};
3049 $child->{y} = int $child->{y};
3050 }
3051 3582
3052 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3059} 3584}
3060 3585
3061sub remove { 3586sub remove {
3062 my ($self, @children) = @_; 3587 my ($self, @children) = @_;
3063 3588
3064 $self->SUPER::remove (@children); 3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3065 3593
3066 while (@children) { 3594 while (@children) {
3067 my $w = pop @children; 3595 my $w = pop @children;
3068 push @children, $w->children; 3596 push @children, $w->children;
3069 $w->set_invisible; 3597 $w->set_invisible;
… …
3088 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3089 $_->() 3617 $_->()
3090 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3091 } 3619 }
3092 3620
3093 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3622 my %queue;
3094 my @queue; 3623 my @queue;
3624 my $widget;
3095 3625
3096 for (;;) { 3626 outer:
3097 if ($self->{check_size}) { 3627 while () {
3098 #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
3099 3631
3100 @queue = sort { $a->{visible} <=> $b->{visible} } 3632 $queue{$widget+0}++ and next; # duplicates are common
3101 @queue, values %{delete $self->{check_size}}; 3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
3102 } 3636 }
3103 3637
3638 while () {
3639 @queue or last outer;
3640
3104 my $widget = pop @queue || last; 3641 $widget = pop @{ $queue[-1] || [] }
3105 3642 and last;
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109 ? @$widget{qw(def_w def_h)}
3110 : $widget->size_request;
3111
3112 if (delete $widget->{force_alloc}
3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115 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}) {
3116 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3118 3664
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3120 3666
3121 $widget->{parent}->check_size
3122 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 }
3123 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3124 } 3677 }
3125 } 3678 }
3126 3679
3127 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3128 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3129 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)};
3130 3688
3131 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3132 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3133 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
3134 $widget->{w} = $w; 3699 $widget->{w} = $w;
3135 $widget->{h} = $h; 3700 $widget->{h} = $h;
3701
3136 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3137 } 3704 }
3138 } 3705 }
3139 3706
3140 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3141 $_->() 3708 $_->()
3142 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3143 } 3710 }
3711
3144 3712
3145 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3146 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3147 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3148 3716
… …
3150 glLoadIdentity; 3718 glLoadIdentity;
3151 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3152 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3153 glLoadIdentity; 3721 glLoadIdentity;
3154 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
3155 $self->_draw; 3730 $self->_draw;
3156} 3731}
3157 3732
3158############################################################################# 3733#############################################################################
3159 3734

Diff Legend

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