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.283 by root, Mon Jun 5 02:28:30 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 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $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}) {
… …
1450 1538
1451 delete $self->{texture}; 1539 delete $self->{texture};
1452 $self->SUPER::update; 1540 $self->SUPER::update;
1453} 1541}
1454 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1455sub set_text { 1550sub set_text {
1456 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1457 1552
1458 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1459 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1460 1555
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1463 1559
1560 $self->realloc;
1464 $self->update; 1561 $self->update;
1465 $self->check_size;
1466} 1562}
1467 1563
1468sub set_markup { 1564sub set_markup {
1469 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1470 1566
… …
1473 1569
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1571
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1478 1575
1576 $self->realloc;
1479 $self->update; 1577 $self->update;
1480 $self->check_size;
1481} 1578}
1482 1579
1483sub size_request { 1580sub size_request {
1484 my ($self) = @_; 1581 my ($self) = @_;
1485 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1486 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1487 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1491 1591
1492 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1493 1593
1494 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1495 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1496 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1597
1498 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1499 1599
1500 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1502 } 1602 }
1503 1603
1604 ($w, $h)
1504 ( 1605 }
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1606}
1509 1607
1510sub size_allocate { 1608sub size_allocate {
1511 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1512 1610
1611 delete $self->{ox};
1612
1513 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514} 1615}
1515 1616
1516sub set_fontsize { 1617sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1518 1619
1519 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1621 delete $self->{texture};
1521 1622
1522 $self->update; 1623 $self->realloc;
1523 $self->check_size;
1524} 1624}
1525 1625
1526sub _draw { 1626sub _draw {
1527 my ($self) = @_; 1627 my ($self) = @_;
1528 1628
… …
1534 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1638
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1540 1641
1642 unless (exists $self->{ox}) {
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1544 1646
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1650 };
1551 1651
1552 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1654
1655 glColor_premultiply @{$self->{fg}}
1555 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1556 glColor @{$self->{fg}}; 1657
1557 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1558 } else {
1559 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1560 }
1561 1659
1562 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1563} 1661}
1564 1662
1565############################################################################# 1663#############################################################################
… …
1592 1690
1593 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1594 1692
1595 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1596 1694
1597 delete $self->{texture};
1598
1599 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1600 $self->{text} = $text; 1696 $self->{text} = $text;
1601 1697
1602 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1603 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1604 1701
1605 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1606} 1706}
1607 1707
1608sub set_text { 1708sub set_text {
1609 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1610 1710
1611 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1712 $self->_set_text ($text);
1613 $self->update;
1614 $self->check_size;
1615} 1713}
1616 1714
1617sub get_text { 1715sub get_text {
1618 $_[0]{text} 1716 $_[0]{text}
1619} 1717}
… …
1649 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1749 $self->_emit ('escape');
1652 } elsif ($uni) { 1750 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1654 } 1754 }
1655 1755
1656 $self->_set_text ($text); 1756 $self->_set_text ($text);
1657 $self->update; 1757
1658 $self->check_size; 1758 $self->realloc;
1759
1760 1
1659} 1761}
1660 1762
1661sub focus_in { 1763sub focus_in {
1662 my ($self) = @_; 1764 my ($self) = @_;
1663 1765
… …
1678 utf8::encode $text; 1780 utf8::encode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1680 1782
1681 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1682 $self->update; 1784 $self->update;
1785
1786 1
1683} 1787}
1684 1788
1685sub mouse_motion { 1789sub mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1687# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792
1793 0
1688} 1794}
1689 1795
1690sub _draw { 1796sub _draw {
1691 my ($self) = @_; 1797 my ($self) = @_;
1692 1798
1693 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1694 1800
1695 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1696 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1697 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1698 } else { 1804 } else {
1699 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1700 } 1806 }
1701 1807
1702 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1705 glVertex 0 , 0; 1811 glVertex 0 , 0;
1706 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1707 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1708 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1769 } else { 1875 } else {
1770 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1771 } 1877 }
1772 1878
1773 } else { 1879 } else {
1774 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1775 } 1883 1
1776
1777} 1884}
1778 1885
1779############################################################################# 1886#############################################################################
1780 1887
1781package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1790 1897
1791sub new { 1898sub new {
1792 my $class = shift; 1899 my $class = shift;
1793 1900
1794 $class->SUPER::new ( 1901 $class->SUPER::new (
1795 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1796 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1798 can_hover => 1, 1906 can_hover => 1,
1799 align => 0, 1907 align => 0,
1800 valign => 0, 1908 valign => 0,
… …
1809 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1810 1918
1811 $self->emit ("activate") 1919 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1921 && $y >= 0 && $y < $self->{h};
1922
1923 1
1814} 1924}
1815 1925
1816sub _draw { 1926sub _draw {
1817 my ($self) = @_; 1927 my ($self) = @_;
1818 1928
1819 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1820
1821 if ($GRAB == $self) {
1822 $self->{fg} = $self->{active_fg};
1823 }
1824 1930
1825 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1827 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1828 1934
… …
1847 1953
1848sub new { 1954sub new {
1849 my $class = shift; 1955 my $class = shift;
1850 1956
1851 $class->SUPER::new ( 1957 $class->SUPER::new (
1852 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1853 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 1962 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 1963 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 1964 state => 0,
… …
1861} 1968}
1862 1969
1863sub size_request { 1970sub size_request {
1864 my ($self) = @_; 1971 my ($self) = @_;
1865 1972
1866 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1867} 1974}
1868 1975
1869sub button_down { 1976sub button_down {
1870 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1871 1978
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1876 } 1987 1
1877} 1988}
1878 1989
1879sub _draw { 1990sub _draw {
1880 my ($self) = @_; 1991 my ($self) = @_;
1881 1992
1882 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1883 1994
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 1996
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1997 my ($w, $h) = @$self{qw(w h)};
1998
1999 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 2000
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 2002
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 2004
… …
2046 2159
2047 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2048 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2049 2162
2050 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2051 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2052 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 2168
2055 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2056 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2156 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2272 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2273 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2274 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2275 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2276 min_h => $::WIDTH / 80,
2163 vertical => 0, 2277 vertical => 0,
2164 can_hover => 1, 2278 can_hover => 1,
2165 inner_pad => 0.02, 2279 inner_pad => 0.02,
2166 @_ 2280 @_
2167 ); 2281 );
… …
2170 $self->update; 2284 $self->update;
2171 2285
2172 $self 2286 $self
2173} 2287}
2174 2288
2289sub changed { }
2290
2175sub set_range { 2291sub set_range {
2176 my ($self, $range) = @_; 2292 my ($self, $range) = @_;
2177 2293
2178 ($range, $self->{range}) = ($self->{range}, $range); 2294 ($range, $self->{range}) = ($self->{range}, $range);
2179 2295
… …
2205} 2321}
2206 2322
2207sub size_request { 2323sub size_request {
2208 my ($self) = @_; 2324 my ($self) = @_;
2209 2325
2210 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2327}
2215 2328
2216sub button_down { 2329sub button_down {
2217 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2218 2331
2219 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2220 2333
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2335
2223 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2224} 2337}
2225 2338
2226sub mouse_motion { 2339sub mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2228 2341
… …
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2346
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2348
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else {
2351 return 0;
2352 }
2353
2237 } 2354 1
2238} 2355}
2239 2356
2240sub update { 2357sub update {
2241 my ($self) = @_; 2358 my ($self) = @_;
2242 2359
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2360 delete $self->{knob_w};
2361 $self->SUPER::update;
2362}
2363
2364sub _draw {
2365 my ($self) = @_;
2366
2367 unless ($self->{knob_w}) {
2244 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2245 2369
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2248 2372
… …
2254 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2256 2380
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2259 }); 2383 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2384
2267 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2268 2386
2269 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2270 2388
… …
2464 2582
2465 delete $self->{texture}; 2583 delete $self->{texture};
2466 } 2584 }
2467 2585
2468 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2469 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2470 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2471 2589
2472 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2473 2591
2474 my $y0 = $top; 2592 my $y0 = $top;
… …
2509sub _draw { 2627sub _draw {
2510 my ($self) = @_; 2628 my ($self) = @_;
2511 2629
2512 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2515 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2516 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2517 2635
2518 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2519 2637
2520} 2638}
… …
2603} 2721}
2604 2722
2605sub set_tooltip_from { 2723sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2724 my ($self, $widget) = @_;
2607 2725
2726 my $tooltip = $widget->{tooltip};
2727
2728 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}";
2733 }
2734
2608 $self->add (new CFClient::UI::Label 2735 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2736 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2738 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2739 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2740 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2625 2752
2626sub size_allocate { 2753sub size_allocate {
2627 my ($self, $w, $h) = @_; 2754 my ($self, $w, $h) = @_;
2628 2755
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2756 $self->SUPER::size_allocate ($w - 4, $h - 4);
2757}
2758
2759sub visibility_change {
2760 my ($self, $visible) = @_;
2761
2762 return unless $visible;
2763
2764 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner}
2766 or return;
2767
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH;
2772
2773 $self->move_abs ($x, $y);
2774 });
2630} 2775}
2631 2776
2632sub _draw { 2777sub _draw {
2633 my ($self) = @_; 2778 my ($self) = @_;
2634 2779
… …
2651 glVertex $w, $h; 2796 glVertex $w, $h;
2652 glVertex $w, 0; 2797 glVertex $w, 0;
2653 glEnd; 2798 glEnd;
2654 2799
2655 glTranslate 2 - 0.375, 2 - 0.375; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2801
2656 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2657} 2803}
2658 2804
2659############################################################################# 2805#############################################################################
2660 2806
… …
2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2720 2866
2721 if ($tex) { 2867 if ($tex) {
2722 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2727 } 2873 }
2728} 2874}
2729 2875
… …
2736 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2737} 2883}
2738 2884
2739############################################################################# 2885#############################################################################
2740 2886
2741package CFClient::UI::Inventory; 2887package CFClient::UI::Buttonbar;
2742 2888
2743our @ISA = CFClient::UI::ScrolledWindow::; 2889our @ISA = CFClient::UI::HBox::;
2744 2890
2745sub new { 2891# 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 2892
2781############################################################################# 2893#############################################################################
2782 2894
2783package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2784 2896
… …
2825 # maybe save $GRAB? must be careful about events... 2937 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 2938 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 2939 $self->{button} = $ev->{button};
2828 2940
2829 $self->show; 2941 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 2943}
2832 2944
2833sub mouse_motion { 2945sub mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2835 2947
2836 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2839} 2953}
2840 2954
2841sub button_up { 2955sub button_up {
2842 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2843 2957
… …
2845 undef $GRAB; 2959 undef $GRAB;
2846 $self->hide; 2960 $self->hide;
2847 2961
2848 $self->_emit ("popdown"); 2962 $self->_emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2850 } 2968 1
2851} 2969}
2852 2970
2853############################################################################# 2971#############################################################################
2854 2972
2855package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2856 2974
2857our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2858 2976
2859sub new { 2977sub new {
2860 my $class = shift; 2978 my $class = shift;
2861 2979
2862 $class->SUPER::new ( 2980 my $self = $class->SUPER::new (
2981 @_,
2982 );
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986
2987 $self
2988}
2989
2990sub add {
2991 my ($self, @widgets) = @_;
2992
2993 $self->SUPER::add (@widgets);
2994
2995 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} };
2997}
2998
2999sub set_current_page {
3000 my ($self, $page_or_widget) = @_;
3001
3002 my $widget = ref $page_or_widget
3003 ? $page_or_widget
3004 : $self->{children}[$page_or_widget];
3005
3006 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008
3009 $self->_emit (page_changed => $self->{current});
3010
3011 $self->realloc;
3012}
3013
3014sub visible_children {
3015 $_[0]{current}
3016}
3017
3018sub size_request {
3019 my ($self) = @_;
3020
3021 $self->{current}->size_request
3022}
3023
3024sub size_allocate {
3025 my ($self, $w, $h) = @_;
3026
3027 $self->{current}->configure (0, 0, $w, $h);
3028}
3029
3030sub _draw {
3031 my ($self) = @_;
3032
3033 $self->{current}->draw;
3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Notebook;
3039
3040our @ISA = CFClient::UI::VBox::;
3041
3042sub new {
3043 my $class = shift;
3044
3045 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3049 @_,
3050 );
3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054
3055 $self
3056}
3057
3058sub add {
3059 my ($self, $title, $widget, $tooltip) = @_;
3060
3061 Scalar::Util::weaken $self;
3062
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget);
3070}
3071
3072sub set_current_page {
3073 my ($self, $page) = @_;
3074
3075 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current});
3077}
3078
3079#############################################################################
3080
3081package CFClient::UI::Statusbox;
3082
3083our @ISA = CFClient::UI::VBox::;
3084
3085sub new {
3086 my $class = shift;
3087
3088 my $self = $class->SUPER::new (
2863 fontsize => 0.8, 3089 fontsize => 0.8,
2864 @_, 3090 @_,
2865 ) 3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
2866} 3098}
2867 3099
2868sub reorder { 3100sub reorder {
2869 my ($self) = @_; 3101 my ($self) = @_;
2870 my $NOW = time; 3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
2871 3108
2872 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2873 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2874 } 3111 }
2875 3112
… …
2878 my @items = sort { 3115 my @items = sort {
2879 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2882 3119
3120 $self->{timer}->interval (1);
3121
2883 my $count = 10 + 1; 3122 my $count = 10 + 1;
2884 for my $item (@items) { 3123 for my $item (@items) {
2885 last unless --$count; 3124 last unless --$count;
2886 3125
2887 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2888 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2889 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text}; 3130 : $item->{text};
2892 3131
… …
2900 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2901 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2902 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2906 can_events => 1, 3145 can_events => 1,
2907 can_hover => 1 3146 can_hover => 1
2908 }; 3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
2909 } 3160 }
2910 3161
2911 $self->clear; 3162 $self->clear;
2912 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2913} 3164}
… …
2918 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2919 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2920 3171
2921 return unless $text; 3172 return unless $text;
2922 3173
2923 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2924 3175
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926 3177
2927 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
2958 3209
2959 $self->reorder; 3210 $self->reorder;
2960 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
2961} 3212}
2962 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
2963############################################################################# 3222#############################################################################
2964 3223
2965package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
2966 3225
2967our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969use CFClient::OpenGL;
2970 3227
2971sub new { 3228sub new {
2972 my $class = shift; 3229 my $class = shift;
2973 3230
2974 $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root;
3520
3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3524
3525use CFClient::OpenGL;
3526
3527sub new {
3528 my $class = shift;
3529
3530 my $self = $class->SUPER::new (
2975 visible => 1, 3531 visible => 1,
2976 @_, 3532 @_,
2977 ) 3533 );
2978}
2979 3534
2980sub configure { 3535 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3536
2983 $self->{w} = $w; 3537 $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} 3538}
2993 3539
2994sub size_request { 3540sub size_request {
2995 my ($self) = @_; 3541 my ($self) = @_;
2996 3542
2997 ($self->{w}, $self->{h}) 3543 ($self->{w}, $self->{h})
3544}
3545
3546sub _to_pixel {
3547 my ($coord, $size, $max) = @_;
3548
3549 $coord =
3550 $coord eq "center" ? ($max - $size) * 0.5
3551 : $coord eq "max" ? $max
3552 : $coord;
3553
3554 $coord = 0 if $coord < 0;
3555 $coord = $max - $size if $coord > $max - $size;
3556
3557 int $coord + 0.5
2998} 3558}
2999 3559
3000sub size_allocate { 3560sub size_allocate {
3001 my ($self, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
3002 3562
3003 for my $child ($self->children) { 3563 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3565
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3566 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3567 $Y = $child->{force_y} if exists $child->{force_y};
3008 3568
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3569 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3570 $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 3571
3017 $child->configure ($X, $Y, $W, $H); 3572 $child->configure ($X, $Y, $W, $H);
3018 } 3573 }
3019} 3574}
3020 3575
… …
3031} 3586}
3032 3587
3033sub update { 3588sub update {
3034 my ($self) = @_; 3589 my ($self) = @_;
3035 3590
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3591 $::WANT_REFRESH++;
3038} 3592}
3039 3593
3040sub add { 3594sub add {
3041 my ($self, @children) = @_; 3595 my ($self, @children) = @_;
3042 3596
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3597 $_->{is_toplevel} = 1
3045 3598 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3599
3051 $self->SUPER::add (@children); 3600 $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} 3601}
3059 3602
3060sub remove { 3603sub remove {
3061 my ($self, @children) = @_; 3604 my ($self, @children) = @_;
3062 3605
3063 $self->SUPER::remove (@children); 3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3064 3610
3065 while (@children) { 3611 while (@children) {
3066 my $w = pop @children; 3612 my $w = pop @children;
3067 push @children, $w->children; 3613 push @children, $w->children;
3068 $w->set_invisible; 3614 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
3088 $_->() 3634 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3635 for values %{delete $self->{refresh_hook}};
3090 } 3636 }
3091 3637
3092 if ($self->{check_size}) { 3638 if ($self->{realloc}) {
3639 my %queue;
3093 my @queue; 3640 my @queue;
3641 my $widget;
3094 3642
3095 for (;;) { 3643 outer:
3096 if ($self->{check_size}) { 3644 while () {
3097 #TODO use array-of-depth approach 3645 if (my $realloc = delete $self->{realloc}) {
3646 for $widget (values %$realloc) {
3647 $widget->{visible} or next; # do not resize invisible widgets
3098 3648
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3649 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
3101 } 3653 }
3102 3654
3655 while () {
3656 @queue or last outer;
3657
3103 my $widget = pop @queue || last; 3658 $widget = pop @{ $queue[-1] || [] }
3104 3659 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 3660
3661 pop @queue;
3662 }
3663
3664 delete $queue{$widget+0};
3665
3666 my ($w, $h) = $widget->size_request;
3667
3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3673
3674 $w = $widget->{force_w} if exists $widget->{force_w};
3675 $h = $widget->{force_h} if exists $widget->{force_h};
3676
3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3678 || delete $widget->{force_realloc}) {
3115 $widget->{req_w} = $w; 3679 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3680 $widget->{req_h} = $h;
3117 3681
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3682 $self->{size_alloc}{$widget+0} = $widget;
3119 3683
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 3684 if (my $parent = $widget->{parent}) {
3685 $self->{realloc}{$parent+0} = $parent
3686 unless $queue{$parent+0};
3687
3688 $parent->{force_size_alloc} = 1;
3689 $self->{size_alloc}{$parent+0} = $parent;
3690 }
3122 } 3691 }
3692
3693 delete $self->{realloc}{$widget+0};
3123 } 3694 }
3124 } 3695 }
3125 3696
3126 while ($self->{size_alloc}) { 3697 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3699 values %$size_alloc;
3700
3701 while () {
3702 my $widget = pop @queue || last;
3703
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3705
3130 $w = 0 if $w < 0; 3706 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3707 $h = 0 if $h < 0;
3132 3708
3709 $w = int $w + 0.5;
3710 $h = int $h + 0.5;
3711
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h};
3715
3133 $widget->{w} = $w; 3716 $widget->{w} = $w;
3134 $widget->{h} = $h; 3717 $widget->{h} = $h;
3718
3135 $widget->emit (size_allocate => $w, $h); 3719 $widget->emit (size_allocate => $w, $h);
3720 }
3136 } 3721 }
3137 } 3722 }
3138 3723
3139 while ($self->{post_alloc_hook}) { 3724 while ($self->{post_alloc_hook}) {
3140 $_->() 3725 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3726 for values %{delete $self->{post_alloc_hook}};
3142 } 3727 }
3728
3143 3729
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
3147 3733
… …
3149 glLoadIdentity; 3735 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 3738 glLoadIdentity;
3153 3739
3740 {
3741 package CFClient::UI::Base;
3742
3743 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h});
3745 }
3746
3154 $self->_draw; 3747 $self->_draw;
3155} 3748}
3156 3749
3157############################################################################# 3750#############################################################################
3158 3751

Diff Legend

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