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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC

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

Diff Legend

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