ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC

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

Diff Legend

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