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.246 by root, Sun May 28 00:40:51 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 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 show_centered {
251 my ($self) = @_;
252 return if $self->{parent};
253
254 $self->show;
255
256 $CFClient::UI::ROOT->on_post_alloc (
257 "centered $self" => sub {
258 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
259 },
260 );
261} 252}
262 253
263sub set_visible { 254sub set_visible {
264 my ($self) = @_; 255 my ($self) = @_;
265 256
266 return if $self->{visible}; 257 return if $self->{visible};
267 258
268 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
270 261
271 $self->emit (visibility_change => 1) 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
272} 267}
273 268
274sub set_invisible { 269sub set_invisible {
275 my ($self) = @_; 270 my ($self) = @_;
276 271
277 return unless $self->{visible}; 272 return unless $self->{visible};
278 273
279 # broken show/hide model 274 $_->set_invisible for $self->children;
280 275
281 delete $self->{root}; 276 delete $self->{root};
282 delete $self->{visible}; 277 delete $self->{visible};
283 278
284 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
286 281
287 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
289 284
290 $self->focus_out; 285 $self->focus_out;
291 286
292 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
293} 305}
294 306
295sub hide { 307sub hide {
296 my ($self) = @_; 308 my ($self) = @_;
297 309
… …
299 311
300 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
301 if $self->{parent}; 313 if $self->{parent};
302} 314}
303 315
304sub move { 316sub move_abs {
305 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
306 318
307 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
308 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
309 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
310 322
311 $self->update; 323 $self->update;
312} 324}
313 325
314sub set_size { 326sub set_size {
315 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
316 328
317 $self->{def_w} = $w; 329 $self->{force_w} = $w;
318 $self->{def_h} = $h; 330 $self->{force_h} = $h;
319 331
320 $self->check_size; 332 $self->realloc;
321} 333}
322 334
323sub size_request { 335sub size_request {
324 require Carp; 336 require Carp;
325 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
327 339
328sub configure { 340sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
330 342
331 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
334 348
335 # use alignment to adjust x, y 349 # use alignment to adjust x, y
336 350
337 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 353 }
342 354
343 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 356 $self->{x} = $x;
345 $self->{y} = $y; 357 $self->{y} = $y;
346 $self->update; 358 $self->update;
347 } 359 }
348 360
349 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
351 } 368 }
352} 369}
353 370
354sub size_allocate { 371sub size_allocate {
355 # nothing to be done 372 # nothing to be done
356} 373}
357 374
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
365sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
366} 381}
367 382
368sub set_max_size { 383sub set_max_size {
369 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
370 385
371 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
372 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
373} 390}
374 391
375sub set_tooltip { 392sub set_tooltip {
376 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
377 394
… …
429 446
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
431 unless $FOCUS; 448 unless $FOCUS;
432} 449}
433 450
434sub mouse_motion { } 451sub mouse_motion { 0 }
435sub button_up { } 452sub button_up { 0 }
436sub key_down { } 453sub key_down { 0 }
437sub key_up { } 454sub key_up { 0 }
438 455
439sub button_down { 456sub button_down {
440 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
441 458
442 $self->focus_in; 459 $self->focus_in;
443}
444 460
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
450 537
451sub draw { 538sub draw {
452 my ($self) = @_; 539 my ($self) = @_;
453 540
454 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
455 552
456 glPushMatrix; 553 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 555
461 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 558 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 560 glBegin GL_QUADS;
468 glVertex $x , $y; 561 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
472 glEnd; 565 glEnd;
473 glDisable GL_BLEND; 566 glDisable GL_BLEND;
474 } 567 }
475 568
476 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 570 glPushMatrix;
478 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 574 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
485 glEnd; 578 glEnd;
486 glPopMatrix; 579 glPopMatrix;
487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
489} 585}
490 586
491sub _draw { 587sub _draw {
492 my ($self) = @_; 588 my ($self) = @_;
493 589
494 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
495}
496
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible;
515
516 $self->check_size;
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555} 591}
556 592
557sub DESTROY { 593sub DESTROY {
558 my ($self) = @_; 594 my ($self) = @_;
559 595
… …
591 627
592 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
594 630
595 glEnable GL_BLEND; 631 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 633 glColor_premultiply @$color;
598 634
599 glBegin GL_QUADS; 635 glBegin GL_QUADS;
600 glVertex 0 , 0; 636 glVertex 0 , 0;
601 glVertex 0 , $h; 637 glVertex 0 , $h;
602 glVertex $w, $h; 638 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
619} 655}
620 656
621sub size_request { 657sub size_request {
622 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
623} 661}
624 662
625sub draw { } 663sub draw { }
626 664
627############################################################################# 665#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
632 670
633sub new { 671sub new {
634 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
635 673
636 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
637 675
638 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
639 children => [], 677 children => [],
640 can_events => 0, 678 can_events => 0,
641 %arg, 679 %arg,
642 ); 680 );
681
643 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
644 684
645 $self 685 $self
646} 686}
647 687
648sub add { 688sub add {
… …
656 $self->{children} = [ 696 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
659 ]; 699 ];
660 700
661 $self->check_size (1); 701 $self->realloc;
662 $self->update;
663} 702}
664 703
665sub children { 704sub children {
666 @{ $_[0]{children} } 705 @{ $_[0]{children} }
667} 706}
… …
672 delete $child->{parent}; 711 delete $child->{parent};
673 $child->hide; 712 $child->hide;
674 713
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 715
677 $self->check_size (1); 716 $self->realloc;
678 $self->update;
679} 717}
680 718
681sub clear { 719sub clear {
682 my ($self) = @_; 720 my ($self) = @_;
683 721
… …
687 for (@$children) { 725 for (@$children) {
688 delete $_->{parent}; 726 delete $_->{parent};
689 $_->hide; 727 $_->hide;
690 } 728 }
691 729
692 $self->check_size; 730 $self->realloc;
693 $self->update;
694} 731}
695 732
696sub find_widget { 733sub find_widget {
697 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
698 735
699 $x -= $self->{x}; 736 $x -= $self->{x};
700 $y -= $self->{y}; 737 $y -= $self->{y};
701 738
702 my $res; 739 my $res;
703 740
704 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
706 and return $res; 743 and return $res;
707 } 744 }
708 745
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
758 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
759} 796}
760 797
761############################################################################# 798#############################################################################
762 799
800# back-buffered drawing area
801
763package CFClient::UI::Window; 802package CFClient::UI::Window;
764 803
765our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
766 805
767use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
785 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 825 $self->update;
787} 826}
788 827
789sub _render { 828sub _render {
829 my ($self) = @_;
830
790 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
791} 832}
792 833
793sub render_child { 834sub render_child {
794 my ($self) = @_; 835 my ($self) = @_;
795 836
796 $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 {
797 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
799 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
800 $self->_render; 848 $self->_render;
801 }; 849 };
802} 850}
803 851
804sub _draw { 852sub _draw {
805 my ($self) = @_; 853 my ($self) = @_;
806 854
807 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
808 856
809 my $tex = $self->{texture} 857 my $tex = $self->{texture}
810 or return; 858 or return;
811 859
812 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
815 863
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 865
818 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
819} 867}
… …
835} 883}
836 884
837sub size_request { 885sub size_request {
838 my ($self) = @_; 886 my ($self) = @_;
839 887
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 889
842 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
843} 894}
844 895
845sub size_allocate { 896sub size_allocate {
846 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
847 898
899 my $child = $self->child;
900
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 903
851 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
852 $self->update; 905 $self->update;
853} 906}
854 907
… …
890} 943}
891 944
892sub _render { 945sub _render {
893 my ($self) = @_; 946 my ($self) = @_;
894 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
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 952
897 $self->SUPER::_render; 953 $self->SUPER::_render;
898} 954}
899 955
… …
902package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
903 959
904our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
905 961
906sub new { 962sub new {
907 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
908 966
909 my $self; 967 my $self;
910 968
911 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
912 vertical => 1, 970 vertical => 1,
… …
917 ; 975 ;
918 976
919 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 979 slider => $slider,
922 @_, 980 %arg,
923 ); 981 );
924 982
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
928 985
929 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
930} 993}
931 994
932sub update { 995sub update {
933 my ($self) = @_; 996 my ($self) = @_;
934 997
… …
973 1036
974 if ($self->{bg}) { 1037 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
976 1039
977 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
980 1043
981 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
982 glVertex 0 , 0; 1045 glVertex 0 , 0;
983 glVertex 0 , $h; 1046 glVertex 0 , $h;
984 glVertex $w, $h; 1047 glVertex $w, $h;
… …
997 1060
998our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
999 1062
1000use CFClient::OpenGL; 1063use CFClient::OpenGL;
1001 1064
1002my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 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);
1005 1072
1006sub new { 1073sub new {
1007 my $class = shift; 1074 my ($class, %arg) = @_;
1075
1076 my $title = delete $arg{title};
1008 1077
1009 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1010 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1011 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1012 border => 0.6, 1081 border => 0.6,
1013 is_toplevel => 1,
1014 can_events => 1, 1082 can_events => 1,
1015 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1016 ); 1086 );
1017 1087
1018 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
1019 align => 0, 1089 align => 0,
1020 valign => 1, 1090 valign => 1,
1021 text => $self->{title}, 1091 text => $title,
1022 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1023 1094
1024 $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};
1025} 1103}
1026 1104
1027sub border { 1105sub border {
1028 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1029} 1107}
1030 1108
1031sub size_request { 1109sub size_request {
1032 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1033 1114
1034 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1035 1116
1036 ( 1117 (
1037 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1040} 1121}
1041 1122
1042sub size_allocate { 1123sub size_allocate {
1043 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1044 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
1045 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1046 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1047 1136
1048 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1049 if $self->{title};
1050
1051 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1052} 1138}
1053 1139
1054sub button_down { 1140sub button_down {
1055 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1056 1142
… …
1072 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1073 1159
1074 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1075 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1076 1162
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081 $self->move ($self->{user_x}, $self->{user_y}); 1165
1082 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1083 }; 1168 };
1084 1169
1085 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1086 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1089 $self->{motion} = sub { 1174 $self->{motion} = sub {
1090 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1091 1176
1092 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1093 1178
1094 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1096 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1097 $self->move ($self->{user_x}, $self->{user_y});
1098 $self->update;
1099 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1100 } 1187 1
1101} 1188}
1102 1189
1103sub button_up { 1190sub button_up {
1104 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1105 1192
1106 delete $self->{motion}; 1193 !!delete $self->{motion}
1107} 1194}
1108 1195
1109sub mouse_motion { 1196sub mouse_motion {
1110 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1111 1198
1112 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1113} 1202}
1114 1203
1115sub _draw { 1204sub _draw {
1116 my ($self) = @_; 1205 my ($self) = @_;
1117 1206
1207 my $child = $self->{children}[0];
1208
1118 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1120 1211
1121 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123 1214
1124 my $border = $self->border; 1215 my $border = $self->border;
1125 1216
1126 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131 1222
1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1134 1225
1135 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1136 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1137 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1138
1139 glColor @{ $self->{bg} };
1140
1141 $bg->{s} = $rep_x;
1142 $bg->{t} = $rep_y;
1143 $bg->{wrap_mode} = 1;
1144 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 } 1231 }
1146 1232
1147 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1148 1234
1149 $self->{title}->draw if $self->{title};
1150
1151 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1152} 1241}
1153 1242
1154############################################################################# 1243#############################################################################
1155 1244
1156package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1178 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1179 1268
1180 $child->set_parent ($self); 1269 $child->set_parent ($self);
1181 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1182 1271
1183 $self->check_size (1); 1272 $self->realloc;
1184} 1273}
1185 1274
1186# 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?
1187sub clear { 1276sub clear {
1188 my ($self) = @_; 1277 my ($self) = @_;
… …
1193 for (@children) { 1282 for (@children) {
1194 delete $_->{parent}; 1283 delete $_->{parent};
1195 $_->hide; 1284 $_->hide;
1196 } 1285 }
1197 1286
1198 $self->check_size (1); 1287 $self->realloc;
1199 $self->update;
1200} 1288}
1201 1289
1202sub get_wh { 1290sub get_wh {
1203 my ($self) = @_; 1291 my ($self) = @_;
1204 1292
… …
1324 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1325 1413
1326 my $space = $self->{vertical} ? $h : $w; 1414 my $space = $self->{vertical} ? $h : $w;
1327 my $children = $self->{children}; 1415 my $children = $self->{children};
1328 1416
1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1417 my @req;
1330 my $req = List::Util::sum @req;
1331 1418
1332 if ($req > $space) { 1419 if ($self->{homogeneous}) {
1333 # ah well, not enough space 1420 @req = ($space / (@$children || 1)) x @$children;
1334 $_ *= $space / $req for @req;
1335 } else { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1337 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand 1433 $req[$_] += $space * $children->[$_]{expand}
1339 for 0 .. $#$children; 1434 for 0 .. $#$children;
1435 }
1340 } 1436 }
1341 1437
1342 CFClient::UI::harmonize \@req; 1438 CFClient::UI::harmonize \@req;
1343 1439
1344 my $pos = 0; 1440 my $pos = 0;
… …
1404 ellipsise => 3, # end 1500 ellipsise => 3, # end
1405 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1406 fontsize => 1, 1502 fontsize => 1,
1407 align => -1, 1503 align => -1,
1408 valign => -1, 1504 valign => -1,
1409 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1410 can_events => 0, 1507 can_events => 0,
1411 %arg 1508 %arg
1412 ); 1509 );
1413 1510
1414 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1441 1538
1442 delete $self->{texture}; 1539 delete $self->{texture};
1443 $self->SUPER::update; 1540 $self->SUPER::update;
1444} 1541}
1445 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc;
1549}
1550
1446sub set_text { 1551sub set_text {
1447 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1448 1553
1449 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1450 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1451 1556
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1454 1559
1560 $self->realloc;
1455 $self->update; 1561 $self->update;
1456 $self->check_size;
1457} 1562}
1458 1563
1459sub set_markup { 1564sub set_markup {
1460 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1461 1566
… …
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466 1571
1467 $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;
1468 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1469 1574
1575 $self->realloc;
1470 $self->update; 1576 $self->update;
1471 $self->check_size;
1472} 1577}
1473 1578
1474sub size_request { 1579sub size_request {
1475 my ($self) = @_; 1580 my ($self) = @_;
1476 1581
1582 if (exists $self->{req_h}) {
1583 @$self{qw(req_w req_h)}
1584 } else {
1477 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1478 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1479 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1480 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1482 1590
1483 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1484 1592
1485 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1486 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1487 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1488 1596
1489 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1490 1598
1491 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1492 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1493 } 1601 }
1494 1602
1603 ($w, $h)
1495 ( 1604 }
1496 $w + $self->{padding} * 2,
1497 $h + $self->{padding} * 2,
1498 )
1499} 1605}
1500 1606
1501sub size_allocate { 1607sub size_allocate {
1502 my ($self, $w, $h) = @_; 1608 my ($self, $w, $h) = @_;
1503 1609
1610 delete $self->{ox};
1611
1504 delete $self->{texture}; 1612 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1505} 1614}
1506 1615
1507sub set_fontsize { 1616sub set_fontsize {
1508 my ($self, $fontsize) = @_; 1617 my ($self, $fontsize) = @_;
1509 1618
1510 $self->{fontsize} = $fontsize; 1619 $self->{fontsize} = $fontsize;
1511 delete $self->{texture}; 1620 delete $self->{texture};
1512 1621
1513 $self->update; 1622 $self->realloc;
1514 $self->check_size;
1515} 1623}
1516 1624
1517sub _draw { 1625sub _draw {
1518 my ($self) = @_; 1626 my ($self) = @_;
1519 1627
… …
1525 $self->{layout}->set_width ($self->{w}); 1633 $self->{layout}->set_width ($self->{w});
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1634 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1637
1530 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1638 new_from_layout CFClient::Texture $self->{layout}
1639 };
1531 1640
1641 unless (exists $self->{ox}) {
1532 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1533 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1534 : ($self->{w} - $tex->{w}) * 0.5); 1644 : ($self->{w} - $tex->{w}) * 0.5);
1535 1645
1536 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1537 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1538 : ($self->{h} - $tex->{h}) * 0.5); 1648 : ($self->{h} - $tex->{h}) * 0.5);
1539
1540 $tex
1541 }; 1649 };
1542 1650
1543 glEnable GL_TEXTURE_2D; 1651 glEnable GL_TEXTURE_2D;
1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1545 1653
1654 glColor_premultiply @{$self->{fg}}
1546 if ($tex->{format} == GL_ALPHA) { 1655 if $tex->{format} == GL_ALPHA;
1547 glColor @{$self->{fg}}; 1656
1548 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1549 } else {
1550 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1551 }
1552 1658
1553 glDisable GL_TEXTURE_2D; 1659 glDisable GL_TEXTURE_2D;
1554} 1660}
1555 1661
1556############################################################################# 1662#############################################################################
… …
1583 1689
1584 delete $self->{cur_h}; 1690 delete $self->{cur_h};
1585 1691
1586 return if $self->{text} eq $text; 1692 return if $self->{text} eq $text;
1587 1693
1588 delete $self->{texture};
1589
1590 $self->{last_activity} = $::NOW; 1694 $self->{last_activity} = $::NOW;
1591 $self->{text} = $text; 1695 $self->{text} = $text;
1592 1696
1593 $text =~ s/./*/g if $self->{hidden}; 1697 $text =~ s/./*/g if $self->{hidden};
1594 $self->{layout}->set_text ("$text "); 1698 $self->{layout}->set_text ("$text ");
1595 1699
1596 $self->_emit (changed => $self->{text}); 1700 $self->_emit (changed => $self->{text});
1701 $self->update;
1597} 1702}
1598 1703
1599sub set_text { 1704sub set_text {
1600 my ($self, $text) = @_; 1705 my ($self, $text) = @_;
1601 1706
1602 $self->{cursor} = length $text; 1707 $self->{cursor} = length $text;
1603 $self->_set_text ($text); 1708 $self->_set_text ($text);
1604 $self->update; 1709
1605 $self->check_size; 1710 $self->realloc;
1606} 1711}
1607 1712
1608sub get_text { 1713sub get_text {
1609 $_[0]{text} 1714 $_[0]{text}
1610} 1715}
… …
1640 $self->{cursor} = length $text; 1745 $self->{cursor} = length $text;
1641 } elsif ($uni == 27) { 1746 } elsif ($uni == 27) {
1642 $self->_emit ('escape'); 1747 $self->_emit ('escape');
1643 } elsif ($uni) { 1748 } elsif ($uni) {
1644 substr $text, $self->{cursor}++, 0, chr $uni; 1749 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else {
1751 return 0;
1645 } 1752 }
1646 1753
1647 $self->_set_text ($text); 1754 $self->_set_text ($text);
1648 $self->update; 1755
1649 $self->check_size; 1756 $self->realloc;
1757
1758 1
1650} 1759}
1651 1760
1652sub focus_in { 1761sub focus_in {
1653 my ($self) = @_; 1762 my ($self) = @_;
1654 1763
… …
1669 utf8::encode $text; 1778 utf8::encode $text;
1670 $self->{cursor} = length substr $text, 0, $idx; 1779 $self->{cursor} = length substr $text, 0, $idx;
1671 1780
1672 $self->_set_text ($self->{text}); 1781 $self->_set_text ($self->{text});
1673 $self->update; 1782 $self->update;
1783
1784 1
1674} 1785}
1675 1786
1676sub mouse_motion { 1787sub mouse_motion {
1677 my ($self, $ev, $x, $y) = @_; 1788 my ($self, $ev, $x, $y) = @_;
1678# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790
1791 0
1679} 1792}
1680 1793
1681sub _draw { 1794sub _draw {
1682 my ($self) = @_; 1795 my ($self) = @_;
1683 1796
1684 local $self->{fg} = $self->{fg}; 1797 local $self->{fg} = $self->{fg};
1685 1798
1686 if ($FOCUS == $self) { 1799 if ($FOCUS == $self) {
1687 glColor @{$self->{active_bg}}; 1800 glColor_premultiply @{$self->{active_bg}};
1688 $self->{fg} = $self->{active_fg}; 1801 $self->{fg} = $self->{active_fg};
1689 } else { 1802 } else {
1690 glColor @{$self->{bg}}; 1803 glColor_premultiply @{$self->{bg}};
1691 } 1804 }
1692 1805
1693 glEnable GL_BLEND; 1806 glEnable GL_BLEND;
1694 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1807 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1695 glBegin GL_QUADS; 1808 glBegin GL_QUADS;
1696 glVertex 0 , 0; 1809 glVertex 0 , 0;
1697 glVertex 0 , $self->{h}; 1810 glVertex 0 , $self->{h};
1698 glVertex $self->{w}, $self->{h}; 1811 glVertex $self->{w}, $self->{h};
1699 glVertex $self->{w}, 0; 1812 glVertex $self->{w}, 0;
… …
1760 } else { 1873 } else {
1761 $self->set_text ($self->{history_saveback}); 1874 $self->set_text ($self->{history_saveback});
1762 } 1875 }
1763 1876
1764 } else { 1877 } else {
1765 $self->SUPER::key_down ($ev); 1878 return $self->SUPER::key_down ($ev)
1879 }
1880
1766 } 1881 1
1767
1768} 1882}
1769 1883
1770############################################################################# 1884#############################################################################
1771 1885
1772package CFClient::UI::Button; 1886package CFClient::UI::Button;
… …
1781 1895
1782sub new { 1896sub new {
1783 my $class = shift; 1897 my $class = shift;
1784 1898
1785 $class->SUPER::new ( 1899 $class->SUPER::new (
1786 padding => 4, 1900 padding_x => 4,
1901 padding_y => 4,
1787 fg => [1, 1, 1], 1902 fg => [1, 1, 1],
1788 active_fg => [0, 0, 1], 1903 active_fg => [0, 0, 1],
1789 can_hover => 1, 1904 can_hover => 1,
1790 align => 0, 1905 align => 0,
1791 valign => 0, 1906 valign => 0,
… …
1800 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1801 1916
1802 $self->emit ("activate") 1917 $self->emit ("activate")
1803 if $x >= 0 && $x < $self->{w} 1918 if $x >= 0 && $x < $self->{w}
1804 && $y >= 0 && $y < $self->{h}; 1919 && $y >= 0 && $y < $self->{h};
1920
1921 1
1805} 1922}
1806 1923
1807sub _draw { 1924sub _draw {
1808 my ($self) = @_; 1925 my ($self) = @_;
1809 1926
1810 local $self->{fg} = $self->{fg}; 1927 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1811
1812 if ($GRAB == $self) {
1813 $self->{fg} = $self->{active_fg};
1814 }
1815 1928
1816 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1818 glColor 0, 0, 0, 1; 1931 glColor 0, 0, 0, 1;
1819 1932
… …
1838 1951
1839sub new { 1952sub new {
1840 my $class = shift; 1953 my $class = shift;
1841 1954
1842 $class->SUPER::new ( 1955 $class->SUPER::new (
1843 padding => 2, 1956 padding_x => 2,
1957 padding_y => 2,
1844 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1845 active_fg => [1, 1, 0], 1959 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2], 1960 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5], 1961 active_bg => [1, 1, 1, 0.5],
1848 state => 0, 1962 state => 0,
… …
1852} 1966}
1853 1967
1854sub size_request { 1968sub size_request {
1855 my ($self) = @_; 1969 my ($self) = @_;
1856 1970
1857 ($self->{padding} * 2 + 6) x 2 1971 (6) x 2
1858} 1972}
1859 1973
1860sub button_down { 1974sub button_down {
1861 my ($self, $ev, $x, $y) = @_; 1975 my ($self, $ev, $x, $y) = @_;
1862 1976
1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865 $self->{state} = !$self->{state}; 1979 $self->{state} = !$self->{state};
1866 $self->_emit (changed => $self->{state}); 1980 $self->_emit (changed => $self->{state});
1981 } else {
1982 return 0
1983 }
1984
1867 } 1985 1
1868} 1986}
1869 1987
1870sub _draw { 1988sub _draw {
1871 my ($self) = @_; 1989 my ($self) = @_;
1872 1990
1873 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1874 1992
1875 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1993 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876 1994
1877 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1995 my ($w, $h) = @$self{qw(w h)};
1996
1997 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1878 1998
1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1999 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880 2000
1881 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2001 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882 2002
… …
2037 2157
2038 my $h1 = $self->{h} * (1 - $ycut1); 2158 my $h1 = $self->{h} * (1 - $ycut1);
2039 my $h2 = $self->{h} * (1 - $ycut2); 2159 my $h2 = $self->{h} * (1 - $ycut2);
2040 2160
2041 glEnable GL_BLEND; 2161 glEnable GL_BLEND;
2042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2043 glEnable GL_TEXTURE_2D; 2164 glEnable GL_TEXTURE_2D;
2044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2165 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2045 2166
2046 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2167 glBindTexture GL_TEXTURE_2D, $t1->{name};
2047 glBegin GL_QUADS; 2168 glBegin GL_QUADS;
… …
2147 fg => [1, 1, 1], 2268 fg => [1, 1, 1],
2148 active_fg => [0, 0, 0], 2269 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2], 2270 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5], 2271 active_bg => [1, 1, 1, 0.5],
2151 range => [0, 0, 100, 10, 0], 2272 range => [0, 0, 100, 10, 0],
2152 req_w => $::WIDTH / 80, 2273 min_w => $::WIDTH / 80,
2153 req_h => $::WIDTH / 80, 2274 min_h => $::WIDTH / 80,
2154 vertical => 0, 2275 vertical => 0,
2155 can_hover => 1, 2276 can_hover => 1,
2156 inner_pad => 0.02, 2277 inner_pad => 0.02,
2157 @_ 2278 @_
2158 ); 2279 );
… …
2161 $self->update; 2282 $self->update;
2162 2283
2163 $self 2284 $self
2164} 2285}
2165 2286
2287sub changed { }
2288
2166sub set_range { 2289sub set_range {
2167 my ($self, $range) = @_; 2290 my ($self, $range) = @_;
2168 2291
2169 ($range, $self->{range}) = ($self->{range}, $range); 2292 ($range, $self->{range}) = ($self->{range}, $range);
2170 2293
… …
2196} 2319}
2197 2320
2198sub size_request { 2321sub size_request {
2199 my ($self) = @_; 2322 my ($self) = @_;
2200 2323
2201 my $w = $self->{req_w}; 2324 ($self->{req_w}, $self->{req_h})
2202 my $h = $self->{req_h};
2203
2204 $self->{vertical} ? ($h, $w) : ($w, $h)
2205} 2325}
2206 2326
2207sub button_down { 2327sub button_down {
2208 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2209 2329
2210 $self->SUPER::button_down ($ev, $x, $y); 2330 $self->SUPER::button_down ($ev, $x, $y);
2211 2331
2212 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213 2333
2214 $self->mouse_motion ($ev, $x, $y); 2334 $self->mouse_motion ($ev, $x, $y)
2215} 2335}
2216 2336
2217sub mouse_motion { 2337sub mouse_motion {
2218 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2219 2339
… …
2223 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2343 my (undef, $lo, $hi, $page) = @{$self->{range}};
2224 2344
2225 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2345 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226 2346
2227 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2347 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2348 } else {
2349 return 0;
2350 }
2351
2228 } 2352 1
2229} 2353}
2230 2354
2231sub update { 2355sub update {
2232 my ($self) = @_; 2356 my ($self) = @_;
2233 2357
2234 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2358 delete $self->{knob_w};
2359 $self->SUPER::update;
2360}
2361
2362sub _draw {
2363 my ($self) = @_;
2364
2365 unless ($self->{knob_w}) {
2235 $self->set_value ($self->{range}[0]); 2366 $self->set_value ($self->{range}[0]);
2236 2367
2237 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2368 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100; 2369 my $range = ($hi - $page - $lo) || 1e-100;
2239 2370
… …
2245 $value = ($value - $lo) / $range; 2376 $value = ($value - $lo) / $range;
2246 $value = $value * $self->{scale} + $self->{offset}; 2377 $value = $value * $self->{scale} + $self->{offset};
2247 2378
2248 $self->{knob_x} = $value - $knob_w * 0.5; 2379 $self->{knob_x} = $value - $knob_w * 0.5;
2249 $self->{knob_w} = $knob_w; 2380 $self->{knob_w} = $knob_w;
2250 }); 2381 }
2251
2252 $self->SUPER::update;
2253}
2254
2255sub _draw {
2256 my ($self) = @_;
2257 2382
2258 $self->SUPER::_draw (); 2383 $self->SUPER::_draw ();
2259 2384
2260 glScale $self->{w}, $self->{h}; 2385 glScale $self->{w}, $self->{h};
2261 2386
… …
2455 2580
2456 delete $self->{texture}; 2581 delete $self->{texture};
2457 } 2582 }
2458 2583
2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2460 glClearColor 0.5, 0.5, 0.5, 0; 2585 glClearColor 0, 0, 0, 0;
2461 glClear GL_COLOR_BUFFER_BIT; 2586 glClear GL_COLOR_BUFFER_BIT;
2462 2587
2463 my $top = int $self->{children}[1]{range}[0]; 2588 my $top = int $self->{children}[1]{range}[0];
2464 2589
2465 my $y0 = $top; 2590 my $y0 = $top;
… …
2500sub _draw { 2625sub _draw {
2501 my ($self) = @_; 2626 my ($self) = @_;
2502 2627
2503 glEnable GL_TEXTURE_2D; 2628 glEnable GL_TEXTURE_2D;
2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2505 glColor 1, 1, 1, 1; 2630 glColor 0, 0, 0, 1;
2506 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2507 glDisable GL_TEXTURE_2D; 2632 glDisable GL_TEXTURE_2D;
2508 2633
2509 $self->{children}[1]->draw; 2634 $self->{children}[1]->draw;
2510 2635
2511} 2636}
… …
2594} 2719}
2595 2720
2596sub set_tooltip_from { 2721sub set_tooltip_from {
2597 my ($self, $widget) = @_; 2722 my ($self, $widget) = @_;
2598 2723
2724 my $tooltip = $widget->{tooltip};
2725
2726 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}";
2731 }
2732
2599 $self->add (new CFClient::UI::Label 2733 $self->add (new CFClient::UI::Label
2600 markup => $widget->{tooltip}, 2734 markup => $tooltip,
2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8, 2736 fontsize => 0.8,
2603 fg => [0, 0, 0, 1], 2737 fg => [0, 0, 0, 1],
2604 ellipsise => 0, 2738 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP), 2739 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2616 2750
2617sub size_allocate { 2751sub size_allocate {
2618 my ($self, $w, $h) = @_; 2752 my ($self, $w, $h) = @_;
2619 2753
2620 $self->SUPER::size_allocate ($w - 4, $h - 4); 2754 $self->SUPER::size_allocate ($w - 4, $h - 4);
2755}
2756
2757sub visibility_change {
2758 my ($self, $visible) = @_;
2759
2760 return unless $visible;
2761
2762 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner}
2764 or return;
2765
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH;
2770
2771 $self->move_abs ($x, $y);
2772 });
2621} 2773}
2622 2774
2623sub _draw { 2775sub _draw {
2624 my ($self) = @_; 2776 my ($self) = @_;
2625 2777
… …
2642 glVertex $w, $h; 2794 glVertex $w, $h;
2643 glVertex $w, 0; 2795 glVertex $w, 0;
2644 glEnd; 2796 glEnd;
2645 2797
2646 glTranslate 2 - 0.375, 2 - 0.375; 2798 glTranslate 2 - 0.375, 2 - 0.375;
2799
2647 $self->SUPER::_draw; 2800 $self->SUPER::_draw;
2648} 2801}
2649 2802
2650############################################################################# 2803#############################################################################
2651 2804
… …
2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2711 2864
2712 if ($tex) { 2865 if ($tex) {
2713 glEnable GL_TEXTURE_2D; 2866 glEnable GL_TEXTURE_2D;
2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2715 glColor 1, 1, 1, 1; 2868 glColor 0, 0, 0, 1;
2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2717 glDisable GL_TEXTURE_2D; 2870 glDisable GL_TEXTURE_2D;
2718 } 2871 }
2719} 2872}
2720 2873
… …
2727 $self->SUPER::DESTROY; 2880 $self->SUPER::DESTROY;
2728} 2881}
2729 2882
2730############################################################################# 2883#############################################################################
2731 2884
2732package CFClient::UI::Inventory; 2885package CFClient::UI::Buttonbar;
2733 2886
2734our @ISA = CFClient::UI::ScrolledWindow::; 2887our @ISA = CFClient::UI::HBox::;
2735 2888
2736sub new { 2889# TODO: should actualyl wrap buttons and other goodies.
2737 my $class = shift;
2738
2739 my $self = $class->SUPER::new (
2740 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2741 @_,
2742 );
2743
2744 $self
2745}
2746
2747sub set_items {
2748 my ($self, $items) = @_;
2749
2750 $self->{scrolled}->clear;
2751 return unless $items;
2752
2753 my @items = sort {
2754 ($a->{type} <=> $b->{type})
2755 or ($a->{name} cmp $b->{name})
2756 } @$items;
2757
2758 $self->{real_items} = \@items;
2759
2760 my $row = 0;
2761 for my $item (@items) {
2762 CFClient::Item::update_widgets $item;
2763
2764 $self->{scrolled}->add (0, $row, $item->{face_widget});
2765 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2766 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2767
2768 $row++;
2769 }
2770}
2771 2890
2772############################################################################# 2891#############################################################################
2773 2892
2774package CFClient::UI::Menu; 2893package CFClient::UI::Menu;
2775 2894
… …
2816 # maybe save $GRAB? must be careful about events... 2935 # maybe save $GRAB? must be careful about events...
2817 $GRAB = $self; 2936 $GRAB = $self;
2818 $self->{button} = $ev->{button}; 2937 $self->{button} = $ev->{button};
2819 2938
2820 $self->show; 2939 $self->show;
2821 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2822} 2941}
2823 2942
2824sub mouse_motion { 2943sub mouse_motion {
2825 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2826 2945
2827 # TODO: should use vbox->find_widget or so 2946 # TODO: should use vbox->find_widget or so
2828 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829 $self->{hover} = $self->{item}{$HOVER}; 2948 $self->{hover} = $self->{item}{$HOVER};
2949
2950 0
2830} 2951}
2831 2952
2832sub button_up { 2953sub button_up {
2833 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2834 2955
… …
2836 undef $GRAB; 2957 undef $GRAB;
2837 $self->hide; 2958 $self->hide;
2838 2959
2839 $self->_emit ("popdown"); 2960 $self->_emit ("popdown");
2840 $self->{hover}[1]->() if $self->{hover}; 2961 $self->{hover}[1]->() if $self->{hover};
2962 } else {
2963 return 0
2964 }
2965
2841 } 2966 1
2842} 2967}
2843 2968
2844############################################################################# 2969#############################################################################
2845 2970
2846package CFClient::UI::Statusbox; 2971package CFClient::UI::Multiplexer;
2847 2972
2848our @ISA = CFClient::UI::VBox::; 2973our @ISA = CFClient::UI::Container::;
2849 2974
2850sub new { 2975sub new {
2851 my $class = shift; 2976 my $class = shift;
2852 2977
2853 $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2979 @_,
2980 );
2981
2982 $self->{current} = $self->{children}[0]
2983 if @{ $self->{children} };
2984
2985 $self
2986}
2987
2988sub add {
2989 my ($self, @widgets) = @_;
2990
2991 $self->SUPER::add (@widgets);
2992
2993 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} };
2995}
2996
2997sub set_current_page {
2998 my ($self, $page_or_widget) = @_;
2999
3000 my $widget = ref $page_or_widget
3001 ? $page_or_widget
3002 : $self->{children}[$page_or_widget];
3003
3004 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006
3007 $self->_emit (page_changed => $self->{current});
3008
3009 $self->realloc;
3010}
3011
3012sub visible_children {
3013 $_[0]{current}
3014}
3015
3016sub size_request {
3017 my ($self) = @_;
3018
3019 $self->{current}->size_request
3020}
3021
3022sub size_allocate {
3023 my ($self, $w, $h) = @_;
3024
3025 $self->{current}->configure (0, 0, $w, $h);
3026}
3027
3028sub _draw {
3029 my ($self) = @_;
3030
3031 $self->{current}->draw;
3032}
3033
3034#############################################################################
3035
3036package CFClient::UI::Notebook;
3037
3038our @ISA = CFClient::UI::VBox::;
3039
3040sub new {
3041 my $class = shift;
3042
3043 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self
3047 @_,
3048 );
3049
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3051 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3052
3053 $self
3054}
3055
3056sub add {
3057 my ($self, $title, $widget, $tooltip) = @_;
3058
3059 Scalar::Util::weaken $self;
3060
3061 $self->{buttonbar}->add (new CFClient::UI::Button
3062 markup => $title,
3063 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) },
3065 );
3066
3067 $self->{multiplexer}->add ($widget);
3068}
3069
3070sub set_current_page {
3071 my ($self, $page) = @_;
3072
3073 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current});
3075}
3076
3077#############################################################################
3078
3079package CFClient::UI::Statusbox;
3080
3081our @ISA = CFClient::UI::VBox::;
3082
3083sub new {
3084 my $class = shift;
3085
3086 my $self = $class->SUPER::new (
2854 fontsize => 0.8, 3087 fontsize => 0.8,
2855 @_, 3088 @_,
2856 ) 3089 );
3090
3091 Scalar::Util::weaken (my $this = $self);
3092
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094
3095 $self
2857} 3096}
2858 3097
2859sub reorder { 3098sub reorder {
2860 my ($self) = @_; 3099 my ($self) = @_;
2861 my $NOW = time; 3100 my $NOW = Time::HiRes::time;
3101
3102 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} };
2862 3106
2863 while (my ($k, $v) = each %{ $self->{item} }) { 3107 while (my ($k, $v) = each %{ $self->{item} }) {
2864 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3108 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865 } 3109 }
2866 3110
… …
2869 my @items = sort { 3113 my @items = sort {
2870 $a->{pri} <=> $b->{pri} 3114 $a->{pri} <=> $b->{pri}
2871 or $b->{id} <=> $a->{id} 3115 or $b->{id} <=> $a->{id}
2872 } values %{ $self->{item} }; 3116 } values %{ $self->{item} };
2873 3117
3118 $self->{timer}->interval (1);
3119
2874 my $count = 10 + 1; 3120 my $count = 10 + 1;
2875 for my $item (@items) { 3121 for my $item (@items) {
2876 last unless --$count; 3122 last unless --$count;
2877 3123
2878 push @widgets, $item->{label} ||= do { 3124 my $label = $item->{label} ||= do {
2879 # TODO: doesn't handle markup well (read as: at all) 3125 # TODO: doesn't handle markup well (read as: at all)
2880 my $short = $item->{count} > 1 3126 my $short = $item->{count} > 1
2881 ? "<b>$item->{count} ×</b> $item->{text}" 3127 ? "<b>$item->{count} ×</b> $item->{text}"
2882 : $item->{text}; 3128 : $item->{text};
2883 3129
… …
2891 tooltip => $item->{tooltip}, 3137 tooltip => $item->{tooltip},
2892 tooltip_font => $::FONT_PROP, 3138 tooltip_font => $::FONT_PROP,
2893 tooltip_width => 0.67, 3139 tooltip_width => 0.67,
2894 fontsize => $item->{fontsize} || $self->{fontsize}, 3140 fontsize => $item->{fontsize} || $self->{fontsize},
2895 max_w => $::WIDTH * 0.44, 3141 max_w => $::WIDTH * 0.44,
2896 fg => $item->{fg}, 3142 fg => [@{ $item->{fg} }],
2897 can_events => 1, 3143 can_events => 1,
2898 can_hover => 1 3144 can_hover => 1
2899 }; 3145 };
3146
3147 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3148 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3149 $label->update;
3150 $label->set_max_size (undef, $label->{req_h} * $diff)
3151 if $diff < 1;
3152 $self->{timer}->interval (1/30);
3153 } else {
3154 $label->{fg}[3] = $item->{fg}[3] || 1;
3155 }
3156
3157 push @widgets, $label;
2900 } 3158 }
2901 3159
2902 $self->clear; 3160 $self->clear;
2903 $self->SUPER::add (reverse @widgets); 3161 $self->SUPER::add (reverse @widgets);
2904} 3162}
… …
2909 $text =~ s/^\s+//; 3167 $text =~ s/^\s+//;
2910 $text =~ s/\s+$//; 3168 $text =~ s/\s+$//;
2911 3169
2912 return unless $text; 3170 return unless $text;
2913 3171
2914 my $timeout = time + ((delete $arg{timeout}) || 60); 3172 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2915 3173
2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3174 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917 3175
2918 if (my $item = $self->{item}{$group}) { 3176 if (my $item = $self->{item}{$group}) {
2919 if ($item->{text} eq $text) { 3177 if ($item->{text} eq $text) {
… …
2949 3207
2950 $self->reorder; 3208 $self->reorder;
2951 $self->SUPER::reconfigure; 3209 $self->SUPER::reconfigure;
2952} 3210}
2953 3211
3212sub DESTROY {
3213 my ($self) = @_;
3214
3215 $self->{timer}->cancel;
3216
3217 $self->SUPER::DESTROY;
3218}
3219
2954############################################################################# 3220#############################################################################
2955 3221
2956package CFClient::UI::Root; 3222package CFClient::UI::Inventory;
2957 3223
2958our @ISA = CFClient::UI::Container::; 3224our @ISA = CFClient::UI::ScrolledWindow::;
2959
2960use CFClient::OpenGL;
2961 3225
2962sub new { 3226sub new {
2963 my $class = shift; 3227 my $class = shift;
2964 3228
2965 $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231 @_,
3232 );
3233
3234 $self
3235}
3236
3237sub set_items {
3238 my ($self, $items) = @_;
3239
3240 $self->{child}->clear;
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList;
3462
3463our @ISA = CFClient::UI::Table::;
3464
3465sub new {
3466 my $class = shift;
3467
3468 my $self = $class->SUPER::new (
3469 binding => [],
3470 commands => [],
3471 @_,
3472 )
3473}
3474
3475# XXX: Do sorting? Argl...
3476sub add_spell {
3477 my ($self, $spell) = @_;
3478 $self->{spells}->{$spell->{name}} = $spell;
3479
3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507}
3508
3509sub remove_spell {
3510 my ($self, $spell) = @_;
3511 delete $self->{spells}->{$spell->{name}};
3512 $self->rebuild_spell_list;
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::Root;
3518
3519our @ISA = CFClient::UI::Container::;
3520
3521use List::Util qw(min max);
3522
3523use CFClient::OpenGL;
3524
3525sub new {
3526 my $class = shift;
3527
3528 my $self = $class->SUPER::new (
2966 visible => 1, 3529 visible => 1,
2967 @_, 3530 @_,
2968 ) 3531 );
2969}
2970 3532
2971sub configure { 3533 Scalar::Util::weaken ($self->{root} = $self);
2972 my ($self, $x, $y, $w, $h) = @_;
2973 3534
2974 $self->{w} = $w; 3535 $self
2975 $self->{h} = $h;
2976}
2977
2978sub check_size {
2979 my ($self) = @_;
2980
2981 $self->size_allocate ($self->{w}, $self->{h})
2982 if $self->{w};
2983} 3536}
2984 3537
2985sub size_request { 3538sub size_request {
2986 my ($self) = @_; 3539 my ($self) = @_;
2987 3540
2988 ($self->{w}, $self->{h}) 3541 ($self->{w}, $self->{h})
3542}
3543
3544sub _to_pixel {
3545 my ($coord, $size, $max) = @_;
3546
3547 $coord =
3548 $coord eq "center" ? ($max - $size) * 0.5
3549 : $coord eq "max" ? $max
3550 : $coord;
3551
3552 $coord = 0 if $coord < 0;
3553 $coord = $max - $size if $coord > $max - $size;
3554
3555 int $coord + 0.5
2989} 3556}
2990 3557
2991sub size_allocate { 3558sub size_allocate {
2992 my ($self, $w, $h) = @_; 3559 my ($self, $w, $h) = @_;
2993 3560
2994 for my $child ($self->children) { 3561 for my $child ($self->children) {
2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996 3563
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3564 $X = $child->{force_x} if exists $child->{force_x};
2998 if exists $child->{req_x}; 3565 $Y = $child->{force_y} if exists $child->{force_y};
2999 3566
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3567 $X = _to_pixel $X, $W, $self->{w};
3001 if exists $child->{req_y}; 3568 $Y = _to_pixel $Y, $H, $self->{h};
3002
3003 delete @$child{qw(req_x req_y)};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3569
3008 $child->configure ($X, $Y, $W, $H); 3570 $child->configure ($X, $Y, $W, $H);
3009 } 3571 }
3010} 3572}
3011 3573
… …
3022} 3584}
3023 3585
3024sub update { 3586sub update {
3025 my ($self) = @_; 3587 my ($self) = @_;
3026 3588
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3589 $::WANT_REFRESH++;
3029} 3590}
3030 3591
3031sub add { 3592sub add {
3032 my ($self, @children) = @_; 3593 my ($self, @children) = @_;
3033 3594
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1; 3595 $_->{is_toplevel} = 1
3036 3596 for @children;
3037 # integerise window positions
3038 $child->{x} = int $child->{x};
3039 $child->{y} = int $child->{y};
3040 }
3041 3597
3042 $self->SUPER::add (@children); 3598 $self->SUPER::add (@children);
3043
3044 for (my @widgets = @children; my $w = pop @widgets; ) {
3045 push @widgets, $w->children;
3046 $w->set_visible;
3047 }
3048
3049} 3599}
3050 3600
3051sub remove { 3601sub remove {
3052 my ($self, @children) = @_; 3602 my ($self, @children) = @_;
3053 3603
3054 $self->SUPER::remove (@children); 3604 $self->SUPER::remove (@children);
3605
3606 delete $self->{is_toplevel}
3607 for @children;
3055 3608
3056 while (@children) { 3609 while (@children) {
3057 my $w = pop @children; 3610 my $w = pop @children;
3058 push @children, $w->children; 3611 push @children, $w->children;
3059 $w->set_invisible; 3612 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3631 while ($self->{refresh_hook}) {
3079 $_->() 3632 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3633 for values %{delete $self->{refresh_hook}};
3081 } 3634 }
3082 3635
3083 if ($self->{check_size}) { 3636 if ($self->{realloc}) {
3637 my %queue;
3084 my @queue; 3638 my @queue;
3639 my $widget;
3085 3640
3086 for (;;) { 3641 outer:
3087 if ($self->{check_size}) { 3642 while () {
3088 #TODO use array-of-depth approach 3643 if (my $realloc = delete $self->{realloc}) {
3644 for $widget (values %$realloc) {
3645 $widget->{visible} or next; # do not resize invisible widgets
3089 3646
3090 @queue = sort { $a->{visible} <=> $b->{visible} } 3647 $queue{$widget+0}++ and next; # duplicates are common
3091 @queue, values %{delete $self->{check_size}}; 3648
3649 push @{ $queue[$widget->{visible}] }, $widget;
3650 }
3092 } 3651 }
3093 3652
3653 while () {
3654 @queue or last outer;
3655
3094 my $widget = pop @queue || last; 3656 $widget = pop @{ $queue[-1] || [] }
3095 3657 and last;
3096 defined $widget->{visible} or last; # do not resize invisible widgets
3097
3098 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3099 ? @$widget{qw(def_w def_h)}
3100 : $widget->size_request;
3101
3102 if (delete $widget->{force_alloc}
3103 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3104 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3105 3658
3659 pop @queue;
3660 }
3661
3662 delete $queue{$widget+0};
3663
3664 my ($w, $h) = $widget->size_request;
3665
3666 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3667 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3668
3669 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3670 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3671
3672 $w = $widget->{force_w} if exists $widget->{force_w};
3673 $h = $widget->{force_h} if exists $widget->{force_h};
3674
3675 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3676 || delete $widget->{force_realloc}) {
3106 $widget->{req_w} = $w; 3677 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h; 3678 $widget->{req_h} = $h;
3108 3679
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3680 $self->{size_alloc}{$widget+0} = $widget;
3110 3681
3111 $widget->{parent}->check_size
3112 if $widget->{parent}; 3682 if (my $parent = $widget->{parent}) {
3683 $self->{realloc}{$parent+0} = $parent
3684 unless $queue{$parent+0};
3685
3686 $parent->{force_size_alloc} = 1;
3687 $self->{size_alloc}{$parent+0} = $parent;
3688 }
3113 } 3689 }
3690
3691 delete $self->{realloc}{$widget+0};
3114 } 3692 }
3115 } 3693 }
3116 3694
3117 while ($self->{size_alloc}) { 3695 while (my $size_alloc = delete $self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) { 3696 my @queue = sort { $b->{visible} <=> $a->{visible} }
3119 my ($widget, $w, $h) = @$_; 3697 values %$size_alloc;
3698
3699 while () {
3700 my $widget = pop @queue || last;
3701
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120 3703
3121 $w = 0 if $w < 0; 3704 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0; 3705 $h = 0 if $h < 0;
3123 3706
3707 $w = int $w + 0.5;
3708 $h = int $h + 0.5;
3709
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w};
3712 $widget->{old_h} = $widget->{h};
3713
3124 $widget->{w} = $w; 3714 $widget->{w} = $w;
3125 $widget->{h} = $h; 3715 $widget->{h} = $h;
3716
3126 $widget->emit (size_allocate => $w, $h); 3717 $widget->emit (size_allocate => $w, $h);
3718 }
3127 } 3719 }
3128 } 3720 }
3129 3721
3130 while ($self->{post_alloc_hook}) { 3722 while ($self->{post_alloc_hook}) {
3131 $_->() 3723 $_->()
3132 for values %{delete $self->{post_alloc_hook}}; 3724 for values %{delete $self->{post_alloc_hook}};
3133 } 3725 }
3726
3134 3727
3135 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3728 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3729 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137 glClear GL_COLOR_BUFFER_BIT; 3730 glClear GL_COLOR_BUFFER_BIT;
3138 3731
… …
3140 glLoadIdentity; 3733 glLoadIdentity;
3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142 glMatrixMode GL_MODELVIEW; 3735 glMatrixMode GL_MODELVIEW;
3143 glLoadIdentity; 3736 glLoadIdentity;
3144 3737
3738 {
3739 package CFClient::UI::Base;
3740
3741 ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h});
3743 }
3744
3145 $self->_draw; 3745 $self->_draw;
3146} 3746}
3147 3747
3148############################################################################# 3748#############################################################################
3149 3749

Diff Legend

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