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

Diff Legend

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