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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.312 by root, Fri Jun 23 23:54:30 2006 UTC

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

Diff Legend

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