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

Diff Legend

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