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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
185 } 189 }
186 } 190 }
187 191
188 reconfigure_widgets; 192 reconfigure_widgets;
189} 193}
… …
198 202
199sub new { 203sub new {
200 my $class = shift; 204 my $class = shift;
201 205
202 my $self = bless { 206 my $self = bless {
203 x => 0, 207 x => "center",
204 y => 0, 208 y => "center",
205 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
206 can_events => 1, 212 can_events => 1,
207 @_ 213 @_
208 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 217
210 for (keys %$self) { 218 for (keys %$self) {
211 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
213 } 221 }
214 } 222 }
215 223
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
223 } 234 }
224 235
225 $self 236 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 237}
237 238
238sub destroy { 239sub destroy {
239 my ($self) = @_; 240 my ($self) = @_;
240 241
… …
242 %$self = (); 243 %$self = ();
243} 244}
244 245
245sub show { 246sub show {
246 my ($self) = @_; 247 my ($self) = @_;
248
247 return if $self->{parent}; 249 return if $self->{parent};
248 250
249 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
250} 252}
251 253
252sub show_centered { 254sub set_visible {
253 my ($self) = @_; 255 my ($self) = @_;
256
254 return if $self->{parent}; 257 return if $self->{visible};
255 258
256 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
257 261
258 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 263
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
261 }, 265
262 ); 266 $_->set_visible for $self->children;
263} 267}
264 268
265sub set_invisible { 269sub set_invisible {
266 my ($self) = @_; 270 my ($self) = @_;
267 271
268 return unless $self->{visible}; 272 return unless $self->{visible};
269 273
270 # broken show/hide model 274 $_->set_invisible for $self->children;
271 275
272 delete $self->{root}; 276 delete $self->{root};
273 delete $self->{visible}; 277 delete $self->{visible};
274 278
275 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
277 281
278 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
280 284
281 $self->focus_out; 285 $self->focus_out;
282 286
283 $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;
284} 305}
285 306
286sub hide { 307sub hide {
287 my ($self) = @_; 308 my ($self) = @_;
288 309
… …
290 311
291 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
292 if $self->{parent}; 313 if $self->{parent};
293} 314}
294 315
295sub move { 316sub move_abs {
296 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
297 318
298 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
299 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
300 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
301 322
302 $self->update; 323 $self->update;
303} 324}
304 325
305sub set_size { 326sub set_size {
306 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
307 328
308 $self->{user_w} = $w; 329 $self->{force_w} = $w;
309 $self->{user_h} = $h; 330 $self->{force_h} = $h;
310 331
311 $self->check_size; 332 $self->realloc;
312} 333}
313 334
314sub size_request { 335sub size_request {
315 require Carp; 336 require Carp;
316 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
318 339
319sub configure { 340sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
321 342
322 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
325 348
326 # use alignment to adjust x, y 349 # use alignment to adjust x, y
327 350
328 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 353 }
333 354
334 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 356 $self->{x} = $x;
336 $self->{y} = $y; 357 $self->{y} = $y;
337 $self->update; 358 $self->update;
338 } 359 }
339 360
340 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341 $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;
342 } 368 }
343} 369}
344 370
345sub size_allocate { 371sub size_allocate {
346 # nothing to be done 372 # nothing to be done
347} 373}
348 374
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354}
355
356sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
357} 381}
358 382
359sub set_max_size { 383sub set_max_size {
360 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
361 385
362 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
363 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388
389 $self->realloc;
364} 390}
365 391
366sub set_tooltip { 392sub set_tooltip {
367 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
368 394
… …
420 446
421 $::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
422 unless $FOCUS; 448 unless $FOCUS;
423} 449}
424 450
425sub mouse_motion { } 451sub mouse_motion { 0 }
426sub button_up { } 452sub button_up { 0 }
427sub key_down { } 453sub key_down { 0 }
428sub key_up { } 454sub key_up { 0 }
429 455
430sub button_down { 456sub button_down {
431 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
432 458
433 $self->focus_in; 459 $self->focus_in;
434}
435 460
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
440sub 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
441 537
442sub draw { 538sub draw {
443 my ($self) = @_; 539 my ($self) = @_;
444 540
445 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);
446 552
447 glPushMatrix; 553 glPushMatrix;
448 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
449 $self->_draw;
450 glPopMatrix;
451 555
452 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
453 my ($x, $y) = @$self{qw(x y)};
454
455 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
456 glEnable GL_BLEND; 558 glEnable GL_BLEND;
457 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
458 glBegin GL_QUADS; 560 glBegin GL_QUADS;
459 glVertex $x , $y; 561 glVertex 0 , 0;
460 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
461 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
462 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
463 glEnd; 565 glEnd;
464 glDisable GL_BLEND; 566 glDisable GL_BLEND;
465 } 567 }
466 568
467 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
468 glPushMatrix; 570 glPushMatrix;
469 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
471 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 574 glVertex 0 , 0;
473 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
474 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
475 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
476 glEnd; 578 glEnd;
477 glPopMatrix; 579 glPopMatrix;
478 #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;
479 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
480} 585}
481 586
482sub _draw { 587sub _draw {
483 my ($self) = @_; 588 my ($self) = @_;
484 589
485 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
486}
487
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
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) = @_;
1008 1075
1009 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
1010 1077
1011 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1081 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1082 can_events => 1,
1017 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1018 ); 1086 );
1019 1087
1020 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
1021 align => 0, 1089 align => 0,
1022 valign => 1, 1090 valign => 1,
1023 text => $self->{title}, 1091 text => $title,
1024 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
1025 1094
1026 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027} 1103}
1028 1104
1029sub border { 1105sub border {
1030 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1031} 1107}
1032 1108
1033sub size_request { 1109sub size_request {
1034 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
1035 1114
1036 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1037 1116
1038 ( 1117 (
1039 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1042} 1121}
1043 1122
1044sub size_allocate { 1123sub size_allocate {
1045 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1046 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
1047 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1049 1136
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1054} 1138}
1055 1139
1056sub button_down { 1140sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1058 1142
… …
1074 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1075 1159
1076 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1078 1162
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1165
1084 $self->check_size; 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 $self->realloc;
1085 }; 1168 };
1086 1169
1087 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1174 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1093 1176
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1178
1096 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1098 $self->move ($self->{user_x}, $self->{user_y}); 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
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
… …
1301 } 1388 }
1302} 1389}
1303 1390
1304############################################################################# 1391#############################################################################
1305 1392
1306package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1307
1308# TODO: wrap into common Box base class
1309 1394
1310our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1311 1396
1312sub size_request { 1397sub size_request {
1313 my ($self) = @_; 1398 my ($self) = @_;
1314 1399
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1316 1401 ? (
1317 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 (List::Util::max map $_->[1], @alloc), 1404 )
1320 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1321} 1409}
1322 1410
1323sub size_allocate { 1411sub size_allocate {
1324 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1325 1413
1326 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1327
1328 my $children = $self->{children}; 1415 my $children = $self->{children};
1329 1416
1330 my @h = map $_->{req_w}, @$children; 1417 my @req;
1331 1418
1332 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1333 1420 @req = ($space / (@$children || 1)) x @$children;
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } 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 {
1338 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1339 $exp ||= 1;
1340 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1341 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 } 1435 }
1348 } 1436 }
1349 1437
1350 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1351 1439
1352 my $y = 0; 1440 my $pos = 0;
1353 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1356 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357 1444
1358 $y += $h; 1445 $pos += $alloc;
1359 } 1446 }
1360 1447
1361 1 1448 1
1362} 1449}
1363 1450
1364############################################################################# 1451#############################################################################
1365 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1366package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1367 1469
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1371 1471
1372sub size_request { 1472sub new {
1373 my ($self) = @_; 1473 my $class = shift;
1374 1474
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1376 1476 vertical => 1,
1377 ( 1477 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1478 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1479}
1421 1480
1422############################################################################# 1481#############################################################################
1423 1482
1424package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1441 ellipsise => 3, # end 1500 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1443 fontsize => 1, 1502 fontsize => 1,
1444 align => -1, 1503 align => -1,
1445 valign => -1, 1504 valign => -1,
1446 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1447 can_events => 0, 1507 can_events => 0,
1448 %arg 1508 %arg
1449 ); 1509 );
1450 1510
1451 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1487 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1488 1548
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1491 1551
1552 $self->realloc;
1492 $self->update; 1553 $self->update;
1493 $self->check_size;
1494} 1554}
1495 1555
1496sub set_markup { 1556sub set_markup {
1497 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1498 1558
… …
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1563
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1506 1566
1567 $self->realloc;
1507 $self->update; 1568 $self->update;
1508 $self->check_size;
1509} 1569}
1510 1570
1511sub size_request { 1571sub size_request {
1512 my ($self) = @_; 1572 my ($self) = @_;
1513 1573
… …
1527 1587
1528 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1530 } 1590 }
1531 1591
1532 ( 1592 ($w, $h)
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1593}
1537 1594
1538sub size_allocate { 1595sub size_allocate {
1539 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1540 1597
1598 delete $self->{ox};
1599
1541 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542} 1602}
1543 1603
1544sub set_fontsize { 1604sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1546 1606
1547 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1608 delete $self->{texture};
1549 1609
1550 $self->update; 1610 $self->realloc;
1551 $self->check_size;
1552} 1611}
1553 1612
1554sub _draw { 1613sub _draw {
1555 my ($self) = @_; 1614 my ($self) = @_;
1556 1615
… …
1562 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1625
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1568 1628
1629 unless (exists $self->{ox}) {
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1572 1633
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1637 };
1579 1638
1580 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1582 1641
1642 glColor_premultiply @{$self->{fg}}
1583 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1584 glColor @{$self->{fg}}; 1644
1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1586 } else {
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1588 }
1589 1646
1590 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1591} 1648}
1592 1649
1593############################################################################# 1650#############################################################################
… …
1620 1677
1621 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1622 1679
1623 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1624 1681
1625 delete $self->{texture};
1626
1627 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1628 $self->{text} = $text; 1683 $self->{text} = $text;
1629 1684
1630 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1631 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1632 1687
1633 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1634} 1690}
1635 1691
1636sub set_text { 1692sub set_text {
1637 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1638 1694
1639 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1696 $self->_set_text ($text);
1641 $self->update; 1697
1642 $self->check_size; 1698 $self->realloc;
1643} 1699}
1644 1700
1645sub get_text { 1701sub get_text {
1646 $_[0]{text} 1702 $_[0]{text}
1647} 1703}
… …
1677 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1680 } elsif ($uni) { 1736 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1682 } 1740 }
1683 1741
1684 $self->_set_text ($text); 1742 $self->_set_text ($text);
1685 $self->update; 1743
1686 $self->check_size; 1744 $self->realloc;
1745
1746 1
1687} 1747}
1688 1748
1689sub focus_in { 1749sub focus_in {
1690 my ($self) = @_; 1750 my ($self) = @_;
1691 1751
… …
1706 utf8::encode $text; 1766 utf8::encode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1708 1768
1709 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1710 $self->update; 1770 $self->update;
1771
1772 1
1711} 1773}
1712 1774
1713sub mouse_motion { 1775sub mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1715# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1716} 1780}
1717 1781
1718sub _draw { 1782sub _draw {
1719 my ($self) = @_; 1783 my ($self) = @_;
1720 1784
1721 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1722 1786
1723 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1724 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1725 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1726 } else { 1790 } else {
1727 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1728 } 1792 }
1729 1793
1730 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1732 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1733 glVertex 0 , 0; 1797 glVertex 0 , 0;
1734 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1735 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1736 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1797 } else { 1861 } else {
1798 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1799 } 1863 }
1800 1864
1801 } else { 1865 } else {
1802 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1803 } 1869 1
1804
1805} 1870}
1806 1871
1807############################################################################# 1872#############################################################################
1808 1873
1809package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1818 1883
1819sub new { 1884sub new {
1820 my $class = shift; 1885 my $class = shift;
1821 1886
1822 $class->SUPER::new ( 1887 $class->SUPER::new (
1823 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1824 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1826 can_hover => 1, 1892 can_hover => 1,
1827 align => 0, 1893 align => 0,
1828 valign => 0, 1894 valign => 0,
… …
1837 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1838 1904
1839 $self->emit ("activate") 1905 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1842} 1910}
1843 1911
1844sub _draw { 1912sub _draw {
1845 my ($self) = @_; 1913 my ($self) = @_;
1846 1914
1847 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1848
1849 if ($GRAB == $self) {
1850 $self->{fg} = $self->{active_fg};
1851 }
1852 1916
1853 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1855 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1856 1920
… …
1875 1939
1876sub new { 1940sub new {
1877 my $class = shift; 1941 my $class = shift;
1878 1942
1879 $class->SUPER::new ( 1943 $class->SUPER::new (
1880 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1881 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 1950 state => 0,
… …
1889} 1954}
1890 1955
1891sub size_request { 1956sub size_request {
1892 my ($self) = @_; 1957 my ($self) = @_;
1893 1958
1894 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1895} 1960}
1896 1961
1897sub button_down { 1962sub button_down {
1898 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1899 1964
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1903 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1904 } 1973 1
1905} 1974}
1906 1975
1907sub _draw { 1976sub _draw {
1908 my ($self) = @_; 1977 my ($self) = @_;
1909 1978
1910 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1911 1980
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 1982
1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915 1986
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 1988
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 1990
… …
2074 2145
2075 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2076 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2077 2148
2078 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2079 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2080 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2082 2154
2083 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2084 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2184 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2191 vertical => 0, 2263 vertical => 0,
2192 can_hover => 1, 2264 can_hover => 1,
2193 inner_pad => 0.02, 2265 inner_pad => 0.02,
2194 @_ 2266 @_
2195 ); 2267 );
… …
2198 $self->update; 2270 $self->update;
2199 2271
2200 $self 2272 $self
2201} 2273}
2202 2274
2275sub changed { }
2276
2203sub set_range { 2277sub set_range {
2204 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2205 2279
2206 ($range, $self->{range}) = ($self->{range}, $range); 2280 ($range, $self->{range}) = ($self->{range}, $range);
2207 2281
… …
2233} 2307}
2234 2308
2235sub size_request { 2309sub size_request {
2236 my ($self) = @_; 2310 my ($self) = @_;
2237 2311
2238 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2313}
2243 2314
2244sub button_down { 2315sub button_down {
2245 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2246 2317
2247 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2248 2319
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2321
2251 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2252} 2323}
2253 2324
2254sub mouse_motion { 2325sub mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2256 2327
… …
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2332
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2334
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2265 } 2340 1
2266} 2341}
2267 2342
2268sub update { 2343sub update {
2269 my ($self) = @_; 2344 my ($self) = @_;
2270 2345
2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2272 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2273 2355
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2276 2358
… …
2282 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2284 2366
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2287 }); 2369 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2370
2295 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2296 2372
2297 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2298 2374
… …
2492 2568
2493 delete $self->{texture}; 2569 delete $self->{texture};
2494 } 2570 }
2495 2571
2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2497 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2498 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2499 2575
2500 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2501 2577
2502 my $y0 = $top; 2578 my $y0 = $top;
… …
2537sub _draw { 2613sub _draw {
2538 my ($self) = @_; 2614 my ($self) = @_;
2539 2615
2540 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2542 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2543 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2544 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2545 2621
2546 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2547 2623
2548} 2624}
… …
2631} 2707}
2632 2708
2633sub set_tooltip_from { 2709sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2635 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2636 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2724 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2726 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2653 2738
2654sub size_allocate { 2739sub size_allocate {
2655 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2656 2741
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2658} 2761}
2659 2762
2660sub _draw { 2763sub _draw {
2661 my ($self) = @_; 2764 my ($self) = @_;
2662 2765
… …
2679 glVertex $w, $h; 2782 glVertex $w, $h;
2680 glVertex $w, 0; 2783 glVertex $w, 0;
2681 glEnd; 2784 glEnd;
2682 2785
2683 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2684 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2685} 2789}
2686 2790
2687############################################################################# 2791#############################################################################
2688 2792
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2852
2749 if ($tex) { 2853 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2755 } 2859 }
2756} 2860}
2757 2861
… …
2764 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2765} 2869}
2766 2870
2767############################################################################# 2871#############################################################################
2768 2872
2769package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2770 2874
2771our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2772 2876
2773sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813 2878
2814############################################################################# 2879#############################################################################
2815 2880
2816package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2817 2882
… …
2858 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2924 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2861 2926
2862 $self->show; 2927 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 2929}
2865 2930
2866sub mouse_motion { 2931sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2868 2933
2869 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2872} 2939}
2873 2940
2874sub button_up { 2941sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2876 2943
… …
2878 undef $GRAB; 2945 undef $GRAB;
2879 $self->hide; 2946 $self->hide;
2880 2947
2881 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2883 } 2954 1
2884} 2955}
2885 2956
2886############################################################################# 2957#############################################################################
2887 2958
2888package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2889 2960
2890our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2891 2962
2892sub new { 2963sub new {
2893 my $class = shift; 2964 my $class = shift;
2894 2965
2895 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2896 fontsize => 0.8, 3075 fontsize => 0.8,
2897 @_, 3076 @_,
2898 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
2899} 3087}
2900 3088
2901sub reorder { 3089sub reorder {
2902 my ($self) = @_; 3090 my ($self) = @_;
2903 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2904 3092
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3095 }
2908 3096
… …
2910 3098
2911 my @items = sort { 3099 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2915 3105
2916 my $count = 10 + 1; 3106 my $count = 10 + 1;
2917 for my $item (@items) { 3107 for my $item (@items) {
2918 last unless --$count; 3108 last unless --$count;
2919 3109
… …
2934 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2939 can_events => 1, 3130 can_events => 1,
2940 can_hover => 1 3131 can_hover => 1
2941 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2942 } 3143 }
2943 3144
2944 $self->clear; 3145 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2946} 3147}
… …
2951 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2953 3154
2954 return unless $text; 3155 return unless $text;
2955 3156
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3158
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3160
2960 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
2991 3192
2992 $self->reorder; 3193 $self->reorder;
2993 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
2994} 3195}
2995 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
2996############################################################################# 3205#############################################################################
2997 3206
2998package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
2999 3208
3000our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002use CFClient::OpenGL;
3003 3210
3004sub new { 3211sub new {
3005 my $class = shift; 3212 my $class = shift;
3006 3213
3007 $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
3456 @_,
3457 )
3458}
3459
3460# XXX: Do sorting? Argl...
3461sub add_spell {
3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
3464
3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root;
3503
3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3507
3508use CFClient::OpenGL;
3509
3510sub new {
3511 my $class = shift;
3512
3513 my $self = $class->SUPER::new (
3008 visible => 1, 3514 visible => 1,
3009 @_, 3515 @_,
3010 ) 3516 );
3011}
3012 3517
3013sub configure { 3518 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3519
3016 $self->{w} = $w; 3520 $self
3017 $self->{h} = $h;
3018}
3019
3020sub check_size {
3021 my ($self) = @_;
3022
3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
3025} 3521}
3026 3522
3027sub size_request { 3523sub size_request {
3028 my ($self) = @_; 3524 my ($self) = @_;
3029 3525
3030 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
3031} 3541}
3032 3542
3033sub size_allocate { 3543sub size_allocate {
3034 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
3035 3545
3036 for my $child ($self->children) { 3546 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3548
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3041 3551
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3554
3051 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
3052 } 3556 }
3053} 3557}
3054 3558
… …
3065} 3569}
3066 3570
3067sub update { 3571sub update {
3068 my ($self) = @_; 3572 my ($self) = @_;
3069 3573
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3072} 3575}
3073 3576
3074sub add { 3577sub add {
3075 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3076 3579
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3580 $_->{is_toplevel} = 1
3085 3581 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3582
3091 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3092} 3584}
3093 3585
3094sub remove { 3586sub remove {
3095 my ($self, @children) = @_; 3587 my ($self, @children) = @_;
3096 3588
3097 $self->SUPER::remove (@children); 3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3098 3593
3099 while (@children) { 3594 while (@children) {
3100 my $w = pop @children; 3595 my $w = pop @children;
3101 push @children, $w->children; 3596 push @children, $w->children;
3102 $w->set_invisible; 3597 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3122 $_->() 3617 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3124 } 3619 }
3125 3620
3126 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3622 my %queue;
3127 my @queue; 3623 my @queue;
3624 my $widget;
3128 3625
3129 for (;;) { 3626 outer:
3130 if ($self->{check_size}) { 3627 while () {
3131 #TODO use array-of-depth approach 3628 if (my $realloc = delete $self->{realloc}) {
3629 for $widget (values %$realloc) {
3630 $widget->{visible} or next; # do not resize invisible widgets
3132 3631
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3632 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
3135 } 3636 }
3136 3637
3638 while () {
3639 @queue or last outer;
3640
3137 my $widget = pop @queue || last; 3641 $widget = pop @{ $queue[-1] || [] }
3138 3642 and last;
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 3643
3644 pop @queue;
3645 }
3646
3647 delete $queue{$widget+0};
3648
3649 my ($w, $h) = $widget->size_request;
3650
3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656
3657 $w = $widget->{force_w} if exists $widget->{force_w};
3658 $h = $widget->{force_h} if exists $widget->{force_h};
3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
3149 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3151 3664
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3153 3666
3154 $widget->{parent}->check_size
3155 if $widget->{parent}; 3667 if (my $parent = $widget->{parent}) {
3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
3156 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3157 } 3677 }
3158 } 3678 }
3159 3679
3160 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 my ($widget, $w, $h) = @$_; 3682 values %$size_alloc;
3683
3684 while () {
3685 my $widget = pop @queue || last;
3686
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163 3688
3164 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3166 3691
3692 $w = int $w + 0.5;
3693 $h = int $h + 0.5;
3694
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3698
3167 $widget->{w} = $w; 3699 $widget->{w} = $w;
3168 $widget->{h} = $h; 3700 $widget->{h} = $h;
3701
3169 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3170 } 3704 }
3171 } 3705 }
3172 3706
3173 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3174 $_->() 3708 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3176 } 3710 }
3711
3177 3712
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3181 3716
… …
3183 glLoadIdentity; 3718 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3721 glLoadIdentity;
3187 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
3188 $self->_draw; 3730 $self->_draw;
3189} 3731}
3190 3732
3191############################################################################# 3733#############################################################################
3192 3734

Diff Legend

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