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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.305 by root, Sun Jun 18 17:13:12 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 27 $TOOLTIP->hide;
46 28
47 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
48 32
49 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
50 34
51 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
52 36
… …
59 } 43 }
60 } 44 }
61 45
62 $TOOLTIP->hide; 46 $TOOLTIP->hide;
63 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
64} 71}
65 72
66# class methods for events 73# class methods for events
67sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
68 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
82 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
83 90
84 $GRAB = $widget; 91 $GRAB = $widget;
85 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
86 93
87 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
88 } 95 }
89 96
90 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
91 98
92 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
107 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
108 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
109 $grab->update if $grab; 116 $grab->update if $grab;
110 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
111 118
112 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
113 } 120 }
114} 121}
115 122
116sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
117 my ($ev) = @_; 124 my ($ev) = @_;
… …
123 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
124 131
125 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
126 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
127 134
128 check_tooltip; 135 $TOOLTIP_WATCHER->start;
129 } 136 }
130 137
131 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
132 if $HOVER; 139 if $HOVER;
133} 140}
… …
165sub rescale_widgets { 172sub rescale_widgets {
166 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
167 174
168 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
176 } 190 }
177 } 191 }
178 192
179 reconfigure_widgets; 193 reconfigure_widgets;
180} 194}
… …
189 203
190sub new { 204sub new {
191 my $class = shift; 205 my $class = shift;
192 206
193 my $self = bless { 207 my $self = bless {
194 x => 0, 208 x => "center",
195 y => 0, 209 y => "center",
196 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
197 can_events => 1, 213 can_events => 1,
198 @_ 214 @_
199 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 218
201 for (keys %$self) { 219 for (keys %$self) {
202 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
204 } 222 }
205 } 223 }
206 224
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
214 } 235 }
215 236
216 $self 237 $self
217} 238}
218 239
… …
229 return if $self->{parent}; 250 return if $self->{parent};
230 251
231 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
232} 253}
233 254
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244}
245
246sub set_visible { 255sub set_visible {
247 my ($self) = @_; 256 my ($self) = @_;
248 257
249 return if $self->{visible}; 258 return if $self->{visible};
250 259
… …
263 272
264 return unless $self->{visible}; 273 return unless $self->{visible};
265 274
266 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
267 276
277 delete $self->{visible};
268 delete $self->{root}; 278 delete $self->{root};
269 delete $self->{visible};
270 279
271 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
272 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
273 282
274 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
275 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
276 285
277 $self->focus_out; 286 $self->emit ("focus_out");
278
279 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
280} 288}
281 289
282sub set_visibility { 290sub set_visibility {
283 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
303 311
304 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
305 if $self->{parent}; 313 if $self->{parent};
306} 314}
307 315
308sub move { 316sub move_abs {
309 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
310 318
311 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
312 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
313 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
314 322
315 $self->update; 323 $self->update;
316} 324}
317 325
318sub set_size { 326sub set_size {
319 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
320 328
321 $self->{def_w} = $w; 329 $self->{force_w} = $w;
322 $self->{def_h} = $h; 330 $self->{force_h} = $h;
323 331
324 $self->realloc; 332 $self->realloc;
325} 333}
326 334
327sub size_request { 335sub size_request {
… …
331 339
332sub configure { 340sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
334 342
335 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
338 348
339 # use alignment to adjust x, y 349 # use alignment to adjust x, y
340 350
341 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 353 }
346 354
347 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 356 $self->{x} = $x;
349 $self->{y} = $y; 357 $self->{y} = $y;
350 $self->update; 358 $self->update;
351 } 359 }
352 360
353 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 362 return unless $self->{visible};
355 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
357 } 368 }
358}
359
360sub size_allocate {
361 # nothing to be done
362} 369}
363 370
364sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
365} 377}
366 378
367sub set_max_size { 379sub set_max_size {
368 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
369 381
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
372} 386}
373 387
374sub set_tooltip { 388sub set_tooltip {
375 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
376 390
… …
381 395
382 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
383 397
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 401 }
388} 402}
389 403
390# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
391sub coord2local { 405sub coord2local {
… …
399 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
400 414
401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
402} 416}
403 417
404sub focus_in { 418sub invoke_focus_in {
405 my ($self) = @_; 419 my ($self) = @_;
406 420
407 return if $FOCUS == $self; 421 return if $FOCUS == $self;
408 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
409 423
410 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
411 425
412 $self->_emit (focus_in => $focus);
413
414 $focus->update if $focus; 426 $focus->update if $focus;
415 $FOCUS->update; 427 $FOCUS->update;
416}
417 428
429 0
430}
431
418sub focus_out { 432sub invoke_focus_out {
419 my ($self) = @_; 433 my ($self) = @_;
420 434
421 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
422 436
423 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
424 438
425 $self->_emit (focus_out => $focus);
426
427 $focus->update if $focus; #? 439 $focus->update if $focus; #?
428 440
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 442 unless $FOCUS;
431}
432 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
433sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
434sub button_up { } 454sub invoke_button_up { 1 }
435sub key_down { } 455sub invoke_key_down { 1 }
436sub key_up { } 456sub invoke_key_up { 1 }
437 457
438sub button_down { 458sub invoke_button_down {
439 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
440 460
441 $self->focus_in; 461 $self->grab_focus;
442}
443 462
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
478}
449 479
450sub find_widget { 480sub find_widget {
451 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
452 482
453 return () unless $self->{can_events}; 483 return () unless $self->{can_events};
… …
461 491
462sub set_parent { 492sub set_parent {
463 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
464 494
465 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 496 $self->set_visible if $parent->{visible};
468} 497}
469 498
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub _emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub emit {
483 my ($self, $signal, @args) = @_;
484
485 $self->_emit ($signal, @args)
486 || $self->$signal (@args);
487}
488
489sub visibility_change {
490 #my ($self, $visible) = @_;
491}
492
493sub realloc { 499sub realloc {
494 my ($self) = @_; 500 my ($self) = @_;
495 501
496 if ($self->{visible}) { 502 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 503 return if $self->{root}{realloc}{$self+0};
498 504
499 $self->{root}{realloc}{$self} = $self; 505 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 506 $self->{root}->update;
501 } else { 507 } else {
502 delete $self->{req_w}; 508 delete $self->{req_w};
509 delete $self->{req_h};
503 } 510 }
504} 511}
505 512
506sub update { 513sub update {
507 my ($self) = @_; 514 my ($self) = @_;
508 515
509 $self->{parent}->update 516 $self->{parent}->update
510 if $self->{parent}; 517 if $self->{parent};
511} 518}
512 519
520sub reconfigure {
521 my ($self) = @_;
522
523 $self->realloc;
524 $self->update;
525}
526
527# using global variables seems a bit hacky, but passing through all drawing
528# functions seems pointless.
529our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
530
513sub draw { 531sub draw {
514 my ($self) = @_; 532 my ($self) = @_;
515 533
516 return unless $self->{h} && $self->{w}; 534 return unless $self->{h} && $self->{w};
535
536 # update screen rectangle
537 local $draw_x = $draw_x + $self->{x};
538 local $draw_y = $draw_y + $self->{y};
539 local $draw_w = $draw_x + $self->{w};
540 local $draw_h = $draw_y + $self->{h};
541
542 # skip widgets that are entirely outside the drawing area
543 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
544 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 545
518 glPushMatrix; 546 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 547 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 548
523 if ($self == $HOVER && $self->{can_hover}) { 549 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 550 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 551 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 552 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 553 glBegin GL_QUADS;
530 glVertex $x , $y; 554 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 555 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 556 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 557 glVertex 0 , $self->{h};
534 glEnd; 558 glEnd;
535 glDisable GL_BLEND; 559 glDisable GL_BLEND;
536 } 560 }
537 561
538 if ($ENV{PCLIENT_DEBUG}) { 562 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 563 glPushMatrix;
540 glColor 1, 1, 0, 1; 564 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 565 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 566 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 567 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 568 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 569 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 570 glVertex 0 , $self->{h} - 1;
547 glEnd; 571 glEnd;
548 glPopMatrix; 572 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 573 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 574 }
575
576 $self->_draw;
577 glPopMatrix;
551} 578}
552 579
553sub _draw { 580sub _draw {
554 my ($self) = @_; 581 my ($self) = @_;
555 582
… …
558 585
559sub DESTROY { 586sub DESTROY {
560 my ($self) = @_; 587 my ($self) = @_;
561 588
562 delete $WIDGET{$self+0}; 589 delete $WIDGET{$self+0};
563 #$self->deactivate; 590
591 eval { $self->destroy };
592 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
564} 593}
565 594
566############################################################################# 595#############################################################################
567 596
568package CFClient::UI::DrawBG; 597package CFClient::UI::DrawBG;
… …
593 622
594 if ($color && (@$color < 4 || $color->[3])) { 623 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 624 my ($w, $h) = @$self{qw(w h)};
596 625
597 glEnable GL_BLEND; 626 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 627 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 628 glColor_premultiply @$color;
600 629
601 glBegin GL_QUADS; 630 glBegin GL_QUADS;
602 glVertex 0 , 0; 631 glVertex 0 , 0;
603 glVertex 0 , $h; 632 glVertex 0 , $h;
604 glVertex $w, $h; 633 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 648 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 649 $class->SUPER::new (can_events => 0, %arg);
621} 650}
622 651
623sub size_request { 652sub size_request {
624 (0, 0) 653 my ($self) = @_;
654
655 ($self->{w} + 0, $self->{h} + 0)
625} 656}
626 657
627sub draw { } 658sub draw { }
628 659
629############################################################################# 660#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 664our @ISA = CFClient::UI::Base::;
634 665
635sub new { 666sub new {
636 my ($class, %arg) = @_; 667 my ($class, %arg) = @_;
637 668
638 my $children = delete $arg{children} || []; 669 my $children = delete $arg{children};
639 670
640 my $self = $class->SUPER::new ( 671 my $self = $class->SUPER::new (
641 children => [], 672 children => [],
642 can_events => 0, 673 can_events => 0,
643 %arg, 674 %arg,
644 ); 675 );
676
645 $self->add ($_) for @$children; 677 $self->add (@$children)
678 if $children;
646 679
647 $self 680 $self
648} 681}
649 682
650sub add { 683sub add {
… …
698 $x -= $self->{x}; 731 $x -= $self->{x};
699 $y -= $self->{y}; 732 $y -= $self->{y};
700 733
701 my $res; 734 my $res;
702 735
703 for (reverse @{ $self->{children} }) { 736 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 737 $res = $_->find_widget ($x, $y)
705 and return $res; 738 and return $res;
706 } 739 }
707 740
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 741 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
729} 762}
730 763
731sub add { 764sub add {
732 my ($self, $child) = @_; 765 my ($self, $child) = @_;
733 766
734 $self->{children} = []; 767 $self->SUPER::remove ($_) for @{ $self->{children} };
735
736 $self->SUPER::add ($child); 768 $self->SUPER::add ($child);
737} 769}
738 770
739sub remove { 771sub remove {
740 my ($self, $widget) = @_; 772 my ($self, $widget) = @_;
… …
749 781
750sub size_request { 782sub size_request {
751 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
752} 784}
753 785
754sub size_allocate { 786sub invoke_size_allocate {
755 my ($self, $w, $h, $changed) = @_; 787 my ($self, $w, $h) = @_;
756 788
757 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
758} 792}
759 793
760############################################################################# 794#############################################################################
795
796# back-buffered drawing area
761 797
762package CFClient::UI::Window; 798package CFClient::UI::Window;
763 799
764our @ISA = CFClient::UI::Bin::; 800our @ISA = CFClient::UI::Bin::;
765 801
… …
776 812
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 814 $self->SUPER::update;
779} 815}
780 816
781sub size_allocate { 817sub invoke_size_allocate {
782 my ($self, $w, $h, $changed) = @_; 818 my ($self, $w, $h) = @_;
783 819
784 $self->SUPER::size_allocate ($w, $h, $changed);
785 $self->update 820 $self->update;
786 if $changed; 821
822 $self->SUPER::invoke_size_allocate ($w, $h)
787} 823}
788 824
789sub _render { 825sub _render {
826 my ($self) = @_;
827
790 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
791} 829}
792 830
793sub render_child { 831sub render_child {
794 my ($self) = @_; 832 my ($self) = @_;
795 833
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
799 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
800 $self->_render; 845 $self->_render;
801 }; 846 };
802} 847}
803 848
804sub _draw { 849sub _draw {
805 my ($self) = @_; 850 my ($self) = @_;
806 851
807 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
808 853
809 my $tex = $self->{texture} 854 my $tex = $self->{texture}
810 or return; 855 or return;
811 856
812 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 859 glColor 0, 0, 0, 1;
815 860
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 862
818 glDisable GL_TEXTURE_2D; 863 glDisable GL_TEXTURE_2D;
819} 864}
… …
835} 880}
836 881
837sub size_request { 882sub size_request {
838 my ($self) = @_; 883 my ($self) = @_;
839 884
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 886
842 $w = 10 if $self->{scroll_x}; 887 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
844 889
845 ($w, $h) 890 ($w, $h)
846} 891}
847 892
848sub size_allocate { 893sub invoke_size_allocate {
849 my ($self, $w, $h, $changed) = @_; 894 my ($self, $w, $h) = @_;
850 895
896 my $child = $self->child;
897
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 900
854 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
855 $self->update; 902 $self->update;
903
904 1
856} 905}
857 906
858sub set_offset { 907sub set_offset {
859 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
860 909
… …
893} 942}
894 943
895sub _render { 944sub _render {
896 my ($self) = @_; 945 my ($self) = @_;
897 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 951
900 $self->SUPER::_render; 952 $self->SUPER::_render;
901} 953}
902 954
… …
905package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
906 958
907our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
908 960
909sub new { 961sub new {
910 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
911 965
912 my $self; 966 my $self;
913 967
914 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
915 vertical => 1, 969 vertical => 1,
… …
920 ; 974 ;
921 975
922 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 978 slider => $slider,
925 @_, 979 %arg,
926 ); 980 );
927 981
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
931 984
932 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
933} 992}
934 993
935sub update { 994sub update {
936 my ($self) = @_; 995 my ($self) = @_;
937 996
… …
940 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
941 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1002}
944 1003
945sub size_allocate { 1004sub invoke_size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1005 my ($self, $w, $h) = @_;
947
948 $self->SUPER::size_allocate ($w, $h, $changed);
949 1006
950 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
952} 1011}
953 1012
954#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
955# update viewport offset on scroll 1014# update viewport offset on scroll
956 1015
… …
976 1035
977 if ($self->{bg}) { 1036 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1037 my ($w, $h) = @$self{qw(w h)};
979 1038
980 glEnable GL_BLEND; 1039 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1040 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1041 glColor_premultiply @{ $self->{bg} };
983 1042
984 glBegin GL_QUADS; 1043 glBegin GL_QUADS;
985 glVertex 0 , 0; 1044 glVertex 0 , 0;
986 glVertex 0 , $h; 1045 glVertex 0 , $h;
987 glVertex $w, $h; 1046 glVertex $w, $h;
… …
1009my @border = 1068my @border =
1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1011 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1012 1071
1013sub new { 1072sub new {
1014 my $class = shift; 1073 my ($class, %arg) = @_;
1015 1074
1016 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
1017 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
1018 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
1019 border => 0.6, 1078 border => 0.6,
1020 is_toplevel => 1,
1021 can_events => 1, 1079 can_events => 1,
1022 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
1023 ); 1083 );
1024 1084
1025 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title_widget} = new CFClient::UI::Label
1026 align => 0, 1086 align => 0,
1027 valign => 1, 1087 valign => 1,
1028 text => $self->{title}, 1088 text => $self->{title},
1029 fontsize => $self->{border}; 1089 fontsize => $self->{border},
1090 if exists $self->{title};
1091
1092 if ($self->{has_close_button}) {
1093 $self->{close_button} =
1094 new CFClient::UI::ImageButton
1095 image => 'x1_close.png',
1096 on_activate => sub { $self->hide };
1097
1098 $self->CFClient::UI::Container::add ($self->{close_button});
1099 }
1030 1100
1031 $self 1101 $self
1102}
1103
1104sub add {
1105 my ($self, @widgets) = @_;
1106
1107 $self->SUPER::add (@widgets);
1108 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1032} 1110}
1033 1111
1034sub border { 1112sub border {
1035 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
1036} 1114}
1037 1115
1038sub size_request { 1116sub size_request {
1039 my ($self) = @_; 1117 my ($self) = @_;
1118
1119 $self->{title_widget}->size_request
1120 if $self->{title_widget};
1121
1122 $self->{close_button}->size_request
1123 if $self->{close_button};
1040 1124
1041 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1042 1126
1043 ( 1127 (
1044 $w + $self->border * 2, 1128 $w + $self->border * 2,
1045 $h + $self->border * 2, 1129 $h + $self->border * 2,
1046 ) 1130 )
1047} 1131}
1048 1132
1049sub size_allocate { 1133sub invoke_size_allocate {
1050 my ($self, $w, $h, $changed) = @_; 1134 my ($self, $w, $h) = @_;
1051 1135
1052 return unless $changed; 1136 if ($self->{title_widget}) {
1137 $self->{title_widget}{w} = $w;
1138 $self->{title_widget}{h} = $h;
1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1140 }
1053 1141
1142 my $border = $self->border;
1143
1054 $h -= List::Util::max 0, $self->border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1056 1146
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1061}
1062 1148
1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1150 if $self->{close_button};
1151
1152 1
1153}
1154
1063sub button_down { 1155sub invoke_button_down {
1064 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1065 1157
1066 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1067 my $border = $self->border; 1159 my $border = $self->border;
1068 1160
… …
1081 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
1082 1174
1083 my $dx = $ev->{x} - $ox; 1175 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1176 my $dy = $ev->{y} - $oy;
1085 1177
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1178 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1179 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1180
1181 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1091 $self->realloc; 1182 $self->realloc;
1092 }; 1183 };
1093 1184
1094 } elsif ($lr ^ $td) { 1185 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1186 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1098 $self->{motion} = sub { 1189 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1190 my ($ev, $x, $y) = @_;
1100 1191
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1193
1103 $self->{user_x} = $bx + $x - $ox; 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1195 # HACK: the next line is required to enforce placement
1105 1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->realloc;
1108 }; 1197 };
1198 } else {
1199 return 0;
1200 }
1201
1109 } 1202 1
1110} 1203}
1111 1204
1112sub button_up { 1205sub invoke_button_up {
1113 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1114 1207
1115 delete $self->{motion}; 1208 ! ! delete $self->{motion}
1116} 1209}
1117 1210
1118sub mouse_motion { 1211sub invoke_mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1120 1213
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1215
1216 ! ! $self->{motion}
1122} 1217}
1123 1218
1124sub _draw { 1219sub _draw {
1125 my ($self) = @_; 1220 my ($self) = @_;
1126 1221
1222 my $child = $self->{children}[0];
1223
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1224 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1225 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1226
1130 glEnable GL_TEXTURE_2D; 1227 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1229
1133 my $border = $self->border; 1230 my $border = $self->border;
… …
1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1245 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149 } 1246 }
1150 1247
1151 glDisable GL_TEXTURE_2D; 1248 glDisable GL_TEXTURE_2D;
1152 1249
1153 $self->{title}->draw if $self->{title};
1154
1155 $self->child->draw; 1250 $child->draw;
1251
1252 if ($self->{title_widget}) {
1253 glTranslate 0, $border - $self->{h};
1254 $self->{title_widget}->_draw;
1255
1256 glTranslate 0, - ($border - $self->{h});
1257 }
1258
1259 $self->{close_button}->draw
1260 if $self->{close_button};
1156} 1261}
1157 1262
1158############################################################################# 1263#############################################################################
1159 1264
1160package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1183 1288
1184 $child->set_parent ($self); 1289 $child->set_parent ($self);
1185 $self->{children}[$y][$x] = $child; 1290 $self->{children}[$y][$x] = $child;
1186 1291
1187 $self->realloc; 1292 $self->realloc;
1293}
1294
1295sub remove {
1296 my ($self, $child) = @_;
1297
1298 # TODO: not yet implemented
1188} 1299}
1189 1300
1190# TODO: move to container class maybe? send children a signal on removal? 1301# TODO: move to container class maybe? send children a signal on removal?
1191sub clear { 1302sub clear {
1192 my ($self) = @_; 1303 my ($self) = @_;
… …
1233 (sum @$ws), 1344 (sum @$ws),
1234 (sum @$hs), 1345 (sum @$hs),
1235 ) 1346 )
1236} 1347}
1237 1348
1238sub size_allocate { 1349sub invoke_size_allocate {
1239 my ($self, $w, $h, $changed) = @_; 1350 my ($self, $w, $h) = @_;
1240 1351
1241 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1242 1353
1243 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
1244 my $req_h = (sum @$hs) || 1; 1355 my $req_h = (sum @$hs) || 1;
… …
1275 } 1386 }
1276 1387
1277 $y += $row_h; 1388 $y += $row_h;
1278 } 1389 }
1279 1390
1391 1
1280} 1392}
1281 1393
1282sub find_widget { 1394sub find_widget {
1283 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1284 1396
… …
1321 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 ) 1435 )
1324} 1436}
1325 1437
1326sub size_allocate { 1438sub invoke_size_allocate {
1327 my ($self, $w, $h, $changed) = @_; 1439 my ($self, $w, $h) = @_;
1328 1440
1329 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children}; 1442 my $children = $self->{children};
1331 1443
1332 my @req; 1444 my @req;
… …
1415 ellipsise => 3, # end 1527 ellipsise => 3, # end
1416 layout => (new CFClient::Layout), 1528 layout => (new CFClient::Layout),
1417 fontsize => 1, 1529 fontsize => 1,
1418 align => -1, 1530 align => -1,
1419 valign => -1, 1531 valign => -1,
1420 padding => 2, 1532 padding_x => 2,
1533 padding_y => 2,
1421 can_events => 0, 1534 can_events => 0,
1422 %arg 1535 %arg
1423 ); 1536 );
1424 1537
1425 if (exists $self->{template}) { 1538 if (exists $self->{template}) {
… …
1452 1565
1453 delete $self->{texture}; 1566 delete $self->{texture};
1454 $self->SUPER::update; 1567 $self->SUPER::update;
1455} 1568}
1456 1569
1570sub realloc {
1571 my ($self) = @_;
1572
1573 delete $self->{ox};
1574 $self->SUPER::realloc;
1575}
1576
1457sub set_text { 1577sub set_text {
1458 my ($self, $text) = @_; 1578 my ($self, $text) = @_;
1459 1579
1460 return if $self->{text} eq "T$text"; 1580 return if $self->{text} eq "T$text";
1461 $self->{text} = "T$text"; 1581 $self->{text} = "T$text";
1462 1582
1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1583 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1464 $self->{layout}->set_text ($text); 1584 $self->{layout}->set_text ($text);
1465 1585
1586 delete $self->{size_req};
1466 $self->realloc; 1587 $self->realloc;
1467 $self->update; 1588 $self->update;
1468} 1589}
1469 1590
1470sub set_markup { 1591sub set_markup {
… …
1476 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1597 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1477 1598
1478 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1599 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1479 $self->{layout}->set_markup ($markup); 1600 $self->{layout}->set_markup ($markup);
1480 1601
1602 delete $self->{size_req};
1481 $self->realloc; 1603 $self->realloc;
1482 $self->update; 1604 $self->update;
1483} 1605}
1484 1606
1485sub size_request { 1607sub size_request {
1486 my ($self) = @_; 1608 my ($self) = @_;
1487 1609
1610 $self->{size_req} ||= do {
1488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1611 $self->{layout}->set_font ($self->{font}) if $self->{font};
1489 $self->{layout}->set_width ($self->{max_w} || -1); 1612 $self->{layout}->set_width ($self->{max_w} || -1);
1490 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1613 $self->{layout}->set_ellipsise ($self->{ellipsise});
1491 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1614 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1492 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1615 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1493 1616
1494 my ($w, $h) = $self->{layout}->size; 1617 my ($w, $h) = $self->{layout}->size;
1495 1618
1496 if (exists $self->{template}) { 1619 if (exists $self->{template}) {
1497 $self->{template}->set_font ($self->{font}) if $self->{font}; 1620 $self->{template}->set_font ($self->{font}) if $self->{font};
1498 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1622
1500 my ($w2, $h2) = $self->{template}->size; 1623 my ($w2, $h2) = $self->{template}->size;
1501 1624
1502 $w = List::Util::max $w, $w2; 1625 $w = List::Util::max $w, $w2;
1503 $h = List::Util::max $h, $h2; 1626 $h = List::Util::max $h, $h2;
1627 }
1628
1629 [$w, $h]
1504 } 1630 };
1505 1631
1506 ( 1632 @{ $self->{size_req} }
1507 $w + $self->{padding} * 2,
1508 $h + $self->{padding} * 2,
1509 )
1510} 1633}
1511 1634
1512sub size_allocate { 1635sub invoke_size_allocate {
1513 my ($self, $w, $h, $changed) = @_; 1636 my ($self, $w, $h) = @_;
1637
1638 delete $self->{ox};
1514 1639
1515 delete $self->{texture} 1640 delete $self->{texture}
1516 if $changed; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1517} 1644}
1518 1645
1519sub set_fontsize { 1646sub set_fontsize {
1520 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1521 1648
1522 $self->{fontsize} = $fontsize; 1649 $self->{fontsize} = $fontsize;
1523 delete $self->{texture}; 1650 delete $self->{texture};
1524 1651
1525 $self->realloc; 1652 $self->realloc;
1653}
1654
1655sub reconfigure {
1656 my ($self) = @_;
1657
1658 delete $self->{size_req};
1659
1660 $self->SUPER::reconfigure;
1526} 1661}
1527 1662
1528sub _draw { 1663sub _draw {
1529 my ($self) = @_; 1664 my ($self) = @_;
1530 1665
… …
1536 $self->{layout}->set_width ($self->{w}); 1671 $self->{layout}->set_width ($self->{w});
1537 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1672 $self->{layout}->set_ellipsise ($self->{ellipsise});
1538 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1673 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1674 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540 1675
1541 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1676 new_from_layout CFClient::Texture $self->{layout}
1677 };
1542 1678
1679 unless (exists $self->{ox}) {
1543 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1680 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1544 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1681 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1545 : ($self->{w} - $tex->{w}) * 0.5); 1682 : ($self->{w} - $tex->{w}) * 0.5);
1546 1683
1547 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1684 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1548 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1685 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1549 : ($self->{h} - $tex->{h}) * 0.5); 1686 : ($self->{h} - $tex->{h}) * 0.5);
1550
1551 $tex
1552 }; 1687 };
1553 1688
1554 glEnable GL_TEXTURE_2D; 1689 glEnable GL_TEXTURE_2D;
1555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1690
1691 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1692 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1556 1693
1557 if ($tex->{format} == GL_ALPHA) { 1694 if ($tex->{format} == GL_ALPHA) {
1695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1558 glColor @{$self->{fg}}; 1696 glColor @{$self->{fg}};
1559 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1697 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1560 } else { 1698 } else {
1699 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1700 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1562 } 1701 }
1563 1702
1564 glDisable GL_TEXTURE_2D; 1703 glDisable GL_TEXTURE_2D;
1565} 1704}
1566 1705
… …
1583 can_hover => 1, 1722 can_hover => 1,
1584 can_focus => 1, 1723 can_focus => 1,
1585 valign => 0, 1724 valign => 0,
1586 can_events => 1, 1725 can_events => 1,
1587 #text => ... 1726 #text => ...
1727 #hidden => "*",
1588 @_ 1728 @_
1589 ) 1729 )
1590} 1730}
1591 1731
1592sub _set_text { 1732sub _set_text {
… …
1594 1734
1595 delete $self->{cur_h}; 1735 delete $self->{cur_h};
1596 1736
1597 return if $self->{text} eq $text; 1737 return if $self->{text} eq $text;
1598 1738
1599 delete $self->{texture};
1600
1601 $self->{last_activity} = $::NOW; 1739 $self->{last_activity} = $::NOW;
1602 $self->{text} = $text; 1740 $self->{text} = $text;
1603 1741
1604 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1605 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1744 delete $self->{size_req};
1606 1745
1607 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1747
1748 $self->realloc;
1749 $self->update;
1608} 1750}
1609 1751
1610sub set_text { 1752sub set_text {
1611 my ($self, $text) = @_; 1753 my ($self, $text) = @_;
1612 1754
1613 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1614 $self->_set_text ($text); 1756 $self->_set_text ($text);
1615
1616 $self->realloc;
1617} 1757}
1618 1758
1619sub get_text { 1759sub get_text {
1620 $_[0]{text} 1760 $_[0]{text}
1621} 1761}
… …
1626 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1627 1767
1628 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1629} 1769}
1630 1770
1631sub key_down { 1771sub invoke_key_down {
1632 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1633 1773
1634 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1635 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1636 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1648 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1649 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1650 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1651 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1652 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1653 $self->_emit ('escape'); 1793 $self->emit ('escape');
1654 } elsif ($uni) { 1794 } elsif ($uni) {
1655 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1796 } else {
1797 return 0;
1656 } 1798 }
1657 1799
1658 $self->_set_text ($text); 1800 $self->_set_text ($text);
1659 1801
1660 $self->realloc; 1802 $self->realloc;
1661}
1662 1803
1804 1
1805}
1806
1663sub focus_in { 1807sub invoke_focus_in {
1664 my ($self) = @_; 1808 my ($self) = @_;
1665 1809
1666 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1667 1811
1668 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1669} 1813}
1670 1814
1671sub button_down { 1815sub invoke_button_down {
1672 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1673 1817
1674 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1675 1819
1676 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1677 1821
1678 # byte-index to char-index 1822 # byte-index to char-index
1679 my $text = $self->{text}; 1823 my $text = $self->{text};
1680 utf8::encode $text; 1824 utf8::encode $text;
1681 $self->{cursor} = length substr $text, 0, $idx; 1825 $self->{cursor} = length substr $text, 0, $idx;
1682 1826
1683 $self->_set_text ($self->{text}); 1827 $self->_set_text ($self->{text});
1684 $self->update; 1828 $self->update;
1829
1830 1
1685} 1831}
1686 1832
1687sub mouse_motion { 1833sub invoke_mouse_motion {
1688 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1689# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1836
1837 1
1690} 1838}
1691 1839
1692sub _draw { 1840sub _draw {
1693 my ($self) = @_; 1841 my ($self) = @_;
1694 1842
1695 local $self->{fg} = $self->{fg}; 1843 local $self->{fg} = $self->{fg};
1696 1844
1697 if ($FOCUS == $self) { 1845 if ($FOCUS == $self) {
1698 glColor @{$self->{active_bg}}; 1846 glColor_premultiply @{$self->{active_bg}};
1699 $self->{fg} = $self->{active_fg}; 1847 $self->{fg} = $self->{active_fg};
1700 } else { 1848 } else {
1701 glColor @{$self->{bg}}; 1849 glColor_premultiply @{$self->{bg}};
1702 } 1850 }
1703 1851
1704 glEnable GL_BLEND; 1852 glEnable GL_BLEND;
1705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1853 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1706 glBegin GL_QUADS; 1854 glBegin GL_QUADS;
1707 glVertex 0 , 0; 1855 glVertex 0 , 0;
1708 glVertex 0 , $self->{h}; 1856 glVertex 0 , $self->{h};
1709 glVertex $self->{w}, $self->{h}; 1857 glVertex $self->{w}, $self->{h};
1710 glVertex $self->{w}, 0; 1858 glVertex $self->{w}, 0;
… …
1735 1883
1736our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1737 1885
1738use CFClient::OpenGL; 1886use CFClient::OpenGL;
1739 1887
1740sub key_down { 1888sub invoke_key_down {
1741 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1742 1890
1743 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1744 1892
1745 if ($sym == 13) { 1893 if ($sym == 13) {
1746 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1747 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1748 $self->{history_pointer} = -1; 1896 $self->{history_pointer} = -1;
1749 $self->{history_saveback} = ''; 1897 $self->{history_saveback} = '';
1750 $self->_emit (activate => $txt); 1898 $self->emit (activate => $txt);
1751 $self->update; 1899 $self->update;
1752 1900
1753 } elsif ($sym == CFClient::SDLK_UP) { 1901 } elsif ($sym == CFClient::SDLK_UP) {
1754 if ($self->{history_pointer} < 0) { 1902 if ($self->{history_pointer} < 0) {
1755 $self->{history_saveback} = $self->get_text; 1903 $self->{history_saveback} = $self->get_text;
… …
1771 } else { 1919 } else {
1772 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1773 } 1921 }
1774 1922
1775 } else { 1923 } else {
1776 $self->SUPER::key_down ($ev); 1924 return $self->SUPER::invoke_key_down ($ev)
1925 }
1926
1777 } 1927 1
1778
1779} 1928}
1780 1929
1781############################################################################# 1930#############################################################################
1782 1931
1783package CFClient::UI::Button; 1932package CFClient::UI::Button;
… …
1792 1941
1793sub new { 1942sub new {
1794 my $class = shift; 1943 my $class = shift;
1795 1944
1796 $class->SUPER::new ( 1945 $class->SUPER::new (
1797 padding => 4, 1946 padding_x => 4,
1947 padding_y => 4,
1798 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1799 active_fg => [0, 0, 1], 1949 active_fg => [0, 0, 1],
1800 can_hover => 1, 1950 can_hover => 1,
1801 align => 0, 1951 align => 0,
1802 valign => 0, 1952 valign => 0,
1803 can_events => 1, 1953 can_events => 1,
1804 @_ 1954 @_
1805 ) 1955 )
1806} 1956}
1807 1957
1808sub activate { }
1809
1810sub button_up { 1958sub invoke_button_up {
1811 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1812 1960
1813 $self->emit ("activate") 1961 $self->emit ("activate")
1814 if $x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1815 && $y >= 0 && $y < $self->{h}; 1963 && $y >= 0 && $y < $self->{h};
1964
1965 1
1816} 1966}
1817 1967
1818sub _draw { 1968sub _draw {
1819 my ($self) = @_; 1969 my ($self) = @_;
1820 1970
1821 local $self->{fg} = $self->{fg}; 1971 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1822
1823 if ($GRAB == $self) {
1824 $self->{fg} = $self->{active_fg};
1825 }
1826 1972
1827 glEnable GL_TEXTURE_2D; 1973 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1974 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 glColor 0, 0, 0, 1; 1975 glColor 0, 0, 0, 1;
1830 1976
… …
1835 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1836} 1982}
1837 1983
1838############################################################################# 1984#############################################################################
1839 1985
1986package CFClient::UI::ImageButton;
1987
1988our @ISA = CFClient::UI::Image::;
1989
1990use CFClient::OpenGL;
1991
1992my %textures;
1993
1994sub new {
1995 my $class = shift;
1996
1997 my $self = $class->SUPER::new (
1998 padding_x => 4,
1999 padding_y => 4,
2000 fg => [1, 1, 1],
2001 active_fg => [0, 0, 1],
2002 can_hover => 1,
2003 align => 0,
2004 valign => 0,
2005 can_events => 1,
2006 @_
2007 );
2008}
2009
2010sub invoke_button_up {
2011 my ($self, $ev, $x, $y) = @_;
2012
2013 $self->emit ("activate")
2014 if $x >= 0 && $x < $self->{w}
2015 && $y >= 0 && $y < $self->{h};
2016
2017 1
2018}
2019
2020#############################################################################
2021
1840package CFClient::UI::CheckBox; 2022package CFClient::UI::CheckBox;
1841 2023
1842our @ISA = CFClient::UI::DrawBG::; 2024our @ISA = CFClient::UI::DrawBG::;
1843 2025
1844my @tex = 2026my @tex =
… …
1849 2031
1850sub new { 2032sub new {
1851 my $class = shift; 2033 my $class = shift;
1852 2034
1853 $class->SUPER::new ( 2035 $class->SUPER::new (
1854 padding => 2, 2036 padding_x => 2,
2037 padding_y => 2,
1855 fg => [1, 1, 1], 2038 fg => [1, 1, 1],
1856 active_fg => [1, 1, 0], 2039 active_fg => [1, 1, 0],
1857 bg => [0, 0, 0, 0.2], 2040 bg => [0, 0, 0, 0.2],
1858 active_bg => [1, 1, 1, 0.5], 2041 active_bg => [1, 1, 1, 0.5],
1859 state => 0, 2042 state => 0,
… …
1863} 2046}
1864 2047
1865sub size_request { 2048sub size_request {
1866 my ($self) = @_; 2049 my ($self) = @_;
1867 2050
1868 ($self->{padding} * 2 + 6) x 2 2051 (6) x 2
1869} 2052}
1870 2053
1871sub button_down { 2054sub invoke_button_down {
1872 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
1873 2056
1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1876 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
1877 $self->_emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
2061 } else {
2062 return 0
2063 }
2064
1878 } 2065 1
1879} 2066}
1880 2067
1881sub _draw { 2068sub _draw {
1882 my ($self) = @_; 2069 my ($self) = @_;
1883 2070
1884 $self->SUPER::_draw; 2071 $self->SUPER::_draw;
1885 2072
1886 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2073 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1887 2074
1888 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2075 my ($w, $h) = @$self{qw(w h)};
2076
2077 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1889 2078
1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2079 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1891 2080
1892 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2081 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893 2082
… …
2048 2237
2049 my $h1 = $self->{h} * (1 - $ycut1); 2238 my $h1 = $self->{h} * (1 - $ycut1);
2050 my $h2 = $self->{h} * (1 - $ycut2); 2239 my $h2 = $self->{h} * (1 - $ycut2);
2051 2240
2052 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2053 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2243 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2054 glEnable GL_TEXTURE_2D; 2244 glEnable GL_TEXTURE_2D;
2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2245 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056 2246
2057 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2247 glBindTexture GL_TEXTURE_2D, $t1->{name};
2058 glBegin GL_QUADS; 2248 glBegin GL_QUADS;
… …
2158 fg => [1, 1, 1], 2348 fg => [1, 1, 1],
2159 active_fg => [0, 0, 0], 2349 active_fg => [0, 0, 0],
2160 bg => [0, 0, 0, 0.2], 2350 bg => [0, 0, 0, 0.2],
2161 active_bg => [1, 1, 1, 0.5], 2351 active_bg => [1, 1, 1, 0.5],
2162 range => [0, 0, 100, 10, 0], 2352 range => [0, 0, 100, 10, 0],
2163 req_w => $::WIDTH / 80, 2353 min_w => $::WIDTH / 80,
2164 req_h => $::WIDTH / 80, 2354 min_h => $::WIDTH / 80,
2165 vertical => 0, 2355 vertical => 0,
2166 can_hover => 1, 2356 can_hover => 1,
2167 inner_pad => 0.02, 2357 inner_pad => 0.02,
2168 @_ 2358 @_
2169 ); 2359 );
… …
2172 $self->update; 2362 $self->update;
2173 2363
2174 $self 2364 $self
2175} 2365}
2176 2366
2177sub changed { }
2178
2179sub set_range { 2367sub set_range {
2180 my ($self, $range) = @_; 2368 my ($self, $range) = @_;
2181 2369
2182 ($range, $self->{range}) = ($self->{range}, $range); 2370 ($range, $self->{range}) = ($self->{range}, $range);
2183 2371
2184 $self->update
2185 if "@$range" ne "@{$self->{range}}"; 2372 if ("@$range" ne "@{$self->{range}}") {
2373 $self->update;
2374 $self->set_value ($self->{range}[0]);
2375 }
2186} 2376}
2187 2377
2188sub set_value { 2378sub set_value {
2189 my ($self, $value) = @_; 2379 my ($self, $value) = @_;
2190 2380
… …
2201 if $unit; 2391 if $unit;
2202 2392
2203 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2393 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2204 2394
2205 if ($value != $old_value) { 2395 if ($value != $old_value) {
2206 $self->_emit (changed => $value); 2396 $self->emit (changed => $value);
2207 $self->update; 2397 $self->update;
2208 } 2398 }
2209} 2399}
2210 2400
2211sub size_request { 2401sub size_request {
2212 my ($self) = @_; 2402 my ($self) = @_;
2213 2403
2214 my $w = $self->{req_w}; 2404 ($self->{req_w}, $self->{req_h})
2215 my $h = $self->{req_h};
2216
2217 $self->{vertical} ? ($h, $w) : ($w, $h)
2218} 2405}
2219 2406
2220sub button_down { 2407sub invoke_button_down {
2221 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
2222 2409
2223 $self->SUPER::button_down ($ev, $x, $y); 2410 $self->SUPER::invoke_button_down ($ev, $x, $y);
2224 2411
2225 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2226 2413
2227 $self->mouse_motion ($ev, $x, $y); 2414 $self->mouse_motion ($ev, $x, $y)
2228} 2415}
2229 2416
2230sub mouse_motion { 2417sub invoke_mouse_motion {
2231 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2232 2419
2233 if ($GRAB == $self) { 2420 if ($GRAB == $self) {
2234 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2421 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2235 2422
2236 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2423 my (undef, $lo, $hi, $page) = @{$self->{range}};
2237 2424
2238 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2425 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2239 2426
2240 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2427 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2428 } else {
2429 return 0;
2430 }
2431
2241 } 2432 1
2242} 2433}
2243 2434
2244sub update { 2435sub update {
2245 my ($self) = @_; 2436 my ($self) = @_;
2246 2437
2247 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2438 delete $self->{knob_w};
2439 $self->SUPER::update;
2440}
2441
2442sub _draw {
2443 my ($self) = @_;
2444
2445 unless ($self->{knob_w}) {
2248 $self->set_value ($self->{range}[0]); 2446 $self->set_value ($self->{range}[0]);
2249 2447
2250 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2448 my ($value, $lo, $hi, $page) = @{$self->{range}};
2251 my $range = ($hi - $page - $lo) || 1e-100; 2449 my $range = ($hi - $page - $lo) || 1e-100;
2252 2450
… …
2258 $value = ($value - $lo) / $range; 2456 $value = ($value - $lo) / $range;
2259 $value = $value * $self->{scale} + $self->{offset}; 2457 $value = $value * $self->{scale} + $self->{offset};
2260 2458
2261 $self->{knob_x} = $value - $knob_w * 0.5; 2459 $self->{knob_x} = $value - $knob_w * 0.5;
2262 $self->{knob_w} = $knob_w; 2460 $self->{knob_w} = $knob_w;
2263 }); 2461 }
2264
2265 $self->SUPER::update;
2266}
2267
2268sub _draw {
2269 my ($self) = @_;
2270 2462
2271 $self->SUPER::_draw (); 2463 $self->SUPER::_draw ();
2272 2464
2273 glScale $self->{w}, $self->{h}; 2465 glScale $self->{w}, $self->{h};
2274 2466
… …
2335sub set_range { shift->{slider}->set_range (@_) } 2527sub set_range { shift->{slider}->set_range (@_) }
2336sub set_value { shift->{slider}->set_value (@_) } 2528sub set_value { shift->{slider}->set_value (@_) }
2337 2529
2338############################################################################# 2530#############################################################################
2339 2531
2340package CFClient::UI::TextView; 2532package CFClient::UI::TextScroller;
2341 2533
2342our @ISA = CFClient::UI::HBox::; 2534our @ISA = CFClient::UI::HBox::;
2343 2535
2344use CFClient::OpenGL; 2536use CFClient::OpenGL;
2345 2537
… …
2347 my $class = shift; 2539 my $class = shift;
2348 2540
2349 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2350 fontsize => 1, 2542 fontsize => 1,
2351 can_events => 0, 2543 can_events => 0,
2544 indent => 0,
2352 #font => default_font 2545 #font => default_font
2353 @_, 2546 @_,
2354 2547
2355 layout => (new CFClient::Layout 1), 2548 layout => (new CFClient::Layout 1),
2356 par => [], 2549 par => [],
… …
2371 2564
2372 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2373 $self->reflow; 2566 $self->reflow;
2374} 2567}
2375 2568
2376sub size_allocate { 2569sub invoke_size_allocate {
2377 my ($self, $w, $h, $changed) = @_; 2570 my ($self, $w, $h) = @_;
2378
2379 $self->SUPER::size_allocate ($w, $h, $changed);
2380
2381 return unless $changed;
2382 2571
2383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2385 $self->{layout}->set_width ($self->{children}[0]{w}); 2574 $self->{layout}->set_width ($self->{children}[0]{w});
2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2386 2576
2387 $self->reflow; 2577 $self->reflow;
2578
2579 $self->SUPER::invoke_size_allocate ($w, $h)
2388} 2580}
2389 2581
2390sub text_size { 2582sub text_size {
2391 my ($self, $text, $indent) = @_; 2583 my ($self, $text, $indent) = @_;
2392 2584
2393 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2394 2586
2395 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2587 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $layout->set_width ($self->{children}[0]{w} - $indent); 2588 $layout->set_width ($self->{children}[0]{w} - $indent);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 $layout->set_markup ($text); 2590 $layout->set_markup ($text);
2398 2591
2399 $layout->size 2592 $layout->size
2400} 2593}
2401 2594
… …
2440 2633
2441 return unless $self->{h} > 0; 2634 return unless $self->{h} > 0;
2442 2635
2443 delete $self->{texture}; 2636 delete $self->{texture};
2444 2637
2445 $ROOT->on_post_alloc ($self, sub { 2638 $ROOT->on_post_alloc ($self => sub {
2446 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2639 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2447 2640
2448 if (delete $self->{need_reflow}) { 2641 if (delete $self->{need_reflow}) {
2449 my $height = 0; 2642 my $height = 0;
2450 2643
… …
2453 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2454 2647
2455 for (@{$self->{par}}) { 2648 for (@{$self->{par}}) {
2456 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2649 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2457 $layout->set_width ($W - $_->[3]); 2650 $layout->set_width ($W - $_->[3]);
2651 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2458 $layout->set_markup ($_->[4]); 2652 $layout->set_markup ($_->[4]);
2459 my ($w, $h) = $layout->size; 2653 my ($w, $h) = $layout->size;
2460 $_->[0] = $w + $_->[3]; 2654 $_->[0] = $w + $_->[3];
2461 $_->[1] = $h; 2655 $_->[1] = $h;
2462 } 2656 }
… …
2465 } 2659 }
2466 2660
2467 $self->{height} = $height; 2661 $self->{height} = $height;
2468 2662
2469 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2663 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2470 2664
2471 delete $self->{texture}; 2665 delete $self->{texture};
2472 } 2666 }
2473 2667
2474 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2668 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2475 glClearColor 0.5, 0.5, 0.5, 0; 2669 glClearColor 0, 0, 0, 0;
2476 glClear GL_COLOR_BUFFER_BIT; 2670 glClear GL_COLOR_BUFFER_BIT;
2477 2671
2478 my $top = int $self->{children}[1]{range}[0]; 2672 my $top = int $self->{children}[1]{range}[0];
2479 2673
2480 my $y0 = $top; 2674 my $y0 = $top;
… …
2494 my $h = $par->[1]; 2688 my $h = $par->[1];
2495 2689
2496 if ($y0 < $y + $h && $y < $y1) { 2690 if ($y0 < $y + $h && $y < $y1) {
2497 $layout->set_foreground (@{ $par->[2] }); 2691 $layout->set_foreground (@{ $par->[2] });
2498 $layout->set_width ($W - $par->[3]); 2692 $layout->set_width ($W - $par->[3]);
2693 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 $layout->set_markup ($par->[4]); 2694 $layout->set_markup ($par->[4]);
2500 2695
2501 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2696 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2502 2697
2503 glRasterPos $par->[3], $y - $y0; 2698 glRasterPos $par->[3], $y - $y0;
… …
2515sub _draw { 2710sub _draw {
2516 my ($self) = @_; 2711 my ($self) = @_;
2517 2712
2518 glEnable GL_TEXTURE_2D; 2713 glEnable GL_TEXTURE_2D;
2519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2520 glColor 1, 1, 1, 1; 2715 glColor 0, 0, 0, 1;
2521 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2716 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2522 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2523 2718
2524 $self->{children}[1]->draw; 2719 $self->{children}[1]->draw;
2525 2720
2526} 2721}
… …
2609} 2804}
2610 2805
2611sub set_tooltip_from { 2806sub set_tooltip_from {
2612 my ($self, $widget) = @_; 2807 my ($self, $widget) = @_;
2613 2808
2809 my $tooltip = $widget->{tooltip};
2810
2811 if ($ENV{CFPLUS_DEBUG} & 2) {
2812 $tooltip .= "\n\n" . (ref $widget) . "\n"
2813 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2814 . "req $widget->{req_w} $widget->{req_h}\n"
2815 . "visible $widget->{visible}";
2816 }
2817
2818 $tooltip =~ s/^\n+//;
2819 $tooltip =~ s/\n+$//;
2820
2614 $self->add (new CFClient::UI::Label 2821 $self->add (new CFClient::UI::Label
2615 markup => $widget->{tooltip}, 2822 markup => $tooltip,
2616 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2823 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617 fontsize => 0.8, 2824 fontsize => 0.8,
2618 fg => [0, 0, 0, 1], 2825 fg => [0, 0, 0, 1],
2619 ellipsise => 0, 2826 ellipsise => 0,
2620 font => ($widget->{tooltip_font} || $::FONT_PROP), 2827 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2627 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2628 2835
2629 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2630} 2837}
2631 2838
2632sub size_allocate { 2839sub invoke_size_allocate {
2633 my ($self, $w, $h, $changed) = @_; 2840 my ($self, $w, $h) = @_;
2634 2841
2635 return unless $changed;
2636
2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2842 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2638} 2843}
2639 2844
2640sub visibility_change { 2845sub invoke_visibility_change {
2641 my ($self, $visible) = @_; 2846 my ($self, $visible) = @_;
2642 2847
2643 return unless $visible; 2848 return unless $visible;
2644 2849
2645 $self->{root}->on_post_alloc ("move_$self" => sub { 2850 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2647 or return; 2852 or return;
2648 2853
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2854 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 2855
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2856 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 2857 if $x + $self->{w} > $self->{root}{w};
2653 2858
2654 $self->move ($x, $y); 2859 $self->move_abs ($x, $y);
2655 }); 2860 });
2656} 2861}
2657 2862
2658sub _draw { 2863sub _draw {
2659 my ($self) = @_; 2864 my ($self) = @_;
… …
2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2951 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2747 2952
2748 if ($tex) { 2953 if ($tex) {
2749 glEnable GL_TEXTURE_2D; 2954 glEnable GL_TEXTURE_2D;
2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2751 glColor 1, 1, 1, 1; 2956 glColor 0, 0, 0, 1;
2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2957 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2753 glDisable GL_TEXTURE_2D; 2958 glDisable GL_TEXTURE_2D;
2754 } 2959 }
2755} 2960}
2756 2961
2757sub DESTROY { 2962sub destroy {
2758 my ($self) = @_; 2963 my ($self) = @_;
2759 2964
2760 $self->{timer}->cancel 2965 $self->{timer}->cancel
2761 if $self->{timer}; 2966 if $self->{timer};
2762 2967
2763 $self->SUPER::DESTROY; 2968 $self->SUPER::destroy;
2764} 2969}
2765 2970
2766############################################################################# 2971#############################################################################
2767 2972
2768package CFClient::UI::Inventory; 2973package CFClient::UI::Buttonbar;
2769 2974
2770our @ISA = CFClient::UI::ScrolledWindow::; 2975our @ISA = CFClient::UI::HBox::;
2771 2976
2772sub new { 2977# TODO: should actualyl wrap buttons and other goodies.
2773 my $class = shift;
2774
2775 my $self = $class->SUPER::new (
2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777 @_,
2778 );
2779
2780 $self
2781}
2782
2783sub set_items {
2784 my ($self, $items) = @_;
2785
2786 $self->{scrolled}->clear;
2787 return unless $items;
2788
2789 my @items = sort {
2790 ($a->{type} <=> $b->{type})
2791 or ($a->{name} cmp $b->{name})
2792 } @$items;
2793
2794 $self->{real_items} = \@items;
2795
2796 my $row = 0;
2797 for my $item (@items) {
2798 CFClient::Item::update_widgets $item;
2799
2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804 $row++;
2805 }
2806}
2807 2978
2808############################################################################# 2979#############################################################################
2809 2980
2810package CFClient::UI::Menu; 2981package CFClient::UI::Menu;
2811 2982
… …
2823 ); 2994 );
2824 2995
2825 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2996 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2826 2997
2827 for my $item (@{ $self->{items} }) { 2998 for my $item (@{ $self->{items} }) {
2828 my ($widget, $cb) = @$item; 2999 my ($widget, $cb, $tooltip) = @$item;
2829 3000
2830 # handle various types of items, only text for now 3001 # handle various types of items, only text for now
2831 if (!ref $widget) { 3002 if (!ref $widget) {
2832 $widget = new CFClient::UI::Label 3003 $widget = new CFClient::UI::Label
2833 can_hover => 1, 3004 can_hover => 1,
2834 can_events => 1, 3005 can_events => 1,
2835 text => $widget; 3006 markup => $widget,
3007 tooltip => $tooltip
2836 } 3008 }
2837 3009
2838 $self->{item}{$widget} = $item; 3010 $self->{item}{$widget} = $item;
2839 3011
2840 $self->{vbox}->add ($widget); 3012 $self->{vbox}->add ($widget);
… …
2845 3017
2846# popup given the event (must be a mouse button down event currently) 3018# popup given the event (must be a mouse button down event currently)
2847sub popup { 3019sub popup {
2848 my ($self, $ev) = @_; 3020 my ($self, $ev) = @_;
2849 3021
2850 $self->_emit ("popdown"); 3022 $self->emit ("popdown");
2851 3023
2852 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 3025 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
2855 3027
2856 $self->show; 3028 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3029 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 3030}
2859 3031
2860sub mouse_motion { 3032sub invoke_mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
2862 3034
2863 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
2864 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
2866}
2867 3038
3039 0
3040}
3041
2868sub button_up { 3042sub invoke_button_up {
2869 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
2870 3044
2871 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
2872 undef $GRAB; 3046 undef $GRAB;
2873 $self->hide; 3047 $self->hide;
2874 3048
2875 $self->_emit ("popdown"); 3049 $self->emit ("popdown");
2876 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
3051 } else {
3052 return 0
3053 }
3054
2877 } 3055 1
2878} 3056}
2879 3057
2880############################################################################# 3058#############################################################################
2881 3059
2882package CFClient::UI::Statusbox; 3060package CFClient::UI::Multiplexer;
2883 3061
2884our @ISA = CFClient::UI::VBox::; 3062our @ISA = CFClient::UI::Container::;
2885 3063
2886sub new { 3064sub new {
2887 my $class = shift; 3065 my $class = shift;
2888 3066
2889 $class->SUPER::new ( 3067 my $self = $class->SUPER::new (
3068 @_,
3069 );
3070
3071 $self->{current} = $self->{children}[0]
3072 if @{ $self->{children} };
3073
3074 $self
3075}
3076
3077sub add {
3078 my ($self, @widgets) = @_;
3079
3080 $self->SUPER::add (@widgets);
3081
3082 $self->{current} = $self->{children}[0]
3083 if @{ $self->{children} };
3084}
3085
3086sub set_current_page {
3087 my ($self, $page_or_widget) = @_;
3088
3089 my $widget = ref $page_or_widget
3090 ? $page_or_widget
3091 : $self->{children}[$page_or_widget];
3092
3093 $self->{current} = $widget;
3094 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3095
3096 $self->emit (page_changed => $self->{current});
3097
3098 $self->realloc;
3099}
3100
3101sub visible_children {
3102 $_[0]{current}
3103}
3104
3105sub size_request {
3106 my ($self) = @_;
3107
3108 $self->{current}->size_request
3109}
3110
3111sub invoke_size_allocate {
3112 my ($self, $w, $h) = @_;
3113
3114 $self->{current}->configure (0, 0, $w, $h);
3115
3116 1
3117}
3118
3119sub _draw {
3120 my ($self) = @_;
3121
3122 $self->{current}->draw;
3123}
3124
3125#############################################################################
3126
3127package CFClient::UI::Notebook;
3128
3129our @ISA = CFClient::UI::VBox::;
3130
3131sub new {
3132 my $class = shift;
3133
3134 my $self = $class->SUPER::new (
3135 buttonbar => (new CFClient::UI::Buttonbar),
3136 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3137 # filter => # will be put between multiplexer and $self
3138 @_,
3139 );
3140
3141 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3142 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3143
3144 $self
3145}
3146
3147sub add {
3148 my ($self, $title, $widget, $tooltip) = @_;
3149
3150 Scalar::Util::weaken $self;
3151
3152 $self->{buttonbar}->add (new CFClient::UI::Button
3153 markup => $title,
3154 tooltip => $tooltip,
3155 on_activate => sub { $self->set_current_page ($widget) },
3156 );
3157
3158 $self->{multiplexer}->add ($widget);
3159}
3160
3161sub set_current_page {
3162 my ($self, $page) = @_;
3163
3164 $self->{multiplexer}->set_current_page ($page);
3165 $self->emit (page_changed => $self->{multiplexer}{current});
3166}
3167
3168#############################################################################
3169
3170package CFClient::UI::Combobox;
3171
3172use utf8;
3173
3174our @ISA = CFClient::UI::Button::;
3175
3176sub new {
3177 my $class = shift;
3178
3179 my $self = $class->SUPER::new (
3180 options => [], # [value, title, longdesc], ...
3181 value => undef,
3182 @_,
3183 );
3184
3185 $self->_set_value ($self->{value});
3186
3187 $self
3188}
3189
3190sub invoke_button_down {
3191 my ($self, $ev) = @_;
3192
3193 my @menu_items;
3194
3195 for (@{ $self->{options} }) {
3196 my ($value, $title, $tooltip) = @$_;
3197
3198 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3199 }
3200
3201 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3202}
3203
3204sub _set_value {
3205 my ($self, $value) = @_;
3206
3207 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3208 or return;
3209
3210 $self->{value} = $item->[0];
3211 $self->set_markup ("$item->[1] ⇓");
3212 $self->set_tooltip ($item->[2]);
3213}
3214
3215sub set_value {
3216 my ($self, $value) = @_;
3217
3218 return unless $self->{value} ne $value;
3219
3220 $self->_set_value ($value);
3221 $self->emit (changed => $value);
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::Statusbox;
3227
3228our @ISA = CFClient::UI::VBox::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (
2890 fontsize => 0.8, 3234 fontsize => 0.8,
2891 @_, 3235 @_,
2892 ) 3236 );
3237
3238 Scalar::Util::weaken (my $this = $self);
3239
3240 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3241
3242 $self
2893} 3243}
2894 3244
2895sub reorder { 3245sub reorder {
2896 my ($self) = @_; 3246 my ($self) = @_;
2897 my $NOW = time; 3247 my $NOW = Time::HiRes::time;
3248
3249 # freeze display when hovering over any label
3250 return if $CFClient::UI::TOOLTIP->{owner}
3251 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3252 values %{ $self->{item} };
2898 3253
2899 while (my ($k, $v) = each %{ $self->{item} }) { 3254 while (my ($k, $v) = each %{ $self->{item} }) {
2900 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3255 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2901 } 3256 }
2902 3257
… …
2905 my @items = sort { 3260 my @items = sort {
2906 $a->{pri} <=> $b->{pri} 3261 $a->{pri} <=> $b->{pri}
2907 or $b->{id} <=> $a->{id} 3262 or $b->{id} <=> $a->{id}
2908 } values %{ $self->{item} }; 3263 } values %{ $self->{item} };
2909 3264
3265 $self->{timer}->interval (1);
3266
2910 my $count = 10 + 1; 3267 my $count = 10 + 1;
2911 for my $item (@items) { 3268 for my $item (@items) {
2912 last unless --$count; 3269 last unless --$count;
2913 3270
2914 push @widgets, $item->{label} ||= do { 3271 my $label = $item->{label} ||= do {
2915 # TODO: doesn't handle markup well (read as: at all) 3272 # TODO: doesn't handle markup well (read as: at all)
2916 my $short = $item->{count} > 1 3273 my $short = $item->{count} > 1
2917 ? "<b>$item->{count} ×</b> $item->{text}" 3274 ? "<b>$item->{count} ×</b> $item->{text}"
2918 : $item->{text}; 3275 : $item->{text};
2919 3276
… …
2927 tooltip => $item->{tooltip}, 3284 tooltip => $item->{tooltip},
2928 tooltip_font => $::FONT_PROP, 3285 tooltip_font => $::FONT_PROP,
2929 tooltip_width => 0.67, 3286 tooltip_width => 0.67,
2930 fontsize => $item->{fontsize} || $self->{fontsize}, 3287 fontsize => $item->{fontsize} || $self->{fontsize},
2931 max_w => $::WIDTH * 0.44, 3288 max_w => $::WIDTH * 0.44,
2932 fg => $item->{fg}, 3289 fg => [@{ $item->{fg} }],
2933 can_events => 1, 3290 can_events => 1,
2934 can_hover => 1 3291 can_hover => 1
2935 }; 3292 };
3293
3294 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3295 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3296 $label->update;
3297 $label->set_max_size (undef, $label->{req_h} * $diff)
3298 if $diff < 1;
3299 $self->{timer}->interval (1/30);
3300 } else {
3301 $label->{fg}[3] = $item->{fg}[3] || 1;
3302 }
3303
3304 push @widgets, $label;
2936 } 3305 }
2937 3306
2938 $self->clear; 3307 $self->clear;
2939 $self->SUPER::add (reverse @widgets); 3308 $self->SUPER::add (reverse @widgets);
2940} 3309}
… …
2945 $text =~ s/^\s+//; 3314 $text =~ s/^\s+//;
2946 $text =~ s/\s+$//; 3315 $text =~ s/\s+$//;
2947 3316
2948 return unless $text; 3317 return unless $text;
2949 3318
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 3319 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2951 3320
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3321 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 3322
2954 if (my $item = $self->{item}{$group}) { 3323 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) { 3324 if ($item->{text} eq $text) {
2956 $item->{count}++; 3325 $item->{count}++;
2957 } else { 3326 } else {
2958 $item->{count} = 1; 3327 $item->{count} = 1;
2959 $item->{text} = $item->{tooltip} = $text; 3328 $item->{text} = $item->{tooltip} = $text;
2960 } 3329 }
2961 $item->{id} = ++$self->{id}; 3330 $item->{id} += 0.2;#d#
2962 $item->{timeout} = $timeout; 3331 $item->{timeout} = $timeout;
2963 delete $item->{label}; 3332 delete $item->{label};
2964 } else { 3333 } else {
2965 $self->{item}{$group} = { 3334 $self->{item}{$group} = {
2966 id => ++$self->{id}, 3335 id => ++$self->{id},
… …
2985 3354
2986 $self->reorder; 3355 $self->reorder;
2987 $self->SUPER::reconfigure; 3356 $self->SUPER::reconfigure;
2988} 3357}
2989 3358
3359sub destroy {
3360 my ($self) = @_;
3361
3362 $self->{timer}->cancel;
3363
3364 $self->SUPER::destroy;
3365}
3366
2990############################################################################# 3367#############################################################################
2991 3368
3369package CFClient::UI::Inventory;
3370
3371our @ISA = CFClient::UI::ScrolledWindow::;
3372
3373sub new {
3374 my $class = shift;
3375
3376 my $self = $class->SUPER::new (
3377 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3378 @_,
3379 );
3380
3381 $self
3382}
3383
3384sub set_items {
3385 my ($self, $items) = @_;
3386
3387 $self->{child}->clear;
3388 return unless $items;
3389
3390 my @items = sort {
3391 ($a->{type} <=> $b->{type})
3392 or ($a->{name} cmp $b->{name})
3393 } @$items;
3394
3395 $self->{real_items} = \@items;
3396
3397 my $row = 0;
3398 for my $item (@items) {
3399 CFClient::Item::update_widgets $item;
3400
3401 $self->{child}->add (0, $row, $item->{face_widget});
3402 $self->{child}->add (1, $row, $item->{desc_widget});
3403 $self->{child}->add (2, $row, $item->{weight_widget});
3404
3405 $row++;
3406 }
3407}
3408
3409#############################################################################
3410
3411package CFClient::UI::BindEditor;
3412
3413our @ISA = CFClient::UI::FancyFrame::;
3414
3415sub new {
3416 my $class = shift;
3417
3418 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3419
3420 $self->add (my $vb = new CFClient::UI::VBox);
3421
3422
3423 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3424 text => "start recording",
3425 tooltip => "Start/Stops recording of actions."
3426 ."All subsequent actions after the recording started will be captured."
3427 ."The actions are displayed after the record was stopped."
3428 ."To bind the action you have to click on the 'Bind' button",
3429 on_activate => sub {
3430 unless ($self->{recording}) {
3431 $self->start;
3432 } else {
3433 $self->stop;
3434 }
3435 });
3436
3437 $vb->add (new CFClient::UI::Label text => "Actions:");
3438 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3439
3440 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3441 $vb->add (my $hb = new CFClient::UI::HBox);
3442 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3443 $hb->add (new CFClient::UI::Button
3444 text => "bind",
3445 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3446 on_activate => sub {
3447 $self->ask_for_bind;
3448 });
3449
3450 $vb->add (my $hb = new CFClient::UI::HBox);
3451 $hb->add (new CFClient::UI::Button
3452 text => "ok",
3453 expand => 1,
3454 tooltip => "This closes the binding editor and saves the binding",
3455 on_activate => sub {
3456 $self->hide;
3457 $self->commit;
3458 });
3459
3460 $hb->add (new CFClient::UI::Button
3461 text => "cancel",
3462 expand => 1,
3463 tooltip => "This closes the binding editor without saving",
3464 on_activate => sub {
3465 $self->hide;
3466 $self->{binding_cancel}->()
3467 if $self->{binding_cancel};
3468 });
3469
3470 $self->update_binding_widgets;
3471
3472 $self
3473}
3474
3475sub commit {
3476 my ($self) = @_;
3477 my ($mod, $sym, $cmds) = $self->get_binding;
3478 if ($sym != 0 && @$cmds > 0) {
3479 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3480 ."'. Don't forget 'Save Config'!");
3481 $self->{binding_change}->($mod, $sym, $cmds)
3482 if $self->{binding_change};
3483 } else {
3484 $::STATUSBOX->add ("No action bound, no key or action specified!");
3485 $self->{binding_cancel}->()
3486 if $self->{binding_cancel};
3487 }
3488}
3489
3490sub start {
3491 my ($self) = @_;
3492
3493 $self->{rec_btn}->set_text ("stop recording");
3494 $self->{recording} = 1;
3495 $self->clear_command_list;
3496 $::CONN->start_record if $::CONN;
3497}
3498
3499sub stop {
3500 my ($self) = @_;
3501
3502 $self->{rec_btn}->set_text ("start recording");
3503 $self->{recording} = 0;
3504
3505 my $rec;
3506 $rec = $::CONN->stop_record if $::CONN;
3507 return unless ref $rec eq 'ARRAY';
3508 $self->set_command_list ($rec);
3509}
3510
3511
3512sub ask_for_bind_and_commit {
3513 my ($self) = @_;
3514 $self->ask_for_bind (1);
3515}
3516
3517sub ask_for_bind {
3518 my ($self, $commit, $end_cb) = @_;
3519
3520 CFClient::Binder::open_binding_dialog (sub {
3521 my ($mod, $sym) = @_;
3522 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3523 $self->update_binding_widgets;
3524 $self->commit if $commit;
3525 $end_cb->() if $end_cb;
3526 });
3527}
3528
3529# $mod and $sym are the modifiers and key symbol
3530# $cmds is a array ref of strings (the commands)
3531# $cb is the callback that is executed on OK
3532# $ccb is the callback that is executed on CANCEL and
3533# when the binding was unsuccessful on OK
3534sub set_binding {
3535 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3536
3537 $self->clear_command_list;
3538 $self->{recording} = 0;
3539 $self->{rec_btn}->set_text ("start recording");
3540
3541 $self->{binding} = [$mod, $sym];
3542 $self->{commands} = $cmds;
3543
3544 $self->{binding_change} = $cb;
3545 $self->{binding_cancel} = $ccb;
3546
3547 $self->update_binding_widgets;
3548}
3549
3550# this is a shortcut method that asks for a binding
3551# and then just binds it.
3552sub do_quick_binding {
3553 my ($self, $cmds, $end_cb) = @_;
3554 $self->set_binding (undef, undef, $cmds, sub {
3555 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3556 });
3557 $self->ask_for_bind (1, $end_cb);
3558}
3559
3560sub update_binding_widgets {
3561 my ($self) = @_;
3562 my ($mod, $sym, $cmds) = $self->get_binding;
3563 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3564 $self->set_command_list ($cmds);
3565}
3566
3567sub get_binding {
3568 my ($self) = @_;
3569 return (
3570 $self->{binding}->[0],
3571 $self->{binding}->[1],
3572 [ grep { defined $_ } @{$self->{commands}} ]
3573 );
3574}
3575
3576sub clear_command_list {
3577 my ($self) = @_;
3578 $self->{cmdbox}->clear ();
3579}
3580
3581sub set_command_list {
3582 my ($self, $cmds) = @_;
3583
3584 $self->{cmdbox}->clear ();
3585 $self->{commands} = $cmds;
3586
3587 my $idx = 0;
3588
3589 for (@$cmds) {
3590 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3591
3592 my $i = $idx;
3593 $hb->add (new CFClient::UI::Label text => $_);
3594 $hb->add (new CFClient::UI::Button
3595 text => "delete",
3596 tooltip => "Deletes the action from the record",
3597 on_activate => sub {
3598 $self->{cmdbox}->remove ($hb);
3599 $cmds->[$i] = undef;
3600 });
3601
3602
3603 $idx++
3604 }
3605}
3606
3607#############################################################################
3608
3609package CFClient::UI::SpellList;
3610
3611our @ISA = CFClient::UI::Table::;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 binding => [],
3618 commands => [],
3619 @_,
3620 )
3621}
3622
3623my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3624
3625my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3626 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3627my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3628 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3629my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3630 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3631my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3632 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3633my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3634 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3635
3636sub rebuild_spell_list {
3637 my ($self) = @_;
3638
3639 $CFClient::UI::ROOT->on_refresh ($self => sub {
3640 $self->clear;
3641
3642 return unless $::CONN;
3643
3644 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3645 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3646 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3647 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3648 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3649
3650 my $row = 0;
3651
3652 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3653 my $spell = $self->{spell}{$_};
3654
3655 $row++;
3656
3657 my $spell_cb = sub {
3658 my ($widget, $ev) = @_;
3659
3660 if ($ev->{button} == 1) {
3661 $::CONN->user_send ("cast $spell->{name}");
3662 } elsif ($ev->{button} == 2) {
3663 $::CONN->user_send ("invoke $spell->{name}");
3664 } elsif ($ev->{button} == 3) {
3665 (new CFClient::UI::Menu
3666 items => [
3667 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3668 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3669 ],
3670 )->popup ($ev);
3671 } else {
3672 return 0;
3673 }
3674
3675 1
3676 };
3677
3678 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3679
3680 #TODO: add path info to tooltip
3681 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3682
3683 $self->add (0, $row, new CFClient::UI::Face
3684 face => $spell->{face},
3685 can_hover => 1,
3686 can_events => 1,
3687 tooltip => $tooltip,
3688 on_button_down => $spell_cb,
3689 );
3690
3691 $self->add (1, $row, new CFClient::UI::Label
3692 expand => 1,
3693 text => $spell->{name},
3694 can_hover => 1,
3695 can_events => 1,
3696 tooltip => $tooltip,
3697 on_button_down => $spell_cb,
3698 );
3699
3700 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3701 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3702 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3703 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3704 }
3705 });
3706}
3707
3708sub add_spell {
3709 my ($self, $spell) = @_;
3710
3711 $self->{spell}->{$spell->{name}} = $spell;
3712 $self->rebuild_spell_list;
3713}
3714
3715sub remove_spell {
3716 my ($self, $spell) = @_;
3717
3718 delete $self->{spell}->{$spell->{name}};
3719 $self->rebuild_spell_list;
3720}
3721
3722sub clear_spells {
3723 my ($self) = @_;
3724
3725 $self->{spell} = {};
3726 $self->rebuild_spell_list;
3727}
3728
3729#############################################################################
3730
2992package CFClient::UI::Root; 3731package CFClient::UI::Root;
2993 3732
2994our @ISA = CFClient::UI::Container::; 3733our @ISA = CFClient::UI::Container::;
3734
3735use List::Util qw(min max);
2995 3736
2996use CFClient::OpenGL; 3737use CFClient::OpenGL;
2997 3738
2998sub new { 3739sub new {
2999 my $class = shift; 3740 my $class = shift;
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3747 Scalar::Util::weaken ($self->{root} = $self);
3007 3748
3008 $self 3749 $self
3009} 3750}
3010 3751
3011sub configure {
3012 my ($self, $x, $y, $w, $h) = @_;
3013
3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request { 3752sub size_request {
3028 my ($self) = @_; 3753 my ($self) = @_;
3029 3754
3030 ($self->{w}, $self->{h}) 3755 ($self->{w}, $self->{h})
3031} 3756}
3032 3757
3758sub _to_pixel {
3759 my ($coord, $size, $max) = @_;
3760
3761 $coord =
3762 $coord eq "center" ? ($max - $size) * 0.5
3763 : $coord eq "max" ? $max
3764 : $coord;
3765
3766 $coord = 0 if $coord < 0;
3767 $coord = $max - $size if $coord > $max - $size;
3768
3769 int $coord + 0.5
3770}
3771
3033sub size_allocate { 3772sub invoke_size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3773 my ($self, $w, $h) = @_;
3035 3774
3036 for my $child ($self->children) { 3775 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3776 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3777
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3778 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3779 $Y = $child->{force_y} if exists $child->{force_y};
3041 3780
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3781 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3782 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049 3783
3050 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
3051 } 3785 }
3786
3787 1
3052} 3788}
3053 3789
3054sub coord2local { 3790sub coord2local {
3055 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
3056 3792
… …
3070} 3806}
3071 3807
3072sub add { 3808sub add {
3073 my ($self, @children) = @_; 3809 my ($self, @children) = @_;
3074 3810
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3811 $_->{is_toplevel} = 1
3077 3812 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3813
3083 $self->SUPER::add (@children); 3814 $self->SUPER::add (@children);
3084} 3815}
3085 3816
3086sub remove { 3817sub remove {
3087 my ($self, @children) = @_; 3818 my ($self, @children) = @_;
3088 3819
3089 $self->SUPER::remove (@children); 3820 $self->SUPER::remove (@children);
3821
3822 delete $self->{is_toplevel}
3823 for @children;
3090 3824
3091 while (@children) { 3825 while (@children) {
3092 my $w = pop @children; 3826 my $w = pop @children;
3093 push @children, $w->children; 3827 push @children, $w->children;
3094 $w->set_invisible; 3828 $w->set_invisible;
… …
3114 $_->() 3848 $_->()
3115 for values %{delete $self->{refresh_hook}}; 3849 for values %{delete $self->{refresh_hook}};
3116 } 3850 }
3117 3851
3118 if ($self->{realloc}) { 3852 if ($self->{realloc}) {
3853 my %queue;
3119 my @queue; 3854 my @queue;
3855 my $widget;
3120 3856
3857 outer:
3121 while () { 3858 while () {
3122 if ($self->{realloc}) { 3859 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 3860 for $widget (values %$realloc) {
3861 $widget->{visible} or next; # do not resize invisible widgets
3124 3862
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3863 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 3864
3865 push @{ $queue[$widget->{visible}] }, $widget;
3866 }
3127 } 3867 }
3128 3868
3869 while () {
3870 @queue or last outer;
3871
3872 $widget = pop @{ $queue[-1] || [] }
3873 and last;
3874
3875 pop @queue;
3876 }
3877
3878 delete $queue{$widget+0};
3879
3880 my ($w, $h) = $widget->size_request;
3881
3882 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3883 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3888 $w = $widget->{force_w} if exists $widget->{force_w};
3889 $h = $widget->{force_h} if exists $widget->{force_h};
3890
3891 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3892 || delete $widget->{force_realloc}) {
3893 $widget->{req_w} = $w;
3894 $widget->{req_h} = $h;
3895
3896 $self->{size_alloc}{$widget+0} = $widget;
3897
3898 if (my $parent = $widget->{parent}) {
3899 $self->{realloc}{$parent+0} = $parent
3900 unless $queue{$parent+0};
3901
3902 $parent->{force_size_alloc} = 1;
3903 $self->{size_alloc}{$parent+0} = $parent;
3904 }
3905 }
3906
3907 delete $self->{realloc}{$widget+0};
3908 }
3909 }
3910
3911 while (my $size_alloc = delete $self->{size_alloc}) {
3912 my @queue = sort { $b->{visible} <=> $a->{visible} }
3913 values %$size_alloc;
3914
3915 while () {
3129 my $widget = pop @queue || last; 3916 my $widget = pop @queue || last;
3130 3917
3131 $widget->{visible} or last; # do not resize invisible widgets 3918 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request;
3136
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139 $widget->{req_w} = $w;
3140 $widget->{req_h} = $h;
3141
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 }
3147 }
3148
3149 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3155 3919
3156 $w = 0 if $w < 0; 3920 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3921 $h = 0 if $h < 0;
3158 3922
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3923 $w = int $w + 0.5;
3924 $h = int $h + 0.5;
3160 3925
3926 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3927 $widget->{old_w} = $widget->{w};
3928 $widget->{old_h} = $widget->{h};
3929
3161 $widget->{w} = $w; 3930 $widget->{w} = $w;
3162 $widget->{h} = $h; 3931 $widget->{h} = $h;
3163 3932
3164 $widget->emit (size_allocate => $w, $h, $changed); 3933 $widget->emit (size_allocate => $w, $h);
3934 }
3165 } 3935 }
3166 } 3936 }
3167 3937
3168 while ($self->{post_alloc_hook}) { 3938 while ($self->{post_alloc_hook}) {
3169 $_->() 3939 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3940 for values %{delete $self->{post_alloc_hook}};
3171 } 3941 }
3942
3172 3943
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3944 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3945 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3946 glClear GL_COLOR_BUFFER_BIT;
3176 3947
… …
3178 glLoadIdentity; 3949 glLoadIdentity;
3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3950 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180 glMatrixMode GL_MODELVIEW; 3951 glMatrixMode GL_MODELVIEW;
3181 glLoadIdentity; 3952 glLoadIdentity;
3182 3953
3954 {
3955 package CFClient::UI::Base;
3956
3957 ($draw_x, $draw_y, $draw_w, $draw_h) =
3958 (0, 0, $self->{w}, $self->{h});
3959 }
3960
3183 $self->_draw; 3961 $self->_draw;
3184} 3962}
3185 3963
3186############################################################################# 3964#############################################################################
3187 3965

Diff Legend

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