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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC

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

Diff Legend

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