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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC

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

Diff Legend

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