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

Diff Legend

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