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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
19 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
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};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
20sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
21 if (!$GRAB) { 47 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
26 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
27 54
28 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
29 56
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 58
32 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 60 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
… …
153sub rescale_widgets { 171sub rescale_widgets {
154 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
155 173
156 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 189 }
167 } 190 }
168 191
169 reconfigure_widgets; 192 reconfigure_widgets;
170} 193}
… …
179 202
180sub new { 203sub new {
181 my $class = shift; 204 my $class = shift;
182 205
183 my $self = bless { 206 my $self = bless {
184 x => 0, 207 x => "center",
185 y => 0, 208 y => "center",
186 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
187 can_events => 1, 212 can_events => 1,
188 @_ 213 @_
189 }, $class; 214 }, $class;
190 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
191 for (keys %$self) { 218 for (keys %$self) {
192 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
194 } 221 }
195 } 222 }
196 223
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
234 }
198 235
199 $self 236 $self
200} 237}
201 238
202sub destroy { 239sub destroy {
… …
206 %$self = (); 243 %$self = ();
207} 244}
208 245
209sub show { 246sub show {
210 my ($self) = @_; 247 my ($self) = @_;
248
211 return if $self->{parent}; 249 return if $self->{parent};
212 250
213 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
214} 252}
215 253
216sub show_centered { 254sub set_visible {
217 my ($self) = @_; 255 my ($self) = @_;
256
218 return if $self->{parent}; 257 return if $self->{visible};
219 258
220 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
221 261
222 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 263
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
225 }, 265
226 ); 266 $_->set_visible for $self->children;
227} 267}
228 268
229sub set_invisible { 269sub set_invisible {
230 my ($self) = @_; 270 my ($self) = @_;
231 271
232 # broken show/hide model 272 return unless $self->{visible};
233 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
234 delete $self->{visible}; 277 delete $self->{visible};
235 278
236 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
238 281
239 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
241 284
242 $self->focus_out; 285 $self->focus_out;
286
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;
243} 305}
244 306
245sub hide { 307sub hide {
246 my ($self) = @_; 308 my ($self) = @_;
247 309
… …
249 311
250 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
251 if $self->{parent}; 313 if $self->{parent};
252} 314}
253 315
254sub move { 316sub move_abs {
255 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
256 318
257 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
258 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
259 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
260 322
261 $self->update; 323 $self->update;
262} 324}
263 325
264sub set_size { 326sub set_size {
265 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
266 328
267 $self->{user_w} = $w; 329 $self->{force_w} = $w;
268 $self->{user_h} = $h; 330 $self->{force_h} = $h;
269 331
270 $self->check_size; 332 $self->realloc;
271} 333}
272 334
273sub size_request { 335sub size_request {
274 require Carp; 336 require Carp;
275 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
277 339
278sub configure { 340sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
280 342
281 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
284 348
285 # use alignment to adjust x, y 349 # use alignment to adjust x, y
286 350
287 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 353 }
292 354
293 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 356 $self->{x} = $x;
295 $self->{y} = $y; 357 $self->{y} = $y;
296 $self->update; 358 $self->update;
297 } 359 }
298 360
299 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300 $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;
301 } 368 }
302} 369}
303 370
304sub size_allocate { 371sub size_allocate {
305 # nothing to be done 372 # nothing to be done
306} 373}
307 374
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313}
314
315sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
316} 381}
317 382
318sub set_max_size { 383sub set_max_size {
319 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
320 385
321 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
322 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
323} 390}
324 391
325sub set_tooltip { 392sub set_tooltip {
326 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
327 394
… …
379 446
380 $::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
381 unless $FOCUS; 448 unless $FOCUS;
382} 449}
383 450
384sub mouse_motion { } 451sub mouse_motion { 0 }
385sub button_up { } 452sub button_up { 0 }
386sub key_down { } 453sub key_down { 0 }
387sub key_up { } 454sub key_up { 0 }
388 455
389sub button_down { 456sub button_down {
390 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
391 458
392 $self->focus_in; 459 $self->focus_in;
393}
394 460
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
399sub 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
400 537
401sub draw { 538sub draw {
402 my ($self) = @_; 539 my ($self) = @_;
403 540
404 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);
405 552
406 glPushMatrix; 553 glPushMatrix;
407 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
408 $self->_draw;
409 glPopMatrix;
410 555
411 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
412 my ($x, $y) = @$self{qw(x y)};
413
414 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
415 glEnable GL_BLEND; 558 glEnable GL_BLEND;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
417 glBegin GL_QUADS; 560 glBegin GL_QUADS;
418 glVertex $x , $y; 561 glVertex 0 , 0;
419 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
420 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
421 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
422 glEnd; 565 glEnd;
423 glDisable GL_BLEND; 566 glDisable GL_BLEND;
424 } 567 }
425 568
426 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 570 glPushMatrix;
428 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
430 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 574 glVertex 0 , 0;
432 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
433 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
434 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
435 glEnd; 578 glEnd;
436 glPopMatrix; 579 glPopMatrix;
437 #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;
438 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
439} 585}
440 586
441sub _draw { 587sub _draw {
442 my ($self) = @_; 588 my ($self) = @_;
443 589
444 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
445}
446
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505} 591}
506 592
507sub DESTROY { 593sub DESTROY {
508 my ($self) = @_; 594 my ($self) = @_;
509 595
… …
541 627
542 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
543 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
544 630
545 glEnable GL_BLEND; 631 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glColor @$color; 633 glColor_premultiply @$color;
548 634
549 glBegin GL_QUADS; 635 glBegin GL_QUADS;
550 glVertex 0 , 0; 636 glVertex 0 , 0;
551 glVertex 0 , $h; 637 glVertex 0 , $h;
552 glVertex $w, $h; 638 glVertex $w, $h;
… …
567 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
569} 655}
570 656
571sub size_request { 657sub size_request {
572 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
573} 661}
574 662
575sub draw { } 663sub draw { }
576 664
577############################################################################# 665#############################################################################
… …
581our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
582 670
583sub new { 671sub new {
584 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
585 673
586 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
587 675
588 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
589 children => [], 677 children => [],
590 can_events => 0, 678 can_events => 0,
591 %arg, 679 %arg,
592 ); 680 );
681
593 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
594 684
595 $self 685 $self
596} 686}
597 687
598sub add { 688sub add {
… …
606 $self->{children} = [ 696 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
609 ]; 699 ];
610 700
611 $self->check_size (1); 701 $self->realloc;
612 $self->update;
613} 702}
614 703
615sub children { 704sub children {
616 @{ $_[0]{children} } 705 @{ $_[0]{children} }
617} 706}
… …
622 delete $child->{parent}; 711 delete $child->{parent};
623 $child->hide; 712 $child->hide;
624 713
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 715
627 $self->check_size (1); 716 $self->realloc;
628 $self->update;
629} 717}
630 718
631sub clear { 719sub clear {
632 my ($self) = @_; 720 my ($self) = @_;
633 721
… …
637 for (@$children) { 725 for (@$children) {
638 delete $_->{parent}; 726 delete $_->{parent};
639 $_->hide; 727 $_->hide;
640 } 728 }
641 729
642 $self->check_size; 730 $self->realloc;
643 $self->update;
644} 731}
645 732
646sub find_widget { 733sub find_widget {
647 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
648 735
649 $x -= $self->{x}; 736 $x -= $self->{x};
650 $y -= $self->{y}; 737 $y -= $self->{y};
651 738
652 my $res; 739 my $res;
653 740
654 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
655 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
656 and return $res; 743 and return $res;
657 } 744 }
658 745
659 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
708 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
709} 796}
710 797
711############################################################################# 798#############################################################################
712 799
800# back-buffered drawing area
801
713package CFClient::UI::Window; 802package CFClient::UI::Window;
714 803
715our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
716 805
717use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
735 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
736 $self->update; 825 $self->update;
737} 826}
738 827
739sub _render { 828sub _render {
829 my ($self) = @_;
830
740 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
741} 832}
742 833
743sub render_child { 834sub render_child {
744 my ($self) = @_; 835 my ($self) = @_;
745 836
746 $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 {
747 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
749 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
750 $self->_render; 848 $self->_render;
751 }; 849 };
752} 850}
753 851
754sub _draw { 852sub _draw {
755 my ($self) = @_; 853 my ($self) = @_;
756 854
757 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
758 856
759 my $tex = $self->{texture} 857 my $tex = $self->{texture}
760 or return; 858 or return;
761 859
762 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
764 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
765 863
766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
767 865
768 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
769} 867}
… …
785} 883}
786 884
787sub size_request { 885sub size_request {
788 my ($self) = @_; 886 my ($self) = @_;
789 887
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 889
792 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
793} 894}
794 895
795sub size_allocate { 896sub size_allocate {
796 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
797 898
899 my $child = $self->child;
900
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 903
801 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
802 $self->update; 905 $self->update;
803} 906}
804 907
… …
840} 943}
841 944
842sub _render { 945sub _render {
843 my ($self) = @_; 946 my ($self) = @_;
844 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
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846 952
847 $self->SUPER::_render; 953 $self->SUPER::_render;
848} 954}
849 955
… …
852package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
853 959
854our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
855 961
856sub new { 962sub new {
857 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
858 966
859 my $self; 967 my $self;
860 968
861 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
862 vertical => 1, 970 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 972 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
866 }, 974 },
867 ; 975 ;
868 976
869 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
870 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
871 slider => $slider, 979 slider => $slider,
872 @_, 980 %arg,
873 ); 981 );
874 982
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
878 985
879 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
880} 993}
881 994
882sub update { 995sub update {
883 my ($self) = @_; 996 my ($self) = @_;
884 997
… …
923 1036
924 if ($self->{bg}) { 1037 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
926 1039
927 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
929 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
930 1043
931 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
932 glVertex 0 , 0; 1045 glVertex 0 , 0;
933 glVertex 0 , $h; 1046 glVertex 0 , $h;
934 glVertex $w, $h; 1047 glVertex $w, $h;
… …
947 1060
948our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
949 1062
950use CFClient::OpenGL; 1063use CFClient::OpenGL;
951 1064
952my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 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);
955 1072
956sub new { 1073sub new {
957 my $class = shift; 1074 my ($class, %arg) = @_;
958 1075
959 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
960 1077
961 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1081 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1082 can_events => 1,
967 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
968 ); 1086 );
969 1087
970 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
971 align => 0, 1089 align => 0,
972 valign => 1, 1090 valign => 1,
973 text => $self->{title}, 1091 text => $title,
974 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
975 1094
976 $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};
977} 1103}
978 1104
979sub border { 1105sub border {
980 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
981} 1107}
982 1108
983sub size_request { 1109sub size_request {
984 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
985 1114
986 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
987 1116
988 ( 1117 (
989 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
992} 1121}
993 1122
994sub size_allocate { 1123sub size_allocate {
995 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
996 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
997 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
999 1136
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001 if $self->{title};
1002
1003 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1004} 1138}
1005 1139
1006sub button_down { 1140sub button_down {
1007 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1008 1142
… …
1024 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1025 1159
1026 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1028 1162
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size; 1167 $self->realloc;
1033 }; 1168 };
1034 1169
1035 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1174 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1041 1176
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1178
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1046 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1047 } 1187 1
1048} 1188}
1049 1189
1050sub button_up { 1190sub button_up {
1051 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1052 1192
1053 delete $self->{motion}; 1193 !!delete $self->{motion}
1054} 1194}
1055 1195
1056sub mouse_motion { 1196sub mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1058 1198
1059 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1060} 1202}
1061 1203
1062sub _draw { 1204sub _draw {
1063 my ($self) = @_; 1205 my ($self) = @_;
1064 1206
1207 my $child = $self->{children}[0];
1208
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1211
1068 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1214
1071 my $border = $self->border; 1215 my $border = $self->border;
1072 1216
1073 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1222
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1081 1225
1082 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1231 }
1093 1232
1094 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1095 1234
1096 $self->{title}->draw if $self->{title};
1097
1098 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1099} 1241}
1100 1242
1101############################################################################# 1243#############################################################################
1102 1244
1103package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1125 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1126 1268
1127 $child->set_parent ($self); 1269 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1129 1271
1130 $self->check_size (1); 1272 $self->realloc;
1131} 1273}
1132 1274
1133# 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?
1134sub clear { 1276sub clear {
1135 my ($self) = @_; 1277 my ($self) = @_;
… …
1140 for (@children) { 1282 for (@children) {
1141 delete $_->{parent}; 1283 delete $_->{parent};
1142 $_->hide; 1284 $_->hide;
1143 } 1285 }
1144 1286
1145 $self->check_size (1); 1287 $self->realloc;
1146 $self->update;
1147} 1288}
1148 1289
1149sub get_wh { 1290sub get_wh {
1150 my ($self) = @_; 1291 my ($self) = @_;
1151 1292
… …
1247 } 1388 }
1248} 1389}
1249 1390
1250############################################################################# 1391#############################################################################
1251 1392
1252package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1394
1256our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1257 1396
1258sub size_request { 1397sub size_request {
1259 my ($self) = @_; 1398 my ($self) = @_;
1260 1399
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1262 1401 ? (
1263 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1404 )
1266 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1267} 1409}
1268 1410
1269sub size_allocate { 1411sub size_allocate {
1270 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1271 1413
1272 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1415 my $children = $self->{children};
1275 1416
1276 my @h = map $_->{req_w}, @$children; 1417 my @req;
1277 1418
1278 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1279 1420 @req = ($space / (@$children || 1)) x @$children;
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } 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 {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 } 1435 }
1294 } 1436 }
1295 1437
1296 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1297 1439
1298 my $y = 0; 1440 my $pos = 0;
1299 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1444
1304 $y += $h; 1445 $pos += $alloc;
1305 } 1446 }
1306 1447
1307 1 1448 1
1308} 1449}
1309 1450
1310############################################################################# 1451#############################################################################
1311 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
1312package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1313 1469
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1317 1471
1318sub size_request { 1472sub new {
1319 my ($self) = @_; 1473 my $class = shift;
1320 1474
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1322 1476 vertical => 1,
1323 ( 1477 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1478 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1479}
1367 1480
1368############################################################################# 1481#############################################################################
1369 1482
1370package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1387 ellipsise => 3, # end 1500 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1389 fontsize => 1, 1502 fontsize => 1,
1390 align => -1, 1503 align => -1,
1391 valign => -1, 1504 valign => -1,
1392 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1393 can_events => 0, 1507 can_events => 0,
1394 %arg 1508 %arg
1395 ); 1509 );
1396 1510
1397 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1424 1538
1425 delete $self->{texture}; 1539 delete $self->{texture};
1426 $self->SUPER::update; 1540 $self->SUPER::update;
1427} 1541}
1428 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1429sub set_text { 1550sub set_text {
1430 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1431 1552
1432 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1433 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1434 1555
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1437 1559
1560 $self->realloc;
1438 $self->update; 1561 $self->update;
1439 $self->check_size;
1440} 1562}
1441 1563
1442sub set_markup { 1564sub set_markup {
1443 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1444 1566
… …
1447 1569
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1571
1450 $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;
1451 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1452 1575
1576 $self->realloc;
1453 $self->update; 1577 $self->update;
1454 $self->check_size;
1455} 1578}
1456 1579
1457sub size_request { 1580sub size_request {
1458 my ($self) = @_; 1581 my ($self) = @_;
1459 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1460 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1461 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1462 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1465 1591
1466 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1467 1593
1468 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1469 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1470 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1471 1597
1472 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1473 1599
1474 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1476 } 1602 }
1477 1603
1604 ($w, $h)
1478 ( 1605 }
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1606}
1483 1607
1484sub size_allocate { 1608sub size_allocate {
1485 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1486 1610
1611 delete $self->{ox};
1612
1487 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488} 1615}
1489 1616
1490sub set_fontsize { 1617sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1492 1619
1493 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1621 delete $self->{texture};
1495 1622
1496 $self->update; 1623 $self->realloc;
1497 $self->check_size;
1498} 1624}
1499 1625
1500sub _draw { 1626sub _draw {
1501 my ($self) = @_; 1627 my ($self) = @_;
1502 1628
… …
1508 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1638
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1514 1641
1642 unless (exists $self->{ox}) {
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1518 1646
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1524 }; 1650 };
1525 1651
1526 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1528 1654
1655 glColor_premultiply @{$self->{fg}}
1529 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1530 glColor @{$self->{fg}}; 1657
1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1532 } else {
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1534 }
1535 1659
1536 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1537} 1661}
1538 1662
1539############################################################################# 1663#############################################################################
… …
1566 1690
1567 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1568 1692
1569 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1570 1694
1571 delete $self->{texture};
1572
1573 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1574 $self->{text} = $text; 1696 $self->{text} = $text;
1575 1697
1576 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1577 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1578 1701
1579 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1580} 1706}
1581 1707
1582sub set_text { 1708sub set_text {
1583 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1584 1710
1585 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1712 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589} 1713}
1590 1714
1591sub get_text { 1715sub get_text {
1592 $_[0]{text} 1716 $_[0]{text}
1593} 1717}
… …
1623 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 1749 $self->_emit ('escape');
1626 } elsif ($uni) { 1750 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1628 } 1754 }
1629 1755
1630 $self->_set_text ($text); 1756 $self->_set_text ($text);
1631 $self->update; 1757
1632 $self->check_size; 1758 $self->realloc;
1759
1760 1
1633} 1761}
1634 1762
1635sub focus_in { 1763sub focus_in {
1636 my ($self) = @_; 1764 my ($self) = @_;
1637 1765
… …
1652 utf8::encode $text; 1780 utf8::encode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1654 1782
1655 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1656 $self->update; 1784 $self->update;
1785
1786 1
1657} 1787}
1658 1788
1659sub mouse_motion { 1789sub mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1661# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1791# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1792
1793 0
1662} 1794}
1663 1795
1664sub _draw { 1796sub _draw {
1665 my ($self) = @_; 1797 my ($self) = @_;
1666 1798
1667 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1668 1800
1669 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1670 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1671 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1672 } else { 1804 } else {
1673 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1674 } 1806 }
1675 1807
1676 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1677 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1678 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1679 glVertex 0 , 0; 1811 glVertex 0 , 0;
1680 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1681 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1682 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1743 } else { 1875 } else {
1744 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1745 } 1877 }
1746 1878
1747 } else { 1879 } else {
1748 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1749 } 1883 1
1750
1751} 1884}
1752 1885
1753############################################################################# 1886#############################################################################
1754 1887
1755package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1764 1897
1765sub new { 1898sub new {
1766 my $class = shift; 1899 my $class = shift;
1767 1900
1768 $class->SUPER::new ( 1901 $class->SUPER::new (
1769 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1770 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1772 can_hover => 1, 1906 can_hover => 1,
1773 align => 0, 1907 align => 0,
1774 valign => 0, 1908 valign => 0,
… …
1783 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1784 1918
1785 $self->emit ("activate") 1919 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 1921 && $y >= 0 && $y < $self->{h};
1922
1923 1
1788} 1924}
1789 1925
1790sub _draw { 1926sub _draw {
1791 my ($self) = @_; 1927 my ($self) = @_;
1792 1928
1793 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1794
1795 if ($GRAB == $self) {
1796 $self->{fg} = $self->{active_fg};
1797 }
1798 1930
1799 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1802 1934
… …
1821 1953
1822sub new { 1954sub new {
1823 my $class = shift; 1955 my $class = shift;
1824 1956
1825 $class->SUPER::new ( 1957 $class->SUPER::new (
1826 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1827 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 1962 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 1963 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 1964 state => 0,
… …
1835} 1968}
1836 1969
1837sub size_request { 1970sub size_request {
1838 my ($self) = @_; 1971 my ($self) = @_;
1839 1972
1840 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1841} 1974}
1842 1975
1843sub button_down { 1976sub button_down {
1844 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1845 1978
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1849 $self->_emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1850 } 1987 1
1851} 1988}
1852 1989
1853sub _draw { 1990sub _draw {
1854 my ($self) = @_; 1991 my ($self) = @_;
1855 1992
1856 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1857 1994
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 1996
1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1997 my ($w, $h) = @$self{qw(w h)};
1998
1999 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1861 2000
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 2002
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 2004
… …
2020 2159
2021 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2022 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2023 2162
2024 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2025 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2026 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2027 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2028 2168
2029 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2030 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2130 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2272 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2273 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2274 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2275 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2276 min_h => $::WIDTH / 80,
2137 vertical => 0, 2277 vertical => 0,
2138 can_hover => 1, 2278 can_hover => 1,
2139 inner_pad => 0.02, 2279 inner_pad => 0.02,
2140 @_ 2280 @_
2141 ); 2281 );
… …
2144 $self->update; 2284 $self->update;
2145 2285
2146 $self 2286 $self
2147} 2287}
2148 2288
2289sub changed { }
2290
2149sub set_range { 2291sub set_range {
2150 my ($self, $range) = @_; 2292 my ($self, $range) = @_;
2151 2293
2152 ($range, $self->{range}) = ($self->{range}, $range); 2294 ($range, $self->{range}) = ($self->{range}, $range);
2153 2295
… …
2179} 2321}
2180 2322
2181sub size_request { 2323sub size_request {
2182 my ($self) = @_; 2324 my ($self) = @_;
2183 2325
2184 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2327}
2189 2328
2190sub button_down { 2329sub button_down {
2191 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2192 2331
2193 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2194 2333
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2335
2197 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2198} 2337}
2199 2338
2200sub mouse_motion { 2339sub mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2202 2341
… …
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2346
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2348
2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2349 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2350 } else {
2351 return 0;
2352 }
2353
2211 } 2354 1
2212} 2355}
2213 2356
2214sub update { 2357sub update {
2215 my ($self) = @_; 2358 my ($self) = @_;
2216 2359
2217 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2360 delete $self->{knob_w};
2361 $self->SUPER::update;
2362}
2363
2364sub _draw {
2365 my ($self) = @_;
2366
2367 unless ($self->{knob_w}) {
2218 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2219 2369
2220 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2222 2372
… …
2228 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2229 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2230 2380
2231 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2233 }); 2383 }
2234
2235 $self->SUPER::update;
2236}
2237
2238sub _draw {
2239 my ($self) = @_;
2240 2384
2241 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2242 2386
2243 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2244 2388
… …
2438 2582
2439 delete $self->{texture}; 2583 delete $self->{texture};
2440 } 2584 }
2441 2585
2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2443 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2444 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2445 2589
2446 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2447 2591
2448 my $y0 = $top; 2592 my $y0 = $top;
… …
2483sub _draw { 2627sub _draw {
2484 my ($self) = @_; 2628 my ($self) = @_;
2485 2629
2486 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2488 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2489 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2490 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2491 2635
2492 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2493 2637
2494} 2638}
… …
2543 2687
2544sub new { 2688sub new {
2545 my $class = shift; 2689 my $class = shift;
2546 2690
2547 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2548 state => 0, 2692 state => 0,
2549 connect_activate => \&toggle_flopper, 2693 on_activate => \&toggle_flopper,
2550 @_ 2694 @_
2551 ); 2695 );
2552 2696
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2697 $self
2559} 2698}
2560 2699
2561sub toggle_flopper { 2700sub toggle_flopper {
2562 my ($self) = @_; 2701 my ($self) = @_;
2563 2702
2564 # TODO: use animation 2703 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2704}
2576 2705
2577############################################################################# 2706#############################################################################
2578 2707
2579package CFClient::UI::Tooltip; 2708package CFClient::UI::Tooltip;
… …
2592} 2721}
2593 2722
2594sub set_tooltip_from { 2723sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2724 my ($self, $widget) = @_;
2596 2725
2726 my $tooltip = $widget->{tooltip};
2727
2728 if ($ENV{CFPLUS_DEBUG} & 2) {
2729 $tooltip .= "\n\n" . (ref $widget) . "\n"
2730 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2731 . "req $widget->{req_w} $widget->{req_h}\n"
2732 . "visible $widget->{visible}";
2733 }
2734
2597 $self->add (new CFClient::UI::Label 2735 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip}, 2736 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2738 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2739 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2740 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2614 2752
2615sub size_allocate { 2753sub size_allocate {
2616 my ($self, $w, $h) = @_; 2754 my ($self, $w, $h) = @_;
2617 2755
2618 $self->SUPER::size_allocate ($w - 4, $h - 4); 2756 $self->SUPER::size_allocate ($w - 4, $h - 4);
2757}
2758
2759sub visibility_change {
2760 my ($self, $visible) = @_;
2761
2762 return unless $visible;
2763
2764 $self->{root}->on_post_alloc ("move_$self" => sub {
2765 my $widget = $self->{owner}
2766 or return;
2767
2768 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2769
2770 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2771 if $x + $self->{w} > $::WIDTH;
2772
2773 $self->move_abs ($x, $y);
2774 });
2619} 2775}
2620 2776
2621sub _draw { 2777sub _draw {
2622 my ($self) = @_; 2778 my ($self) = @_;
2623 2779
… …
2640 glVertex $w, $h; 2796 glVertex $w, $h;
2641 glVertex $w, 0; 2797 glVertex $w, 0;
2642 glEnd; 2798 glEnd;
2643 2799
2644 glTranslate 2 - 0.375, 2 - 0.375; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2801
2645 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2646} 2803}
2647 2804
2648############################################################################# 2805#############################################################################
2649 2806
… …
2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2709 2866
2710 if ($tex) { 2867 if ($tex) {
2711 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2713 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2715 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2716 } 2873 }
2717} 2874}
2718 2875
… …
2725 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2726} 2883}
2727 2884
2728############################################################################# 2885#############################################################################
2729 2886
2730package CFClient::UI::Inventory; 2887package CFClient::UI::Buttonbar;
2731 2888
2732our @ISA = CFClient::UI::ScrolledWindow::; 2889our @ISA = CFClient::UI::HBox::;
2733 2890
2734sub new { 2891# TODO: should actualyl wrap buttons and other goodies.
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774 2892
2775############################################################################# 2893#############################################################################
2776 2894
2777package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2778 2896
… …
2819 # maybe save $GRAB? must be careful about events... 2937 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 2938 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 2939 $self->{button} = $ev->{button};
2822 2940
2823 $self->show; 2941 $self->show;
2824 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2942 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825} 2943}
2826 2944
2827sub mouse_motion { 2945sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2829 2947
2830 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2833} 2953}
2834 2954
2835sub button_up { 2955sub button_up {
2836 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2837 2957
… …
2839 undef $GRAB; 2959 undef $GRAB;
2840 $self->hide; 2960 $self->hide;
2841 2961
2842 $self->_emit ("popdown"); 2962 $self->_emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2844 } 2968 1
2845} 2969}
2846 2970
2847############################################################################# 2971#############################################################################
2848 2972
2849package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2850 2974
2851our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2852 2976
2853sub new { 2977sub new {
2854 my $class = shift; 2978 my $class = shift;
2855 2979
2856 $class->SUPER::new ( 2980 my $self = $class->SUPER::new (
2981 @_,
2982 );
2983
2984 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} };
2986
2987 $self
2988}
2989
2990sub add {
2991 my ($self, @widgets) = @_;
2992
2993 $self->SUPER::add (@widgets);
2994
2995 $self->{current} = $self->{children}[0]
2996 if @{ $self->{children} };
2997}
2998
2999sub set_current_page {
3000 my ($self, $page_or_widget) = @_;
3001
3002 my $widget = ref $page_or_widget
3003 ? $page_or_widget
3004 : $self->{children}[$page_or_widget];
3005
3006 $self->{current} = $widget;
3007 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3008
3009 $self->_emit (page_changed => $self->{current});
3010
3011 $self->realloc;
3012}
3013
3014sub visible_children {
3015 $_[0]{current}
3016}
3017
3018sub size_request {
3019 my ($self) = @_;
3020
3021 $self->{current}->size_request
3022}
3023
3024sub size_allocate {
3025 my ($self, $w, $h) = @_;
3026
3027 $self->{current}->configure (0, 0, $w, $h);
3028}
3029
3030sub _draw {
3031 my ($self) = @_;
3032
3033 $self->{current}->draw;
3034}
3035
3036#############################################################################
3037
3038package CFClient::UI::Notebook;
3039
3040our @ISA = CFClient::UI::VBox::;
3041
3042sub new {
3043 my $class = shift;
3044
3045 my $self = $class->SUPER::new (
3046 buttonbar => (new CFClient::UI::Buttonbar),
3047 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3048 # filter => # will be put between multiplexer and $self
3049 @_,
3050 );
3051
3052 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3053 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3054
3055 $self
3056}
3057
3058sub add {
3059 my ($self, $title, $widget, $tooltip) = @_;
3060
3061 Scalar::Util::weaken $self;
3062
3063 $self->{buttonbar}->add (new CFClient::UI::Button
3064 markup => $title,
3065 tooltip => $tooltip,
3066 on_activate => sub { $self->set_current_page ($widget) },
3067 );
3068
3069 $self->{multiplexer}->add ($widget);
3070}
3071
3072sub set_current_page {
3073 my ($self, $page) = @_;
3074
3075 $self->{multiplexer}->set_current_page ($page);
3076 $self->_emit (page_changed => $self->{multiplexer}{current});
3077}
3078
3079#############################################################################
3080
3081package CFClient::UI::Statusbox;
3082
3083our @ISA = CFClient::UI::VBox::;
3084
3085sub new {
3086 my $class = shift;
3087
3088 my $self = $class->SUPER::new (
2857 fontsize => 0.8, 3089 fontsize => 0.8,
2858 @_, 3090 @_,
2859 ) 3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
2860} 3098}
2861 3099
2862sub reorder { 3100sub reorder {
2863 my ($self) = @_; 3101 my ($self) = @_;
2864 my $NOW = time; 3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
2865 3108
2866 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 } 3111 }
2869 3112
… …
2872 my @items = sort { 3115 my @items = sort {
2873 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2876 3119
3120 $self->{timer}->interval (1);
3121
2877 my $count = 10 + 1; 3122 my $count = 10 + 1;
2878 for my $item (@items) { 3123 for my $item (@items) {
2879 last unless --$count; 3124 last unless --$count;
2880 3125
2881 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text}; 3130 : $item->{text};
2886 3131
… …
2894 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2900 can_events => 1, 3145 can_events => 1,
2901 can_hover => 1 3146 can_hover => 1
2902 }; 3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
2903 } 3160 }
2904 3161
2905 $self->clear; 3162 $self->clear;
2906 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2907} 3164}
… …
2912 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2914 3171
2915 return unless $text; 3172 return unless $text;
2916 3173
2917 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2918 3175
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920 3177
2921 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
2952 3209
2953 $self->reorder; 3210 $self->reorder;
2954 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
2955} 3212}
2956 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
2957############################################################################# 3222#############################################################################
2958 3223
2959package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
2960 3225
2961our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963use CFClient::OpenGL;
2964 3227
2965sub new { 3228sub new {
2966 my $class = shift; 3229 my $class = shift;
2967 3230
2968 $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
2969 @_, 3473 @_,
2970 ) 3474 )
2971} 3475}
2972 3476
2973sub configure { 3477# XXX: Do sorting? Argl...
2974 my ($self, $x, $y, $w, $h) = @_; 3478sub add_spell {
2975
2976 $self->{w} = $w;
2977 $self->{h} = $h;
2978}
2979
2980sub check_size {
2981 my ($self) = @_; 3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
2982 3481
2983 $self->size_allocate ($self->{w}, $self->{h}) 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2984 if $self->{w}; 3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root;
3520
3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3524
3525use CFClient::OpenGL;
3526
3527sub new {
3528 my $class = shift;
3529
3530 my $self = $class->SUPER::new (
3531 visible => 1,
3532 @_,
3533 );
3534
3535 Scalar::Util::weaken ($self->{root} = $self);
3536
3537 $self
2985} 3538}
2986 3539
2987sub size_request { 3540sub size_request {
2988 my ($self) = @_; 3541 my ($self) = @_;
2989 3542
2990 ($self->{w}, $self->{h}) 3543 ($self->{w}, $self->{h})
3544}
3545
3546sub _to_pixel {
3547 my ($coord, $size, $max) = @_;
3548
3549 $coord =
3550 $coord eq "center" ? ($max - $size) * 0.5
3551 : $coord eq "max" ? $max
3552 : $coord;
3553
3554 $coord = 0 if $coord < 0;
3555 $coord = $max - $size if $coord > $max - $size;
3556
3557 int $coord + 0.5
2991} 3558}
2992 3559
2993sub size_allocate { 3560sub size_allocate {
2994 my ($self, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
2995 3562
2996 for my $child ($self->children) { 3563 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3564 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 3565
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3566 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3567 $Y = $child->{force_y} if exists $child->{force_y};
3001 3568
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3569 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3570 $Y = _to_pixel $Y, $H, $self->{h};
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 3571
3008 $child->configure ($X, $Y, $W, $H); 3572 $child->configure ($X, $Y, $W, $H);
3009 } 3573 }
3010} 3574}
3011 3575
… …
3022} 3586}
3023 3587
3024sub update { 3588sub update {
3025 my ($self) = @_; 3589 my ($self) = @_;
3026 3590
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3591 $::WANT_REFRESH++;
3029} 3592}
3030 3593
3031sub add { 3594sub add {
3032 my ($self, @children) = @_; 3595 my ($self, @children) = @_;
3033 3596
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3597 $_->{is_toplevel} = 1
3042 3598 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3599
3048 $self->SUPER::add (@children); 3600 $self->SUPER::add (@children);
3049} 3601}
3050 3602
3051sub remove { 3603sub remove {
3052 my ($self, @children) = @_; 3604 my ($self, @children) = @_;
3053 3605
3054 $self->SUPER::remove (@children); 3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3055 3610
3056 while (@children) { 3611 while (@children) {
3057 my $w = pop @children; 3612 my $w = pop @children;
3058 push @children, $w->children; 3613 push @children, $w->children;
3059 $w->set_invisible; 3614 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
3079 $_->() 3634 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3635 for values %{delete $self->{refresh_hook}};
3081 } 3636 }
3082 3637
3083 if ($self->{check_size}) { 3638 if ($self->{realloc}) {
3084 my @queue = ([], []); 3639 my %queue;
3640 my @queue;
3641 my $widget;
3085 3642
3086 for (;;) { 3643 outer:
3087 if ($self->{check_size}) { 3644 while () {
3088 # heuristic: check containers last 3645 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3646 for $widget (values %$realloc) {
3090 for values %{delete $self->{check_size}} 3647 $widget->{visible} or next; # do not resize invisible widgets
3648
3649 $queue{$widget+0}++ and next; # duplicates are common
3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
3091 } 3653 }
3092 3654
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3655 while () {
3656 @queue or last outer;
3094 3657
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3658 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3659 and last;
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 3660
3661 pop @queue;
3662 }
3663
3664 delete $queue{$widget+0};
3665
3666 my ($w, $h) = $widget->size_request;
3667
3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3673
3674 $w = $widget->{force_w} if exists $widget->{force_w};
3675 $h = $widget->{force_h} if exists $widget->{force_h};
3676
3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3678 || delete $widget->{force_realloc}) {
3103 $widget->{req_w} = $w; 3679 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3680 $widget->{req_h} = $h;
3105 3681
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3682 $self->{size_alloc}{$widget+0} = $widget;
3107 3683
3108 $widget->{parent}->check_size
3109 if $widget->{parent}; 3684 if (my $parent = $widget->{parent}) {
3685 $self->{realloc}{$parent+0} = $parent
3686 unless $queue{$parent+0};
3687
3688 $parent->{force_size_alloc} = 1;
3689 $self->{size_alloc}{$parent+0} = $parent;
3690 }
3110 } 3691 }
3692
3693 delete $self->{realloc}{$widget+0};
3111 } 3694 }
3112 } 3695 }
3113 3696
3114 while ($self->{size_alloc}) { 3697 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 my ($widget, $w, $h) = @$_; 3699 values %$size_alloc;
3700
3701 while () {
3702 my $widget = pop @queue || last;
3703
3704 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117 3705
3118 $w = 0 if $w < 0; 3706 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3707 $h = 0 if $h < 0;
3120 3708
3709 $w = int $w + 0.5;
3710 $h = int $h + 0.5;
3711
3712 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3713 $widget->{old_w} = $widget->{w};
3714 $widget->{old_h} = $widget->{h};
3715
3121 $widget->{w} = $w; 3716 $widget->{w} = $w;
3122 $widget->{h} = $h; 3717 $widget->{h} = $h;
3718
3123 $widget->emit (size_allocate => $w, $h); 3719 $widget->emit (size_allocate => $w, $h);
3720 }
3124 } 3721 }
3125 } 3722 }
3126 3723
3127 while ($self->{post_alloc_hook}) { 3724 while ($self->{post_alloc_hook}) {
3128 $_->() 3725 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3726 for values %{delete $self->{post_alloc_hook}};
3130 } 3727 }
3728
3131 3729
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
3135 3733
… …
3137 glLoadIdentity; 3735 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 3738 glLoadIdentity;
3141 3739
3740 {
3741 package CFClient::UI::Base;
3742
3743 ($draw_x, $draw_y, $draw_w, $draw_h) =
3744 (0, 0, $self->{w}, $self->{h});
3745 }
3746
3142 $self->_draw; 3747 $self->_draw;
3143} 3748}
3144 3749
3145############################################################################# 3750#############################################################################
3146 3751

Diff Legend

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