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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 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
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 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
157 $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.]+$/;
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $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.]+$/;
162 $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};
163 $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};
164 $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
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 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 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $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;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $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;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
322} 390}
323 391
324sub set_tooltip { 392sub set_tooltip {
325 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
326 399
327 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
328 401
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
… …
373 446
374 $::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
375 unless $FOCUS; 448 unless $FOCUS;
376} 449}
377 450
378sub mouse_motion { } 451sub mouse_motion { 0 }
379sub button_up { } 452sub button_up { 0 }
380sub key_down { } 453sub key_down { 0 }
381sub key_up { } 454sub key_up { 0 }
382 455
383sub button_down { 456sub button_down {
384 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
385 458
386 $self->focus_in; 459 $self->focus_in;
387}
388 460
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
393sub 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
394 537
395sub draw { 538sub draw {
396 my ($self) = @_; 539 my ($self) = @_;
397 540
398 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);
399 552
400 glPushMatrix; 553 glPushMatrix;
401 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
402 $self->_draw;
403 glPopMatrix;
404 555
405 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
406 my ($x, $y) = @$self{qw(x y)};
407
408 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
409 glEnable GL_BLEND; 558 glEnable GL_BLEND;
410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
411 glBegin GL_QUADS; 560 glBegin GL_QUADS;
412 glVertex $x , $y;
413 glVertex $x + $self->{w}, $y;
414 glVertex $x + $self->{w}, $y + $self->{h};
415 glVertex $x , $y + $self->{h};
416 glEnd;
417 glDisable GL_BLEND;
418 }
419
420 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix;
422 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 561 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
427 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
428 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
429 glEnd; 565 glEnd;
566 glDisable GL_BLEND;
567 }
568
569 if ($ENV{CFPLUS_DEBUG} & 1) {
570 glPushMatrix;
571 glColor 1, 1, 0, 1;
572 glTranslate 0.375, 0.375;
573 glBegin GL_LINE_LOOP;
574 glVertex 0 , 0;
575 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1;
578 glEnd;
430 glPopMatrix; 579 glPopMatrix;
431 #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;
432 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
433} 585}
434 586
435sub _draw { 587sub _draw {
436 my ($self) = @_; 588 my ($self) = @_;
437 589
438 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
439}
440
441sub find_widget {
442 my ($self, $x, $y) = @_;
443
444 return () unless $self->{can_events};
445
446 return $self
447 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450 ()
451}
452
453sub set_parent {
454 my ($self, $parent) = @_;
455
456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
463}
464
465sub check_size {
466 my ($self, $forced) = @_;
467
468 $self->{force_alloc} = 1 if $forced;
469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
470}
471
472sub update {
473 my ($self) = @_;
474
475 $self->{parent}->update
476 if $self->{parent};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496} 591}
497 592
498sub DESTROY { 593sub DESTROY {
499 my ($self) = @_; 594 my ($self) = @_;
500 595
… …
532 627
533 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
534 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
535 630
536 glEnable GL_BLEND; 631 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glColor @$color; 633 glColor_premultiply @$color;
539 634
540 glBegin GL_QUADS; 635 glBegin GL_QUADS;
541 glVertex 0 , 0; 636 glVertex 0 , 0;
542 glVertex 0 , $h; 637 glVertex 0 , $h;
543 glVertex $w, $h; 638 glVertex $w, $h;
… …
558 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
559 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
560} 655}
561 656
562sub size_request { 657sub size_request {
563 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
564} 661}
565 662
566sub draw { } 663sub draw { }
567 664
568############################################################################# 665#############################################################################
… …
572our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
573 670
574sub new { 671sub new {
575 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
576 673
577 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
578 675
579 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
580 children => [], 677 children => [],
581 can_events => 0, 678 can_events => 0,
582 %arg, 679 %arg,
583 ); 680 );
681
584 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
585 684
586 $self 685 $self
587} 686}
588 687
589sub add { 688sub add {
… …
597 $self->{children} = [ 696 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
600 ]; 699 ];
601 700
602 $self->check_size (1); 701 $self->realloc;
603 $self->update;
604} 702}
605 703
606sub children { 704sub children {
607 @{ $_[0]{children} } 705 @{ $_[0]{children} }
608} 706}
… …
613 delete $child->{parent}; 711 delete $child->{parent};
614 $child->hide; 712 $child->hide;
615 713
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 715
618 $self->check_size; 716 $self->realloc;
619 $self->update;
620} 717}
621 718
622sub clear { 719sub clear {
623 my ($self) = @_; 720 my ($self) = @_;
624 721
… …
628 for (@$children) { 725 for (@$children) {
629 delete $_->{parent}; 726 delete $_->{parent};
630 $_->hide; 727 $_->hide;
631 } 728 }
632 729
633 $self->check_size; 730 $self->realloc;
634 $self->update;
635} 731}
636 732
637sub find_widget { 733sub find_widget {
638 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
639 735
640 $x -= $self->{x}; 736 $x -= $self->{x};
641 $y -= $self->{y}; 737 $y -= $self->{y};
642 738
643 my $res; 739 my $res;
644 740
645 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
646 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
647 and return $res; 743 and return $res;
648 } 744 }
649 745
650 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
699 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
700} 796}
701 797
702############################################################################# 798#############################################################################
703 799
800# back-buffered drawing area
801
704package CFClient::UI::Window; 802package CFClient::UI::Window;
705 803
706our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
707 805
708use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
726 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
727 $self->update; 825 $self->update;
728} 826}
729 827
730sub _render { 828sub _render {
829 my ($self) = @_;
830
731 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
732} 832}
733 833
734sub render_child { 834sub render_child {
735 my ($self) = @_; 835 my ($self) = @_;
736 836
737 $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 {
738 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
739 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
740 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
741 $self->_render; 848 $self->_render;
742 }; 849 };
743} 850}
744 851
745sub _draw { 852sub _draw {
746 my ($self) = @_; 853 my ($self) = @_;
747 854
748 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
749 856
750 my $tex = $self->{texture} 857 my $tex = $self->{texture}
751 or return; 858 or return;
752 859
753 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
755 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
756 863
757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
758 865
759 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
760} 867}
… …
763 870
764package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
765 872
766our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
767 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
768sub size_request { 885sub size_request {
769 my ($self) = @_; 886 my ($self) = @_;
770 887
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772 889
773 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
774} 894}
775 895
776sub size_allocate { 896sub size_allocate {
777 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
778 898
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 899 my $child = $self->child;
780# $w = $self->{w}; 900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
781 $self->child->configure (0, 0, $cw, $ch); 904 $self->child->configure (0, 0, $w, $h);
782 $self->update; 905 $self->update;
783} 906}
784 907
785sub set_offset { 908sub set_offset {
786 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
… …
820} 943}
821 944
822sub _render { 945sub _render {
823 my ($self) = @_; 946 my ($self) = @_;
824 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
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826 952
827 $self->SUPER::_render; 953 $self->SUPER::_render;
828} 954}
829 955
… …
832package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
833 959
834our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
835 961
836sub new { 962sub new {
837 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
838 966
839 my $self; 967 my $self;
840 968
841 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
842 vertical => 1, 970 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 972 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
846 }, 974 },
847 ; 975 ;
848 976
849 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
850 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
851 slider => $slider, 979 slider => $slider,
852 @_, 980 %arg,
853 ); 981 );
854 982
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
858 985
859 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
993}
994
995sub update {
996 my ($self) = @_;
997
998 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 1003}
861 1004
862sub size_allocate { 1005sub size_allocate {
863 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
864 1007
… …
893 1036
894 if ($self->{bg}) { 1037 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
896 1039
897 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
899 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
900 1043
901 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
902 glVertex 0 , 0; 1045 glVertex 0 , 0;
903 glVertex 0 , $h; 1046 glVertex 0 , $h;
904 glVertex $w, $h; 1047 glVertex $w, $h;
… …
917 1060
918our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
919 1062
920use CFClient::OpenGL; 1063use CFClient::OpenGL;
921 1064
922my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 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);
925 1072
926sub new { 1073sub new {
927 my $class = shift; 1074 my ($class, %arg) = @_;
928 1075
929 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
930 1077
931 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1081 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1082 can_events => 1,
937 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
938 ); 1086 );
939 1087
940 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
941 align => 0, 1089 align => 0,
942 valign => 1, 1090 valign => 1,
943 text => $self->{title}, 1091 text => $title,
944 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
945 1094
946 $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};
947} 1103}
948 1104
949sub border { 1105sub border {
950 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
951} 1107}
952 1108
953sub size_request { 1109sub size_request {
954 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
955 1114
956 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
957 1116
958 ( 1117 (
959 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
962} 1121}
963 1122
964sub size_allocate { 1123sub size_allocate {
965 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
966 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
967 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
969 1136
970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
971 if $self->{title};
972
973 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
974} 1138}
975 1139
976sub button_down { 1140sub button_down {
977 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
978 1142
… …
994 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
995 1159
996 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
998 1162
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size; 1167 $self->realloc;
1003 }; 1168 };
1004 1169
1005 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1174 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1011 1176
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1178
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1016 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1017 } 1187 1
1018} 1188}
1019 1189
1020sub button_up { 1190sub button_up {
1021 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1022 1192
1023 delete $self->{motion}; 1193 !!delete $self->{motion}
1024} 1194}
1025 1195
1026sub mouse_motion { 1196sub mouse_motion {
1027 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1028 1198
1029 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1030} 1202}
1031 1203
1032sub _draw { 1204sub _draw {
1033 my ($self) = @_; 1205 my ($self) = @_;
1034 1206
1207 my $child = $self->{children}[0];
1208
1035 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1037 1211
1038 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1214
1041 my $border = $self->border; 1215 my $border = $self->border;
1042 1216
1043 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1222
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1051 1225
1052 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1055
1056 glColor @{ $self->{bg} };
1057
1058 $bg->{s} = $rep_x;
1059 $bg->{t} = $rep_y;
1060 $bg->{wrap_mode} = 1;
1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1231 }
1063 1232
1064 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1065 1234
1066 $self->{title}->draw if $self->{title};
1067
1068 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1069} 1241}
1070 1242
1071############################################################################# 1243#############################################################################
1072 1244
1073package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1081sub new { 1253sub new {
1082 my $class = shift; 1254 my $class = shift;
1083 1255
1084 $class->SUPER::new ( 1256 $class->SUPER::new (
1085 col_expand => [], 1257 col_expand => [],
1086 @_ 1258 @_,
1087 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1264}
1089 1265
1090sub add { 1266sub add {
1091 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1092 1268
1093 $child->set_parent ($self); 1269 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1095 1271
1096 $child->check_size; 1272 $self->realloc;
1097} 1273}
1098 1274
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1276sub clear {
1105 my ($self) = @_; 1277 my ($self) = @_;
1106 1278
1107 my @children = $self->children; 1279 my @children = $self->children;
1108 delete $self->{children}; 1280 delete $self->{children};
… …
1110 for (@children) { 1282 for (@children) {
1111 delete $_->{parent}; 1283 delete $_->{parent};
1112 $_->hide; 1284 $_->hide;
1113 } 1285 }
1114 1286
1115 $self->update; 1287 $self->realloc;
1116} 1288}
1117 1289
1118sub get_wh { 1290sub get_wh {
1119 my ($self) = @_; 1291 my ($self) = @_;
1120 1292
… …
1151sub size_allocate { 1323sub size_allocate {
1152 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1153 1325
1154 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1155 1327
1156 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1158 1330
1159 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1388 }
1217} 1389}
1218 1390
1219############################################################################# 1391#############################################################################
1220 1392
1221package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1222
1223# TODO: wrap into common Box base class
1224 1394
1225our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1226 1396
1227sub size_request { 1397sub size_request {
1228 my ($self) = @_; 1398 my ($self) = @_;
1229 1399
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1231 1401 ? (
1232 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1233 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234 (List::Util::max map $_->[1], @alloc), 1404 )
1235 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1236} 1409}
1237 1410
1238sub size_allocate { 1411sub size_allocate {
1239 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1240 1413
1241 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1242
1243 my $children = $self->{children}; 1415 my $children = $self->{children};
1244 1416
1245 my @h = map $_->{req_w}, @$children; 1417 my @req;
1246 1418
1247 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1248 1420 @req = ($space / (@$children || 1)) x @$children;
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } 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 {
1253 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254 $exp ||= 1;
1255 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1256 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 } 1435 }
1263 } 1436 }
1264 1437
1265 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1266 1439
1267 my $y = 0; 1440 my $pos = 0;
1268 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1271 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272 1444
1273 $y += $h; 1445 $pos += $alloc;
1274 } 1446 }
1275 1447
1276 1 1448 1
1277} 1449}
1278 1450
1279############################################################################# 1451#############################################################################
1280 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
1281package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1282 1469
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1286 1471
1287sub size_request { 1472sub new {
1288 my ($self) = @_; 1473 my $class = shift;
1289 1474
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1291 1476 vertical => 1,
1292 ( 1477 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1478 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1479}
1336 1480
1337############################################################################# 1481#############################################################################
1338 1482
1339package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1356 ellipsise => 3, # end 1500 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1358 fontsize => 1, 1502 fontsize => 1,
1359 align => -1, 1503 align => -1,
1360 valign => -1, 1504 valign => -1,
1361 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1362 can_events => 0, 1507 can_events => 0,
1363 %arg 1508 %arg
1364 ); 1509 );
1365 1510
1366 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1393 1538
1394 delete $self->{texture}; 1539 delete $self->{texture};
1395 $self->SUPER::update; 1540 $self->SUPER::update;
1396} 1541}
1397 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1398sub set_text { 1550sub set_text {
1399 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1400 1552
1401 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1402 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1403 1555
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1406 1559
1560 $self->realloc;
1407 $self->update; 1561 $self->update;
1408 $self->check_size;
1409} 1562}
1410 1563
1411sub set_markup { 1564sub set_markup {
1412 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1413 1566
… …
1416 1569
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1571
1419 $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;
1420 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1421 1575
1576 $self->realloc;
1422 $self->update; 1577 $self->update;
1423 $self->check_size;
1424} 1578}
1425 1579
1426sub size_request { 1580sub size_request {
1427 my ($self) = @_; 1581 my ($self) = @_;
1428 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1429 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1430 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1431 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1432 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1434 1591
1435 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1436 1593
1437 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1438 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1439 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1440 1597
1441 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1442 1599
1443 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1445 } 1602 }
1446 1603
1604 ($w, $h)
1447 ( 1605 }
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1606}
1452 1607
1453sub size_allocate { 1608sub size_allocate {
1454 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1455 1610
1611 delete $self->{ox};
1612
1456 delete $self->{texture}; 1613 delete $self->{texture}
1614 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457} 1615}
1458 1616
1459sub set_fontsize { 1617sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1618 my ($self, $fontsize) = @_;
1461 1619
1462 $self->{fontsize} = $fontsize; 1620 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1621 delete $self->{texture};
1464 1622
1465 $self->update; 1623 $self->realloc;
1466 $self->check_size;
1467} 1624}
1468 1625
1469sub _draw { 1626sub _draw {
1470 my ($self) = @_; 1627 my ($self) = @_;
1471 1628
… …
1477 $self->{layout}->set_width ($self->{w}); 1634 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1635 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1636 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1637 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1638
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1639 new_from_layout CFClient::Texture $self->{layout}
1640 };
1483 1641
1642 unless (exists $self->{ox}) {
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1643 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1644 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1645 : ($self->{w} - $tex->{w}) * 0.5);
1487 1646
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1647 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1648 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1649 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1493 }; 1650 };
1494 1651
1495 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1497 1654
1655 glColor_premultiply @{$self->{fg}}
1498 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1499 glColor @{$self->{fg}}; 1657
1500 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1501 } else {
1502 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1503 }
1504 1659
1505 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1506} 1661}
1507 1662
1508############################################################################# 1663#############################################################################
… …
1535 1690
1536 delete $self->{cur_h}; 1691 delete $self->{cur_h};
1537 1692
1538 return if $self->{text} eq $text; 1693 return if $self->{text} eq $text;
1539 1694
1540 delete $self->{texture};
1541
1542 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1543 $self->{text} = $text; 1696 $self->{text} = $text;
1544 1697
1545 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1546 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1547 1701
1548 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1705 $self->update;
1549} 1706}
1550 1707
1551sub set_text { 1708sub set_text {
1552 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1553 1710
1554 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1712 $self->_set_text ($text);
1556 $self->update;
1557 $self->check_size;
1558} 1713}
1559 1714
1560sub get_text { 1715sub get_text {
1561 $_[0]{text} 1716 $_[0]{text}
1562} 1717}
… …
1592 $self->{cursor} = length $text; 1747 $self->{cursor} = length $text;
1593 } elsif ($uni == 27) { 1748 } elsif ($uni == 27) {
1594 $self->_emit ('escape'); 1749 $self->_emit ('escape');
1595 } elsif ($uni) { 1750 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1751 substr $text, $self->{cursor}++, 0, chr $uni;
1752 } else {
1753 return 0;
1597 } 1754 }
1598 1755
1599 $self->_set_text ($text); 1756 $self->_set_text ($text);
1600 $self->update; 1757
1601 $self->check_size; 1758 $self->realloc;
1759
1760 1
1602} 1761}
1603 1762
1604sub focus_in { 1763sub focus_in {
1605 my ($self) = @_; 1764 my ($self) = @_;
1606 1765
… …
1621 utf8::encode $text; 1780 utf8::encode $text;
1622 $self->{cursor} = length substr $text, 0, $idx; 1781 $self->{cursor} = length substr $text, 0, $idx;
1623 1782
1624 $self->_set_text ($self->{text}); 1783 $self->_set_text ($self->{text});
1625 $self->update; 1784 $self->update;
1785
1786 1
1626} 1787}
1627 1788
1628sub mouse_motion { 1789sub mouse_motion {
1629 my ($self, $ev, $x, $y) = @_; 1790 my ($self, $ev, $x, $y) = @_;
1630# 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
1631} 1794}
1632 1795
1633sub _draw { 1796sub _draw {
1634 my ($self) = @_; 1797 my ($self) = @_;
1635 1798
1636 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1637 1800
1638 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1639 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1640 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1641 } else { 1804 } else {
1642 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1643 } 1806 }
1644 1807
1645 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1647 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1648 glVertex 0 , 0; 1811 glVertex 0 , 0;
1649 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1650 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1651 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1712 } else { 1875 } else {
1713 $self->set_text ($self->{history_saveback}); 1876 $self->set_text ($self->{history_saveback});
1714 } 1877 }
1715 1878
1716 } else { 1879 } else {
1717 $self->SUPER::key_down ($ev); 1880 return $self->SUPER::key_down ($ev)
1881 }
1882
1718 } 1883 1
1719
1720} 1884}
1721 1885
1722############################################################################# 1886#############################################################################
1723 1887
1724package CFClient::UI::Button; 1888package CFClient::UI::Button;
… …
1733 1897
1734sub new { 1898sub new {
1735 my $class = shift; 1899 my $class = shift;
1736 1900
1737 $class->SUPER::new ( 1901 $class->SUPER::new (
1738 padding => 4, 1902 padding_x => 4,
1903 padding_y => 4,
1739 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1905 active_fg => [0, 0, 1],
1741 can_hover => 1, 1906 can_hover => 1,
1742 align => 0, 1907 align => 0,
1743 valign => 0, 1908 valign => 0,
… …
1752 my ($self, $ev, $x, $y) = @_; 1917 my ($self, $ev, $x, $y) = @_;
1753 1918
1754 $self->emit ("activate") 1919 $self->emit ("activate")
1755 if $x >= 0 && $x < $self->{w} 1920 if $x >= 0 && $x < $self->{w}
1756 && $y >= 0 && $y < $self->{h}; 1921 && $y >= 0 && $y < $self->{h};
1922
1923 1
1757} 1924}
1758 1925
1759sub _draw { 1926sub _draw {
1760 my ($self) = @_; 1927 my ($self) = @_;
1761 1928
1762 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1763
1764 if ($GRAB == $self) {
1765 $self->{fg} = $self->{active_fg};
1766 }
1767 1930
1768 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1771 1934
… …
1790 1953
1791sub new { 1954sub new {
1792 my $class = shift; 1955 my $class = shift;
1793 1956
1794 $class->SUPER::new ( 1957 $class->SUPER::new (
1795 padding => 2, 1958 padding_x => 2,
1959 padding_y => 2,
1796 fg => [1, 1, 1], 1960 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 1961 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 1962 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 1963 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 1964 state => 0,
… …
1804} 1968}
1805 1969
1806sub size_request { 1970sub size_request {
1807 my ($self) = @_; 1971 my ($self) = @_;
1808 1972
1809 ($self->{padding} * 2 + 6) x 2 1973 (6) x 2
1810} 1974}
1811 1975
1812sub button_down { 1976sub button_down {
1813 my ($self, $ev, $x, $y) = @_; 1977 my ($self, $ev, $x, $y) = @_;
1814 1978
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1979 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1980 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 1981 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 1982 $self->_emit (changed => $self->{state});
1983 } else {
1984 return 0
1985 }
1986
1819 } 1987 1
1820} 1988}
1821 1989
1822sub _draw { 1990sub _draw {
1823 my ($self) = @_; 1991 my ($self) = @_;
1824 1992
1825 $self->SUPER::_draw; 1993 $self->SUPER::_draw;
1826 1994
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1995 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 1996
1829 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;
1830 2000
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2001 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 2002
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2003 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 2004
… …
1989 2159
1990 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
1991 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
1992 2162
1993 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
1994 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;
1995 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997 2168
1998 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
1999 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2099 fg => [1, 1, 1], 2270 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2271 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2272 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2273 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2274 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2275 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2276 min_h => $::WIDTH / 80,
2106 vertical => 0, 2277 vertical => 0,
2107 can_hover => 1, 2278 can_hover => 1,
2108 inner_pad => 0.02, 2279 inner_pad => 0.02,
2109 @_ 2280 @_
2110 ); 2281 );
… …
2113 $self->update; 2284 $self->update;
2114 2285
2115 $self 2286 $self
2116} 2287}
2117 2288
2289sub changed { }
2290
2118sub set_range { 2291sub set_range {
2119 my ($self, $range) = @_; 2292 my ($self, $range) = @_;
2120 2293
2121 $self->{range} = $range; 2294 ($range, $self->{range}) = ($self->{range}, $range);
2122 2295
2123 $self->update; 2296 $self->update
2297 if "@$range" ne "@{$self->{range}}";
2124} 2298}
2125 2299
2126sub set_value { 2300sub set_value {
2127 my ($self, $value) = @_; 2301 my ($self, $value) = @_;
2128 2302
… …
2147} 2321}
2148 2322
2149sub size_request { 2323sub size_request {
2150 my ($self) = @_; 2324 my ($self) = @_;
2151 2325
2152 my $w = $self->{req_w}; 2326 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2327}
2157 2328
2158sub button_down { 2329sub button_down {
2159 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2160 2331
2161 $self->SUPER::button_down ($ev, $x, $y); 2332 $self->SUPER::button_down ($ev, $x, $y);
2162 2333
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2334 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164 2335
2165 $self->mouse_motion ($ev, $x, $y); 2336 $self->mouse_motion ($ev, $x, $y)
2166} 2337}
2167 2338
2168sub mouse_motion { 2339sub mouse_motion {
2169 my ($self, $ev, $x, $y) = @_; 2340 my ($self, $ev, $x, $y) = @_;
2170 2341
… …
2174 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2345 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175 2346
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2347 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177 2348
2178 $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
2179 } 2354 1
2180} 2355}
2181 2356
2182sub update { 2357sub update {
2183 my ($self) = @_; 2358 my ($self) = @_;
2184 2359
2185 $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}) {
2186 $self->set_value ($self->{range}[0]); 2368 $self->set_value ($self->{range}[0]);
2187 2369
2188 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2370 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100; 2371 my $range = ($hi - $page - $lo) || 1e-100;
2190 2372
… …
2196 $value = ($value - $lo) / $range; 2378 $value = ($value - $lo) / $range;
2197 $value = $value * $self->{scale} + $self->{offset}; 2379 $value = $value * $self->{scale} + $self->{offset};
2198 2380
2199 $self->{knob_x} = $value - $knob_w * 0.5; 2381 $self->{knob_x} = $value - $knob_w * 0.5;
2200 $self->{knob_w} = $knob_w; 2382 $self->{knob_w} = $knob_w;
2201 }); 2383 }
2202
2203 $self->SUPER::update;
2204}
2205
2206sub _draw {
2207 my ($self) = @_;
2208 2384
2209 $self->SUPER::_draw (); 2385 $self->SUPER::_draw ();
2210 2386
2211 glScale $self->{w}, $self->{h}; 2387 glScale $self->{w}, $self->{h};
2212 2388
… …
2406 2582
2407 delete $self->{texture}; 2583 delete $self->{texture};
2408 } 2584 }
2409 2585
2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2411 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2412 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2413 2589
2414 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2415 2591
2416 my $y0 = $top; 2592 my $y0 = $top;
… …
2451sub _draw { 2627sub _draw {
2452 my ($self) = @_; 2628 my ($self) = @_;
2453 2629
2454 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2456 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2457 $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});
2458 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2459 2635
2460 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2461 2637
2462} 2638}
… …
2511 2687
2512sub new { 2688sub new {
2513 my $class = shift; 2689 my $class = shift;
2514 2690
2515 my $self = $class->SUPER::new ( 2691 my $self = $class->SUPER::new (
2516 state => 0, 2692 state => 0,
2517 connect_activate => \&toggle_flopper, 2693 on_activate => \&toggle_flopper,
2518 @_ 2694 @_
2519 ); 2695 );
2520 2696
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2697 $self
2527} 2698}
2528 2699
2529sub toggle_flopper { 2700sub toggle_flopper {
2530 my ($self) = @_; 2701 my ($self) = @_;
2531 2702
2532 # TODO: use animation 2703 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2704}
2544 2705
2545############################################################################# 2706#############################################################################
2546 2707
2547package CFClient::UI::Tooltip; 2708package CFClient::UI::Tooltip;
… …
2560} 2721}
2561 2722
2562sub set_tooltip_from { 2723sub set_tooltip_from {
2563 my ($self, $widget) = @_; 2724 my ($self, $widget) = @_;
2564 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
2565 $self->add (new CFClient::UI::Label 2735 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip}, 2736 markup => $tooltip,
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2737 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8, 2738 fontsize => 0.8,
2569 fg => [0, 0, 0, 1], 2739 fg => [0, 0, 0, 1],
2570 ellipsise => 0, 2740 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP), 2741 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2582 2752
2583sub size_allocate { 2753sub size_allocate {
2584 my ($self, $w, $h) = @_; 2754 my ($self, $w, $h) = @_;
2585 2755
2586 $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 });
2587} 2775}
2588 2776
2589sub _draw { 2777sub _draw {
2590 my ($self) = @_; 2778 my ($self) = @_;
2591 2779
… …
2608 glVertex $w, $h; 2796 glVertex $w, $h;
2609 glVertex $w, 0; 2797 glVertex $w, 0;
2610 glEnd; 2798 glEnd;
2611 2799
2612 glTranslate 2 - 0.375, 2 - 0.375; 2800 glTranslate 2 - 0.375, 2 - 0.375;
2801
2613 $self->SUPER::_draw; 2802 $self->SUPER::_draw;
2614} 2803}
2615 2804
2616############################################################################# 2805#############################################################################
2617 2806
… …
2623 2812
2624sub new { 2813sub new {
2625 my $class = shift; 2814 my $class = shift;
2626 2815
2627 my $self = $class->SUPER::new ( 2816 my $self = $class->SUPER::new (
2628 aspect => 1, 2817 aspect => 1,
2818 can_events => 0,
2629 @_, 2819 @_,
2630 ); 2820 );
2631 2821
2632 if ($self->{anim} && $self->{animspeed}) { 2822 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2823 Scalar::Util::weaken (my $widget = $self);
… …
2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2676 2866
2677 if ($tex) { 2867 if ($tex) {
2678 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2680 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2682 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2683 } 2873 }
2684} 2874}
2685 2875
… …
2692 $self->SUPER::DESTROY; 2882 $self->SUPER::DESTROY;
2693} 2883}
2694 2884
2695############################################################################# 2885#############################################################################
2696 2886
2697package CFClient::UI::InventoryItem; 2887package CFClient::UI::Buttonbar;
2698 2888
2699our @ISA = CFClient::UI::HBox::; 2889our @ISA = CFClient::UI::HBox::;
2700 2890
2701sub _item_to_desc { 2891# TODO: should actualyl wrap buttons and other goodies.
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856}
2857 2892
2858############################################################################# 2893#############################################################################
2859 2894
2860package CFClient::UI::Menu; 2895package CFClient::UI::Menu;
2861 2896
… …
2902 # maybe save $GRAB? must be careful about events... 2937 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 2938 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 2939 $self->{button} = $ev->{button};
2905 2940
2906 $self->show; 2941 $self->show;
2907 $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);
2908} 2943}
2909 2944
2910sub mouse_motion { 2945sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2912 2947
2913 # TODO: should use vbox->find_widget or so 2948 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2949 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER}; 2950 $self->{hover} = $self->{item}{$HOVER};
2951
2952 0
2916} 2953}
2917 2954
2918sub button_up { 2955sub button_up {
2919 my ($self, $ev, $x, $y) = @_; 2956 my ($self, $ev, $x, $y) = @_;
2920 2957
… …
2922 undef $GRAB; 2959 undef $GRAB;
2923 $self->hide; 2960 $self->hide;
2924 2961
2925 $self->_emit ("popdown"); 2962 $self->_emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover}; 2963 $self->{hover}[1]->() if $self->{hover};
2964 } else {
2965 return 0
2966 }
2967
2927 } 2968 1
2928} 2969}
2929 2970
2930############################################################################# 2971#############################################################################
2931 2972
2932package CFClient::UI::Statusbox; 2973package CFClient::UI::Multiplexer;
2933 2974
2934our @ISA = CFClient::UI::VBox::; 2975our @ISA = CFClient::UI::Container::;
2935 2976
2936sub new { 2977sub new {
2937 my $class = shift; 2978 my $class = shift;
2938 2979
2939 $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 (
2940 fontsize => 0.8, 3089 fontsize => 0.8,
2941 @_, 3090 @_,
2942 ) 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
2943} 3098}
2944 3099
2945sub reorder { 3100sub reorder {
2946 my ($self) = @_; 3101 my ($self) = @_;
2947 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} };
2948 3108
2949 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
2950 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2951 } 3111 }
2952 3112
… …
2955 my @items = sort { 3115 my @items = sort {
2956 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
2959 3119
3120 $self->{timer}->interval (1);
3121
2960 my $count = 10 + 1; 3122 my $count = 10 + 1;
2961 for my $item (@items) { 3123 for my $item (@items) {
2962 last unless --$count; 3124 last unless --$count;
2963 3125
2964 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
2965 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
2966 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
2967 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
2968 : $item->{text}; 3130 : $item->{text};
2969 3131
… …
2977 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
2978 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
2979 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
2980 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
2983 can_events => 1, 3145 can_events => 1,
2984 can_hover => 1 3146 can_hover => 1
2985 }; 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;
2986 } 3160 }
2987 3161
2988 $self->clear; 3162 $self->clear;
2989 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
2990} 3164}
… …
2993 my ($self, $text, %arg) = @_; 3167 my ($self, $text, %arg) = @_;
2994 3168
2995 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
2997 3171
3172 return unless $text;
3173
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2999 3175
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 3177
3002 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
3003 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
3033 3209
3034 $self->reorder; 3210 $self->reorder;
3035 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
3036} 3212}
3037 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3038############################################################################# 3222#############################################################################
3039 3223
3040package CFClient::UI::Root; 3224package CFClient::UI::Inventory;
3041 3225
3042our @ISA = CFClient::UI::Container::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044use CFClient::OpenGL;
3045 3227
3046sub new { 3228sub new {
3047 my $class = shift; 3229 my $class = shift;
3048 3230
3049 $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 => [],
3050 @_, 3473 @_,
3051 ) 3474 )
3052} 3475}
3053 3476
3054sub configure { 3477# XXX: Do sorting? Argl...
3055 my ($self, $x, $y, $w, $h) = @_; 3478sub add_spell {
3056
3057 $self->{w} = $w;
3058 $self->{h} = $h;
3059}
3060
3061sub check_size {
3062 my ($self) = @_; 3479 my ($self, $spell) = @_;
3480 $self->{spells}->{$spell->{name}} = $spell;
3063 3481
3064 $self->size_allocate ($self->{w}, $self->{h}) 3482 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3065 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
3066} 3538}
3067 3539
3068sub size_request { 3540sub size_request {
3069 my ($self) = @_; 3541 my ($self) = @_;
3070 3542
3071 ($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
3072} 3558}
3073 3559
3074sub size_allocate { 3560sub size_allocate {
3075 my ($self, $w, $h) = @_; 3561 my ($self, $w, $h) = @_;
3076 3562
3077 for my $child ($self->children) { 3563 for my $child ($self->children) {
3078 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)};
3079 3565
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3566 $X = $child->{force_x} if exists $child->{force_x};
3081 if exists $child->{req_x}; 3567 $Y = $child->{force_y} if exists $child->{force_y};
3082 3568
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3569 $X = _to_pixel $X, $W, $self->{w};
3084 if exists $child->{req_y}; 3570 $Y = _to_pixel $Y, $H, $self->{h};
3085
3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088 3571
3089 $child->configure ($X, $Y, $W, $H); 3572 $child->configure ($X, $Y, $W, $H);
3090 } 3573 }
3091} 3574}
3092 3575
… …
3103} 3586}
3104 3587
3105sub update { 3588sub update {
3106 my ($self) = @_; 3589 my ($self) = @_;
3107 3590
3108 $self->check_size;
3109 $::WANT_REFRESH++; 3591 $::WANT_REFRESH++;
3110} 3592}
3111 3593
3112sub add { 3594sub add {
3113 my ($self, @children) = @_; 3595 my ($self, @children) = @_;
3114 3596
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3597 $_->{is_toplevel} = 1
3123 3598 for @children;
3124 # integerise window positions
3125 $child->{x} = int $child->{x};
3126 $child->{y} = int $child->{y};
3127 }
3128 3599
3129 $self->SUPER::add (@children); 3600 $self->SUPER::add (@children);
3130} 3601}
3131 3602
3132sub remove { 3603sub remove {
3133 my ($self, @children) = @_; 3604 my ($self, @children) = @_;
3134 3605
3135 $self->SUPER::remove (@children); 3606 $self->SUPER::remove (@children);
3607
3608 delete $self->{is_toplevel}
3609 for @children;
3136 3610
3137 while (@children) { 3611 while (@children) {
3138 my $w = pop @children; 3612 my $w = pop @children;
3139 push @children, $w->children; 3613 push @children, $w->children;
3140 $w->set_invisible; 3614 $w->set_invisible;
… …
3159 while ($self->{refresh_hook}) { 3633 while ($self->{refresh_hook}) {
3160 $_->() 3634 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3635 for values %{delete $self->{refresh_hook}};
3162 } 3636 }
3163 3637
3164 if ($self->{check_size}) { 3638 if ($self->{realloc}) {
3165 my @queue = ([], []); 3639 my %queue;
3640 my @queue;
3641 my $widget;
3166 3642
3167 for (;;) { 3643 outer:
3168 if ($self->{check_size}) { 3644 while () {
3169 # heuristic: check containers last 3645 if (my $realloc = delete $self->{realloc}) {
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3646 for $widget (values %$realloc) {
3171 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 }
3172 } 3653 }
3173 3654
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3655 while () {
3656 @queue or last outer;
3175 3657
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3658 $widget = pop @{ $queue[-1] || [] }
3177 ? @$widget{qw(user_w user_h)} 3659 and last;
3178 : $widget->size_request;
3179
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183 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}) {
3184 $widget->{req_w} = $w; 3679 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h; 3680 $widget->{req_h} = $h;
3186 3681
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3682 $self->{size_alloc}{$widget+0} = $widget;
3188 3683
3189 $widget->{parent}->check_size
3190 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 }
3191 } 3691 }
3692
3693 delete $self->{realloc}{$widget+0};
3192 } 3694 }
3193 } 3695 }
3194 3696
3195 while ($self->{size_alloc}) { 3697 while (my $size_alloc = delete $self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) { 3698 my @queue = sort { $b->{visible} <=> $a->{visible} }
3197 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)};
3198 3705
3199 $w = 0 if $w < 0; 3706 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3707 $h = 0 if $h < 0;
3201 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
3202 $widget->{w} = $w; 3716 $widget->{w} = $w;
3203 $widget->{h} = $h; 3717 $widget->{h} = $h;
3718
3204 $widget->emit (size_allocate => $w, $h); 3719 $widget->emit (size_allocate => $w, $h);
3720 }
3205 } 3721 }
3206 } 3722 }
3207 3723
3208 while ($self->{post_alloc_hook}) { 3724 while ($self->{post_alloc_hook}) {
3209 $_->() 3725 $_->()
3210 for values %{delete $self->{post_alloc_hook}}; 3726 for values %{delete $self->{post_alloc_hook}};
3211 } 3727 }
3728
3212 3729
3213 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3730 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3731 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215 glClear GL_COLOR_BUFFER_BIT; 3732 glClear GL_COLOR_BUFFER_BIT;
3216 3733
… …
3218 glLoadIdentity; 3735 glLoadIdentity;
3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3736 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3220 glMatrixMode GL_MODELVIEW; 3737 glMatrixMode GL_MODELVIEW;
3221 glLoadIdentity; 3738 glLoadIdentity;
3222 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
3223 $self->_draw; 3747 $self->_draw;
3224} 3748}
3225 3749
3226############################################################################# 3750#############################################################################
3227 3751

Diff Legend

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