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.310 by root, Fri Jun 23 20:28:20 2006 UTC

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

Diff Legend

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