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.243 by root, Sat May 27 20:46:54 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 # broken show/hide model 273 return unless $self->{visible};
259 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
260 delete $self->{root}; 278 delete $self->{root};
261 delete $self->{visible};
262 279
263 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
265 282
266 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
268 285
269 $self->focus_out; 286 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
270} 305}
271 306
272sub hide { 307sub hide {
273 my ($self) = @_; 308 my ($self) = @_;
274 309
… …
276 311
277 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
278 if $self->{parent}; 313 if $self->{parent};
279} 314}
280 315
281sub move { 316sub move_abs {
282 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
283 318
284 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
285 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
286 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
287 322
288 $self->update; 323 $self->update;
289} 324}
290 325
291sub set_size { 326sub set_size {
292 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
293 328
294 $self->{user_w} = $w; 329 $self->{force_w} = $w;
295 $self->{user_h} = $h; 330 $self->{force_h} = $h;
296 331
297 $self->check_size; 332 $self->realloc;
298} 333}
299 334
300sub size_request { 335sub size_request {
301 require Carp; 336 require Carp;
302 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
303} 338}
304 339
340sub baseline_shift {
341 0
342}
343
305sub configure { 344sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
307 346
308 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
311 352
312 # use alignment to adjust x, y 353 # use alignment to adjust x, y
313 354
314 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 357 }
319 358
320 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 360 $self->{x} = $x;
322 $self->{y} = $y; 361 $self->{y} = $y;
323 $self->update; 362 $self->update;
324 } 363 }
325 364
326 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
328 }
329}
330 367
331sub size_allocate { 368 $self->{alloc_w} = $w;
332 # nothing to be done 369 $self->{alloc_h} = $h;
333}
334 370
335sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
336 my ($self) = @_; 372 }
337
338 $self->check_size (1);
339 $self->update;
340} 373}
341 374
342sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
343} 381}
344 382
345sub set_max_size { 383sub set_max_size {
346 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
347 385
348 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
350} 390}
351 391
352sub set_tooltip { 392sub set_tooltip {
353 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
354 394
… …
359 399
360 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
361 401
362 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
363 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
364 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
365 } 405 }
366} 406}
367 407
368# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
369sub coord2local { 409sub coord2local {
… …
377 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
378 418
379 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
380} 420}
381 421
382sub focus_in { 422sub invoke_focus_in {
383 my ($self) = @_; 423 my ($self) = @_;
384 424
385 return if $FOCUS == $self; 425 return if $FOCUS == $self;
386 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
387 427
388 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
389 429
390 $self->_emit (focus_in => $focus);
391
392 $focus->update if $focus; 430 $focus->update if $focus;
393 $FOCUS->update; 431 $FOCUS->update;
394}
395 432
433 0
434}
435
396sub focus_out { 436sub invoke_focus_out {
397 my ($self) = @_; 437 my ($self) = @_;
398 438
399 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
400 440
401 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
402 442
403 $self->_emit (focus_out => $focus);
404
405 $focus->update if $focus; #? 443 $focus->update if $focus; #?
406 444
407 $::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
408 unless $FOCUS; 446 unless $FOCUS;
409}
410 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
411sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
412sub button_up { } 458sub invoke_button_up { 1 }
413sub key_down { } 459sub invoke_key_down { 1 }
414sub key_up { } 460sub invoke_key_up { 1 }
415 461
416sub button_down { 462sub invoke_button_down {
417 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
418 464
419 $self->focus_in; 465 $self->grab_focus;
420}
421 466
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
426sub 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
427 535
428sub draw { 536sub draw {
429 my ($self) = @_; 537 my ($self) = @_;
430 538
431 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);
432 548
433 glPushMatrix; 549 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 551
438 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 554 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 556 glBegin GL_QUADS;
445 glVertex $x , $y; 557 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
449 glEnd; 561 glEnd;
450 glDisable GL_BLEND; 562 glDisable GL_BLEND;
451 } 563 }
452 564
453 if ($ENV{PCLIENT_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 566 glPushMatrix;
455 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 570 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
462 glEnd; 574 glEnd;
463 glPopMatrix; 575 glPopMatrix;
464 #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;
465 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
466} 581}
467 582
468sub _draw { 583sub _draw {
469 my ($self) = @_; 584 my ($self) = @_;
470 585
471 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
472} 587}
473 588
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532}
533
534sub DESTROY { 589sub DESTROY {
535 my ($self) = @_; 590 my ($self) = @_;
536 591
537 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
538 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
539} 596}
540 597
541############################################################################# 598#############################################################################
542 599
543package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
568 625
569 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
571 628
572 glEnable GL_BLEND; 629 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 631 glColor_premultiply @$color;
575 632
576 glBegin GL_QUADS; 633 glBegin GL_QUADS;
577 glVertex 0 , 0; 634 glVertex 0 , 0;
578 glVertex 0 , $h; 635 glVertex 0 , $h;
579 glVertex $w, $h; 636 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
596} 653}
597 654
598sub size_request { 655sub size_request {
599 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
600} 659}
601 660
602sub draw { } 661sub draw { }
603 662
604############################################################################# 663#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
609 668
610sub new { 669sub new {
611 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
612 671
613 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
614 673
615 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
616 children => [], 675 children => [],
617 can_events => 0, 676 can_events => 0,
618 %arg, 677 %arg,
619 ); 678 );
679
620 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
621 682
622 $self 683 $self
623} 684}
624 685
625sub add { 686sub add {
… …
633 $self->{children} = [ 694 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
636 ]; 697 ];
637 698
638 $self->check_size (1); 699 $self->realloc;
639 $self->update;
640} 700}
641 701
642sub children { 702sub children {
643 @{ $_[0]{children} } 703 @{ $_[0]{children} }
644} 704}
… …
649 delete $child->{parent}; 709 delete $child->{parent};
650 $child->hide; 710 $child->hide;
651 711
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 713
654 $self->check_size (1); 714 $self->realloc;
655 $self->update;
656} 715}
657 716
658sub clear { 717sub clear {
659 my ($self) = @_; 718 my ($self) = @_;
660 719
… …
664 for (@$children) { 723 for (@$children) {
665 delete $_->{parent}; 724 delete $_->{parent};
666 $_->hide; 725 $_->hide;
667 } 726 }
668 727
669 $self->check_size; 728 $self->realloc;
670 $self->update;
671} 729}
672 730
673sub find_widget { 731sub find_widget {
674 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
675 733
676 $x -= $self->{x}; 734 $x -= $self->{x};
677 $y -= $self->{y}; 735 $y -= $self->{y};
678 736
679 my $res; 737 my $res;
680 738
681 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
683 and return $res; 741 and return $res;
684 } 742 }
685 743
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707} 765}
708 766
709sub add { 767sub add {
710 my ($self, $child) = @_; 768 my ($self, $child) = @_;
711 769
712 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
713
714 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
715} 772}
716 773
717sub remove { 774sub remove {
718 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
727 784
728sub size_request { 785sub size_request {
729 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
730} 787}
731 788
732sub size_allocate { 789sub invoke_size_allocate {
733 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
734 791
735 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
736} 795}
737 796
738############################################################################# 797#############################################################################
798
799# back-buffered drawing area
739 800
740package CFClient::UI::Window; 801package CFClient::UI::Window;
741 802
742our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
743 804
… …
754 815
755 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
756 $self->SUPER::update; 817 $self->SUPER::update;
757} 818}
758 819
759sub size_allocate { 820sub invoke_size_allocate {
760 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
761 822
762 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
764} 826}
765 827
766sub _render { 828sub _render {
829 my ($self) = @_;
830
767 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
768} 832}
769 833
770sub render_child { 834sub render_child {
771 my ($self) = @_; 835 my ($self) = @_;
772 836
773 $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 {
774 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
776 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
777 $self->_render; 848 $self->_render;
778 }; 849 };
779} 850}
780 851
781sub _draw { 852sub _draw {
782 my ($self) = @_; 853 my ($self) = @_;
783 854
784 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
785 856
786 my $tex = $self->{texture} 857 my $tex = $self->{texture}
787 or return; 858 or return;
788 859
789 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
792 863
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 865
795 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
796} 867}
… …
812} 883}
813 884
814sub size_request { 885sub size_request {
815 my ($self) = @_; 886 my ($self) = @_;
816 887
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 889
819 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
820} 891 $h = 10 if $self->{scroll_y};
821 892
893 ($w, $h)
894}
895
822sub size_allocate { 896sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
824 898
899 my $child = $self->child;
900
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 903
828 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
829 $self->update; 905 $self->update;
906
907 1
830} 908}
831 909
832sub set_offset { 910sub set_offset {
833 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
834 912
… …
867} 945}
868 946
869sub _render { 947sub _render {
870 my ($self) = @_; 948 my ($self) = @_;
871 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
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 954
874 $self->SUPER::_render; 955 $self->SUPER::_render;
875} 956}
876 957
… …
879package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
880 961
881our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
882 963
883sub new { 964sub new {
884 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
885 968
886 my $self; 969 my $self;
887 970
888 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
889 vertical => 1, 972 vertical => 1,
… …
894 ; 977 ;
895 978
896 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 981 slider => $slider,
899 @_, 982 %arg,
900 ); 983 );
901 984
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
905 987
906 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
907} 995}
908 996
909sub update { 997sub update {
910 my ($self) = @_; 998 my ($self) = @_;
911 999
… …
914 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
915 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
916 $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]);
917} 1005}
918 1006
919sub size_allocate { 1007sub invoke_size_allocate {
920 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
921
922 $self->SUPER::size_allocate ($w, $h);
923 1009
924 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
925 $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)
926} 1014}
927 1015
928#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
929# update viewport offset on scroll 1017# update viewport offset on scroll
930 1018
… …
950 1038
951 if ($self->{bg}) { 1039 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
953 1041
954 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
957 1045
958 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
959 glVertex 0 , 0; 1047 glVertex 0 , 0;
960 glVertex 0 , $h; 1048 glVertex 0 , $h;
961 glVertex $w, $h; 1049 glVertex $w, $h;
… …
974 1062
975our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
976 1064
977use CFClient::OpenGL; 1065use CFClient::OpenGL;
978 1066
979my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 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);
982 1074
983sub new { 1075sub new {
984 my $class = shift; 1076 my ($class, %arg) = @_;
985
986 # TODO: user_x, user_y, overwrite moveto?
987 1077
988 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1081 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1082 can_events => 1,
994 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
995 ); 1086 );
996 1087
997 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
998 align => 0, 1089 align => 0,
999 valign => 1, 1090 valign => 1,
1000 text => $self->{title}, 1091 text => $self->{title},
1001 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 }
1002 1103
1003 $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};
1004} 1113}
1005 1114
1006sub border { 1115sub border {
1007 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1008} 1117}
1009 1118
1010sub size_request { 1119sub size_request {
1011 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};
1012 1127
1013 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1014 1129
1015 ( 1130 (
1016 $w + $self->border * 2, 1131 $w + $self->border * 2,
1017 $h + $self->border * 2, 1132 $h + $self->border * 2,
1018 ) 1133 )
1019} 1134}
1020 1135
1021sub size_allocate { 1136sub invoke_size_allocate {
1022 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1023 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
1024 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1026 1149
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1031}
1032 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1033sub button_down { 1158sub invoke_button_down {
1034 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1035 1160
1036 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1037 my $border = $self->border; 1162 my $border = $self->border;
1038 1163
… …
1051 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1052 1177
1053 my $dx = $ev->{x} - $ox; 1178 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
1055 1180
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1183
1061 $self->check_size; 1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1185 $self->realloc;
1062 }; 1186 };
1063 1187
1064 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1192 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
1070 1194
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1196
1073 $self->{user_x} = $bx + $x - $ox; 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy; 1198 # HACK: the next line is required to enforce placement
1075 $self->move ($self->{user_x}, $self->{user_y}); 1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1076 $self->update;
1077 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
1078 } 1205 1
1079} 1206}
1080 1207
1081sub button_up { 1208sub invoke_button_up {
1082 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1083 1210
1084 delete $self->{motion}; 1211 ! ! delete $self->{motion}
1085} 1212}
1086 1213
1087sub mouse_motion { 1214sub invoke_mouse_motion {
1088 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1089 1216
1090 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
1091} 1220}
1092 1221
1093sub _draw { 1222sub _draw {
1094 my ($self) = @_; 1223 my ($self) = @_;
1095 1224
1225 my $child = $self->{children}[0];
1226
1096 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
1098 1229
1099 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1232
1102 my $border = $self->border; 1233 my $border = $self->border;
1103 1234
1104 glColor @{ $self->{border_bg} }; 1235 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1236 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1240
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1242 glColor @{ $self->{bg} };
1112 1243
1113 # TODO: repeat texture not scale 1244 # TODO: repeat texture not scale
1245 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1246 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1247 $bg->{t} = $ch / $bg->{h};
1116
1117 glColor @{ $self->{bg} };
1118
1119 $bg->{s} = $rep_x;
1120 $bg->{t} = $rep_y;
1121 $bg->{wrap_mode} = 1;
1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1249 }
1124 1250
1125 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1126 1252
1127 $self->{title}->draw if $self->{title};
1128
1129 $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};
1130} 1264}
1131 1265
1132############################################################################# 1266#############################################################################
1133 1267
1134package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1156 my ($self, $x, $y, $child) = @_; 1290 my ($self, $x, $y, $child) = @_;
1157 1291
1158 $child->set_parent ($self); 1292 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1160 1294
1161 $self->check_size (1); 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1162} 1302}
1163 1303
1164# 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?
1165sub clear { 1305sub clear {
1166 my ($self) = @_; 1306 my ($self) = @_;
… …
1171 for (@children) { 1311 for (@children) {
1172 delete $_->{parent}; 1312 delete $_->{parent};
1173 $_->hide; 1313 $_->hide;
1174 } 1314 }
1175 1315
1176 $self->check_size (1); 1316 $self->realloc;
1177 $self->update;
1178} 1317}
1179 1318
1180sub get_wh { 1319sub get_wh {
1181 my ($self) = @_; 1320 my ($self) = @_;
1182 1321
… …
1208 (sum @$ws), 1347 (sum @$ws),
1209 (sum @$hs), 1348 (sum @$hs),
1210 ) 1349 )
1211} 1350}
1212 1351
1213sub size_allocate { 1352sub invoke_size_allocate {
1214 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1215 1354
1216 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1217 1356
1218 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1250 } 1389 }
1251 1390
1252 $y += $row_h; 1391 $y += $row_h;
1253 } 1392 }
1254 1393
1394 1
1255} 1395}
1256 1396
1257sub find_widget { 1397sub find_widget {
1258 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1259 1399
… …
1278 } 1418 }
1279} 1419}
1280 1420
1281############################################################################# 1421#############################################################################
1282 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
1283package CFClient::UI::HBox; 1483package CFClient::UI::HBox;
1284 1484
1285# TODO: wrap into common Box base class
1286
1287our @ISA = CFClient::UI::Container::; 1485our @ISA = CFClient::UI::Box::;
1288 1486
1289sub size_request { 1487sub new {
1290 my ($self) = @_; 1488 my $class = shift;
1291 1489
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1490 $class->SUPER::new (
1293 1491 vertical => 0,
1294 ( 1492 @_,
1295 (List::Util::sum map $_->[0], @alloc),
1296 (List::Util::max map $_->[1], @alloc),
1297 ) 1493 )
1298} 1494}
1299 1495
1300sub size_allocate {
1301 my ($self, $w, $h) = @_;
1302
1303 ($h, $w) = ($w, $h);
1304
1305 my $children = $self->{children};
1306
1307 my @h = map $_->{req_w}, @$children;
1308
1309 my $req_h = List::Util::sum @h;
1310
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } else {
1315 my $exp = List::Util::sum map $_->{expand}, @$children;
1316 $exp ||= 1;
1317
1318 for (0 .. $#$children) {
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 }
1325 }
1326
1327 CFClient::UI::harmonize \@h;
1328
1329 my $y = 0;
1330 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_];
1333 $child->configure ($y, 0, $h, $w);
1334
1335 $y += $h;
1336 }
1337
1338 1
1339}
1340
1341############################################################################# 1496#############################################################################
1342 1497
1343package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1344 1499
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1348 1501
1349sub size_request { 1502sub new {
1350 my ($self) = @_; 1503 my $class = shift;
1351 1504
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1353 1506 vertical => 1,
1354 ( 1507 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1508 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1509}
1398 1510
1399############################################################################# 1511#############################################################################
1400 1512
1401package CFClient::UI::Label; 1513package CFClient::UI::Label;
… …
1418 ellipsise => 3, # end 1530 ellipsise => 3, # end
1419 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1420 fontsize => 1, 1532 fontsize => 1,
1421 align => -1, 1533 align => -1,
1422 valign => -1, 1534 valign => -1,
1423 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1424 can_events => 0, 1537 can_events => 0,
1425 %arg 1538 %arg
1426 ); 1539 );
1427 1540
1428 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1455 1568
1456 delete $self->{texture}; 1569 delete $self->{texture};
1457 $self->SUPER::update; 1570 $self->SUPER::update;
1458} 1571}
1459 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1460sub set_text { 1580sub set_text {
1461 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1462 1582
1463 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1464 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1465 1585
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1468 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1469 $self->update; 1591 $self->update;
1470 $self->check_size;
1471} 1592}
1472 1593
1473sub set_markup { 1594sub set_markup {
1474 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1475 1596
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1601
1481 $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;
1482 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1483 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1484 $self->update; 1607 $self->update;
1485 $self->check_size;
1486} 1608}
1487 1609
1488sub size_request { 1610sub size_request {
1489 my ($self) = @_; 1611 my ($self) = @_;
1490 1612
1613 $self->{size_req} ||= do {
1491 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1492 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1496 1619
1497 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1498 1621
1499 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1500 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1501 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1502 1625
1503 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1504 1627
1505 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1507 } 1633 };
1508 1634
1509 ( 1635 @{ $self->{size_req} }
1510 $w + $self->{padding} * 2,
1511 $h + $self->{padding} * 2,
1512 )
1513} 1636}
1514 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1515sub size_allocate { 1642sub invoke_size_allocate {
1516 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1517 1644
1645 delete $self->{ox};
1646
1518 delete $self->{texture}; 1647 delete $self->{texture}
1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1519} 1651}
1520 1652
1521sub set_fontsize { 1653sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1523 1655
1524 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1657 delete $self->{texture};
1526 1658
1527 $self->update; 1659 $self->realloc;
1528 $self->check_size; 1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1529} 1668}
1530 1669
1531sub _draw { 1670sub _draw {
1532 my ($self) = @_; 1671 my ($self) = @_;
1533 1672
… …
1539 $self->{layout}->set_width ($self->{w}); 1678 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1679 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543 1682
1544 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1683 new_from_layout CFClient::Texture $self->{layout}
1684 };
1545 1685
1686 unless (exists $self->{ox}) {
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548 : ($self->{w} - $tex->{w}) * 0.5); 1689 : ($self->{w} - $tex->{w}) * 0.5);
1549 1690
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1555 }; 1694 };
1556 1695
1557 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1558 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};
1559 1700
1560 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1561 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1563 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1565 } 1708 }
1566 1709
1567 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1568} 1711}
1569 1712
… …
1586 can_hover => 1, 1729 can_hover => 1,
1587 can_focus => 1, 1730 can_focus => 1,
1588 valign => 0, 1731 valign => 0,
1589 can_events => 1, 1732 can_events => 1,
1590 #text => ... 1733 #text => ...
1734 #hidden => "*",
1591 @_ 1735 @_
1592 ) 1736 )
1593} 1737}
1594 1738
1595sub _set_text { 1739sub _set_text {
… …
1597 1741
1598 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1599 1743
1600 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1601 1745
1602 delete $self->{texture};
1603
1604 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1605 $self->{text} = $text; 1747 $self->{text} = $text;
1606 1748
1607 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1608 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1609 1752
1610 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1611} 1757}
1612 1758
1613sub set_text { 1759sub set_text {
1614 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1615 1761
1616 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1763 $self->_set_text ($text);
1618 $self->update;
1619 $self->check_size;
1620} 1764}
1621 1765
1622sub get_text { 1766sub get_text {
1623 $_[0]{text} 1767 $_[0]{text}
1624} 1768}
… …
1629 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1630 1774
1631 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1632} 1776}
1633 1777
1634sub key_down { 1778sub invoke_key_down {
1635 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1636 1780
1637 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1638 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1639 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1651 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1652 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1653 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1654 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1655 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1656 $self->_emit ('escape'); 1800 $self->emit ('escape');
1657 } elsif ($uni) { 1801 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1659 } 1805 }
1660 1806
1661 $self->_set_text ($text); 1807 $self->_set_text ($text);
1662 $self->update;
1663 $self->check_size;
1664}
1665 1808
1809 $self->realloc;
1810
1811 1
1812}
1813
1666sub focus_in { 1814sub invoke_focus_in {
1667 my ($self) = @_; 1815 my ($self) = @_;
1668 1816
1669 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1670 1818
1671 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1672} 1820}
1673 1821
1674sub button_down { 1822sub invoke_button_down {
1675 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1676 1824
1677 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1678 1826
1679 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1680 1828
1681 # byte-index to char-index 1829 # byte-index to char-index
1682 my $text = $self->{text}; 1830 my $text = $self->{text};
1683 utf8::encode $text; 1831 utf8::encode $text;
1684 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1685 1833
1686 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1687 $self->update; 1835 $self->update;
1836
1837 1
1688} 1838}
1689 1839
1690sub mouse_motion { 1840sub invoke_mouse_motion {
1691 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1692# 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
1693} 1845}
1694 1846
1695sub _draw { 1847sub _draw {
1696 my ($self) = @_; 1848 my ($self) = @_;
1697 1849
1698 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1699 1851
1700 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1701 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1702 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1703 } else { 1855 } else {
1704 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1705 } 1857 }
1706 1858
1707 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1708 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1709 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1710 glVertex 0 , 0; 1862 glVertex 0 , 0;
1711 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1712 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1713 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1738 1890
1739our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1740 1892
1741use CFClient::OpenGL; 1893use CFClient::OpenGL;
1742 1894
1743sub key_down { 1895sub invoke_key_down {
1744 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1745 1897
1746 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1747 1899
1748 if ($sym == 13) { 1900 if ($sym == 13) {
1749 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1750 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1751 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1752 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1753 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1754 $self->update; 1907 $self->update;
1755 1908
1756 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1757 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1758 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1774 } else { 1927 } else {
1775 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1776 } 1929 }
1777 1930
1778 } else { 1931 } else {
1779 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1780 } 1935 1
1781
1782} 1936}
1783 1937
1784############################################################################# 1938#############################################################################
1785 1939
1786package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1795 1949
1796sub new { 1950sub new {
1797 my $class = shift; 1951 my $class = shift;
1798 1952
1799 $class->SUPER::new ( 1953 $class->SUPER::new (
1800 padding => 4, 1954 padding_x => 4,
1955 padding_y => 4,
1801 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1802 active_fg => [0, 0, 1], 1957 active_fg => [0, 0, 1],
1803 can_hover => 1, 1958 can_hover => 1,
1804 align => 0, 1959 align => 0,
1805 valign => 0, 1960 valign => 0,
1806 can_events => 1, 1961 can_events => 1,
1807 @_ 1962 @_
1808 ) 1963 )
1809} 1964}
1810 1965
1811sub activate { }
1812
1813sub button_up { 1966sub invoke_button_up {
1814 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1815 1968
1816 $self->emit ("activate") 1969 $self->emit ("activate")
1817 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1818 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1972
1973 1
1819} 1974}
1820 1975
1821sub _draw { 1976sub _draw {
1822 my ($self) = @_; 1977 my ($self) = @_;
1823 1978
1824 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1825
1826 if ($GRAB == $self) {
1827 $self->{fg} = $self->{active_fg};
1828 }
1829 1980
1830 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1832 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1833 1984
… …
1838 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1839} 1990}
1840 1991
1841############################################################################# 1992#############################################################################
1842 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
1843package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
1844 2031
1845our @ISA = CFClient::UI::DrawBG::; 2032our @ISA = CFClient::UI::DrawBG::;
1846 2033
1847my @tex = 2034my @tex =
… …
1852 2039
1853sub new { 2040sub new {
1854 my $class = shift; 2041 my $class = shift;
1855 2042
1856 $class->SUPER::new ( 2043 $class->SUPER::new (
1857 padding => 2, 2044 padding_x => 2,
2045 padding_y => 2,
1858 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1859 active_fg => [1, 1, 0], 2047 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2], 2048 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5], 2049 active_bg => [1, 1, 1, 0.5],
1862 state => 0, 2050 state => 0,
… …
1866} 2054}
1867 2055
1868sub size_request { 2056sub size_request {
1869 my ($self) = @_; 2057 my ($self) = @_;
1870 2058
1871 ($self->{padding} * 2 + 6) x 2 2059 (6) x 2
1872} 2060}
1873 2061
1874sub button_down { 2062sub invoke_button_down {
1875 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1876 2064
1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1880 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1881 } 2073 1
1882} 2074}
1883 2075
1884sub _draw { 2076sub _draw {
1885 my ($self) = @_; 2077 my ($self) = @_;
1886 2078
1887 $self->SUPER::_draw; 2079 $self->SUPER::_draw;
1888 2080
1889 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890 2082
1891 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;
1892 2086
1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894 2088
1895 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896 2090
… …
1904package CFClient::UI::Image; 2098package CFClient::UI::Image;
1905 2099
1906our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1907 2101
1908use CFClient::OpenGL; 2102use CFClient::OpenGL;
1909use Carp qw/confess/;
1910 2103
1911our %loaded_images; 2104our %texture_cache;
1912 2105
1913sub new { 2106sub new {
1914 my $class = shift; 2107 my $class = shift;
1915 2108
1916 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1917 2113
1918 $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";
1919 2116
1920 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1921 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;
1922 2119
1923 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1924 2121
1925 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1926
1927 $self->{aspect} = $tex->{w} / $tex->{h};
1928 2123
1929 $self 2124 $self
1930} 2125}
1931 2126
1932sub size_request { 2127sub size_request {
1933 my ($self) = @_; 2128 my ($self) = @_;
1934 2129
1935 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1936} 2131}
1937 2132
1938sub _draw { 2133sub _draw {
1939 my ($self) = @_; 2134 my ($self) = @_;
1940 2135
… …
2051 2246
2052 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
2054 2249
2055 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
2056 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;
2057 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2059 2255
2060 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
2061 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2161 fg => [1, 1, 1], 2357 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2358 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2359 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2360 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2361 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2362 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2363 min_h => $::WIDTH / 80,
2168 vertical => 0, 2364 vertical => 0,
2169 can_hover => 1, 2365 can_hover => 1,
2170 inner_pad => 0.02, 2366 inner_pad => 0.02,
2171 @_ 2367 @_
2172 ); 2368 );
… …
2180sub set_range { 2376sub set_range {
2181 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2182 2378
2183 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2184 2380
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2187} 2385}
2188 2386
2189sub set_value { 2387sub set_value {
2190 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2191 2389
… …
2202 if $unit; 2400 if $unit;
2203 2401
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205 2403
2206 if ($value != $old_value) { 2404 if ($value != $old_value) {
2207 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2208 $self->update; 2406 $self->update;
2209 } 2407 }
2210} 2408}
2211 2409
2212sub size_request { 2410sub size_request {
2213 my ($self) = @_; 2411 my ($self) = @_;
2214 2412
2215 my $w = $self->{req_w}; 2413 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2414}
2220 2415
2221sub button_down { 2416sub invoke_button_down {
2222 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2223 2418
2224 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2225 2420
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2422
2228 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2229} 2424}
2230 2425
2231sub mouse_motion { 2426sub invoke_mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2233 2428
2234 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236 2431
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2433
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2435
2241 $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
2242 } 2441 1
2243} 2442}
2244 2443
2245sub update { 2444sub update {
2246 my ($self) = @_; 2445 my ($self) = @_;
2247 2446
2248 $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}) {
2249 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2250 2456
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2253 2459
… …
2259 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2261 2467
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2264 }); 2470 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2471
2272 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2273 2473
2274 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2275 2475
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2338 2538
2339############################################################################# 2539#############################################################################
2340 2540
2341package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2342 2542
2343our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2344 2544
2345use CFClient::OpenGL; 2545use CFClient::OpenGL;
2346 2546
… …
2348 my $class = shift; 2548 my $class = shift;
2349 2549
2350 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2351 fontsize => 1, 2551 fontsize => 1,
2352 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2353 #font => default_font 2554 #font => default_font
2354 @_, 2555 @_,
2355 2556
2356 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2357 par => [], 2558 par => [],
… …
2372 2573
2373 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2575 $self->reflow;
2375} 2576}
2376 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
2377sub size_allocate { 2587sub invoke_size_allocate {
2378 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2379 2589
2380 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2381 2592
2382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $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});
2385 2597
2386 $self->reflow; 2598 $self->reflow;
2387}
2388 2599
2389sub text_size { 2600 local $self->{children} = [$empty, $slider];
2390 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2391 2606
2392 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2393 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2394 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $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});
2396 $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}}
2397 2620 );
2621
2398 $layout->size 2622 $layout
2399} 2623}
2400 2624
2401sub reflow { 2625sub reflow {
2402 my ($self) = @_; 2626 my ($self) = @_;
2403 2627
… …
2412 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2413} 2637}
2414 2638
2415sub clear { 2639sub clear {
2416 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2417 2644
2418 $self->{par} = []; 2645 $self->{par} = [];
2419 $self->{height} = 0; 2646 $self->{height} = 0;
2420 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2421} 2648}
2422 2649
2423sub add_paragraph { 2650sub add_paragraph {
2424 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2425 2652
2426 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2427 my ($w, $h) = $self->text_size ($line); 2654
2428 $self->{height} += $h; 2655 $para = {
2429 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,
2430 } 2662 };
2431 2663
2432 $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;
2433} 2676}
2434 2677
2435sub update { 2678sub update {
2436 my ($self) = @_; 2679 my ($self) = @_;
2437 2680
… …
2439 2682
2440 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2441 2684
2442 delete $self->{texture}; 2685 delete $self->{texture};
2443 2686
2444 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446 2689
2447 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2448 my $height = 0; 2691 my $height = 0;
2449 2692
2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453
2454 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2455 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2456 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2457 $layout->set_markup ($_->[4]);
2458 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2459 $_->[0] = $w + $_->[3]; 2697
2460 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2461 } 2701 }
2462 2702
2463 $height += $_->[1]; 2703 $height += $para->{h};
2464 } 2704 }
2465 2705
2466 $self->{height} = $height; 2706 $self->{height} = $height;
2467 2707
2468 $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]);
2469 2709
2470 delete $self->{texture}; 2710 delete $self->{texture};
2471 } 2711 }
2472 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2474 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2475 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2476 2720
2477 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2478 2722
2479 my $y0 = $top; 2723 my $y0 = $top;
2480 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2481 2725
2482 my $y = 0; 2726 my $y = 0;
2483
2484 my $layout = $self->{layout};
2485
2486 $layout->set_font ($self->{font}) if $self->{font};
2487 2727
2488 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2489 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2490 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2491 2731
2492 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2493 my $h = $par->[1]; 2733 my $h = $para->{h};
2494 2734
2495 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2496 $layout->set_foreground (@{ $par->[2] }); 2736
2497 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2498 $layout->set_markup ($par->[4]);
2499 2738
2500 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2501 2740
2502 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2503 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 }
2504 } 2756 }
2505 2757
2506 $y += $h; 2758 $y += $h;
2507 } 2759 }
2508 2760
2509 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2510 }; 2762 };
2511 }); 2763 });
2512} 2764}
2513 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2514sub _draw { 2775sub _draw {
2515 my ($self) = @_; 2776 my ($self) = @_;
2516 2777
2517 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2520 $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});
2521 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2522 2783
2523 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2524
2525} 2785}
2526 2786
2527############################################################################# 2787#############################################################################
2528 2788
2529package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2579 state => 0, 2839 state => 0,
2580 on_activate => \&toggle_flopper, 2840 on_activate => \&toggle_flopper,
2581 @_ 2841 @_
2582 ); 2842 );
2583 2843
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2844 $self
2590} 2845}
2591 2846
2592sub toggle_flopper { 2847sub toggle_flopper {
2593 my ($self) = @_; 2848 my ($self) = @_;
2594 2849
2595 # TODO: use animation 2850 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2851}
2607 2852
2608############################################################################# 2853#############################################################################
2609 2854
2610package CFClient::UI::Tooltip; 2855package CFClient::UI::Tooltip;
… …
2623} 2868}
2624 2869
2625sub set_tooltip_from { 2870sub set_tooltip_from {
2626 my ($self, $widget) = @_; 2871 my ($self, $widget) = @_;
2627 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
2628 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip}, 2886 markup => $tooltip,
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8, 2888 fontsize => 0.8,
2632 fg => [0, 0, 0, 1], 2889 fg => [0, 0, 0, 1],
2633 ellipsise => 0, 2890 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP), 2891 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2641 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2642 2899
2643 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2644} 2901}
2645 2902
2646sub size_allocate { 2903sub invoke_size_allocate {
2647 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2648 2905
2649 $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 });
2650} 2925}
2651 2926
2652sub _draw { 2927sub _draw {
2653 my ($self) = @_; 2928 my ($self) = @_;
2654 2929
… …
2671 glVertex $w, $h; 2946 glVertex $w, $h;
2672 glVertex $w, 0; 2947 glVertex $w, 0;
2673 glEnd; 2948 glEnd;
2674 2949
2675 glTranslate 2 - 0.375, 2 - 0.375; 2950 glTranslate 2 - 0.375, 2 - 0.375;
2951
2676 $self->SUPER::_draw; 2952 $self->SUPER::_draw;
2677} 2953}
2678 2954
2679############################################################################# 2955#############################################################################
2680 2956
… …
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740 3016
2741 if ($tex) { 3017 if ($tex) {
2742 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2747 } 3023 }
2748} 3024}
2749 3025
2750sub DESTROY { 3026sub destroy {
2751 my ($self) = @_; 3027 my ($self) = @_;
2752 3028
2753 $self->{timer}->cancel 3029 $self->{timer}->cancel
2754 if $self->{timer}; 3030 if $self->{timer};
2755 3031
2756 $self->SUPER::DESTROY; 3032 $self->SUPER::destroy;
2757} 3033}
2758 3034
2759############################################################################# 3035#############################################################################
2760 3036
2761package CFClient::UI::Inventory; 3037package CFClient::UI::Buttonbar;
2762 3038
2763our @ISA = CFClient::UI::ScrolledWindow::; 3039our @ISA = CFClient::UI::HBox::;
2764 3040
2765sub new { 3041# TODO: should actualyl wrap buttons and other goodies.
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805 3042
2806############################################################################# 3043#############################################################################
2807 3044
2808package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2809 3046
… …
2821 ); 3058 );
2822 3059
2823 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2824 3061
2825 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2826 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2827 3064
2828 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2829 if (!ref $widget) { 3066 if (!ref $widget) {
2830 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2831 can_hover => 1, 3068 can_hover => 1,
2832 can_events => 1, 3069 can_events => 1,
2833 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2834 } 3072 }
2835 3073
2836 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2837 3075
2838 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2843 3081
2844# 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)
2845sub popup { 3083sub popup {
2846 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
2847 3085
2848 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
2849 3087
2850 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self; 3089 $GRAB = $self;
2852 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2853 3091
2854 $self->show; 3092 $self->show;
2855 $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);
2856} 3094}
2857 3095
2858sub mouse_motion { 3096sub invoke_mouse_motion {
2859 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2860 3098
2861 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2864}
2865 3102
3103 0
3104}
3105
2866sub button_up { 3106sub invoke_button_up {
2867 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2868 3108
2869 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2870 undef $GRAB; 3110 undef $GRAB;
2871 $self->hide; 3111 $self->hide;
2872 3112
2873 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3115 } else {
3116 return 0
3117 }
3118
2875 } 3119 1
2876} 3120}
2877 3121
2878############################################################################# 3122#############################################################################
2879 3123
2880package CFClient::UI::Statusbox; 3124package CFClient::UI::Multiplexer;
2881 3125
2882our @ISA = CFClient::UI::VBox::; 3126our @ISA = CFClient::UI::Container::;
2883 3127
2884sub new { 3128sub new {
2885 my $class = shift; 3129 my $class = shift;
2886 3130
2887 $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 (
2888 fontsize => 0.8, 3298 fontsize => 0.8,
2889 @_, 3299 @_,
2890 ) 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
2891} 3307}
2892 3308
2893sub reorder { 3309sub reorder {
2894 my ($self) = @_; 3310 my ($self) = @_;
2895 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} };
2896 3317
2897 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 } 3320 }
2900 3321
… …
2903 my @items = sort { 3324 my @items = sort {
2904 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
2907 3328
3329 $self->{timer}->interval (1);
3330
2908 my $count = 10 + 1; 3331 my $count = 10 + 1;
2909 for my $item (@items) { 3332 for my $item (@items) {
2910 last unless --$count; 3333 last unless --$count;
2911 3334
2912 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text}; 3339 : $item->{text};
2917 3340
… …
2925 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44, 3352 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
2931 can_events => 1, 3354 can_events => 1,
2932 can_hover => 1 3355 can_hover => 1
2933 }; 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;
2934 } 3369 }
2935 3370
2936 $self->clear; 3371 $self->clear;
2937 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
2938} 3373}
… …
2943 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
2945 3380
2946 return unless $text; 3381 return unless $text;
2947 3382
2948 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2949 3384
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951 3386
2952 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
2954 $item->{count}++; 3389 $item->{count}++;
2955 } else { 3390 } else {
2956 $item->{count} = 1; 3391 $item->{count} = 1;
2957 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
2958 } 3393 }
2959 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
2960 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
2961 delete $item->{label}; 3396 delete $item->{label};
2962 } else { 3397 } else {
2963 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
2964 id => ++$self->{id}, 3399 id => ++$self->{id},
… …
2983 3418
2984 $self->reorder; 3419 $self->reorder;
2985 $self->SUPER::reconfigure; 3420 $self->SUPER::reconfigure;
2986} 3421}
2987 3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
2988############################################################################# 3431#############################################################################
2989 3432
2990package CFClient::UI::Root; 3433package CFClient::UI::Inventory;
2991 3434
2992our @ISA = CFClient::UI::Container::; 3435our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994use CFClient::OpenGL;
2995 3436
2996sub new { 3437sub new {
2997 my $class = shift; 3438 my $class = shift;
2998 3439
2999 $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 (
3000 visible => 1, 3817 visible => 1,
3001 @_, 3818 @_,
3002 ) 3819 );
3003}
3004 3820
3005sub configure { 3821 Scalar::Util::weaken ($self->{root} = $self);
3006 my ($self, $x, $y, $w, $h) = @_;
3007 3822
3008 $self->{w} = $w; 3823 $self
3009 $self->{h} = $h;
3010}
3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017} 3824}
3018 3825
3019sub size_request { 3826sub size_request {
3020 my ($self) = @_; 3827 my ($self) = @_;
3021 3828
3022 ($self->{w}, $self->{h}) 3829 ($self->{w}, $self->{h})
3023} 3830}
3024 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
3025sub size_allocate { 3846sub invoke_size_allocate {
3026 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3027 3848
3028 for my $child ($self->children) { 3849 for my $child ($self->children) {
3029 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)};
3030 3851
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3852 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3853 $Y = $child->{force_y} if exists $child->{force_y};
3033 3854
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3855 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3857
3040 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3041 } 3859 }
3860
3861 1
3042} 3862}
3043 3863
3044sub coord2local { 3864sub coord2local {
3045 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3046 3866
… …
3054} 3874}
3055 3875
3056sub update { 3876sub update {
3057 my ($self) = @_; 3877 my ($self) = @_;
3058 3878
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3879 $::WANT_REFRESH++;
3061} 3880}
3062 3881
3063sub add { 3882sub add {
3064 my ($self, @children) = @_; 3883 my ($self, @children) = @_;
3065 3884
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3885 $_->{is_toplevel} = 1
3074 3886 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3887
3080 $self->SUPER::add (@children); 3888 $self->SUPER::add (@children);
3081} 3889}
3082 3890
3083sub remove { 3891sub remove {
3084 my ($self, @children) = @_; 3892 my ($self, @children) = @_;
3085 3893
3086 $self->SUPER::remove (@children); 3894 $self->SUPER::remove (@children);
3895
3896 delete $self->{is_toplevel}
3897 for @children;
3087 3898
3088 while (@children) { 3899 while (@children) {
3089 my $w = pop @children; 3900 my $w = pop @children;
3090 push @children, $w->children; 3901 push @children, $w->children;
3091 $w->set_invisible; 3902 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3921 while ($self->{refresh_hook}) {
3111 $_->() 3922 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3923 for values %{delete $self->{refresh_hook}};
3113 } 3924 }
3114 3925
3115 if ($self->{check_size}) { 3926 if ($self->{realloc}) {
3927 my %queue;
3116 my @queue; 3928 my @queue;
3929 my $widget;
3117 3930
3118 for (;;) { 3931 outer:
3119 if ($self->{check_size}) { 3932 while () {
3120 #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
3121 3936
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3937 $queue{$widget+0}++ and next; # duplicates are common
3123 @queue, values %{delete $self->{check_size}}; 3938
3939 push @{ $queue[$widget->{visible}] }, $widget;
3940 }
3124 } 3941 }
3125 3942
3943 while () {
3944 @queue or last outer;
3945
3126 my $widget = pop @queue || last; 3946 $widget = pop @{ $queue[-1] || [] }
3127 3947 and last;
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request;
3133
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137 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}) {
3138 $widget->{req_w} = $w; 3967 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3968 $widget->{req_h} = $h;
3140 3969
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3970 $self->{size_alloc}{$widget+0} = $widget;
3142 3971
3143 $widget->{parent}->check_size
3144 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 }
3145 } 3979 }
3980
3981 delete $self->{realloc}{$widget+0};
3146 } 3982 }
3147 } 3983 }
3148 3984
3149 while ($self->{size_alloc}) { 3985 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3986 my @queue = sort { $b->{visible} <=> $a->{visible} }
3151 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)};
3152 3993
3153 $w = 0 if $w < 0; 3994 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3995 $h = 0 if $h < 0;
3155 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
3156 $widget->{w} = $w; 4004 $widget->{w} = $w;
3157 $widget->{h} = $h; 4005 $widget->{h} = $h;
4006
3158 $widget->emit (size_allocate => $w, $h); 4007 $widget->emit (size_allocate => $w, $h);
4008 }
3159 } 4009 }
3160 } 4010 }
3161 4011
3162 while ($self->{post_alloc_hook}) { 4012 while ($self->{post_alloc_hook}) {
3163 $_->() 4013 $_->()
3164 for values %{delete $self->{post_alloc_hook}}; 4014 for values %{delete $self->{post_alloc_hook}};
3165 } 4015 }
4016
3166 4017
3167 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4018 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169 glClear GL_COLOR_BUFFER_BIT; 4020 glClear GL_COLOR_BUFFER_BIT;
3170 4021
… …
3172 glLoadIdentity; 4023 glLoadIdentity;
3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174 glMatrixMode GL_MODELVIEW; 4025 glMatrixMode GL_MODELVIEW;
3175 glLoadIdentity; 4026 glLoadIdentity;
3176 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
3177 $self->_draw; 4035 $self->_draw;
3178} 4036}
3179 4037
3180############################################################################# 4038#############################################################################
3181 4039

Diff Legend

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