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

Diff Legend

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