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.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
… …
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{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 $self->{max_w} = int $w if defined $w;
363 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $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}) {
… …
1478 1538
1479 delete $self->{texture}; 1539 delete $self->{texture};
1480 $self->SUPER::update; 1540 $self->SUPER::update;
1481} 1541}
1482 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1483sub set_text { 1550sub set_text {
1484 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1485 1552
1486 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1487 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1488 1555
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1491 1559
1560 $self->realloc;
1492 $self->update; 1561 $self->update;
1493 $self->check_size;
1494} 1562}
1495 1563
1496sub set_markup { 1564sub set_markup {
1497 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1498 1566
… …
1501 1569
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1571
1504 $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;
1505 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1506 1575
1576 $self->realloc;
1507 $self->update; 1577 $self->update;
1508 $self->check_size;
1509} 1578}
1510 1579
1511sub size_request { 1580sub size_request {
1512 my ($self) = @_; 1581 my ($self) = @_;
1513 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1515 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1516 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1517 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1519 1591
1520 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1521 1593
1522 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1523 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1524 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1525 1597
1526 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1527 1599
1528 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1530 } 1602 }
1531 1603
1604 ($w, $h)
1532 ( 1605 }
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1606}
1537 1607
1538sub size_allocate { 1608sub size_allocate {
1539 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1540 1610
1611 delete $self->{ox};
1612
1541 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1542} 1615}
1543 1616
1544sub set_fontsize { 1617sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1546 1619
1547 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1548 delete $self->{texture}; 1621 delete $self->{texture};
1549 1622
1550 $self->update; 1623 $self->realloc;
1551 $self->check_size;
1552} 1624}
1553 1625
1554sub _draw { 1626sub _draw {
1555 my ($self) = @_; 1627 my ($self) = @_;
1556 1628
… …
1562 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1638
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1568 1641
1642 unless (exists $self->{ox}) {
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1571 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1572 1646
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1575 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1650 };
1579 1651
1580 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1582 1654
1655 glColor_premultiply @{$self->{fg}}
1583 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1584 glColor @{$self->{fg}}; 1657
1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1586 } else {
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1588 }
1589 1659
1590 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1591} 1661}
1592 1662
1593############################################################################# 1663#############################################################################
… …
1620 1690
1621 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1622 1692
1623 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1624 1694
1625 delete $self->{texture};
1626
1627 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1628 $self->{text} = $text; 1696 $self->{text} = $text;
1629 1697
1630 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1631 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1632 1701
1633 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1634} 1706}
1635 1707
1636sub set_text { 1708sub set_text {
1637 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1638 1710
1639 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1712 $self->_set_text ($text);
1641 $self->update;
1642 $self->check_size;
1643} 1713}
1644 1714
1645sub get_text { 1715sub get_text {
1646 $_[0]{text} 1716 $_[0]{text}
1647} 1717}
… …
1677 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1749 $self->_emit ('escape');
1680 } elsif ($uni) { 1750 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1682 } 1754 }
1683 1755
1684 $self->_set_text ($text); 1756 $self->_set_text ($text);
1685 $self->update; 1757
1686 $self->check_size; 1758 $self->realloc;
1759
1760 1
1687} 1761}
1688 1762
1689sub focus_in { 1763sub focus_in {
1690 my ($self) = @_; 1764 my ($self) = @_;
1691 1765
… …
1706 utf8::encode $text; 1780 utf8::encode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1708 1782
1709 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1710 $self->update; 1784 $self->update;
1785
1786 1
1711} 1787}
1712 1788
1713sub mouse_motion { 1789sub mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1715# 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
1716} 1794}
1717 1795
1718sub _draw { 1796sub _draw {
1719 my ($self) = @_; 1797 my ($self) = @_;
1720 1798
1721 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1722 1800
1723 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1724 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1725 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1726 } else { 1804 } else {
1727 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1728 } 1806 }
1729 1807
1730 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1732 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1733 glVertex 0 , 0; 1811 glVertex 0 , 0;
1734 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1735 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1736 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1797 } else { 1875 } else {
1798 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1799 } 1877 }
1800 1878
1801 } else { 1879 } else {
1802 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1803 } 1883 1
1804
1805} 1884}
1806 1885
1807############################################################################# 1886#############################################################################
1808 1887
1809package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1818 1897
1819sub new { 1898sub new {
1820 my $class = shift; 1899 my $class = shift;
1821 1900
1822 $class->SUPER::new ( 1901 $class->SUPER::new (
1823 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1824 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1826 can_hover => 1, 1906 can_hover => 1,
1827 align => 0, 1907 align => 0,
1828 valign => 0, 1908 valign => 0,
… …
1837 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1838 1918
1839 $self->emit ("activate") 1919 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1921 && $y >= 0 && $y < $self->{h};
1922
1923 1
1842} 1924}
1843 1925
1844sub _draw { 1926sub _draw {
1845 my ($self) = @_; 1927 my ($self) = @_;
1846 1928
1847 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1848
1849 if ($GRAB == $self) {
1850 $self->{fg} = $self->{active_fg};
1851 }
1852 1930
1853 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1855 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1856 1934
… …
1875 1953
1876sub new { 1954sub new {
1877 my $class = shift; 1955 my $class = shift;
1878 1956
1879 $class->SUPER::new ( 1957 $class->SUPER::new (
1880 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1881 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 1962 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 1963 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 1964 state => 0,
… …
1889} 1968}
1890 1969
1891sub size_request { 1970sub size_request {
1892 my ($self) = @_; 1971 my ($self) = @_;
1893 1972
1894 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1895} 1974}
1896 1975
1897sub button_down { 1976sub button_down {
1898 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1899 1978
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1903 $self->_emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1904 } 1987 1
1905} 1988}
1906 1989
1907sub _draw { 1990sub _draw {
1908 my ($self) = @_; 1991 my ($self) = @_;
1909 1992
1910 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1911 1994
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 1996
1914 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;
1915 2000
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 2002
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 2004
… …
2074 2159
2075 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2076 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2077 2162
2078 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2079 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;
2080 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2082 2168
2083 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2084 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2184 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2272 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2273 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2274 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2275 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2276 min_h => $::WIDTH / 80,
2191 vertical => 0, 2277 vertical => 0,
2192 can_hover => 1, 2278 can_hover => 1,
2193 inner_pad => 0.02, 2279 inner_pad => 0.02,
2194 @_ 2280 @_
2195 ); 2281 );
… …
2198 $self->update; 2284 $self->update;
2199 2285
2200 $self 2286 $self
2201} 2287}
2202 2288
2289sub changed { }
2290
2203sub set_range { 2291sub set_range {
2204 my ($self, $range) = @_; 2292 my ($self, $range) = @_;
2205 2293
2206 ($range, $self->{range}) = ($self->{range}, $range); 2294 ($range, $self->{range}) = ($self->{range}, $range);
2207 2295
… …
2233} 2321}
2234 2322
2235sub size_request { 2323sub size_request {
2236 my ($self) = @_; 2324 my ($self) = @_;
2237 2325
2238 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2327}
2243 2328
2244sub button_down { 2329sub button_down {
2245 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2246 2331
2247 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2248 2333
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2335
2251 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2252} 2337}
2253 2338
2254sub mouse_motion { 2339sub mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2256 2341
… …
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2346
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2348
2264 $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
2265 } 2354 1
2266} 2355}
2267 2356
2268sub update { 2357sub update {
2269 my ($self) = @_; 2358 my ($self) = @_;
2270 2359
2271 $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}) {
2272 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2273 2369
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2276 2372
… …
2282 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2284 2380
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2287 }); 2383 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2384
2295 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2296 2386
2297 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2298 2388
… …
2492 2582
2493 delete $self->{texture}; 2583 delete $self->{texture};
2494 } 2584 }
2495 2585
2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2497 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2498 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2499 2589
2500 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2501 2591
2502 my $y0 = $top; 2592 my $y0 = $top;
… …
2537sub _draw { 2627sub _draw {
2538 my ($self) = @_; 2628 my ($self) = @_;
2539 2629
2540 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2542 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2543 $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});
2544 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2545 2635
2546 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2547 2637
2548} 2638}
… …
2631} 2721}
2632 2722
2633sub set_tooltip_from { 2723sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2724 my ($self, $widget) = @_;
2635 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
2636 $self->add (new CFClient::UI::Label 2735 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2736 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2738 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2739 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2740 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2653 2752
2654sub size_allocate { 2753sub size_allocate {
2655 my ($self, $w, $h) = @_; 2754 my ($self, $w, $h) = @_;
2656 2755
2657 $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 });
2658} 2775}
2659 2776
2660sub _draw { 2777sub _draw {
2661 my ($self) = @_; 2778 my ($self) = @_;
2662 2779
… …
2679 glVertex $w, $h; 2796 glVertex $w, $h;
2680 glVertex $w, 0; 2797 glVertex $w, 0;
2681 glEnd; 2798 glEnd;
2682 2799
2683 glTranslate 2 - 0.375, 2 - 0.375; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2801
2684 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2685} 2803}
2686 2804
2687############################################################################# 2805#############################################################################
2688 2806
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2866
2749 if ($tex) { 2867 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2755 } 2873 }
2756} 2874}
2757 2875
… …
2764 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2765} 2883}
2766 2884
2767############################################################################# 2885#############################################################################
2768 2886
2769package CFClient::UI::Inventory; 2887package CFClient::UI::Buttonbar;
2770 2888
2771our @ISA = CFClient::UI::ScrolledWindow::; 2889our @ISA = CFClient::UI::HBox::;
2772 2890
2773sub new { 2891# 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 2892
2814############################################################################# 2893#############################################################################
2815 2894
2816package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2817 2896
… …
2858 # maybe save $GRAB? must be careful about events... 2937 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 2938 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 2939 $self->{button} = $ev->{button};
2861 2940
2862 $self->show; 2941 $self->show;
2863 $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);
2864} 2943}
2865 2944
2866sub mouse_motion { 2945sub mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2868 2947
2869 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2872} 2953}
2873 2954
2874sub button_up { 2955sub button_up {
2875 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2876 2957
… …
2878 undef $GRAB; 2959 undef $GRAB;
2879 $self->hide; 2960 $self->hide;
2880 2961
2881 $self->_emit ("popdown"); 2962 $self->_emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2883 } 2968 1
2884} 2969}
2885 2970
2886############################################################################# 2971#############################################################################
2887 2972
2888package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2889 2974
2890our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2891 2976
2892sub new { 2977sub new {
2893 my $class = shift; 2978 my $class = shift;
2894 2979
2895 $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 (
2896 fontsize => 0.8, 3089 fontsize => 0.8,
2897 @_, 3090 @_,
2898 ) 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
2899} 3098}
2900 3099
2901sub reorder { 3100sub reorder {
2902 my ($self) = @_; 3101 my ($self) = @_;
2903 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} };
2904 3108
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3111 }
2908 3112
… …
2911 my @items = sort { 3115 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2915 3119
3120 $self->{timer}->interval (1);
3121
2916 my $count = 10 + 1; 3122 my $count = 10 + 1;
2917 for my $item (@items) { 3123 for my $item (@items) {
2918 last unless --$count; 3124 last unless --$count;
2919 3125
2920 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3130 : $item->{text};
2925 3131
… …
2933 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3145 can_events => 1,
2940 can_hover => 1 3146 can_hover => 1
2941 }; 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;
2942 } 3160 }
2943 3161
2944 $self->clear; 3162 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2946} 3164}
… …
2951 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2953 3171
2954 return unless $text; 3172 return unless $text;
2955 3173
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3175
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3177
2960 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
2991 3209
2992 $self->reorder; 3210 $self->reorder;
2993 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
2994} 3212}
2995 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
2996############################################################################# 3222#############################################################################
2997 3223
2998package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
2999 3225
3000our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
3001
3002use CFClient::OpenGL;
3003 3227
3004sub new { 3228sub new {
3005 my $class = shift; 3229 my $class = shift;
3006 3230
3007 $class->SUPER::new ( 3231 my $self = $class->SUPER::new (
3232 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3233 @_,
3234 );
3235
3236 $self
3237}
3238
3239sub set_items {
3240 my ($self, $items) = @_;
3241
3242 $self->{child}->clear;
3243 return unless $items;
3244
3245 my @items = sort {
3246 ($a->{type} <=> $b->{type})
3247 or ($a->{name} cmp $b->{name})
3248 } @$items;
3249
3250 $self->{real_items} = \@items;
3251
3252 my $row = 0;
3253 for my $item (@items) {
3254 CFClient::Item::update_widgets $item;
3255
3256 $self->{child}->add (0, $row, $item->{face_widget});
3257 $self->{child}->add (1, $row, $item->{desc_widget});
3258 $self->{child}->add (2, $row, $item->{weight_widget});
3259
3260 $row++;
3261 }
3262}
3263
3264#############################################################################
3265
3266package CFClient::UI::BindEditor;
3267
3268our @ISA = CFClient::UI::FancyFrame::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3274
3275 $self->add (my $vb = new CFClient::UI::VBox);
3276
3277
3278 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3279 text => "start recording",
3280 tooltip => "Start/Stops recording of actions."
3281 ."All subsequent actions after the recording started will be captured."
3282 ."The actions are displayed after the record was stopped."
3283 ."To bind the action you have to click on the 'Bind' button",
3284 on_activate => sub {
3285 unless ($self->{recording}) {
3286 $self->start;
3287 } else {
3288 $self->stop;
3289 }
3290 });
3291
3292 $vb->add (new CFClient::UI::Label text => "Actions:");
3293 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3294
3295 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3296 $vb->add (my $hb = new CFClient::UI::HBox);
3297 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3298 $hb->add (new CFClient::UI::Button
3299 text => "bind",
3300 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3301 on_activate => sub {
3302 $self->ask_for_bind;
3303 });
3304
3305 $vb->add (my $hb = new CFClient::UI::HBox);
3306 $hb->add (new CFClient::UI::Button
3307 text => "ok",
3308 expand => 1,
3309 tooltip => "This closes the binding editor and saves the binding",
3310 on_activate => sub {
3311 $self->hide;
3312 $self->commit;
3313 });
3314
3315 $hb->add (new CFClient::UI::Button
3316 text => "cancel",
3317 expand => 1,
3318 tooltip => "This closes the binding editor without saving",
3319 on_activate => sub {
3320 $self->hide;
3321 $self->{binding_cancel}->()
3322 if $self->{binding_cancel};
3323 });
3324
3325 $self->update_binding_widgets;
3326
3327 $self
3328}
3329
3330sub commit {
3331 my ($self) = @_;
3332 my ($mod, $sym, $cmds) = $self->get_binding;
3333 if ($sym != 0 && @$cmds > 0) {
3334 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3335 ."'. Don't forget 'Save Config'!");
3336 $self->{binding_change}->($mod, $sym, $cmds)
3337 if $self->{binding_change};
3338 } else {
3339 $::STATUSBOX->add ("No action bound, no key or action specified!");
3340 $self->{binding_cancel}->()
3341 if $self->{binding_cancel};
3342 }
3343}
3344
3345sub start {
3346 my ($self) = @_;
3347
3348 $self->{rec_btn}->set_text ("stop recording");
3349 $self->{recording} = 1;
3350 $self->clear_command_list;
3351 $::CONN->start_record if $::CONN;
3352}
3353
3354sub stop {
3355 my ($self) = @_;
3356
3357 $self->{rec_btn}->set_text ("start recording");
3358 $self->{recording} = 0;
3359
3360 my $rec;
3361 $rec = $::CONN->stop_record if $::CONN;
3362 return unless ref $rec eq 'ARRAY';
3363 $self->set_command_list ($rec);
3364}
3365
3366
3367sub ask_for_bind_and_commit {
3368 my ($self) = @_;
3369 $self->ask_for_bind (1);
3370}
3371
3372sub ask_for_bind {
3373 my ($self, $commit) = @_;
3374
3375 CFClient::Binder::open_binding_dialog (sub {
3376 my ($mod, $sym) = @_;
3377 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3378 $self->update_binding_widgets;
3379 $self->commit if $commit;
3380 });
3381}
3382
3383# $mod and $sym are the modifiers and key symbol
3384# $cmds is a array ref of strings (the commands)
3385# $cb is the callback that is executed on OK
3386# $ccb is the callback that is executed on CANCEL and
3387# when the binding was unsuccessful on OK
3388sub set_binding {
3389 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3390
3391 $self->clear_command_list;
3392 $self->{recording} = 0;
3393 $self->{rec_btn}->set_text ("start recording");
3394
3395 $self->{binding} = [$mod, $sym];
3396 $self->{commands} = $cmds;
3397
3398 $self->{binding_change} = $cb;
3399 $self->{binding_cancel} = $ccb;
3400
3401 $self->update_binding_widgets;
3402}
3403
3404# this is a shortcut method that asks for a binding
3405# and then just binds it.
3406sub do_quick_binding {
3407 my ($self, $cmds) = @_;
3408 $self->set_binding (undef, undef, $cmds, sub {
3409 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3410 });
3411 $self->ask_for_bind (1);
3412}
3413
3414sub update_binding_widgets {
3415 my ($self) = @_;
3416 my ($mod, $sym, $cmds) = $self->get_binding;
3417 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3418 $self->set_command_list ($cmds);
3419}
3420
3421sub get_binding {
3422 my ($self) = @_;
3423 return (
3424 $self->{binding}->[0],
3425 $self->{binding}->[1],
3426 [ grep { defined $_ } @{$self->{commands}} ]
3427 );
3428}
3429
3430sub clear_command_list {
3431 my ($self) = @_;
3432 $self->{cmdbox}->clear ();
3433}
3434
3435sub set_command_list {
3436 my ($self, $cmds) = @_;
3437
3438 $self->{cmdbox}->clear ();
3439 $self->{commands} = $cmds;
3440
3441 my $idx = 0;
3442
3443 for (@$cmds) {
3444 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3445
3446 my $i = $idx;
3447 $hb->add (new CFClient::UI::Label text => $_);
3448 $hb->add (new CFClient::UI::Button
3449 text => "delete",
3450 tooltip => "Deletes the action from the record",
3451 on_activate => sub {
3452 $self->{cmdbox}->remove ($hb);
3453 $cmds->[$i] = undef;
3454 });
3455
3456
3457 $idx++
3458 }
3459}
3460
3461#############################################################################
3462
3463package CFClient::UI::SpellList;
3464
3465our @ISA = CFClient::UI::Table::;
3466
3467sub new {
3468 my $class = shift;
3469
3470 my $self = $class->SUPER::new (
3471 binding => [],
3472 commands => [],
3473 @_,
3474 )
3475}
3476
3477# XXX: Do sorting? Argl...
3478sub add_spell {
3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3481
3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3483 face => $spell->{face},
3484 can_hover => 1,
3485 can_events => 1,
3486 tooltip => $spell->{message});
3487
3488 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3489 text => $spell->{name},
3490 can_hover => 1,
3491 can_events => 1,
3492 tooltip => $spell->{message},
3493 expand => 1);
3494
3495 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3496 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3497 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3498 expand => 1);
3499
3500 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3501 text => "bind to key",
3502 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3503}
3504
3505sub rebuild_spell_list {
3506 my ($self) = @_;
3507 $self->{tbl_idx} = 0;
3508 $self->add_spell ($_) for values %{$self->{spells}};
3509}
3510
3511sub remove_spell {
3512 my ($self, $spell) = @_;
3513 delete $self->{spells}->{$spell->{name}};
3514 $self->rebuild_spell_list;
3515}
3516
3517#############################################################################
3518
3519package CFClient::UI::Root;
3520
3521our @ISA = CFClient::UI::Container::;
3522
3523use List::Util qw(min max);
3524
3525use CFClient::OpenGL;
3526
3527sub new {
3528 my $class = shift;
3529
3530 my $self = $class->SUPER::new (
3008 visible => 1, 3531 visible => 1,
3009 @_, 3532 @_,
3010 ) 3533 );
3011}
3012 3534
3013sub configure { 3535 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3536
3016 $self->{w} = $w; 3537 $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} 3538}
3026 3539
3027sub size_request { 3540sub size_request {
3028 my ($self) = @_; 3541 my ($self) = @_;
3029 3542
3030 ($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
3031} 3558}
3032 3559
3033sub size_allocate { 3560sub size_allocate {
3034 my ($self, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
3035 3562
3036 for my $child ($self->children) { 3563 for my $child ($self->children) {
3037 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)};
3038 3565
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3566 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3567 $Y = $child->{force_y} if exists $child->{force_y};
3041 3568
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3569 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3570 $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 3571
3051 $child->configure ($X, $Y, $W, $H); 3572 $child->configure ($X, $Y, $W, $H);
3052 } 3573 }
3053} 3574}
3054 3575
… …
3065} 3586}
3066 3587
3067sub update { 3588sub update {
3068 my ($self) = @_; 3589 my ($self) = @_;
3069 3590
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3591 $::WANT_REFRESH++;
3072} 3592}
3073 3593
3074sub add { 3594sub add {
3075 my ($self, @children) = @_; 3595 my ($self, @children) = @_;
3076 3596
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; 3597 $_->{is_toplevel} = 1
3085 3598 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3599
3091 $self->SUPER::add (@children); 3600 $self->SUPER::add (@children);
3092} 3601}
3093 3602
3094sub remove { 3603sub remove {
3095 my ($self, @children) = @_; 3604 my ($self, @children) = @_;
3096 3605
3097 $self->SUPER::remove (@children); 3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3098 3610
3099 while (@children) { 3611 while (@children) {
3100 my $w = pop @children; 3612 my $w = pop @children;
3101 push @children, $w->children; 3613 push @children, $w->children;
3102 $w->set_invisible; 3614 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
3122 $_->() 3634 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3635 for values %{delete $self->{refresh_hook}};
3124 } 3636 }
3125 3637
3126 if ($self->{check_size}) { 3638 if ($self->{realloc}) {
3639 my %queue;
3127 my @queue; 3640 my @queue;
3641 my $widget;
3128 3642
3129 for (;;) { 3643 outer:
3130 if ($self->{check_size}) { 3644 while () {
3131 #TODO use array-of-depth approach 3645 if (my $realloc = delete $self->{realloc}) {
3646 for $widget (values %$realloc) {
3647 $widget->{visible} or next; # do not resize invisible widgets
3132 3648
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3649 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3650
3651 push @{ $queue[$widget->{visible}] }, $widget;
3652 }
3135 } 3653 }
3136 3654
3655 while () {
3656 @queue or last outer;
3657
3137 my $widget = pop @queue || last; 3658 $widget = pop @{ $queue[-1] || [] }
3138 3659 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 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}) {
3149 $widget->{req_w} = $w; 3679 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3680 $widget->{req_h} = $h;
3151 3681
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3682 $self->{size_alloc}{$widget+0} = $widget;
3153 3683
3154 $widget->{parent}->check_size
3155 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 }
3156 } 3691 }
3692
3693 delete $self->{realloc}{$widget+0};
3157 } 3694 }
3158 } 3695 }
3159 3696
3160 while ($self->{size_alloc}) { 3697 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 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)};
3163 3705
3164 $w = 0 if $w < 0; 3706 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3707 $h = 0 if $h < 0;
3166 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
3167 $widget->{w} = $w; 3716 $widget->{w} = $w;
3168 $widget->{h} = $h; 3717 $widget->{h} = $h;
3718
3169 $widget->emit (size_allocate => $w, $h); 3719 $widget->emit (size_allocate => $w, $h);
3720 }
3170 } 3721 }
3171 } 3722 }
3172 3723
3173 while ($self->{post_alloc_hook}) { 3724 while ($self->{post_alloc_hook}) {
3174 $_->() 3725 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3726 for values %{delete $self->{post_alloc_hook}};
3176 } 3727 }
3728
3177 3729
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
3181 3733
… …
3183 glLoadIdentity; 3735 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3738 glLoadIdentity;
3187 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
3188 $self->_draw; 3747 $self->_draw;
3189} 3748}
3190 3749
3191############################################################################# 3750#############################################################################
3192 3751

Diff Legend

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