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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 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;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 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
157 $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.]+$/;
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 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
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
235 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
232 276
233 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
238 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
240 285
241 $self->focus_out; 286 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
275} 338}
276 339
340sub baseline_shift {
341 0
342}
343
277sub configure { 344sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
279 346
280 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
283 352
284 # use alignment to adjust x, y 353 # use alignment to adjust x, y
285 354
286 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 357 }
291 358
292 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 360 $self->{x} = $x;
294 $self->{y} = $y; 361 $self->{y} = $y;
295 $self->update; 362 $self->update;
296 } 363 }
297 364
298 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
300 }
301}
302 367
303sub size_allocate { 368 $self->{alloc_w} = $w;
304 # nothing to be done 369 $self->{alloc_h} = $h;
305}
306 370
307sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
308 my ($self) = @_; 372 }
309
310 $self->check_size (1);
311 $self->update;
312} 373}
313 374
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
322} 390}
323 391
324sub set_tooltip { 392sub set_tooltip {
325 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
326 394
… …
331 399
332 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
333 401
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 405 }
338} 406}
339 407
340# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
341sub coord2local { 409sub coord2local {
… …
349 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
350 418
351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
352} 420}
353 421
354sub focus_in { 422sub invoke_focus_in {
355 my ($self) = @_; 423 my ($self) = @_;
356 424
357 return if $FOCUS == $self; 425 return if $FOCUS == $self;
358 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
359 427
360 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
361 429
362 $self->_emit (focus_in => $focus); 430 $self->update;
363 431
364 $focus->update if $focus; 432 0
365 $FOCUS->update;
366} 433}
367 434
368sub focus_out { 435sub invoke_focus_out {
369 my ($self) = @_; 436 my ($self) = @_;
370 437
371 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
372 439
373 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
374 441
375 $self->_emit (focus_out => $focus); 442 $self->update;
376 443
377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 445 unless $FOCUS;
381}
382 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
383sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
384sub button_up { } 458sub invoke_button_up { 1 }
385sub key_down { } 459sub invoke_key_down { 1 }
386sub key_up { } 460sub invoke_key_up { 1 }
387 461
388sub button_down { 462sub invoke_button_down {
389 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
390 464
391 $self->focus_in; 465 $self->grab_focus;
392}
393 466
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
398sub 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
399 535
400sub draw { 536sub draw {
401 my ($self) = @_; 537 my ($self) = @_;
402 538
403 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
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 548
405 glPushMatrix; 549 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 551
410 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 554 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 556 glBegin GL_QUADS;
417 glVertex $x , $y; 557 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
421 glEnd; 561 glEnd;
422 glDisable GL_BLEND; 562 glDisable GL_BLEND;
423 } 563 }
424 564
425 if ($ENV{PCLIENT_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 566 glPushMatrix;
427 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 570 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
434 glEnd; 574 glEnd;
435 glPopMatrix; 575 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
438} 581}
439 582
440sub _draw { 583sub _draw {
441 my ($self) = @_; 584 my ($self) = @_;
442 585
443 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
444} 587}
445 588
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub DESTROY { 589sub DESTROY {
504 my ($self) = @_; 590 my ($self) = @_;
505 591
506 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
507 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
508} 596}
509 597
510############################################################################# 598#############################################################################
511 599
512package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
537 625
538 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
540 628
541 glEnable GL_BLEND; 629 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 631 glColor_premultiply @$color;
544 632
545 glBegin GL_QUADS; 633 glBegin GL_QUADS;
546 glVertex 0 , 0; 634 glVertex 0 , 0;
547 glVertex 0 , $h; 635 glVertex 0 , $h;
548 glVertex $w, $h; 636 glVertex $w, $h;
… …
563 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
565} 653}
566 654
567sub size_request { 655sub size_request {
568 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
569} 659}
570 660
571sub draw { } 661sub draw { }
572 662
573############################################################################# 663#############################################################################
… …
577our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
578 668
579sub new { 669sub new {
580 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
581 671
582 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
583 673
584 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
585 children => [], 675 children => [],
586 can_events => 0, 676 can_events => 0,
587 %arg, 677 %arg,
588 ); 678 );
679
589 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
590 682
591 $self 683 $self
592} 684}
593 685
594sub add { 686sub add {
… …
602 $self->{children} = [ 694 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
605 ]; 697 ];
606 698
607 $self->check_size (1); 699 $self->realloc;
608 $self->update;
609} 700}
610 701
611sub children { 702sub children {
612 @{ $_[0]{children} } 703 @{ $_[0]{children} }
613} 704}
… …
618 delete $child->{parent}; 709 delete $child->{parent};
619 $child->hide; 710 $child->hide;
620 711
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 713
623 $self->check_size (1); 714 $self->realloc;
624 $self->update;
625} 715}
626 716
627sub clear { 717sub clear {
628 my ($self) = @_; 718 my ($self) = @_;
629 719
… …
633 for (@$children) { 723 for (@$children) {
634 delete $_->{parent}; 724 delete $_->{parent};
635 $_->hide; 725 $_->hide;
636 } 726 }
637 727
638 $self->check_size; 728 $self->realloc;
639 $self->update;
640} 729}
641 730
642sub find_widget { 731sub find_widget {
643 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
644 733
645 $x -= $self->{x}; 734 $x -= $self->{x};
646 $y -= $self->{y}; 735 $y -= $self->{y};
647 736
648 my $res; 737 my $res;
649 738
650 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
652 and return $res; 741 and return $res;
653 } 742 }
654 743
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
676} 765}
677 766
678sub add { 767sub add {
679 my ($self, $child) = @_; 768 my ($self, $child) = @_;
680 769
681 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
682
683 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
684} 772}
685 773
686sub remove { 774sub remove {
687 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
696 784
697sub size_request { 785sub size_request {
698 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
699} 787}
700 788
701sub size_allocate { 789sub invoke_size_allocate {
702 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
703 791
704 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
705} 795}
706 796
707############################################################################# 797#############################################################################
798
799# back-buffered drawing area
708 800
709package CFClient::UI::Window; 801package CFClient::UI::Window;
710 802
711our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
712 804
… …
723 815
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 817 $self->SUPER::update;
726} 818}
727 819
728sub size_allocate { 820sub invoke_size_allocate {
729 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
730 822
731 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
733} 826}
734 827
735sub _render { 828sub _render {
829 my ($self) = @_;
830
736 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
737} 832}
738 833
739sub render_child { 834sub render_child {
740 my ($self) = @_; 835 my ($self) = @_;
741 836
742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
745 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
746 $self->_render; 848 $self->_render;
747 }; 849 };
748} 850}
749 851
750sub _draw { 852sub _draw {
751 my ($self) = @_; 853 my ($self) = @_;
752 854
753 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
754 856
755 my $tex = $self->{texture} 857 my $tex = $self->{texture}
756 or return; 858 or return;
757 859
758 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
761 863
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
763 865
764 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
765} 867}
… …
781} 883}
782 884
783sub size_request { 885sub size_request {
784 my ($self) = @_; 886 my ($self) = @_;
785 887
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 889
788 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
789} 891 $h = 10 if $self->{scroll_y};
790 892
893 ($w, $h)
894}
895
791sub size_allocate { 896sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
793 898
899 my $child = $self->child;
900
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 903
797 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
798 $self->update; 905 $self->update;
906
907 1
799} 908}
800 909
801sub set_offset { 910sub set_offset {
802 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
803 912
… …
836} 945}
837 946
838sub _render { 947sub _render {
839 my ($self) = @_; 948 my ($self) = @_;
840 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 954
843 $self->SUPER::_render; 955 $self->SUPER::_render;
844} 956}
845 957
… …
848package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
849 961
850our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
851 963
852sub new { 964sub new {
853 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
854 968
855 my $self; 969 my $self;
856 970
857 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
858 vertical => 1, 972 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 974 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
862 }, 976 },
863 ; 977 ;
864 978
865 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
867 slider => $slider, 981 slider => $slider,
868 @_, 982 %arg,
869 ); 983 );
870 984
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
874 987
875 $self 988 $self
876} 989}
877 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub update {
1006 my ($self) = @_;
1007
1008 $self->SUPER::update;
1009
1010 $self->update_slider;
1011}
1012
878sub size_allocate { 1013sub invoke_size_allocate {
879 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
880 1015
1016 $self->update_slider;
1017
881 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885} 1019}
886
887#TODO# update range on size_allocate depending on child
888# update viewport offset on scroll
889 1020
890############################################################################# 1021#############################################################################
891 1022
892package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
893 1024
… …
909 1040
910 if ($self->{bg}) { 1041 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
912 1043
913 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
916 1047
917 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
918 glVertex 0 , 0; 1049 glVertex 0 , 0;
919 glVertex 0 , $h; 1050 glVertex 0 , $h;
920 glVertex $w, $h; 1051 glVertex $w, $h;
… …
933 1064
934our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
935 1066
936use CFClient::OpenGL; 1067use CFClient::OpenGL;
937 1068
938my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 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);
941 1076
942sub new { 1077sub new {
943 my $class = shift; 1078 my ($class, %arg) = @_;
944
945 # TODO: user_x, user_y, overwrite moveto?
946 1079
947 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1083 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1084 can_events => 1,
953 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
954 ); 1088 );
955 1089
956 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
957 align => 0, 1091 align => 0,
958 valign => 1, 1092 valign => 1,
959 text => $self->{title}, 1093 text => $self->{title},
960 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->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
961 1105
962 $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};
963} 1115}
964 1116
965sub border { 1117sub border {
966 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
967} 1119}
968 1120
969sub size_request { 1121sub size_request {
970 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};
971 1129
972 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
973 1131
974 ( 1132 (
975 $w + $self->border * 2, 1133 $w + $self->border * 2,
976 $h + $self->border * 2, 1134 $h + $self->border * 2,
977 ) 1135 )
978} 1136}
979 1137
980sub size_allocate { 1138sub invoke_size_allocate {
981 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
982 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
983 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
985 1151
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
990}
991 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
992sub button_down { 1168sub invoke_button_down {
993 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
994 1170
995 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
996 my $border = $self->border; 1172 my $border = $self->border;
997 1173
… …
1010 my ($ev, $x, $y) = @_; 1186 my ($ev, $x, $y) = @_;
1011 1187
1012 my $dx = $ev->{x} - $ox; 1188 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1189 my $dy = $ev->{y} - $oy;
1014 1190
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1191 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1192 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1193
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1194 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1195 $self->realloc;
1019 }; 1196 };
1020 1197
1021 } elsif ($lr ^ $td) { 1198 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1199 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1200 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1202 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1203 my ($ev, $x, $y) = @_;
1027 1204
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1206
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1208 # HACK: the next line is required to enforce placement
1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1210 };
1211 } else {
1212 return 0;
1213 }
1214
1033 } 1215 1
1034} 1216}
1035 1217
1036sub button_up { 1218sub invoke_button_up {
1037 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1038 1220
1039 delete $self->{motion}; 1221 ! ! delete $self->{motion}
1040} 1222}
1041 1223
1042sub mouse_motion { 1224sub invoke_mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1044 1226
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1228
1229 ! ! $self->{motion}
1046} 1230}
1047 1231
1048sub _draw { 1232sub _draw {
1049 my ($self) = @_; 1233 my ($self) = @_;
1050 1234
1235 my $child = $self->{children}[0];
1236
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1237 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1238 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1239
1054 glEnable GL_TEXTURE_2D; 1240 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1241 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1242
1057 my $border = $self->border; 1243 my $border = $self->border;
1058 1244
1059 glColor @{ $self->{border_bg} }; 1245 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1246 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1247 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1248 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1249 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1250
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1251 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1252 glColor @{ $self->{bg} };
1067 1253
1068 # TODO: repeat texture not scale 1254 # TODO: repeat texture not scale
1255 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1256 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1257 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1258 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1259 }
1079 1260
1080 glDisable GL_TEXTURE_2D; 1261 glDisable GL_TEXTURE_2D;
1081 1262
1082 $self->{title}->draw if $self->{title};
1083
1084 $self->child->draw; 1263 $child->draw;
1264
1265 if ($self->{title_widget}) {
1266 glTranslate 0, $border - $self->{h};
1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1085} 1274}
1086 1275
1087############################################################################# 1276#############################################################################
1088 1277
1089package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1111 my ($self, $x, $y, $child) = @_; 1300 my ($self, $x, $y, $child) = @_;
1112 1301
1113 $child->set_parent ($self); 1302 $child->set_parent ($self);
1114 $self->{children}[$y][$x] = $child; 1303 $self->{children}[$y][$x] = $child;
1115 1304
1116 $self->check_size (1); 1305 $self->realloc;
1306}
1307
1308sub remove {
1309 my ($self, $child) = @_;
1310
1311 # TODO: not yet implemented
1117} 1312}
1118 1313
1119# TODO: move to container class maybe? send children a signal on removal? 1314# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1315sub clear {
1121 my ($self) = @_; 1316 my ($self) = @_;
… …
1126 for (@children) { 1321 for (@children) {
1127 delete $_->{parent}; 1322 delete $_->{parent};
1128 $_->hide; 1323 $_->hide;
1129 } 1324 }
1130 1325
1131 $self->check_size (1); 1326 $self->realloc;
1132 $self->update;
1133} 1327}
1134 1328
1135sub get_wh { 1329sub get_wh {
1136 my ($self) = @_; 1330 my ($self) = @_;
1137 1331
… …
1163 (sum @$ws), 1357 (sum @$ws),
1164 (sum @$hs), 1358 (sum @$hs),
1165 ) 1359 )
1166} 1360}
1167 1361
1168sub size_allocate { 1362sub invoke_size_allocate {
1169 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1170 1364
1171 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1172 1366
1173 my $req_w = sum @$ws; 1367 my $req_w = (sum @$ws) || 1;
1174 my $req_h = sum @$hs; 1368 my $req_h = (sum @$hs) || 1;
1175 1369
1176 # TODO: nicer code && do row_expand 1370 # TODO: nicer code && do row_expand
1177 my @col_expand = @{$self->{col_expand}}; 1371 my @col_expand = @{$self->{col_expand}};
1178 @col_expand = (1) x @$ws unless @col_expand; 1372 @col_expand = (1) x @$ws unless @col_expand;
1179 my $col_expand = (sum @col_expand) || 1; 1373 my $col_expand = (sum @col_expand) || 1;
… …
1205 } 1399 }
1206 1400
1207 $y += $row_h; 1401 $y += $row_h;
1208 } 1402 }
1209 1403
1404 1
1210} 1405}
1211 1406
1212sub find_widget { 1407sub find_widget {
1213 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1214 1409
… …
1233 } 1428 }
1234} 1429}
1235 1430
1236############################################################################# 1431#############################################################################
1237 1432
1433package CFClient::UI::Box;
1434
1435our @ISA = CFClient::UI::Container::;
1436
1437sub size_request {
1438 my ($self) = @_;
1439
1440 $self->{vertical}
1441 ? (
1442 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1443 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1444 )
1445 : (
1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1448 )
1449}
1450
1451sub invoke_size_allocate {
1452 my ($self, $w, $h) = @_;
1453
1454 my $space = $self->{vertical} ? $h : $w;
1455 my @children = $self->visible_children;
1456
1457 my @req;
1458
1459 if ($self->{homogeneous}) {
1460 @req = ($space / (@children || 1)) x @children;
1461 } else {
1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1463 my $req = List::Util::sum @req;
1464
1465 if ($req > $space) {
1466 # ah well, not enough space
1467 $_ *= $space / $req for @req;
1468 } else {
1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1470
1471 $space = ($space - $req) / $expand; # remaining space to give away
1472
1473 $req[$_] += $space * $children[$_]{expand}
1474 for 0 .. $#children;
1475 }
1476 }
1477
1478 CFClient::UI::harmonize \@req;
1479
1480 my $pos = 0;
1481 for (0 .. $#children) {
1482 my $alloc = $req[$_];
1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1484
1485 $pos += $alloc;
1486 }
1487
1488 1
1489}
1490
1491#############################################################################
1492
1238package CFClient::UI::HBox; 1493package CFClient::UI::HBox;
1239 1494
1240# TODO: wrap into common Box base class
1241
1242our @ISA = CFClient::UI::Container::; 1495our @ISA = CFClient::UI::Box::;
1243 1496
1244sub size_request { 1497sub new {
1245 my ($self) = @_; 1498 my $class = shift;
1246 1499
1247 my @alloc = map [$_->size_request], @{$self->{children}}; 1500 $class->SUPER::new (
1248 1501 vertical => 0,
1249 ( 1502 @_,
1250 (List::Util::sum map $_->[0], @alloc),
1251 (List::Util::max map $_->[1], @alloc),
1252 ) 1503 )
1253} 1504}
1254 1505
1255sub size_allocate {
1256 my ($self, $w, $h) = @_;
1257
1258 ($h, $w) = ($w, $h);
1259
1260 my $children = $self->{children};
1261
1262 my @h = map $_->{req_w}, @$children;
1263
1264 my $req_h = List::Util::sum @h;
1265
1266 if ($req_h > $h) {
1267 # ah well, not enough space
1268 $_ *= $h / $req_h for @h;
1269 } else {
1270 my $exp = List::Util::sum map $_->{expand}, @$children;
1271 $exp ||= 1;
1272
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275
1276 my $alloc_h = $h[$_];
1277 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1278 $h[$_] = $alloc_h;
1279 }
1280 }
1281
1282 CFClient::UI::harmonize \@h;
1283
1284 my $y = 0;
1285 for (0 .. $#$children) {
1286 my $child = $children->[$_];
1287 my $h = $h[$_];
1288 $child->configure ($y, 0, $h, $w);
1289
1290 $y += $h;
1291 }
1292
1293 1
1294}
1295
1296############################################################################# 1506#############################################################################
1297 1507
1298package CFClient::UI::VBox; 1508package CFClient::UI::VBox;
1299 1509
1300# TODO: wrap into common Box base class
1301
1302our @ISA = CFClient::UI::Container::; 1510our @ISA = CFClient::UI::Box::;
1303 1511
1304sub size_request { 1512sub new {
1305 my ($self) = @_; 1513 my $class = shift;
1306 1514
1307 my @alloc = map [$_->size_request], @{$self->{children}}; 1515 $class->SUPER::new (
1308 1516 vertical => 1,
1309 ( 1517 @_,
1310 (List::Util::max map $_->[0], @alloc),
1311 (List::Util::sum map $_->[1], @alloc),
1312 ) 1518 )
1313}
1314
1315sub size_allocate {
1316 my ($self, $w, $h) = @_;
1317
1318 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1320 my $children = $self->{children};
1321
1322 my @h = map $_->{req_h}, @$children;
1323
1324 my $req_h = List::Util::sum @h;
1325
1326 if ($req_h > $h) {
1327 # ah well, not enough space
1328 $_ *= $h / $req_h for @h;
1329 } else {
1330 my $exp = List::Util::sum map $_->{expand}, @$children;
1331 $exp ||= 1;
1332
1333 for (0 .. $#$children) {
1334 my $child = $children->[$_];
1335
1336 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1337 }
1338 }
1339
1340 CFClient::UI::harmonize \@h;
1341
1342 my $y = 0;
1343 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_];
1346 $child->configure (0, $y, $w, $h);
1347
1348 $y += $h;
1349 }
1350
1351 1
1352} 1519}
1353 1520
1354############################################################################# 1521#############################################################################
1355 1522
1356package CFClient::UI::Label; 1523package CFClient::UI::Label;
… …
1373 ellipsise => 3, # end 1540 ellipsise => 3, # end
1374 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout),
1375 fontsize => 1, 1542 fontsize => 1,
1376 align => -1, 1543 align => -1,
1377 valign => -1, 1544 valign => -1,
1378 padding => 2, 1545 padding_x => 2,
1546 padding_y => 2,
1379 can_events => 0, 1547 can_events => 0,
1380 %arg 1548 %arg
1381 ); 1549 );
1382 1550
1383 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
… …
1410 1578
1411 delete $self->{texture}; 1579 delete $self->{texture};
1412 $self->SUPER::update; 1580 $self->SUPER::update;
1413} 1581}
1414 1582
1583sub realloc {
1584 my ($self) = @_;
1585
1586 delete $self->{ox};
1587 $self->SUPER::realloc;
1588}
1589
1415sub set_text { 1590sub set_text {
1416 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1417 1592
1418 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1419 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1420 1595
1421 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1422 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1423 1597
1598 delete $self->{size_req};
1599 $self->realloc;
1424 $self->update; 1600 $self->update;
1425 $self->check_size;
1426} 1601}
1427 1602
1428sub set_markup { 1603sub set_markup {
1429 my ($self, $markup) = @_; 1604 my ($self, $markup) = @_;
1430 1605
1431 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1432 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1433 1608
1434 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435 1610
1436 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1437 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1438 1612
1613 delete $self->{size_req};
1614 $self->realloc;
1439 $self->update; 1615 $self->update;
1440 $self->check_size;
1441} 1616}
1442 1617
1443sub size_request { 1618sub size_request {
1444 my ($self) = @_; 1619 my ($self) = @_;
1445 1620
1621 $self->{size_req} ||= do {
1446 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1622 $self->{layout}->set_font ($self->{font}) if $self->{font};
1447 $self->{layout}->set_width ($self->{max_w} || -1); 1623 $self->{layout}->set_width ($self->{max_w} || -1);
1448 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1624 $self->{layout}->set_ellipsise ($self->{ellipsise});
1449 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1625 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1450 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1451 1627
1452 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1453 1629
1454 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1455 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1456 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1457 1634
1458 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1459 1636
1460 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
1461 $h = List::Util::max $h, $h2; 1638 $h = List::Util::max $h, $h2;
1639 }
1640
1641 [$w, $h]
1462 } 1642 };
1463 1643
1464 ( 1644 @{ $self->{size_req} }
1465 $w + $self->{padding} * 2,
1466 $h + $self->{padding} * 2,
1467 )
1468} 1645}
1469 1646
1647sub baseline_shift {
1648 $_[0]{layout}->descent
1649}
1650
1470sub size_allocate { 1651sub invoke_size_allocate {
1471 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1472 1653
1654 delete $self->{ox};
1655
1473 delete $self->{texture}; 1656 delete $self->{texture}
1657 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1658
1659 1
1474} 1660}
1475 1661
1476sub set_fontsize { 1662sub set_fontsize {
1477 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1478 1664
1479 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1480 delete $self->{texture}; 1667 delete $self->{texture};
1481 1668
1482 $self->update; 1669 $self->realloc;
1483 $self->check_size; 1670}
1671
1672sub reconfigure {
1673 my ($self) = @_;
1674
1675 delete $self->{size_req};
1676 delete $self->{texture};
1677
1678 $self->SUPER::reconfigure;
1484} 1679}
1485 1680
1486sub _draw { 1681sub _draw {
1487 my ($self) = @_; 1682 my ($self) = @_;
1488 1683
1489 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1490 1685
1491 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1492 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1693
1499 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1694 [$self->{layout}->size]
1500
1501 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1502 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1503 : ($self->{w} - $tex->{w}) * 0.5);
1504
1505 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1506 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1507 : ($self->{h} - $tex->{h}) * 0.5);
1508
1509 $tex
1510 }; 1695 };
1511 1696
1512 glEnable GL_TEXTURE_2D; 1697 unless (exists $self->{ox}) {
1513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $size->[0]) * 0.5);
1514 1701
1515 if ($tex->{format} == GL_ALPHA) { 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1516 glColor @{$self->{fg}}; 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1517 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 : ($self->{h} - $size->[1]) * 0.5);
1518 } else {
1519 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1520 } 1705 };
1521 1706
1522 glDisable GL_TEXTURE_2D; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1709
1710 $self->{layout}->render ($self->{ox}, $self->{oy});
1523} 1711}
1524 1712
1525############################################################################# 1713#############################################################################
1526 1714
1527package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
1541 can_hover => 1, 1729 can_hover => 1,
1542 can_focus => 1, 1730 can_focus => 1,
1543 valign => 0, 1731 valign => 0,
1544 can_events => 1, 1732 can_events => 1,
1545 #text => ... 1733 #text => ...
1734 #hidden => "*",
1546 @_ 1735 @_
1547 ) 1736 )
1548} 1737}
1549 1738
1550sub _set_text { 1739sub _set_text {
… …
1552 1741
1553 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1554 1743
1555 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1556 1745
1557 delete $self->{texture};
1558
1559 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1560 $self->{text} = $text; 1747 $self->{text} = $text;
1561 1748
1562 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1563 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1564 1752
1565 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1566} 1757}
1567 1758
1568sub set_text { 1759sub set_text {
1569 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1570 1761
1571 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1572 $self->_set_text ($text); 1763 $self->_set_text ($text);
1573 $self->update;
1574 $self->check_size;
1575} 1764}
1576 1765
1577sub get_text { 1766sub get_text {
1578 $_[0]{text} 1767 $_[0]{text}
1579} 1768}
… …
1584 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1585 1774
1586 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1587} 1776}
1588 1777
1589sub key_down { 1778sub invoke_key_down {
1590 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1591 1780
1592 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1593 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1594 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1606 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1607 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1608 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1609 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1610 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1611 $self->_emit ('escape'); 1800 $self->emit ('escape');
1612 } elsif ($uni) { 1801 } elsif ($uni) {
1613 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1614 } 1805 }
1615 1806
1616 $self->_set_text ($text); 1807 $self->_set_text ($text);
1617 $self->update;
1618 $self->check_size;
1619}
1620 1808
1809 $self->realloc;
1810
1811 1
1812}
1813
1621sub focus_in { 1814sub invoke_focus_in {
1622 my ($self) = @_; 1815 my ($self) = @_;
1623 1816
1624 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1625 1818
1626 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1627} 1820}
1628 1821
1629sub button_down { 1822sub invoke_button_down {
1630 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1631 1824
1632 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1633 1826
1634 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1635 1828
1636 # byte-index to char-index 1829 # byte-index to char-index
1637 my $text = $self->{text}; 1830 my $text = $self->{text};
1638 utf8::encode $text; 1831 utf8::encode $text;
1639 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1640 1833
1641 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1642 $self->update; 1835 $self->update;
1836
1837 1
1643} 1838}
1644 1839
1645sub mouse_motion { 1840sub invoke_mouse_motion {
1646 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1647# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1843
1844 1
1648} 1845}
1649 1846
1650sub _draw { 1847sub _draw {
1651 my ($self) = @_; 1848 my ($self) = @_;
1652 1849
1653 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1654 1851
1655 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1656 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1657 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1658 } else { 1855 } else {
1659 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1660 } 1857 }
1661 1858
1662 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1664 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1665 glVertex 0 , 0; 1862 glVertex 0 , 0;
1666 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1667 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1668 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1693 1890
1694our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1695 1892
1696use CFClient::OpenGL; 1893use CFClient::OpenGL;
1697 1894
1698sub key_down { 1895sub invoke_key_down {
1699 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1700 1897
1701 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1702 1899
1703 if ($sym == 13) { 1900 if ($sym == 13) {
1704 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1705 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1706 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1707 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1708 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1709 $self->update; 1907 $self->update;
1710 1908
1711 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1712 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1713 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1729 } else { 1927 } else {
1730 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1731 } 1929 }
1732 1930
1733 } else { 1931 } else {
1734 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1735 } 1935 1
1736
1737} 1936}
1738 1937
1739############################################################################# 1938#############################################################################
1740 1939
1741package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1750 1949
1751sub new { 1950sub new {
1752 my $class = shift; 1951 my $class = shift;
1753 1952
1754 $class->SUPER::new ( 1953 $class->SUPER::new (
1755 padding => 4, 1954 padding_x => 4,
1955 padding_y => 4,
1756 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1757 active_fg => [0, 0, 1], 1957 active_fg => [0, 0, 1],
1758 can_hover => 1, 1958 can_hover => 1,
1759 align => 0, 1959 align => 0,
1760 valign => 0, 1960 valign => 0,
1761 can_events => 1, 1961 can_events => 1,
1762 @_ 1962 @_
1763 ) 1963 )
1764} 1964}
1765 1965
1766sub activate { }
1767
1768sub button_up { 1966sub invoke_button_up {
1769 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1770 1968
1771 $self->emit ("activate") 1969 $self->emit ("activate")
1772 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1773 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1972
1973 1
1774} 1974}
1775 1975
1776sub _draw { 1976sub _draw {
1777 my ($self) = @_; 1977 my ($self) = @_;
1778 1978
1779 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1780
1781 if ($GRAB == $self) {
1782 $self->{fg} = $self->{active_fg};
1783 }
1784 1980
1785 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1786 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1787 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1788 1984
… …
1793 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1794} 1990}
1795 1991
1796############################################################################# 1992#############################################################################
1797 1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
2026}
2027
2028#############################################################################
2029
1798package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
1799 2031
1800our @ISA = CFClient::UI::DrawBG::; 2032our @ISA = CFClient::UI::DrawBG::;
1801 2033
1802my @tex = 2034my @tex =
… …
1807 2039
1808sub new { 2040sub new {
1809 my $class = shift; 2041 my $class = shift;
1810 2042
1811 $class->SUPER::new ( 2043 $class->SUPER::new (
1812 padding => 2, 2044 padding_x => 2,
2045 padding_y => 2,
1813 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1814 active_fg => [1, 1, 0], 2047 active_fg => [1, 1, 0],
1815 bg => [0, 0, 0, 0.2], 2048 bg => [0, 0, 0, 0.2],
1816 active_bg => [1, 1, 1, 0.5], 2049 active_bg => [1, 1, 1, 0.5],
1817 state => 0, 2050 state => 0,
… …
1821} 2054}
1822 2055
1823sub size_request { 2056sub size_request {
1824 my ($self) = @_; 2057 my ($self) = @_;
1825 2058
1826 ($self->{padding} * 2 + 6) x 2 2059 (6) x 2
1827} 2060}
1828 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
1829sub button_down { 2070sub invoke_button_down {
1830 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
1831 2072
1832 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1833 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1834 $self->{state} = !$self->{state}; 2075 $self->toggle;
1835 $self->_emit (changed => $self->{state}); 2076 } else {
2077 return 0
2078 }
2079
1836 } 2080 1
1837} 2081}
1838 2082
1839sub _draw { 2083sub _draw {
1840 my ($self) = @_; 2084 my ($self) = @_;
1841 2085
1842 $self->SUPER::_draw; 2086 $self->SUPER::_draw;
1843 2087
1844 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2088 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1845 2089
1846 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2090 my ($w, $h) = @$self{qw(w h)};
2091
2092 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1847 2093
1848 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2094 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1849 2095
1850 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2096 my $tex = $self->{state} ? $tex[1] : $tex[0];
1851 2097
… …
1859package CFClient::UI::Image; 2105package CFClient::UI::Image;
1860 2106
1861our @ISA = CFClient::UI::Base::; 2107our @ISA = CFClient::UI::Base::;
1862 2108
1863use CFClient::OpenGL; 2109use CFClient::OpenGL;
1864use Carp qw/confess/;
1865 2110
1866our %loaded_images; 2111our %texture_cache;
1867 2112
1868sub new { 2113sub new {
1869 my $class = shift; 2114 my $class = shift;
1870 2115
1871 my $self = $class->SUPER::new (can_events => 0, @_); 2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
1872 2120
1873 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2121 $self->{path}
2122 or Carp::croak "required attribute 'path' not set";
1874 2123
1875 $loaded_images{$self->{image}} ||= 2124 $self->{tex} = $texture_cache{$self->{path}} ||=
1876 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1877 2126
1878 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2127 Scalar::Util::weaken $texture_cache{$self->{path}};
1879 2128
1880 Scalar::Util::weaken $loaded_images{$self->{image}}; 2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1881
1882 $self->{aspect} = $tex->{w} / $tex->{h};
1883 2130
1884 $self 2131 $self
1885} 2132}
1886 2133
1887sub size_request { 2134sub size_request {
1888 my ($self) = @_; 2135 my ($self) = @_;
1889 2136
1890 ($self->{tex}->{w}, $self->{tex}->{h}) 2137 ($self->{tex}{w}, $self->{tex}{h})
1891} 2138}
1892 2139
1893sub _draw { 2140sub _draw {
1894 my ($self) = @_; 2141 my ($self) = @_;
1895 2142
… …
2004 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2005 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2006 2253
2007 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2008 my $h2 = $self->{h} * (1 - $ycut2); 2255 my $h2 = $self->{h} * (1 - $ycut2);
2256 my $h3 = $self->{h};
2257
2258 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2009 2259
2010 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2011 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2012 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
2013 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2014 2265
2015 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2266 glBindTexture GL_TEXTURE_2D, $t1->{name};
2016 glBegin GL_QUADS; 2267 glBegin GL_QUADS;
… …
2031 2282
2032 if ($t3) { 2283 if ($t3) {
2033 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2034 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2035 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2036 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2037 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2038 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2039 glEnd; 2290 glEnd;
2040 } 2291 }
2041 2292
2042 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
… …
2116 fg => [1, 1, 1], 2367 fg => [1, 1, 1],
2117 active_fg => [0, 0, 0], 2368 active_fg => [0, 0, 0],
2118 bg => [0, 0, 0, 0.2], 2369 bg => [0, 0, 0, 0.2],
2119 active_bg => [1, 1, 1, 0.5], 2370 active_bg => [1, 1, 1, 0.5],
2120 range => [0, 0, 100, 10, 0], 2371 range => [0, 0, 100, 10, 0],
2121 req_w => $::WIDTH / 80, 2372 min_w => $::WIDTH / 80,
2122 req_h => $::WIDTH / 80, 2373 min_h => $::WIDTH / 80,
2123 vertical => 0, 2374 vertical => 0,
2124 can_hover => 1, 2375 can_hover => 1,
2125 inner_pad => 0.02, 2376 inner_pad => 0.02,
2126 @_ 2377 @_
2127 ); 2378 );
… …
2133} 2384}
2134 2385
2135sub set_range { 2386sub set_range {
2136 my ($self, $range) = @_; 2387 my ($self, $range) = @_;
2137 2388
2138 $self->{range} = $range; 2389 ($range, $self->{range}) = ($self->{range}, $range);
2139 2390
2391 if ("@$range" ne "@{$self->{range}}") {
2140 $self->update; 2392 $self->update;
2393 $self->set_value ($self->{range}[0]);
2394 }
2141} 2395}
2142 2396
2143sub set_value { 2397sub set_value {
2144 my ($self, $value) = @_; 2398 my ($self, $value) = @_;
2145 2399
… …
2156 if $unit; 2410 if $unit;
2157 2411
2158 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2412 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2159 2413
2160 if ($value != $old_value) { 2414 if ($value != $old_value) {
2161 $self->_emit (changed => $value); 2415 $self->emit (changed => $value);
2162 $self->update; 2416 $self->update;
2163 } 2417 }
2164} 2418}
2165 2419
2166sub size_request { 2420sub size_request {
2167 my ($self) = @_; 2421 my ($self) = @_;
2168 2422
2169 my $w = $self->{req_w}; 2423 ($self->{req_w}, $self->{req_h})
2170 my $h = $self->{req_h};
2171
2172 $self->{vertical} ? ($h, $w) : ($w, $h)
2173} 2424}
2174 2425
2175sub button_down { 2426sub invoke_button_down {
2176 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2177 2428
2178 $self->SUPER::button_down ($ev, $x, $y); 2429 $self->SUPER::invoke_button_down ($ev, $x, $y);
2179 2430
2180 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2431 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2181 2432
2182 $self->mouse_motion ($ev, $x, $y); 2433 $self->invoke_mouse_motion ($ev, $x, $y)
2183} 2434}
2184 2435
2185sub mouse_motion { 2436sub invoke_mouse_motion {
2186 my ($self, $ev, $x, $y) = @_; 2437 my ($self, $ev, $x, $y) = @_;
2187 2438
2188 if ($GRAB == $self) { 2439 if ($GRAB == $self) {
2189 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2440 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2190 2441
2191 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2442 my (undef, $lo, $hi, $page) = @{$self->{range}};
2192 2443
2193 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2444 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2194 2445
2195 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2446 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2447 } else {
2448 return 0;
2449 }
2450
2196 } 2451 1
2197} 2452}
2198 2453
2199sub update { 2454sub update {
2200 my ($self) = @_; 2455 my ($self) = @_;
2201 2456
2202 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2457 delete $self->{knob_w};
2458 $self->SUPER::update;
2459}
2460
2461sub _draw {
2462 my ($self) = @_;
2463
2464 unless ($self->{knob_w}) {
2203 $self->set_value ($self->{range}[0]); 2465 $self->set_value ($self->{range}[0]);
2204 2466
2205 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2467 my ($value, $lo, $hi, $page) = @{$self->{range}};
2206 my $range = ($hi - $page - $lo) || 1e-100; 2468 my $range = ($hi - $page - $lo) || 1e-100;
2207 2469
… …
2213 $value = ($value - $lo) / $range; 2475 $value = ($value - $lo) / $range;
2214 $value = $value * $self->{scale} + $self->{offset}; 2476 $value = $value * $self->{scale} + $self->{offset};
2215 2477
2216 $self->{knob_x} = $value - $knob_w * 0.5; 2478 $self->{knob_x} = $value - $knob_w * 0.5;
2217 $self->{knob_w} = $knob_w; 2479 $self->{knob_w} = $knob_w;
2218 }); 2480 }
2219
2220 $self->SUPER::update;
2221}
2222
2223sub _draw {
2224 my ($self) = @_;
2225 2481
2226 $self->SUPER::_draw (); 2482 $self->SUPER::_draw ();
2227 2483
2228 glScale $self->{w}, $self->{h}; 2484 glScale $self->{w}, $self->{h};
2229 2485
… …
2290sub set_range { shift->{slider}->set_range (@_) } 2546sub set_range { shift->{slider}->set_range (@_) }
2291sub set_value { shift->{slider}->set_value (@_) } 2547sub set_value { shift->{slider}->set_value (@_) }
2292 2548
2293############################################################################# 2549#############################################################################
2294 2550
2295package CFClient::UI::TextView; 2551package CFClient::UI::TextScroller;
2296 2552
2297our @ISA = CFClient::UI::HBox::; 2553our @ISA = CFClient::UI::HBox::;
2298 2554
2299use CFClient::OpenGL; 2555use CFClient::OpenGL;
2300 2556
… …
2302 my $class = shift; 2558 my $class = shift;
2303 2559
2304 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2305 fontsize => 1, 2561 fontsize => 1,
2306 can_events => 0, 2562 can_events => 0,
2563 indent => 0,
2307 #font => default_font 2564 #font => default_font
2308 @_, 2565 @_,
2309 2566
2310 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2311 par => [], 2568 par => [],
2312 height => 0, 2569 height => 0,
2313 children => [ 2570 children => [
2314 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2315 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2326 2583
2327 $self->{fontsize} = $fontsize; 2584 $self->{fontsize} = $fontsize;
2328 $self->reflow; 2585 $self->reflow;
2329} 2586}
2330 2587
2588sub size_request {
2589 my ($self) = @_;
2590
2591 my ($empty, $slider) = @{ $self->{children} };
2592
2593 local $self->{children} = [$empty, $slider];
2594 $self->SUPER::size_request
2595}
2596
2331sub size_allocate { 2597sub invoke_size_allocate {
2332 my ($self, $w, $h) = @_; 2598 my ($self, $w, $h) = @_;
2333 2599
2334 $self->SUPER::size_allocate ($w, $h); 2600 my ($empty, $slider, @other) = @{ $self->{children} };
2601 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2335 2602
2336 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2603 $self->{layout}->set_font ($self->{font}) if $self->{font};
2337 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2604 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2338 $self->{layout}->set_width ($self->{children}[0]{w}); 2605 $self->{layout}->set_width ($empty->{w});
2606 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2339 2607
2340 $self->reflow; 2608 $self->reflow;
2341}
2342 2609
2343sub text_size { 2610 local $self->{children} = [$empty, $slider];
2344 my ($self, $text, $indent) = @_; 2611 $self->SUPER::invoke_size_allocate ($w, $h)
2612}
2613
2614sub get_layout {
2615 my ($self, $para) = @_;
2345 2616
2346 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2347 2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620 $layout->set_foreground (@{$para->{fg}});
2348 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2621 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2349 $layout->set_width ($self->{children}[0]{w} - $indent); 2622 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2350 $layout->set_markup ($text); 2624 $layout->set_markup ($para->{markup});
2625
2626 $layout->set_shapes (
2627 map
2628 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2629 @{$para->{widget}}
2351 2630 );
2631
2352 $layout->size 2632 $layout
2353} 2633}
2354 2634
2355sub reflow { 2635sub reflow {
2356 my ($self) = @_; 2636 my ($self) = @_;
2357 2637
… …
2366 $self->{children}[1]->set_value ($offset); 2646 $self->{children}[1]->set_value ($offset);
2367} 2647}
2368 2648
2369sub clear { 2649sub clear {
2370 my ($self) = @_; 2650 my ($self) = @_;
2651
2652 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other;
2371 2654
2372 $self->{par} = []; 2655 $self->{par} = [];
2373 $self->{height} = 0; 2656 $self->{height} = 0;
2374 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2375} 2658}
2376 2659
2377sub add_paragraph { 2660sub add_paragraph {
2378 my ($self, $color, $text, $indent) = @_; 2661 my ($self, $color, $para, $indent) = @_;
2379 2662
2380 for my $line (split /\n/, $text) { 2663 my ($text, @w) = ref $para ? @$para : $para;
2381 my ($w, $h) = $self->text_size ($line); 2664
2382 $self->{height} += $h; 2665 $para = {
2383 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2666 w => 1e10,
2667 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2384 } 2672 };
2385 2673
2386 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2674 $self->add (@w) if @w;
2675 push @{$self->{par}}, $para;
2676
2677 $self->{need_reflow}++;
2678 $self->update;
2679}
2680
2681sub scroll_to_bottom {
2682 my ($self) = @_;
2683
2684 $self->{scroll_to_bottom} = 1;
2685 $self->update;
2387} 2686}
2388 2687
2389sub update { 2688sub update {
2390 my ($self) = @_; 2689 my ($self) = @_;
2391 2690
… …
2393 2692
2394 return unless $self->{h} > 0; 2693 return unless $self->{h} > 0;
2395 2694
2396 delete $self->{texture}; 2695 delete $self->{texture};
2397 2696
2398 $ROOT->on_post_alloc ($self, sub { 2697 $ROOT->on_post_alloc ($self => sub {
2399 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2400 2699
2401 if (delete $self->{need_reflow}) { 2700 if (delete $self->{need_reflow}) {
2402 my $height = 0; 2701 my $height = 0;
2403 2702
2404 my $layout = $self->{layout};
2405
2406 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2407
2408 for (@{$self->{par}}) { 2703 for my $para (@{$self->{par}}) {
2409 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2410 $layout->set_width ($W - $_->[3]); 2705 my $layout = $self->get_layout ($para);
2411 $layout->set_markup ($_->[4]);
2412 my ($w, $h) = $layout->size; 2706 my ($w, $h) = $layout->size;
2413 $_->[0] = $w + $_->[3]; 2707
2414 $_->[1] = $h; 2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2415 } 2711 }
2416 2712
2417 $height += $_->[1]; 2713 $height += $para->{h};
2418 } 2714 }
2419 2715
2420 $self->{height} = $height; 2716 $self->{height} = $height;
2421 2717
2422 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2718 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2423 2719
2424 delete $self->{texture}; 2720 delete $self->{texture};
2425 } 2721 }
2426 2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2725 }
2726
2427 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2428 glClearColor 0.5, 0.5, 0.5, 0; 2728 glClearColor 0, 0, 0, 0;
2429 glClear GL_COLOR_BUFFER_BIT; 2729 glClear GL_COLOR_BUFFER_BIT;
2430 2730
2431 my $top = int $self->{children}[1]{range}[0]; 2731 my $top = int $self->{children}[1]{range}[0];
2432 2732
2433 my $y0 = $top; 2733 my $y0 = $top;
2434 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2435 2735
2436 my $y = 0; 2736 my $y = 0;
2437 2737
2438 my $layout = $self->{layout};
2439
2440 $layout->set_font ($self->{font}) if $self->{font};
2441
2442 glEnable GL_BLEND;
2443 #TODO# not correct in windows where rgba is forced off
2444 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2445
2446 for my $par (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2447 my $h = $par->[1]; 2739 my $h = $para->{h};
2448 2740
2449 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2450 $layout->set_foreground (@{ $par->[2] });
2451 $layout->set_width ($W - $par->[3]);
2452 $layout->set_markup ($par->[4]);
2453 2742
2454 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2743 my $layout = $self->get_layout ($para);
2455 2744
2456 glRasterPos $par->[3], $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2457 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 }
2458 } 2759 }
2459 2760
2460 $y += $h; 2761 $y += $h;
2461 } 2762 }
2462
2463 glDisable GL_BLEND;
2464 }; 2763 };
2465 }); 2764 });
2466} 2765}
2467 2766
2767sub reconfigure {
2768 my ($self) = @_;
2769
2770 $self->SUPER::reconfigure;
2771
2772 $_->{w} = 1e10 for @{ $self->{par} };
2773 $self->reflow;
2774}
2775
2468sub _draw { 2776sub _draw {
2469 my ($self) = @_; 2777 my ($self) = @_;
2470 2778
2471 glEnable GL_TEXTURE_2D; 2779 glEnable GL_TEXTURE_2D;
2472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2780 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2473 glColor 1, 1, 1, 1; 2781 glColor 0, 0, 0, 1;
2474 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2782 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2475 glDisable GL_TEXTURE_2D; 2783 glDisable GL_TEXTURE_2D;
2476 2784
2477 $self->{children}[1]->draw; 2785 $self->{children}[1]->draw;
2478
2479} 2786}
2480 2787
2481############################################################################# 2788#############################################################################
2482 2789
2483package CFClient::UI::Animator; 2790package CFClient::UI::Animator;
… …
2528 2835
2529sub new { 2836sub new {
2530 my $class = shift; 2837 my $class = shift;
2531 2838
2532 my $self = $class->SUPER::new ( 2839 my $self = $class->SUPER::new (
2533 state => 0, 2840 state => 0,
2534 connect_activate => \&toggle_flopper, 2841 on_activate => \&toggle_flopper,
2535 @_ 2842 @_
2536 ); 2843 );
2537 2844
2538 if ($self->{state}) {
2539 $self->{state} = 0;
2540 $self->toggle_flopper;
2541 }
2542
2543 $self 2845 $self
2544} 2846}
2545 2847
2546sub toggle_flopper { 2848sub toggle_flopper {
2547 my ($self) = @_; 2849 my ($self) = @_;
2548 2850
2549 # TODO: use animation 2851 $self->{other}->toggle_visibility;
2550 if ($self->{state} = !$self->{state}) {
2551 $CFClient::UI::ROOT->add ($self->{other});
2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2553 $self->_emit ("open");
2554 } else {
2555 $CFClient::UI::ROOT->remove ($self->{other});
2556 $self->_emit ("close");
2557 }
2558
2559 $self->_emit (changed => $self->{state});
2560} 2852}
2561 2853
2562############################################################################# 2854#############################################################################
2563 2855
2564package CFClient::UI::Tooltip; 2856package CFClient::UI::Tooltip;
… …
2577} 2869}
2578 2870
2579sub set_tooltip_from { 2871sub set_tooltip_from {
2580 my ($self, $widget) = @_; 2872 my ($self, $widget) = @_;
2581 2873
2874 my $tooltip = $widget->{tooltip};
2875
2876 if ($ENV{CFPLUS_DEBUG} & 2) {
2877 $tooltip .= "\n\n" . (ref $widget) . "\n"
2878 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2879 . "req $widget->{req_w} $widget->{req_h}\n"
2880 . "visible $widget->{visible}";
2881 }
2882
2883 $tooltip =~ s/^\n+//;
2884 $tooltip =~ s/\n+$//;
2885
2582 $self->add (new CFClient::UI::Label 2886 $self->add (new CFClient::UI::Label
2583 markup => $widget->{tooltip}, 2887 markup => $tooltip,
2584 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2888 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2585 fontsize => 0.8, 2889 fontsize => 0.8,
2586 fg => [0, 0, 0, 1], 2890 fg => [0, 0, 0, 1],
2587 ellipsise => 0, 2891 ellipsise => 0,
2588 font => ($widget->{tooltip_font} || $::FONT_PROP), 2892 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2595 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2899 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2596 2900
2597 ($w + 4, $h + 4) 2901 ($w + 4, $h + 4)
2598} 2902}
2599 2903
2600sub size_allocate { 2904sub invoke_size_allocate {
2601 my ($self, $w, $h) = @_; 2905 my ($self, $w, $h) = @_;
2602 2906
2603 $self->SUPER::size_allocate ($w - 4, $h - 4); 2907 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2908}
2909
2910sub invoke_visibility_change {
2911 my ($self, $visible) = @_;
2912
2913 return unless $visible;
2914
2915 $self->{root}->on_post_alloc ("move_$self" => sub {
2916 my $widget = $self->{owner}
2917 or return;
2918
2919 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2920
2921 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2922 if $x + $self->{w} > $self->{root}{w};
2923
2924 $self->move_abs ($x, $y);
2925 });
2604} 2926}
2605 2927
2606sub _draw { 2928sub _draw {
2607 my ($self) = @_; 2929 my ($self) = @_;
2608 2930
… …
2625 glVertex $w, $h; 2947 glVertex $w, $h;
2626 glVertex $w, 0; 2948 glVertex $w, 0;
2627 glEnd; 2949 glEnd;
2628 2950
2629 glTranslate 2 - 0.375, 2 - 0.375; 2951 glTranslate 2 - 0.375, 2 - 0.375;
2952
2630 $self->SUPER::_draw; 2953 $self->SUPER::_draw;
2631} 2954}
2632 2955
2633############################################################################# 2956#############################################################################
2634 2957
… …
2693 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3016 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2694 3017
2695 if ($tex) { 3018 if ($tex) {
2696 glEnable GL_TEXTURE_2D; 3019 glEnable GL_TEXTURE_2D;
2697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2698 glColor 1, 1, 1, 1; 3021 glColor 0, 0, 0, 1;
2699 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3022 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2700 glDisable GL_TEXTURE_2D; 3023 glDisable GL_TEXTURE_2D;
2701 } 3024 }
2702} 3025}
2703 3026
2704sub DESTROY { 3027sub destroy {
2705 my ($self) = @_; 3028 my ($self) = @_;
2706 3029
2707 $self->{timer}->cancel 3030 $self->{timer}->cancel
2708 if $self->{timer}; 3031 if $self->{timer};
2709 3032
2710 $self->SUPER::DESTROY; 3033 $self->SUPER::destroy;
2711} 3034}
2712 3035
2713############################################################################# 3036#############################################################################
2714 3037
2715package CFClient::UI::Inventory; 3038package CFClient::UI::Buttonbar;
2716 3039
2717our @ISA = CFClient::UI::ScrolledWindow::; 3040our @ISA = CFClient::UI::HBox::;
2718 3041
2719sub new { 3042# TODO: should actualyl wrap buttons and other goodies.
2720 my $class = shift;
2721
2722 my $self = $class->SUPER::new (
2723 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2724 @_,
2725 );
2726
2727 $self
2728}
2729
2730sub set_items {
2731 my ($self, $items) = @_;
2732
2733 $self->{scrolled}->clear;
2734 return unless $items;
2735
2736 my @items = sort {
2737 ($a->{type} <=> $b->{type})
2738 or ($a->{name} cmp $b->{name})
2739 } @$items;
2740
2741 $self->{real_items} = \@items;
2742
2743 my $row = 0;
2744 for my $item (@items) {
2745 CFClient::Item::update_widgets $item;
2746
2747 $self->{scrolled}->add (0, $row, $item->{face_widget});
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750
2751 $row++;
2752 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755}
2756
2757sub size_request {
2758 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h});
2760}
2761 3043
2762############################################################################# 3044#############################################################################
2763 3045
2764package CFClient::UI::Menu; 3046package CFClient::UI::Menu;
2765 3047
… …
2777 ); 3059 );
2778 3060
2779 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3061 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2780 3062
2781 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
2782 my ($widget, $cb) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
2783 3065
2784 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
2785 if (!ref $widget) { 3067 if (!ref $widget) {
3068 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2;
3070
3071 $widget = new CFClient::UI::HBox
3072 can_hover => 1,
3073 can_events => 1,
3074 tooltip => $tooltip,
3075 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1),
3078 ],
3079 ;
3080
3081 } else {
2786 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
2787 can_hover => 1, 3083 can_hover => 1,
2788 can_events => 1, 3084 can_events => 1,
2789 text => $widget; 3085 markup => $widget,
3086 tooltip => $tooltip;
3087 }
2790 } 3088 }
2791 3089
2792 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
2793 3091
2794 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
2799 3097
2800# popup given the event (must be a mouse button down event currently) 3098# popup given the event (must be a mouse button down event currently)
2801sub popup { 3099sub popup {
2802 my ($self, $ev) = @_; 3100 my ($self, $ev) = @_;
2803 3101
2804 $self->_emit ("popdown"); 3102 $self->emit ("popdown");
2805 3103
2806 # maybe save $GRAB? must be careful about events... 3104 # maybe save $GRAB? must be careful about events...
2807 $GRAB = $self; 3105 $GRAB = $self;
2808 $self->{button} = $ev->{button}; 3106 $self->{button} = $ev->{button};
2809 3107
2810 $self->show; 3108 $self->show;
2811 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3109 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2812} 3110}
2813 3111
2814sub mouse_motion { 3112sub invoke_mouse_motion {
2815 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2816 3114
2817 # TODO: should use vbox->find_widget or so 3115 # TODO: should use vbox->find_widget or so
2818 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3116 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2819 $self->{hover} = $self->{item}{$HOVER}; 3117 $self->{hover} = $self->{item}{$HOVER};
2820}
2821 3118
3119 0
3120}
3121
2822sub button_up { 3122sub invoke_button_up {
2823 my ($self, $ev, $x, $y) = @_; 3123 my ($self, $ev, $x, $y) = @_;
2824 3124
2825 if ($ev->{button} == $self->{button}) { 3125 if ($ev->{button} == $self->{button}) {
2826 undef $GRAB; 3126 undef $GRAB;
2827 $self->hide; 3127 $self->hide;
2828 3128
2829 $self->_emit ("popdown"); 3129 $self->emit ("popdown");
2830 $self->{hover}[1]->() if $self->{hover}; 3130 $self->{hover}[1]->() if $self->{hover};
3131 } else {
3132 return 0
3133 }
3134
2831 } 3135 1
2832} 3136}
2833 3137
2834############################################################################# 3138#############################################################################
2835 3139
2836package CFClient::UI::Statusbox; 3140package CFClient::UI::Multiplexer;
2837 3141
2838our @ISA = CFClient::UI::VBox::; 3142our @ISA = CFClient::UI::Container::;
2839 3143
2840sub new { 3144sub new {
2841 my $class = shift; 3145 my $class = shift;
2842 3146
2843 $class->SUPER::new ( 3147 my $self = $class->SUPER::new (
3148 @_,
3149 );
3150
3151 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} };
3153
3154 $self
3155}
3156
3157sub add {
3158 my ($self, @widgets) = @_;
3159
3160 $self->SUPER::add (@widgets);
3161
3162 $self->{current} = $self->{children}[0]
3163 if @{ $self->{children} };
3164}
3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3170}
3171
3172sub set_current_page {
3173 my ($self, $page_or_widget) = @_;
3174
3175 my $widget = ref $page_or_widget
3176 ? $page_or_widget
3177 : $self->{children}[$page_or_widget];
3178
3179 $self->{current} = $widget;
3180 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3181
3182 $self->emit (page_changed => $self->{current});
3183
3184 $self->realloc;
3185}
3186
3187sub visible_children {
3188 $_[0]{current}
3189}
3190
3191sub size_request {
3192 my ($self) = @_;
3193
3194 $self->{current}->size_request
3195}
3196
3197sub invoke_size_allocate {
3198 my ($self, $w, $h) = @_;
3199
3200 $self->{current}->configure (0, 0, $w, $h);
3201
3202 1
3203}
3204
3205sub _draw {
3206 my ($self) = @_;
3207
3208 $self->{current}->draw;
3209}
3210
3211#############################################################################
3212
3213package CFClient::UI::Notebook;
3214
3215our @ISA = CFClient::UI::VBox::;
3216
3217sub new {
3218 my $class = shift;
3219
3220 my $self = $class->SUPER::new (
3221 buttonbar => (new CFClient::UI::Buttonbar),
3222 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3223 # filter => # will be put between multiplexer and $self
3224 @_,
3225 );
3226
3227 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3228 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3229
3230 $self
3231}
3232
3233sub add {
3234 my ($self, $title, $widget, $tooltip) = @_;
3235
3236 Scalar::Util::weaken $self;
3237
3238 $self->{buttonbar}->add (new CFClient::UI::Button
3239 markup => $title,
3240 tooltip => $tooltip,
3241 on_activate => sub { $self->set_current_page ($widget) },
3242 );
3243
3244 $self->{multiplexer}->add ($widget);
3245}
3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3251}
3252
3253sub set_current_page {
3254 my ($self, $page) = @_;
3255
3256 $self->{multiplexer}->set_current_page ($page);
3257 $self->emit (page_changed => $self->{multiplexer}{current});
3258}
3259
3260#############################################################################
3261
3262package CFClient::UI::Combobox;
3263
3264use utf8;
3265
3266our @ISA = CFClient::UI::Button::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (
3272 options => [], # [value, title, longdesc], ...
3273 value => undef,
3274 @_,
3275 );
3276
3277 $self->_set_value ($self->{value});
3278
3279 $self
3280}
3281
3282sub invoke_button_down {
3283 my ($self, $ev) = @_;
3284
3285 my @menu_items;
3286
3287 for (@{ $self->{options} }) {
3288 my ($value, $title, $tooltip) = @$_;
3289
3290 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3291 }
3292
3293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3294}
3295
3296sub _set_value {
3297 my ($self, $value) = @_;
3298
3299 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3300 or return;
3301
3302 $self->{value} = $item->[0];
3303 $self->set_markup ("$item->[1] ⇓");
3304 $self->set_tooltip ($item->[2]);
3305}
3306
3307sub set_value {
3308 my ($self, $value) = @_;
3309
3310 return unless $self->{value} ne $value;
3311
3312 $self->_set_value ($value);
3313 $self->emit (changed => $value);
3314}
3315
3316#############################################################################
3317
3318package CFClient::UI::Statusbox;
3319
3320our @ISA = CFClient::UI::VBox::;
3321
3322sub new {
3323 my $class = shift;
3324
3325 my $self = $class->SUPER::new (
2844 fontsize => 0.8, 3326 fontsize => 0.8,
2845 @_, 3327 @_,
2846 ) 3328 );
3329
3330 Scalar::Util::weaken (my $this = $self);
3331
3332 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3333
3334 $self
2847} 3335}
2848 3336
2849sub reorder { 3337sub reorder {
2850 my ($self) = @_; 3338 my ($self) = @_;
2851 my $NOW = time; 3339 my $NOW = Time::HiRes::time;
3340
3341 # freeze display when hovering over any label
3342 return if $CFClient::UI::TOOLTIP->{owner}
3343 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3344 values %{ $self->{item} };
2852 3345
2853 while (my ($k, $v) = each %{ $self->{item} }) { 3346 while (my ($k, $v) = each %{ $self->{item} }) {
2854 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3347 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2855 } 3348 }
2856 3349
… …
2859 my @items = sort { 3352 my @items = sort {
2860 $a->{pri} <=> $b->{pri} 3353 $a->{pri} <=> $b->{pri}
2861 or $b->{id} <=> $a->{id} 3354 or $b->{id} <=> $a->{id}
2862 } values %{ $self->{item} }; 3355 } values %{ $self->{item} };
2863 3356
3357 $self->{timer}->interval (1);
3358
2864 my $count = 10 + 1; 3359 my $count = 10 + 1;
2865 for my $item (@items) { 3360 for my $item (@items) {
2866 last unless --$count; 3361 last unless --$count;
2867 3362
2868 push @widgets, $item->{label} ||= do { 3363 my $label = $item->{label} ||= do {
2869 # TODO: doesn't handle markup well (read as: at all) 3364 # TODO: doesn't handle markup well (read as: at all)
2870 my $short = $item->{count} > 1 3365 my $short = $item->{count} > 1
2871 ? "<b>$item->{count} ×</b> $item->{text}" 3366 ? "<b>$item->{count} ×</b> $item->{text}"
2872 : $item->{text}; 3367 : $item->{text};
2873 3368
… …
2881 tooltip => $item->{tooltip}, 3376 tooltip => $item->{tooltip},
2882 tooltip_font => $::FONT_PROP, 3377 tooltip_font => $::FONT_PROP,
2883 tooltip_width => 0.67, 3378 tooltip_width => 0.67,
2884 fontsize => $item->{fontsize} || $self->{fontsize}, 3379 fontsize => $item->{fontsize} || $self->{fontsize},
2885 max_w => $::WIDTH * 0.44, 3380 max_w => $::WIDTH * 0.44,
2886 fg => $item->{fg}, 3381 fg => [@{ $item->{fg} }],
2887 can_events => 1, 3382 can_events => 1,
2888 can_hover => 1 3383 can_hover => 1
2889 }; 3384 };
3385
3386 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3387 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3388 $label->update;
3389 $label->set_max_size (undef, $label->{req_h} * $diff)
3390 if $diff < 1;
3391 $self->{timer}->interval (1/30);
3392 } else {
3393 $label->{fg}[3] = $item->{fg}[3] || 1;
3394 }
3395
3396 push @widgets, $label;
2890 } 3397 }
2891 3398
2892 $self->clear; 3399 $self->clear;
2893 $self->SUPER::add (reverse @widgets); 3400 $self->SUPER::add (reverse @widgets);
2894} 3401}
… …
2899 $text =~ s/^\s+//; 3406 $text =~ s/^\s+//;
2900 $text =~ s/\s+$//; 3407 $text =~ s/\s+$//;
2901 3408
2902 return unless $text; 3409 return unless $text;
2903 3410
2904 my $timeout = time + ((delete $arg{timeout}) || 60); 3411 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2905 3412
2906 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3413 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2907 3414
2908 if (my $item = $self->{item}{$group}) { 3415 if (my $item = $self->{item}{$group}) {
2909 if ($item->{text} eq $text) { 3416 if ($item->{text} eq $text) {
2910 $item->{count}++; 3417 $item->{count}++;
2911 } else { 3418 } else {
2912 $item->{count} = 1; 3419 $item->{count} = 1;
2913 $item->{text} = $item->{tooltip} = $text; 3420 $item->{text} = $item->{tooltip} = $text;
2914 } 3421 }
2915 $item->{id} = ++$self->{id}; 3422 $item->{id} += 0.2;#d#
2916 $item->{timeout} = $timeout; 3423 $item->{timeout} = $timeout;
2917 delete $item->{label}; 3424 delete $item->{label};
2918 } else { 3425 } else {
2919 $self->{item}{$group} = { 3426 $self->{item}{$group} = {
2920 id => ++$self->{id}, 3427 id => ++$self->{id},
… …
2926 count => 1, 3433 count => 1,
2927 %arg, 3434 %arg,
2928 }; 3435 };
2929 } 3436 }
2930 3437
3438 $ROOT->on_refresh (reorder => sub {
2931 $self->reorder; 3439 $self->reorder;
3440 });
2932} 3441}
2933 3442
2934sub reconfigure { 3443sub reconfigure {
2935 my ($self) = @_; 3444 my ($self) = @_;
2936 3445
… …
2939 3448
2940 $self->reorder; 3449 $self->reorder;
2941 $self->SUPER::reconfigure; 3450 $self->SUPER::reconfigure;
2942} 3451}
2943 3452
3453sub destroy {
3454 my ($self) = @_;
3455
3456 $self->{timer}->cancel;
3457
3458 $self->SUPER::destroy;
3459}
3460
2944############################################################################# 3461#############################################################################
2945 3462
2946package CFClient::UI::Root; 3463package CFClient::UI::Inventory;
2947 3464
2948our @ISA = CFClient::UI::Container::; 3465our @ISA = CFClient::UI::Table::;
2949
2950use CFClient::OpenGL;
2951 3466
2952sub new { 3467sub new {
2953 my $class = shift; 3468 my $class = shift;
2954 3469
2955 $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3471 col_expand => [0, 1, 0],
3472 @_,
3473 );
3474
3475 $self
3476}
3477
3478sub set_items {
3479 my ($self, $items) = @_;
3480
3481 $self->clear;
3482 return unless $items;
3483
3484 my @items = sort {
3485 ($a->{type} <=> $b->{type})
3486 or ($a->{name} cmp $b->{name})
3487 } values %$items;
3488
3489 $self->{real_items} = \@items;
3490
3491 my $row = 0;
3492 for my $item (@items) {
3493 CFClient::Item::update_widgets $item;
3494
3495 $self->add (0, $row, $item->{face_widget});
3496 $self->add (1, $row, $item->{desc_widget});
3497 $self->add (2, $row, $item->{weight_widget});
3498
3499 $row++;
3500 }
3501}
3502
3503#############################################################################
3504
3505package CFClient::UI::SpellList;
3506
3507our @ISA = CFClient::UI::Table::;
3508
3509sub new {
3510 my $class = shift;
3511
3512 my $self = $class->SUPER::new (
3513 binding => [],
3514 commands => [],
2956 @_, 3515 @_,
2957 ) 3516 )
2958} 3517}
2959 3518
2960sub configure { 3519my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2961 my ($self, $x, $y, $w, $h) = @_;
2962 3520
2963 $self->{w} = $w; 3521my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2964 $self->{h} = $h; 3522 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2965} 3523my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3524 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3525my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3529my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2966 3531
2967sub check_size { 3532sub rebuild_spell_list {
3533 my ($self) = @_;
3534
3535 $CFClient::UI::ROOT->on_refresh ($self => sub {
3536 $self->clear;
3537
3538 return unless $::CONN;
3539
3540 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3541 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3542 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3543 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3544 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3545
3546 my $row = 0;
3547
3548 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3549 my $spell = $self->{spell}{$_};
3550
3551 $row++;
3552
3553 my $spell_cb = sub {
3554 my ($widget, $ev) = @_;
3555
3556 if ($ev->{button} == 1) {
3557 $::CONN->user_send ("cast $spell->{name}");
3558 } elsif ($ev->{button} == 2) {
3559 $::CONN->user_send ("invoke $spell->{name}");
3560 } elsif ($ev->{button} == 3) {
3561 (new CFClient::UI::Menu
3562 items => [
3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3565 ],
3566 )->popup ($ev);
3567 } else {
3568 return 0;
3569 }
3570
3571 1
3572 };
3573
3574 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3575
3576 #TODO: add path info to tooltip
3577 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3578
3579 $self->add (0, $row, new CFClient::UI::Face
3580 face => $spell->{face},
3581 can_hover => 1,
3582 can_events => 1,
3583 tooltip => $tooltip,
3584 on_button_down => $spell_cb,
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $tooltip,
3593 on_button_down => $spell_cb,
3594 );
3595
3596 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600 }
3601 });
3602}
3603
3604sub add_spell {
2968 my ($self) = @_; 3605 my ($self, $spell) = @_;
2969 3606
2970 $self->size_allocate ($self->{w}, $self->{h}) 3607 $self->{spell}->{$spell->{name}} = $spell;
2971 if $self->{w}; 3608 $self->rebuild_spell_list;
3609}
3610
3611sub remove_spell {
3612 my ($self, $spell) = @_;
3613
3614 delete $self->{spell}->{$spell->{name}};
3615 $self->rebuild_spell_list;
3616}
3617
3618sub clear_spells {
3619 my ($self) = @_;
3620
3621 $self->{spell} = {};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3627package CFClient::UI::Root;
3628
3629our @ISA = CFClient::UI::Container::;
3630
3631use List::Util qw(min max);
3632
3633use CFClient::OpenGL;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
3639 visible => 1,
3640 @_,
3641 );
3642
3643 Scalar::Util::weaken ($self->{root} = $self);
3644
3645 $self
2972} 3646}
2973 3647
2974sub size_request { 3648sub size_request {
2975 my ($self) = @_; 3649 my ($self) = @_;
2976 3650
2977 ($self->{w}, $self->{h}) 3651 ($self->{w}, $self->{h})
2978} 3652}
2979 3653
3654sub _to_pixel {
3655 my ($coord, $size, $max) = @_;
3656
3657 $coord =
3658 $coord eq "center" ? ($max - $size) * 0.5
3659 : $coord eq "max" ? $max
3660 : $coord;
3661
3662 $coord = 0 if $coord < 0;
3663 $coord = $max - $size if $coord > $max - $size;
3664
3665 int $coord + 0.5
3666}
3667
2980sub size_allocate { 3668sub invoke_size_allocate {
2981 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
2982 3670
2983 for my $child ($self->children) { 3671 for my $child ($self->children) {
2984 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2985 3673
2986 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3674 $X = $child->{force_x} if exists $child->{force_x};
2987 if exists $child->{req_x}; 3675 $Y = $child->{force_y} if exists $child->{force_y};
2988 3676
2989 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3677 $X = _to_pixel $X, $W, $self->{w};
2990 if exists $child->{req_y}; 3678 $Y = _to_pixel $Y, $H, $self->{h};
2991
2992 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2993 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994 3679
2995 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
2996 } 3681 }
3682
3683 1
2997} 3684}
2998 3685
2999sub coord2local { 3686sub coord2local {
3000 my ($self, $x, $y) = @_; 3687 my ($self, $x, $y) = @_;
3001 3688
… …
3009} 3696}
3010 3697
3011sub update { 3698sub update {
3012 my ($self) = @_; 3699 my ($self) = @_;
3013 3700
3014 $self->check_size;
3015 $::WANT_REFRESH++; 3701 $::WANT_REFRESH++;
3016} 3702}
3017 3703
3018sub add { 3704sub add {
3019 my ($self, @children) = @_; 3705 my ($self, @children) = @_;
3020 3706
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026
3027 for my $child (@children) {
3028 $child->{is_toplevel} = 1; 3707 $_->{is_toplevel} = 1
3029 3708 for @children;
3030 # integerise window positions
3031 $child->{x} = int $child->{x};
3032 $child->{y} = int $child->{y};
3033 }
3034 3709
3035 $self->SUPER::add (@children); 3710 $self->SUPER::add (@children);
3036} 3711}
3037 3712
3038sub remove { 3713sub remove {
3039 my ($self, @children) = @_; 3714 my ($self, @children) = @_;
3040 3715
3041 $self->SUPER::remove (@children); 3716 $self->SUPER::remove (@children);
3717
3718 delete $self->{is_toplevel}
3719 for @children;
3042 3720
3043 while (@children) { 3721 while (@children) {
3044 my $w = pop @children; 3722 my $w = pop @children;
3045 push @children, $w->children; 3723 push @children, $w->children;
3046 $w->set_invisible; 3724 $w->set_invisible;
… …
3065 while ($self->{refresh_hook}) { 3743 while ($self->{refresh_hook}) {
3066 $_->() 3744 $_->()
3067 for values %{delete $self->{refresh_hook}}; 3745 for values %{delete $self->{refresh_hook}};
3068 } 3746 }
3069 3747
3070 if ($self->{check_size}) { 3748 if ($self->{realloc}) {
3071 my @queue = ([], []); 3749 my %queue;
3750 my @queue;
3751 my $widget;
3072 3752
3073 for (;;) { 3753 outer:
3074 if ($self->{check_size}) { 3754 while () {
3075 # heuristic: check containers last 3755 if (my $realloc = delete $self->{realloc}) {
3076 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3756 for $widget (values %$realloc) {
3077 for values %{delete $self->{check_size}} 3757 $widget->{visible} or next; # do not resize invisible widgets
3758
3759 $queue{$widget+0}++ and next; # duplicates are common
3760
3761 push @{ $queue[$widget->{visible}] }, $widget;
3762 }
3078 } 3763 }
3079 3764
3080 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3765 while () {
3766 @queue or last outer;
3081 3767
3082 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3768 $widget = pop @{ $queue[-1] || [] }
3083 ? @$widget{qw(user_w user_h)} 3769 and last;
3084 : $widget->size_request;
3085
3086 if (delete $widget->{force_alloc}
3087 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3089 3770
3771 pop @queue;
3772 }
3773
3774 delete $queue{$widget+0};
3775
3776 my ($w, $h) = $widget->size_request;
3777
3778 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3779 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3780
3781 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3782 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3783
3784 $w = $widget->{force_w} if exists $widget->{force_w};
3785 $h = $widget->{force_h} if exists $widget->{force_h};
3786
3787 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3788 || delete $widget->{force_realloc}) {
3090 $widget->{req_w} = $w; 3789 $widget->{req_w} = $w;
3091 $widget->{req_h} = $h; 3790 $widget->{req_h} = $h;
3092 3791
3093 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3792 $self->{size_alloc}{$widget+0} = $widget;
3094 3793
3095 $widget->{parent}->check_size
3096 if $widget->{parent}; 3794 if (my $parent = $widget->{parent}) {
3795 $self->{realloc}{$parent+0} = $parent
3796 unless $queue{$parent+0};
3797
3798 $parent->{force_size_alloc} = 1;
3799 $self->{size_alloc}{$parent+0} = $parent;
3800 }
3097 } 3801 }
3802
3803 delete $self->{realloc}{$widget+0};
3098 } 3804 }
3099 } 3805 }
3100 3806
3101 while ($self->{size_alloc}) { 3807 while (my $size_alloc = delete $self->{size_alloc}) {
3102 for (values %{delete $self->{size_alloc}}) { 3808 my @queue = sort { $b->{visible} <=> $a->{visible} }
3103 my ($widget, $w, $h) = @$_; 3809 values %$size_alloc;
3810
3811 while () {
3812 my $widget = pop @queue || last;
3813
3814 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3104 3815
3105 $w = 0 if $w < 0; 3816 $w = 0 if $w < 0;
3106 $h = 0 if $h < 0; 3817 $h = 0 if $h < 0;
3107 3818
3819 $w = int $w + 0.5;
3820 $h = int $h + 0.5;
3821
3822 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3823 $widget->{old_w} = $widget->{w};
3824 $widget->{old_h} = $widget->{h};
3825
3108 $widget->{w} = $w; 3826 $widget->{w} = $w;
3109 $widget->{h} = $h; 3827 $widget->{h} = $h;
3828
3110 $widget->emit (size_allocate => $w, $h); 3829 $widget->emit (size_allocate => $w, $h);
3830 }
3111 } 3831 }
3112 } 3832 }
3113 3833
3114 while ($self->{post_alloc_hook}) { 3834 while ($self->{post_alloc_hook}) {
3115 $_->() 3835 $_->()
3116 for values %{delete $self->{post_alloc_hook}}; 3836 for values %{delete $self->{post_alloc_hook}};
3117 } 3837 }
3838
3118 3839
3119 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3840 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3120 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3841 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3121 glClear GL_COLOR_BUFFER_BIT; 3842 glClear GL_COLOR_BUFFER_BIT;
3122 3843
… …
3124 glLoadIdentity; 3845 glLoadIdentity;
3125 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3846 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3126 glMatrixMode GL_MODELVIEW; 3847 glMatrixMode GL_MODELVIEW;
3127 glLoadIdentity; 3848 glLoadIdentity;
3128 3849
3850 {
3851 package CFClient::UI::Base;
3852
3853 ($draw_x, $draw_y, $draw_w, $draw_h) =
3854 (0, 0, $self->{w}, $self->{h});
3855 }
3856
3129 $self->_draw; 3857 $self->_draw;
3130} 3858}
3131 3859
3132############################################################################# 3860#############################################################################
3133 3861

Diff Legend

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