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

Diff Legend

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