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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.316 by root, Sun Jul 2 13:57:58 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
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
327 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
328 401
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
331 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
332 } 405 }
333} 406}
334 407
335# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
336sub coord2local { 409sub coord2local {
… …
344 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
345 418
346 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
347} 420}
348 421
349sub focus_in { 422sub invoke_focus_in {
350 my ($self) = @_; 423 my ($self) = @_;
351 424
352 return if $FOCUS == $self; 425 return if $FOCUS == $self;
353 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
354 427
355 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
356 429
357 $self->_emit (focus_in => $focus);
358
359 $focus->update if $focus; 430 $focus->update if $focus;
360 $FOCUS->update; 431 $FOCUS->update;
361}
362 432
433 0
434}
435
363sub focus_out { 436sub invoke_focus_out {
364 my ($self) = @_; 437 my ($self) = @_;
365 438
366 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
367 440
368 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
369 442
370 $self->_emit (focus_out => $focus);
371
372 $focus->update if $focus; #? 443 $focus->update if $focus; #?
373 444
374 $::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
375 unless $FOCUS; 446 unless $FOCUS;
376}
377 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
378sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
379sub button_up { } 458sub invoke_button_up { 1 }
380sub key_down { } 459sub invoke_key_down { 1 }
381sub key_up { } 460sub invoke_key_up { 1 }
382 461
383sub button_down { 462sub invoke_button_down {
384 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
385 464
386 $self->focus_in; 465 $self->grab_focus;
387}
388 466
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
393sub 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
394 535
395sub draw { 536sub draw {
396 my ($self) = @_; 537 my ($self) = @_;
397 538
398 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);
399 548
400 glPushMatrix; 549 glPushMatrix;
401 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
402 $self->_draw;
403 glPopMatrix;
404 551
405 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
406 my ($x, $y) = @$self{qw(x y)};
407
408 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
409 glEnable GL_BLEND; 554 glEnable GL_BLEND;
410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
411 glBegin GL_QUADS; 556 glBegin GL_QUADS;
412 glVertex $x , $y;
413 glVertex $x + $self->{w}, $y;
414 glVertex $x + $self->{w}, $y + $self->{h};
415 glVertex $x , $y + $self->{h};
416 glEnd;
417 glDisable GL_BLEND;
418 }
419
420 if ($ENV{PCLIENT_DEBUG}) {
421 glPushMatrix;
422 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 557 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 558 glVertex $self->{w}, 0;
427 glVertex $self->{w}, $self->{h}; 559 glVertex $self->{w}, $self->{h};
428 glVertex 0 , $self->{h}; 560 glVertex 0 , $self->{h};
429 glEnd; 561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
430 glPopMatrix; 575 glPopMatrix;
431 #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;
432 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
433} 581}
434 582
435sub _draw { 583sub _draw {
436 my ($self) = @_; 584 my ($self) = @_;
437 585
438 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
439} 587}
440 588
441sub find_widget {
442 my ($self, $x, $y) = @_;
443
444 return () unless $self->{can_events};
445
446 return $self
447 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450 ()
451}
452
453sub set_parent {
454 my ($self, $parent) = @_;
455
456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
463}
464
465sub check_size {
466 my ($self, $forced) = @_;
467
468 $self->{force_alloc} = 1 if $forced;
469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
470}
471
472sub update {
473 my ($self) = @_;
474
475 $self->{parent}->update
476 if $self->{parent};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub DESTROY { 589sub DESTROY {
499 my ($self) = @_; 590 my ($self) = @_;
500 591
501 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
502 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
503} 596}
504 597
505############################################################################# 598#############################################################################
506 599
507package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
532 625
533 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
534 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
535 628
536 glEnable GL_BLEND; 629 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glColor @$color; 631 glColor_premultiply @$color;
539 632
540 glBegin GL_QUADS; 633 glBegin GL_QUADS;
541 glVertex 0 , 0; 634 glVertex 0 , 0;
542 glVertex 0 , $h; 635 glVertex 0 , $h;
543 glVertex $w, $h; 636 glVertex $w, $h;
… …
558 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
559 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
560} 653}
561 654
562sub size_request { 655sub size_request {
563 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
564} 659}
565 660
566sub draw { } 661sub draw { }
567 662
568############################################################################# 663#############################################################################
… …
572our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
573 668
574sub new { 669sub new {
575 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
576 671
577 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
578 673
579 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
580 children => [], 675 children => [],
581 can_events => 0, 676 can_events => 0,
582 %arg, 677 %arg,
583 ); 678 );
679
584 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
585 682
586 $self 683 $self
587} 684}
588 685
589sub add { 686sub add {
… …
597 $self->{children} = [ 694 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
600 ]; 697 ];
601 698
602 $self->check_size (1); 699 $self->realloc;
603 $self->update;
604} 700}
605 701
606sub children { 702sub children {
607 @{ $_[0]{children} } 703 @{ $_[0]{children} }
608} 704}
… …
613 delete $child->{parent}; 709 delete $child->{parent};
614 $child->hide; 710 $child->hide;
615 711
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 713
618 $self->check_size; 714 $self->realloc;
619 $self->update;
620} 715}
621 716
622sub clear { 717sub clear {
623 my ($self) = @_; 718 my ($self) = @_;
624 719
… …
628 for (@$children) { 723 for (@$children) {
629 delete $_->{parent}; 724 delete $_->{parent};
630 $_->hide; 725 $_->hide;
631 } 726 }
632 727
633 $self->check_size; 728 $self->realloc;
634 $self->update;
635} 729}
636 730
637sub find_widget { 731sub find_widget {
638 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
639 733
640 $x -= $self->{x}; 734 $x -= $self->{x};
641 $y -= $self->{y}; 735 $y -= $self->{y};
642 736
643 my $res; 737 my $res;
644 738
645 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
646 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
647 and return $res; 741 and return $res;
648 } 742 }
649 743
650 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
671} 765}
672 766
673sub add { 767sub add {
674 my ($self, $child) = @_; 768 my ($self, $child) = @_;
675 769
676 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
677
678 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
679} 772}
680 773
681sub remove { 774sub remove {
682 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
691 784
692sub size_request { 785sub size_request {
693 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
694} 787}
695 788
696sub size_allocate { 789sub invoke_size_allocate {
697 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
698 791
699 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
700} 795}
701 796
702############################################################################# 797#############################################################################
798
799# back-buffered drawing area
703 800
704package CFClient::UI::Window; 801package CFClient::UI::Window;
705 802
706our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
707 804
… …
718 815
719 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
720 $self->SUPER::update; 817 $self->SUPER::update;
721} 818}
722 819
723sub size_allocate { 820sub invoke_size_allocate {
724 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
725 822
726 $self->SUPER::size_allocate ($w, $h);
727 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
728} 826}
729 827
730sub _render { 828sub _render {
829 my ($self) = @_;
830
731 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
732} 832}
733 833
734sub render_child { 834sub render_child {
735 my ($self) = @_; 835 my ($self) = @_;
736 836
737 $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 {
738 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
739 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
740 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
741 $self->_render; 848 $self->_render;
742 }; 849 };
743} 850}
744 851
745sub _draw { 852sub _draw {
746 my ($self) = @_; 853 my ($self) = @_;
747 854
748 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
749 856
750 my $tex = $self->{texture} 857 my $tex = $self->{texture}
751 or return; 858 or return;
752 859
753 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
754 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
755 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
756 863
757 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
758 865
759 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
760} 867}
… …
763 870
764package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
765 872
766our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
767 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
768sub size_request { 885sub size_request {
769 my ($self) = @_; 886 my ($self) = @_;
770 887
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772 889
773 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
774} 891 $h = 10 if $self->{scroll_y};
775 892
893 ($w, $h)
894}
895
776sub size_allocate { 896sub invoke_size_allocate {
777 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
778 898
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 899 my $child = $self->child;
780# $w = $self->{w}; 900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
781 $self->child->configure (0, 0, $cw, $ch); 904 $self->child->configure (0, 0, $w, $h);
782 $self->update; 905 $self->update;
906
907 1
783} 908}
784 909
785sub set_offset { 910sub set_offset {
786 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
787 912
… …
820} 945}
821 946
822sub _render { 947sub _render {
823 my ($self) = @_; 948 my ($self) = @_;
824 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
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826 954
827 $self->SUPER::_render; 955 $self->SUPER::_render;
828} 956}
829 957
… …
832package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
833 961
834our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
835 963
836sub new { 964sub new {
837 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
838 968
839 my $self; 969 my $self;
840 970
841 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
842 vertical => 1, 972 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 974 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
846 }, 976 },
847 ; 977 ;
848 978
849 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
850 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
851 slider => $slider, 981 slider => $slider,
852 @_, 982 %arg,
853 ); 983 );
854 984
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
858 987
859 $self 988 $self
860} 989}
861 990
991#TODO# update range on size_allocate depending on child
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
1005sub update {
1006 my ($self) = @_;
1007
1008 $self->SUPER::update;
1009
1010 $self->update_slider;
1011}
1012
862sub size_allocate { 1013sub invoke_size_allocate {
863 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
864 1015
1016 $self->update_slider;
1017
865 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
866
867 my $child = $self->{vp}->child;
868 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
869} 1019}
870
871#TODO# update range on size_allocate depending on child
872# update viewport offset on scroll
873 1020
874############################################################################# 1021#############################################################################
875 1022
876package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
877 1024
… …
893 1040
894 if ($self->{bg}) { 1041 if ($self->{bg}) {
895 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
896 1043
897 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
898 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
899 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
900 1047
901 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
902 glVertex 0 , 0; 1049 glVertex 0 , 0;
903 glVertex 0 , $h; 1050 glVertex 0 , $h;
904 glVertex $w, $h; 1051 glVertex $w, $h;
… …
917 1064
918our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
919 1066
920use CFClient::OpenGL; 1067use CFClient::OpenGL;
921 1068
922my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1076
926sub new { 1077sub new {
927 my $class = shift; 1078 my ($class, %arg) = @_;
928
929 # TODO: user_x, user_y, overwrite moveto?
930 1079
931 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1083 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1084 can_events => 1,
937 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
938 ); 1088 );
939 1089
940 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
941 align => 0, 1091 align => 0,
942 valign => 1, 1092 valign => 1,
943 text => $self->{title}, 1093 text => $self->{title},
944 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
945 1105
946 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
947} 1115}
948 1116
949sub border { 1117sub border {
950 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
951} 1119}
952 1120
953sub size_request { 1121sub size_request {
954 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
955 1129
956 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
957 1131
958 ( 1132 (
959 $w + $self->border * 2, 1133 $w + $self->border * 2,
960 $h + $self->border * 2, 1134 $h + $self->border * 2,
961 ) 1135 )
962} 1136}
963 1137
964sub size_allocate { 1138sub invoke_size_allocate {
965 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
966 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
967 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
969 1151
970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
971 if $self->{title};
972
973 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
974}
975 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
976sub button_down { 1160sub invoke_button_down {
977 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
978 1162
979 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
980 my $border = $self->border; 1164 my $border = $self->border;
981 1165
… …
994 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
995 1179
996 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
998 1182
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1185
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size; 1187 $self->realloc;
1003 }; 1188 };
1004 1189
1005 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1194 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
1011 1196
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1198
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update; 1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1016 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
1017 } 1207 1
1018} 1208}
1019 1209
1020sub button_up { 1210sub invoke_button_up {
1021 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1022 1212
1023 delete $self->{motion}; 1213 ! ! delete $self->{motion}
1024} 1214}
1025 1215
1026sub mouse_motion { 1216sub invoke_mouse_motion {
1027 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1028 1218
1029 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
1030} 1222}
1031 1223
1032sub _draw { 1224sub _draw {
1033 my ($self) = @_; 1225 my ($self) = @_;
1034 1226
1227 my $child = $self->{children}[0];
1228
1035 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
1037 1231
1038 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1234
1041 my $border = $self->border; 1235 my $border = $self->border;
1042 1236
1043 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1242
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1244 glColor @{ $self->{bg} };
1051 1245
1052 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
1247 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1248 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1249 $bg->{t} = $ch / $bg->{h};
1055
1056 glColor @{ $self->{bg} };
1057
1058 $bg->{s} = $rep_x;
1059 $bg->{t} = $rep_y;
1060 $bg->{wrap_mode} = 1;
1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1251 }
1063 1252
1064 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1065 1254
1066 $self->{title}->draw if $self->{title};
1067
1068 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1069} 1266}
1070 1267
1071############################################################################# 1268#############################################################################
1072 1269
1073package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1081sub new { 1278sub new {
1082 my $class = shift; 1279 my $class = shift;
1083 1280
1084 $class->SUPER::new ( 1281 $class->SUPER::new (
1085 col_expand => [], 1282 col_expand => [],
1086 @_ 1283 @_,
1087 ) 1284 )
1285}
1286
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1289}
1089 1290
1090sub add { 1291sub add {
1091 my ($self, $x, $y, $child) = @_; 1292 my ($self, $x, $y, $child) = @_;
1092 1293
1093 $child->set_parent ($self); 1294 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1095 1296
1096 $child->check_size; 1297 $self->realloc;
1097} 1298}
1098 1299
1099sub children { 1300sub remove {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1301 my ($self, $child) = @_;
1101}
1102 1302
1303 # TODO: not yet implemented
1304}
1305
1103# TODO: move to container class maybe? send childs a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1307sub clear {
1105 my ($self) = @_; 1308 my ($self) = @_;
1106 1309
1107 my @children = $self->children; 1310 my @children = $self->children;
1108 delete $self->{children}; 1311 delete $self->{children};
… …
1110 for (@children) { 1313 for (@children) {
1111 delete $_->{parent}; 1314 delete $_->{parent};
1112 $_->hide; 1315 $_->hide;
1113 } 1316 }
1114 1317
1115 $self->update; 1318 $self->realloc;
1116} 1319}
1117 1320
1118sub get_wh { 1321sub get_wh {
1119 my ($self) = @_; 1322 my ($self) = @_;
1120 1323
… …
1146 (sum @$ws), 1349 (sum @$ws),
1147 (sum @$hs), 1350 (sum @$hs),
1148 ) 1351 )
1149} 1352}
1150 1353
1151sub size_allocate { 1354sub invoke_size_allocate {
1152 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1153 1356
1154 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1155 1358
1156 my $req_w = sum @$ws; 1359 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1360 my $req_h = (sum @$hs) || 1;
1158 1361
1159 # TODO: nicer code && do row_expand 1362 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1363 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1364 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1365 my $col_expand = (sum @col_expand) || 1;
… …
1188 } 1391 }
1189 1392
1190 $y += $row_h; 1393 $y += $row_h;
1191 } 1394 }
1192 1395
1396 1
1193} 1397}
1194 1398
1195sub find_widget { 1399sub find_widget {
1196 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1197 1401
… …
1216 } 1420 }
1217} 1421}
1218 1422
1219############################################################################# 1423#############################################################################
1220 1424
1425package CFClient::UI::Box;
1426
1427our @ISA = CFClient::UI::Container::;
1428
1429sub size_request {
1430 my ($self) = @_;
1431
1432 $self->{vertical}
1433 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1436 )
1437 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1440 )
1441}
1442
1443sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_;
1445
1446 my $space = $self->{vertical} ? $h : $w;
1447 my @children = $self->visible_children;
1448
1449 my @req;
1450
1451 if ($self->{homogeneous}) {
1452 @req = ($space / (@children || 1)) x @children;
1453 } else {
1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1455 my $req = List::Util::sum @req;
1456
1457 if ($req > $space) {
1458 # ah well, not enough space
1459 $_ *= $space / $req for @req;
1460 } else {
1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1462
1463 $space = ($space - $req) / $expand; # remaining space to give away
1464
1465 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children;
1467 }
1468 }
1469
1470 CFClient::UI::harmonize \@req;
1471
1472 my $pos = 0;
1473 for (0 .. $#children) {
1474 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1476
1477 $pos += $alloc;
1478 }
1479
1480 1
1481}
1482
1483#############################################################################
1484
1221package CFClient::UI::HBox; 1485package CFClient::UI::HBox;
1222 1486
1223# TODO: wrap into common Box base class
1224
1225our @ISA = CFClient::UI::Container::; 1487our @ISA = CFClient::UI::Box::;
1226 1488
1227sub size_request { 1489sub new {
1228 my ($self) = @_; 1490 my $class = shift;
1229 1491
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1492 $class->SUPER::new (
1231 1493 vertical => 0,
1232 ( 1494 @_,
1233 (List::Util::sum map $_->[0], @alloc),
1234 (List::Util::max map $_->[1], @alloc),
1235 ) 1495 )
1236} 1496}
1237 1497
1238sub size_allocate {
1239 my ($self, $w, $h) = @_;
1240
1241 ($h, $w) = ($w, $h);
1242
1243 my $children = $self->{children};
1244
1245 my @h = map $_->{req_w}, @$children;
1246
1247 my $req_h = List::Util::sum @h;
1248
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children;
1254 $exp ||= 1;
1255
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 }
1263 }
1264
1265 CFClient::UI::harmonize \@h;
1266
1267 my $y = 0;
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_];
1271 $child->configure ($y, 0, $h, $w);
1272
1273 $y += $h;
1274 }
1275
1276 1
1277}
1278
1279############################################################################# 1498#############################################################################
1280 1499
1281package CFClient::UI::VBox; 1500package CFClient::UI::VBox;
1282 1501
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1502our @ISA = CFClient::UI::Box::;
1286 1503
1287sub size_request { 1504sub new {
1288 my ($self) = @_; 1505 my $class = shift;
1289 1506
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1507 $class->SUPER::new (
1291 1508 vertical => 1,
1292 ( 1509 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1510 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1511}
1336 1512
1337############################################################################# 1513#############################################################################
1338 1514
1339package CFClient::UI::Label; 1515package CFClient::UI::Label;
… …
1356 ellipsise => 3, # end 1532 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1358 fontsize => 1, 1534 fontsize => 1,
1359 align => -1, 1535 align => -1,
1360 valign => -1, 1536 valign => -1,
1361 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1362 can_events => 0, 1539 can_events => 0,
1363 %arg 1540 %arg
1364 ); 1541 );
1365 1542
1366 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1393 1570
1394 delete $self->{texture}; 1571 delete $self->{texture};
1395 $self->SUPER::update; 1572 $self->SUPER::update;
1396} 1573}
1397 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1398sub set_text { 1582sub set_text {
1399 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1400 1584
1401 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1402 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1403 1587
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1406 1590
1591 delete $self->{size_req};
1592 $self->realloc;
1407 $self->update; 1593 $self->update;
1408 $self->check_size;
1409} 1594}
1410 1595
1411sub set_markup { 1596sub set_markup {
1412 my ($self, $markup) = @_; 1597 my ($self, $markup) = @_;
1413 1598
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1603
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1421 1606
1607 delete $self->{size_req};
1608 $self->realloc;
1422 $self->update; 1609 $self->update;
1423 $self->check_size;
1424} 1610}
1425 1611
1426sub size_request { 1612sub size_request {
1427 my ($self) = @_; 1613 my ($self) = @_;
1428 1614
1615 $self->{size_req} ||= do {
1429 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1430 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1431 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1432 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1433 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1434 1621
1435 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1436 1623
1437 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1438 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1439 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1440 1627
1441 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1442 1629
1443 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1445 } 1635 };
1446 1636
1447 ( 1637 @{ $self->{size_req} }
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1638}
1452 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1453sub size_allocate { 1644sub invoke_size_allocate {
1454 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1455 1646
1647 delete $self->{ox};
1648
1456 delete $self->{texture}; 1649 delete $self->{texture}
1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1457} 1653}
1458 1654
1459sub set_fontsize { 1655sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1461 1657
1462 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1463 delete $self->{texture}; 1660 delete $self->{texture};
1464 1661
1465 $self->update; 1662 $self->realloc;
1466 $self->check_size; 1663}
1664
1665sub reconfigure {
1666 my ($self) = @_;
1667
1668 delete $self->{size_req};
1669
1670 $self->SUPER::reconfigure;
1467} 1671}
1468 1672
1469sub _draw { 1673sub _draw {
1470 my ($self) = @_; 1674 my ($self) = @_;
1471 1675
… …
1477 $self->{layout}->set_width ($self->{w}); 1681 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1682 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1685
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1686 new_from_layout CFClient::Texture $self->{layout}
1687 };
1483 1688
1689 unless (exists $self->{ox}) {
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1692 : ($self->{w} - $tex->{w}) * 0.5);
1487 1693
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1696 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1493 }; 1697 };
1494 1698
1495 glEnable GL_TEXTURE_2D; 1699 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1497 1703
1498 if ($tex->{format} == GL_ALPHA) { 1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1499 glColor @{$self->{fg}}; 1706 glColor @{$self->{fg}};
1500 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1501 } else { 1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1502 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1503 } 1711 }
1504 1712
1505 glDisable GL_TEXTURE_2D; 1713 glDisable GL_TEXTURE_2D;
1506} 1714}
1507 1715
… …
1524 can_hover => 1, 1732 can_hover => 1,
1525 can_focus => 1, 1733 can_focus => 1,
1526 valign => 0, 1734 valign => 0,
1527 can_events => 1, 1735 can_events => 1,
1528 #text => ... 1736 #text => ...
1737 #hidden => "*",
1529 @_ 1738 @_
1530 ) 1739 )
1531} 1740}
1532 1741
1533sub _set_text { 1742sub _set_text {
… …
1535 1744
1536 delete $self->{cur_h}; 1745 delete $self->{cur_h};
1537 1746
1538 return if $self->{text} eq $text; 1747 return if $self->{text} eq $text;
1539 1748
1540 delete $self->{texture};
1541
1542 $self->{last_activity} = $::NOW; 1749 $self->{last_activity} = $::NOW;
1543 $self->{text} = $text; 1750 $self->{text} = $text;
1544 1751
1545 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1546 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1754 delete $self->{size_req};
1547 1755
1548 $self->_emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1757
1758 $self->realloc;
1759 $self->update;
1549} 1760}
1550 1761
1551sub set_text { 1762sub set_text {
1552 my ($self, $text) = @_; 1763 my ($self, $text) = @_;
1553 1764
1554 $self->{cursor} = length $text; 1765 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1766 $self->_set_text ($text);
1556 $self->update;
1557 $self->check_size;
1558} 1767}
1559 1768
1560sub get_text { 1769sub get_text {
1561 $_[0]{text} 1770 $_[0]{text}
1562} 1771}
… …
1567 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1568 1777
1569 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1570} 1779}
1571 1780
1572sub key_down { 1781sub invoke_key_down {
1573 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1574 1783
1575 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1576 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1577 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
… …
1589 } elsif ($sym == CFClient::SDLK_HOME) { 1798 } elsif ($sym == CFClient::SDLK_HOME) {
1590 $self->{cursor} = 0; 1799 $self->{cursor} = 0;
1591 } elsif ($sym == CFClient::SDLK_END) { 1800 } elsif ($sym == CFClient::SDLK_END) {
1592 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1593 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1594 $self->_emit ('escape'); 1803 $self->emit ('escape');
1595 } elsif ($uni) { 1804 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else {
1807 return 0;
1597 } 1808 }
1598 1809
1599 $self->_set_text ($text); 1810 $self->_set_text ($text);
1600 $self->update;
1601 $self->check_size;
1602}
1603 1811
1812 $self->realloc;
1813
1814 1
1815}
1816
1604sub focus_in { 1817sub invoke_focus_in {
1605 my ($self) = @_; 1818 my ($self) = @_;
1606 1819
1607 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1608 1821
1609 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1610} 1823}
1611 1824
1612sub button_down { 1825sub invoke_button_down {
1613 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1614 1827
1615 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1616 1829
1617 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1618 1831
1619 # byte-index to char-index 1832 # byte-index to char-index
1620 my $text = $self->{text}; 1833 my $text = $self->{text};
1621 utf8::encode $text; 1834 utf8::encode $text;
1622 $self->{cursor} = length substr $text, 0, $idx; 1835 $self->{cursor} = length substr $text, 0, $idx;
1623 1836
1624 $self->_set_text ($self->{text}); 1837 $self->_set_text ($self->{text});
1625 $self->update; 1838 $self->update;
1839
1840 1
1626} 1841}
1627 1842
1628sub mouse_motion { 1843sub invoke_mouse_motion {
1629 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1630# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1845# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1846
1847 1
1631} 1848}
1632 1849
1633sub _draw { 1850sub _draw {
1634 my ($self) = @_; 1851 my ($self) = @_;
1635 1852
1636 local $self->{fg} = $self->{fg}; 1853 local $self->{fg} = $self->{fg};
1637 1854
1638 if ($FOCUS == $self) { 1855 if ($FOCUS == $self) {
1639 glColor @{$self->{active_bg}}; 1856 glColor_premultiply @{$self->{active_bg}};
1640 $self->{fg} = $self->{active_fg}; 1857 $self->{fg} = $self->{active_fg};
1641 } else { 1858 } else {
1642 glColor @{$self->{bg}}; 1859 glColor_premultiply @{$self->{bg}};
1643 } 1860 }
1644 1861
1645 glEnable GL_BLEND; 1862 glEnable GL_BLEND;
1646 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1863 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1647 glBegin GL_QUADS; 1864 glBegin GL_QUADS;
1648 glVertex 0 , 0; 1865 glVertex 0 , 0;
1649 glVertex 0 , $self->{h}; 1866 glVertex 0 , $self->{h};
1650 glVertex $self->{w}, $self->{h}; 1867 glVertex $self->{w}, $self->{h};
1651 glVertex $self->{w}, 0; 1868 glVertex $self->{w}, 0;
… …
1676 1893
1677our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1678 1895
1679use CFClient::OpenGL; 1896use CFClient::OpenGL;
1680 1897
1681sub key_down { 1898sub invoke_key_down {
1682 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1683 1900
1684 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1685 1902
1686 if ($sym == 13) { 1903 if ($sym == 13) {
1687 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1688 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1689 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1690 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1691 $self->_emit (activate => $txt); 1909 $self->emit (activate => $txt);
1692 $self->update; 1910 $self->update;
1693 1911
1694 } elsif ($sym == CFClient::SDLK_UP) { 1912 } elsif ($sym == CFClient::SDLK_UP) {
1695 if ($self->{history_pointer} < 0) { 1913 if ($self->{history_pointer} < 0) {
1696 $self->{history_saveback} = $self->get_text; 1914 $self->{history_saveback} = $self->get_text;
… …
1712 } else { 1930 } else {
1713 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1714 } 1932 }
1715 1933
1716 } else { 1934 } else {
1717 $self->SUPER::key_down ($ev); 1935 return $self->SUPER::invoke_key_down ($ev)
1936 }
1937
1718 } 1938 1
1719
1720} 1939}
1721 1940
1722############################################################################# 1941#############################################################################
1723 1942
1724package CFClient::UI::Button; 1943package CFClient::UI::Button;
… …
1733 1952
1734sub new { 1953sub new {
1735 my $class = shift; 1954 my $class = shift;
1736 1955
1737 $class->SUPER::new ( 1956 $class->SUPER::new (
1738 padding => 4, 1957 padding_x => 4,
1958 padding_y => 4,
1739 fg => [1, 1, 1], 1959 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1960 active_fg => [0, 0, 1],
1741 can_hover => 1, 1961 can_hover => 1,
1742 align => 0, 1962 align => 0,
1743 valign => 0, 1963 valign => 0,
1744 can_events => 1, 1964 can_events => 1,
1745 @_ 1965 @_
1746 ) 1966 )
1747} 1967}
1748 1968
1749sub activate { }
1750
1751sub button_up { 1969sub invoke_button_up {
1752 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1753 1971
1754 $self->emit ("activate") 1972 $self->emit ("activate")
1755 if $x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1756 && $y >= 0 && $y < $self->{h}; 1974 && $y >= 0 && $y < $self->{h};
1975
1976 1
1757} 1977}
1758 1978
1759sub _draw { 1979sub _draw {
1760 my ($self) = @_; 1980 my ($self) = @_;
1761 1981
1762 local $self->{fg} = $self->{fg}; 1982 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1763
1764 if ($GRAB == $self) {
1765 $self->{fg} = $self->{active_fg};
1766 }
1767 1983
1768 glEnable GL_TEXTURE_2D; 1984 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770 glColor 0, 0, 0, 1; 1986 glColor 0, 0, 0, 1;
1771 1987
… …
1776 $self->SUPER::_draw; 1992 $self->SUPER::_draw;
1777} 1993}
1778 1994
1779############################################################################# 1995#############################################################################
1780 1996
1997package CFClient::UI::ImageButton;
1998
1999our @ISA = CFClient::UI::Image::;
2000
2001use CFClient::OpenGL;
2002
2003my %textures;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 padding_x => 4,
2010 padding_y => 4,
2011 fg => [1, 1, 1],
2012 active_fg => [0, 0, 1],
2013 can_hover => 1,
2014 align => 0,
2015 valign => 0,
2016 can_events => 1,
2017 @_
2018 );
2019}
2020
2021sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_;
2023
2024 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h};
2027
2028 1
2029}
2030
2031#############################################################################
2032
1781package CFClient::UI::CheckBox; 2033package CFClient::UI::CheckBox;
1782 2034
1783our @ISA = CFClient::UI::DrawBG::; 2035our @ISA = CFClient::UI::DrawBG::;
1784 2036
1785my @tex = 2037my @tex =
… …
1790 2042
1791sub new { 2043sub new {
1792 my $class = shift; 2044 my $class = shift;
1793 2045
1794 $class->SUPER::new ( 2046 $class->SUPER::new (
1795 padding => 2, 2047 padding_x => 2,
2048 padding_y => 2,
1796 fg => [1, 1, 1], 2049 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 2050 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 2051 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 2052 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 2053 state => 0,
… …
1804} 2057}
1805 2058
1806sub size_request { 2059sub size_request {
1807 my ($self) = @_; 2060 my ($self) = @_;
1808 2061
1809 ($self->{padding} * 2 + 6) x 2 2062 (6) x 2
1810} 2063}
1811 2064
1812sub button_down { 2065sub invoke_button_down {
1813 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1814 2067
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
2072 } else {
2073 return 0
2074 }
2075
1819 } 2076 1
1820} 2077}
1821 2078
1822sub _draw { 2079sub _draw {
1823 my ($self) = @_; 2080 my ($self) = @_;
1824 2081
1825 $self->SUPER::_draw; 2082 $self->SUPER::_draw;
1826 2083
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2084 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 2085
1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2086 my ($w, $h) = @$self{qw(w h)};
2087
2088 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830 2089
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2090 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 2091
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2092 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 2093
… …
1842package CFClient::UI::Image; 2101package CFClient::UI::Image;
1843 2102
1844our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
1845 2104
1846use CFClient::OpenGL; 2105use CFClient::OpenGL;
1847use Carp qw/confess/;
1848 2106
1849our %loaded_images; 2107our %texture_cache;
1850 2108
1851sub new { 2109sub new {
1852 my $class = shift; 2110 my $class = shift;
1853 2111
1854 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
1855 2116
1856 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
1857 2119
1858 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
1859 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1860 2122
1861 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
1862 2124
1863 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1864
1865 $self->{aspect} = $tex->{w} / $tex->{h};
1866 2126
1867 $self 2127 $self
1868} 2128}
1869 2129
1870sub size_request { 2130sub size_request {
1871 my ($self) = @_; 2131 my ($self) = @_;
1872 2132
1873 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
1874} 2134}
1875 2135
1876sub _draw { 2136sub _draw {
1877 my ($self) = @_; 2137 my ($self) = @_;
1878 2138
… …
1989 2249
1990 my $h1 = $self->{h} * (1 - $ycut1); 2250 my $h1 = $self->{h} * (1 - $ycut1);
1991 my $h2 = $self->{h} * (1 - $ycut2); 2251 my $h2 = $self->{h} * (1 - $ycut2);
1992 2252
1993 glEnable GL_BLEND; 2253 glEnable GL_BLEND;
1994 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1995 glEnable GL_TEXTURE_2D; 2256 glEnable GL_TEXTURE_2D;
1996 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1997 2258
1998 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2259 glBindTexture GL_TEXTURE_2D, $t1->{name};
1999 glBegin GL_QUADS; 2260 glBegin GL_QUADS;
… …
2099 fg => [1, 1, 1], 2360 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2361 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2362 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2363 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2364 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2365 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2366 min_h => $::WIDTH / 80,
2106 vertical => 0, 2367 vertical => 0,
2107 can_hover => 1, 2368 can_hover => 1,
2108 inner_pad => 0.02, 2369 inner_pad => 0.02,
2109 @_ 2370 @_
2110 ); 2371 );
… …
2116} 2377}
2117 2378
2118sub set_range { 2379sub set_range {
2119 my ($self, $range) = @_; 2380 my ($self, $range) = @_;
2120 2381
2121 $self->{range} = $range; 2382 ($range, $self->{range}) = ($self->{range}, $range);
2122 2383
2384 if ("@$range" ne "@{$self->{range}}") {
2123 $self->update; 2385 $self->update;
2386 $self->set_value ($self->{range}[0]);
2387 }
2124} 2388}
2125 2389
2126sub set_value { 2390sub set_value {
2127 my ($self, $value) = @_; 2391 my ($self, $value) = @_;
2128 2392
… …
2139 if $unit; 2403 if $unit;
2140 2404
2141 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2142 2406
2143 if ($value != $old_value) { 2407 if ($value != $old_value) {
2144 $self->_emit (changed => $value); 2408 $self->emit (changed => $value);
2145 $self->update; 2409 $self->update;
2146 } 2410 }
2147} 2411}
2148 2412
2149sub size_request { 2413sub size_request {
2150 my ($self) = @_; 2414 my ($self) = @_;
2151 2415
2152 my $w = $self->{req_w}; 2416 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2417}
2157 2418
2158sub button_down { 2419sub invoke_button_down {
2159 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2160 2421
2161 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2162 2423
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164 2425
2165 $self->mouse_motion ($ev, $x, $y); 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2166} 2427}
2167 2428
2168sub mouse_motion { 2429sub invoke_mouse_motion {
2169 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2170 2431
2171 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2172 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2173 2434
2174 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2435 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175 2436
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2437 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177 2438
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2439 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2440 } else {
2441 return 0;
2442 }
2443
2179 } 2444 1
2180} 2445}
2181 2446
2182sub update { 2447sub update {
2183 my ($self) = @_; 2448 my ($self) = @_;
2184 2449
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2450 delete $self->{knob_w};
2451 $self->SUPER::update;
2452}
2453
2454sub _draw {
2455 my ($self) = @_;
2456
2457 unless ($self->{knob_w}) {
2186 $self->set_value ($self->{range}[0]); 2458 $self->set_value ($self->{range}[0]);
2187 2459
2188 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2460 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100; 2461 my $range = ($hi - $page - $lo) || 1e-100;
2190 2462
… …
2196 $value = ($value - $lo) / $range; 2468 $value = ($value - $lo) / $range;
2197 $value = $value * $self->{scale} + $self->{offset}; 2469 $value = $value * $self->{scale} + $self->{offset};
2198 2470
2199 $self->{knob_x} = $value - $knob_w * 0.5; 2471 $self->{knob_x} = $value - $knob_w * 0.5;
2200 $self->{knob_w} = $knob_w; 2472 $self->{knob_w} = $knob_w;
2201 }); 2473 }
2202
2203 $self->SUPER::update;
2204}
2205
2206sub _draw {
2207 my ($self) = @_;
2208 2474
2209 $self->SUPER::_draw (); 2475 $self->SUPER::_draw ();
2210 2476
2211 glScale $self->{w}, $self->{h}; 2477 glScale $self->{w}, $self->{h};
2212 2478
… …
2273sub set_range { shift->{slider}->set_range (@_) } 2539sub set_range { shift->{slider}->set_range (@_) }
2274sub set_value { shift->{slider}->set_value (@_) } 2540sub set_value { shift->{slider}->set_value (@_) }
2275 2541
2276############################################################################# 2542#############################################################################
2277 2543
2278package CFClient::UI::TextView; 2544package CFClient::UI::TextScroller;
2279 2545
2280our @ISA = CFClient::UI::HBox::; 2546our @ISA = CFClient::UI::HBox::;
2281 2547
2282use CFClient::OpenGL; 2548use CFClient::OpenGL;
2283 2549
… …
2285 my $class = shift; 2551 my $class = shift;
2286 2552
2287 my $self = $class->SUPER::new ( 2553 my $self = $class->SUPER::new (
2288 fontsize => 1, 2554 fontsize => 1,
2289 can_events => 0, 2555 can_events => 0,
2556 indent => 0,
2290 #font => default_font 2557 #font => default_font
2291 @_, 2558 @_,
2292 2559
2293 layout => (new CFClient::Layout 1), 2560 layout => (new CFClient::Layout 1),
2294 par => [], 2561 par => [],
… …
2309 2576
2310 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2311 $self->reflow; 2578 $self->reflow;
2312} 2579}
2313 2580
2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2314sub size_allocate { 2590sub invoke_size_allocate {
2315 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2316 2592
2317 $self->SUPER::size_allocate ($w, $h); 2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2318 2595
2319 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2320 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2321 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2322 2600
2323 $self->reflow; 2601 $self->reflow;
2324}
2325 2602
2326sub text_size { 2603 local $self->{children} = [$empty, $slider];
2327 my ($self, $text, $indent) = @_; 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2608 my ($self, $para) = @_;
2328 2609
2329 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2330 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2331 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2332 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2333 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2334 2623 );
2624
2335 $layout->size 2625 $layout
2336} 2626}
2337 2627
2338sub reflow { 2628sub reflow {
2339 my ($self) = @_; 2629 my ($self) = @_;
2340 2630
… …
2349 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2350} 2640}
2351 2641
2352sub clear { 2642sub clear {
2353 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2354 2647
2355 $self->{par} = []; 2648 $self->{par} = [];
2356 $self->{height} = 0; 2649 $self->{height} = 0;
2357 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2358} 2651}
2359 2652
2360sub add_paragraph { 2653sub add_paragraph {
2361 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2362 2655
2363 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2364 my ($w, $h) = $self->text_size ($line); 2657
2365 $self->{height} += $h; 2658 $para = {
2366 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2367 } 2665 };
2368 2666
2369 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2669
2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2673
2674sub scroll_to_bottom {
2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2370} 2679}
2371 2680
2372sub update { 2681sub update {
2373 my ($self) = @_; 2682 my ($self) = @_;
2374 2683
… …
2376 2685
2377 return unless $self->{h} > 0; 2686 return unless $self->{h} > 0;
2378 2687
2379 delete $self->{texture}; 2688 delete $self->{texture};
2380 2689
2381 $ROOT->on_post_alloc ($self, sub { 2690 $ROOT->on_post_alloc ($self => sub {
2382 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2383 2692
2384 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2385 my $height = 0; 2694 my $height = 0;
2386 2695
2387 my $layout = $self->{layout};
2388
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390
2391 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2392 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2393 $layout->set_width ($W - $_->[3]); 2698 my $layout = $self->get_layout ($para);
2394 $layout->set_markup ($_->[4]);
2395 my ($w, $h) = $layout->size; 2699 my ($w, $h) = $layout->size;
2396 $_->[0] = $w + $_->[3]; 2700
2397 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2398 } 2704 }
2399 2705
2400 $height += $_->[1]; 2706 $height += $para->{h};
2401 } 2707 }
2402 2708
2403 $self->{height} = $height; 2709 $self->{height} = $height;
2404 2710
2405 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2406 2712
2407 delete $self->{texture}; 2713 delete $self->{texture};
2408 } 2714 }
2409 2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2410 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2411 glClearColor 0.5, 0.5, 0.5, 0; 2721 glClearColor 0, 0, 0, 0;
2412 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
2413 2723
2414 my $top = int $self->{children}[1]{range}[0]; 2724 my $top = int $self->{children}[1]{range}[0];
2415 2725
2416 my $y0 = $top; 2726 my $y0 = $top;
2417 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2418 2728
2419 my $y = 0; 2729 my $y = 0;
2420
2421 my $layout = $self->{layout};
2422
2423 $layout->set_font ($self->{font}) if $self->{font};
2424 2730
2425 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2426 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2427 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2428 2734
2429 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2430 my $h = $par->[1]; 2736 my $h = $para->{h};
2431 2737
2432 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2433 $layout->set_foreground (@{ $par->[2] }); 2739
2434 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2435 $layout->set_markup ($par->[4]);
2436 2741
2437 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2438 2743
2439 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2440 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2441 } 2762 }
2442 2763
2443 $y += $h; 2764 $y += $h;
2444 } 2765 }
2445 2766
2446 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2447 }; 2768 };
2448 }); 2769 });
2449} 2770}
2450 2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2779}
2780
2451sub _draw { 2781sub _draw {
2452 my ($self) = @_; 2782 my ($self) = @_;
2453 2783
2454 glEnable GL_TEXTURE_2D; 2784 glEnable GL_TEXTURE_2D;
2455 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2456 glColor 1, 1, 1, 1; 2786 glColor 0, 0, 0, 1;
2457 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2458 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2459 2789
2460 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2461
2462} 2791}
2463 2792
2464############################################################################# 2793#############################################################################
2465 2794
2466package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
2511 2840
2512sub new { 2841sub new {
2513 my $class = shift; 2842 my $class = shift;
2514 2843
2515 my $self = $class->SUPER::new ( 2844 my $self = $class->SUPER::new (
2516 state => 0, 2845 state => 0,
2517 connect_activate => \&toggle_flopper, 2846 on_activate => \&toggle_flopper,
2518 @_ 2847 @_
2519 ); 2848 );
2520 2849
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2850 $self
2527} 2851}
2528 2852
2529sub toggle_flopper { 2853sub toggle_flopper {
2530 my ($self) = @_; 2854 my ($self) = @_;
2531 2855
2532 # TODO: use animation 2856 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2857}
2544 2858
2545############################################################################# 2859#############################################################################
2546 2860
2547package CFClient::UI::Tooltip; 2861package CFClient::UI::Tooltip;
… …
2560} 2874}
2561 2875
2562sub set_tooltip_from { 2876sub set_tooltip_from {
2563 my ($self, $widget) = @_; 2877 my ($self, $widget) = @_;
2564 2878
2879 my $tooltip = $widget->{tooltip};
2880
2881 if ($ENV{CFPLUS_DEBUG} & 2) {
2882 $tooltip .= "\n\n" . (ref $widget) . "\n"
2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2884 . "req $widget->{req_w} $widget->{req_h}\n"
2885 . "visible $widget->{visible}";
2886 }
2887
2888 $tooltip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//;
2890
2565 $self->add (new CFClient::UI::Label 2891 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip}, 2892 markup => $tooltip,
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8, 2894 fontsize => 0.8,
2569 fg => [0, 0, 0, 1], 2895 fg => [0, 0, 0, 1],
2570 ellipsise => 0, 2896 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP), 2897 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2578 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2579 2905
2580 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2581} 2907}
2582 2908
2583sub size_allocate { 2909sub invoke_size_allocate {
2584 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2585 2911
2586 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2913}
2914
2915sub invoke_visibility_change {
2916 my ($self, $visible) = @_;
2917
2918 return unless $visible;
2919
2920 $self->{root}->on_post_alloc ("move_$self" => sub {
2921 my $widget = $self->{owner}
2922 or return;
2923
2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925
2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927 if $x + $self->{w} > $self->{root}{w};
2928
2929 $self->move_abs ($x, $y);
2930 });
2587} 2931}
2588 2932
2589sub _draw { 2933sub _draw {
2590 my ($self) = @_; 2934 my ($self) = @_;
2591 2935
… …
2608 glVertex $w, $h; 2952 glVertex $w, $h;
2609 glVertex $w, 0; 2953 glVertex $w, 0;
2610 glEnd; 2954 glEnd;
2611 2955
2612 glTranslate 2 - 0.375, 2 - 0.375; 2956 glTranslate 2 - 0.375, 2 - 0.375;
2957
2613 $self->SUPER::_draw; 2958 $self->SUPER::_draw;
2614} 2959}
2615 2960
2616############################################################################# 2961#############################################################################
2617 2962
… …
2623 2968
2624sub new { 2969sub new {
2625 my $class = shift; 2970 my $class = shift;
2626 2971
2627 my $self = $class->SUPER::new ( 2972 my $self = $class->SUPER::new (
2628 aspect => 1, 2973 aspect => 1,
2974 can_events => 0,
2629 @_, 2975 @_,
2630 ); 2976 );
2631 2977
2632 if ($self->{anim} && $self->{animspeed}) { 2978 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2979 Scalar::Util::weaken (my $widget = $self);
… …
2675 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2676 3022
2677 if ($tex) { 3023 if ($tex) {
2678 glEnable GL_TEXTURE_2D; 3024 glEnable GL_TEXTURE_2D;
2679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2680 glColor 1, 1, 1, 1; 3026 glColor 0, 0, 0, 1;
2681 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2682 glDisable GL_TEXTURE_2D; 3028 glDisable GL_TEXTURE_2D;
2683 } 3029 }
2684} 3030}
2685 3031
2686sub DESTROY { 3032sub destroy {
2687 my ($self) = @_; 3033 my ($self) = @_;
2688 3034
2689 $self->{timer}->cancel 3035 $self->{timer}->cancel
2690 if $self->{timer}; 3036 if $self->{timer};
2691 3037
2692 $self->SUPER::DESTROY; 3038 $self->SUPER::destroy;
2693} 3039}
2694 3040
2695############################################################################# 3041#############################################################################
2696 3042
2697package CFClient::UI::InventoryItem; 3043package CFClient::UI::Buttonbar;
2698 3044
2699our @ISA = CFClient::UI::HBox::; 3045our @ISA = CFClient::UI::HBox::;
2700 3046
2701sub _item_to_desc { 3047# TODO: should actualyl wrap buttons and other goodies.
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856}
2857 3048
2858############################################################################# 3049#############################################################################
2859 3050
2860package CFClient::UI::Menu; 3051package CFClient::UI::Menu;
2861 3052
… …
2873 ); 3064 );
2874 3065
2875 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3066 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2876 3067
2877 for my $item (@{ $self->{items} }) { 3068 for my $item (@{ $self->{items} }) {
2878 my ($widget, $cb) = @$item; 3069 my ($widget, $cb, $tooltip) = @$item;
2879 3070
2880 # handle various types of items, only text for now 3071 # handle various types of items, only text for now
2881 if (!ref $widget) { 3072 if (!ref $widget) {
2882 $widget = new CFClient::UI::Label 3073 $widget = new CFClient::UI::Label
2883 can_hover => 1, 3074 can_hover => 1,
2884 can_events => 1, 3075 can_events => 1,
2885 text => $widget; 3076 markup => $widget,
3077 tooltip => $tooltip
2886 } 3078 }
2887 3079
2888 $self->{item}{$widget} = $item; 3080 $self->{item}{$widget} = $item;
2889 3081
2890 $self->{vbox}->add ($widget); 3082 $self->{vbox}->add ($widget);
… …
2895 3087
2896# popup given the event (must be a mouse button down event currently) 3088# popup given the event (must be a mouse button down event currently)
2897sub popup { 3089sub popup {
2898 my ($self, $ev) = @_; 3090 my ($self, $ev) = @_;
2899 3091
2900 $self->_emit ("popdown"); 3092 $self->emit ("popdown");
2901 3093
2902 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 3095 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
2905 3097
2906 $self->show; 3098 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908} 3100}
2909 3101
2910sub mouse_motion { 3102sub invoke_mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
2912 3104
2913 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
2916}
2917 3108
3109 0
3110}
3111
2918sub button_up { 3112sub invoke_button_up {
2919 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2920 3114
2921 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
2922 undef $GRAB; 3116 undef $GRAB;
2923 $self->hide; 3117 $self->hide;
2924 3118
2925 $self->_emit ("popdown"); 3119 $self->emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
3121 } else {
3122 return 0
3123 }
3124
2927 } 3125 1
2928} 3126}
2929 3127
2930############################################################################# 3128#############################################################################
2931 3129
2932package CFClient::UI::Statusbox; 3130package CFClient::UI::Multiplexer;
2933 3131
2934our @ISA = CFClient::UI::VBox::; 3132our @ISA = CFClient::UI::Container::;
2935 3133
2936sub new { 3134sub new {
2937 my $class = shift; 3135 my $class = shift;
2938 3136
2939 $class->SUPER::new ( 3137 my $self = $class->SUPER::new (
3138 @_,
3139 );
3140
3141 $self->{current} = $self->{children}[0]
3142 if @{ $self->{children} };
3143
3144 $self
3145}
3146
3147sub add {
3148 my ($self, @widgets) = @_;
3149
3150 $self->SUPER::add (@widgets);
3151
3152 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} };
3154}
3155
3156sub set_current_page {
3157 my ($self, $page_or_widget) = @_;
3158
3159 my $widget = ref $page_or_widget
3160 ? $page_or_widget
3161 : $self->{children}[$page_or_widget];
3162
3163 $self->{current} = $widget;
3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3165
3166 $self->emit (page_changed => $self->{current});
3167
3168 $self->realloc;
3169}
3170
3171sub visible_children {
3172 $_[0]{current}
3173}
3174
3175sub size_request {
3176 my ($self) = @_;
3177
3178 $self->{current}->size_request
3179}
3180
3181sub invoke_size_allocate {
3182 my ($self, $w, $h) = @_;
3183
3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3187}
3188
3189sub _draw {
3190 my ($self) = @_;
3191
3192 $self->{current}->draw;
3193}
3194
3195#############################################################################
3196
3197package CFClient::UI::Notebook;
3198
3199our @ISA = CFClient::UI::VBox::;
3200
3201sub new {
3202 my $class = shift;
3203
3204 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3207 # filter => # will be put between multiplexer and $self
3208 @_,
3209 );
3210
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3212 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3213
3214 $self
3215}
3216
3217sub add {
3218 my ($self, $title, $widget, $tooltip) = @_;
3219
3220 Scalar::Util::weaken $self;
3221
3222 $self->{buttonbar}->add (new CFClient::UI::Button
3223 markup => $title,
3224 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) },
3226 );
3227
3228 $self->{multiplexer}->add ($widget);
3229}
3230
3231sub set_current_page {
3232 my ($self, $page) = @_;
3233
3234 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current});
3236}
3237
3238#############################################################################
3239
3240package CFClient::UI::Combobox;
3241
3242use utf8;
3243
3244our @ISA = CFClient::UI::Button::;
3245
3246sub new {
3247 my $class = shift;
3248
3249 my $self = $class->SUPER::new (
3250 options => [], # [value, title, longdesc], ...
3251 value => undef,
3252 @_,
3253 );
3254
3255 $self->_set_value ($self->{value});
3256
3257 $self
3258}
3259
3260sub invoke_button_down {
3261 my ($self, $ev) = @_;
3262
3263 my @menu_items;
3264
3265 for (@{ $self->{options} }) {
3266 my ($value, $title, $tooltip) = @$_;
3267
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 }
3270
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272}
3273
3274sub _set_value {
3275 my ($self, $value) = @_;
3276
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3278 or return;
3279
3280 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]);
3283}
3284
3285sub set_value {
3286 my ($self, $value) = @_;
3287
3288 return unless $self->{value} ne $value;
3289
3290 $self->_set_value ($value);
3291 $self->emit (changed => $value);
3292}
3293
3294#############################################################################
3295
3296package CFClient::UI::Statusbox;
3297
3298our @ISA = CFClient::UI::VBox::;
3299
3300sub new {
3301 my $class = shift;
3302
3303 my $self = $class->SUPER::new (
2940 fontsize => 0.8, 3304 fontsize => 0.8,
2941 @_, 3305 @_,
2942 ) 3306 );
3307
3308 Scalar::Util::weaken (my $this = $self);
3309
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3311
3312 $self
2943} 3313}
2944 3314
2945sub reorder { 3315sub reorder {
2946 my ($self) = @_; 3316 my ($self) = @_;
2947 my $NOW = time; 3317 my $NOW = Time::HiRes::time;
3318
3319 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} };
2948 3323
2949 while (my ($k, $v) = each %{ $self->{item} }) { 3324 while (my ($k, $v) = each %{ $self->{item} }) {
2950 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3325 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2951 } 3326 }
2952 3327
… …
2955 my @items = sort { 3330 my @items = sort {
2956 $a->{pri} <=> $b->{pri} 3331 $a->{pri} <=> $b->{pri}
2957 or $b->{id} <=> $a->{id} 3332 or $b->{id} <=> $a->{id}
2958 } values %{ $self->{item} }; 3333 } values %{ $self->{item} };
2959 3334
3335 $self->{timer}->interval (1);
3336
2960 my $count = 10 + 1; 3337 my $count = 10 + 1;
2961 for my $item (@items) { 3338 for my $item (@items) {
2962 last unless --$count; 3339 last unless --$count;
2963 3340
2964 push @widgets, $item->{label} ||= do { 3341 my $label = $item->{label} ||= do {
2965 # TODO: doesn't handle markup well (read as: at all) 3342 # TODO: doesn't handle markup well (read as: at all)
2966 my $short = $item->{count} > 1 3343 my $short = $item->{count} > 1
2967 ? "<b>$item->{count} ×</b> $item->{text}" 3344 ? "<b>$item->{count} ×</b> $item->{text}"
2968 : $item->{text}; 3345 : $item->{text};
2969 3346
… …
2977 tooltip => $item->{tooltip}, 3354 tooltip => $item->{tooltip},
2978 tooltip_font => $::FONT_PROP, 3355 tooltip_font => $::FONT_PROP,
2979 tooltip_width => 0.67, 3356 tooltip_width => 0.67,
2980 fontsize => $item->{fontsize} || $self->{fontsize}, 3357 fontsize => $item->{fontsize} || $self->{fontsize},
2981 max_w => $::WIDTH * 0.44, 3358 max_w => $::WIDTH * 0.44,
2982 fg => $item->{fg}, 3359 fg => [@{ $item->{fg} }],
2983 can_events => 1, 3360 can_events => 1,
2984 can_hover => 1 3361 can_hover => 1
2985 }; 3362 };
3363
3364 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3365 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3366 $label->update;
3367 $label->set_max_size (undef, $label->{req_h} * $diff)
3368 if $diff < 1;
3369 $self->{timer}->interval (1/30);
3370 } else {
3371 $label->{fg}[3] = $item->{fg}[3] || 1;
3372 }
3373
3374 push @widgets, $label;
2986 } 3375 }
2987 3376
2988 $self->clear; 3377 $self->clear;
2989 $self->SUPER::add (reverse @widgets); 3378 $self->SUPER::add (reverse @widgets);
2990} 3379}
… …
2993 my ($self, $text, %arg) = @_; 3382 my ($self, $text, %arg) = @_;
2994 3383
2995 $text =~ s/^\s+//; 3384 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 3385 $text =~ s/\s+$//;
2997 3386
3387 return unless $text;
3388
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 3389 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2999 3390
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3391 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 3392
3002 if (my $item = $self->{item}{$group}) { 3393 if (my $item = $self->{item}{$group}) {
3003 if ($item->{text} eq $text) { 3394 if ($item->{text} eq $text) {
3004 $item->{count}++; 3395 $item->{count}++;
3005 } else { 3396 } else {
3006 $item->{count} = 1; 3397 $item->{count} = 1;
3007 $item->{text} = $item->{tooltip} = $text; 3398 $item->{text} = $item->{tooltip} = $text;
3008 } 3399 }
3009 $item->{id} = ++$self->{id}; 3400 $item->{id} += 0.2;#d#
3010 $item->{timeout} = $timeout; 3401 $item->{timeout} = $timeout;
3011 delete $item->{label}; 3402 delete $item->{label};
3012 } else { 3403 } else {
3013 $self->{item}{$group} = { 3404 $self->{item}{$group} = {
3014 id => ++$self->{id}, 3405 id => ++$self->{id},
… …
3020 count => 1, 3411 count => 1,
3021 %arg, 3412 %arg,
3022 }; 3413 };
3023 } 3414 }
3024 3415
3416 $ROOT->on_refresh (reorder => sub {
3025 $self->reorder; 3417 $self->reorder;
3418 });
3026} 3419}
3027 3420
3028sub reconfigure { 3421sub reconfigure {
3029 my ($self) = @_; 3422 my ($self) = @_;
3030 3423
… …
3033 3426
3034 $self->reorder; 3427 $self->reorder;
3035 $self->SUPER::reconfigure; 3428 $self->SUPER::reconfigure;
3036} 3429}
3037 3430
3431sub destroy {
3432 my ($self) = @_;
3433
3434 $self->{timer}->cancel;
3435
3436 $self->SUPER::destroy;
3437}
3438
3038############################################################################# 3439#############################################################################
3039 3440
3040package CFClient::UI::Root; 3441package CFClient::UI::Inventory;
3041 3442
3042our @ISA = CFClient::UI::Container::; 3443our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044use CFClient::OpenGL;
3045 3444
3046sub new { 3445sub new {
3047 my $class = shift; 3446 my $class = shift;
3048 3447
3049 $class->SUPER::new ( 3448 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450 @_,
3451 );
3452
3453 $self
3454}
3455
3456sub set_items {
3457 my ($self, $items) = @_;
3458
3459 $self->{child}->clear;
3460 return unless $items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479}
3480
3481#############################################################################
3482
3483package CFClient::UI::SpellList;
3484
3485our @ISA = CFClient::UI::Table::;
3486
3487sub new {
3488 my $class = shift;
3489
3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
3050 @_, 3493 @_,
3051 ) 3494 )
3052} 3495}
3053 3496
3054sub configure { 3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3055 my ($self, $x, $y, $w, $h) = @_;
3056 3498
3057 $self->{w} = $w; 3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3058 $self->{h} = $h; 3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3059} 3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3060 3509
3061sub check_size { 3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3582sub add_spell {
3062 my ($self) = @_; 3583 my ($self, $spell) = @_;
3063 3584
3064 $self->size_allocate ($self->{w}, $self->{h}) 3585 $self->{spell}->{$spell->{name}} = $spell;
3065 if $self->{w}; 3586 $self->rebuild_spell_list;
3587}
3588
3589sub remove_spell {
3590 my ($self, $spell) = @_;
3591
3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3603#############################################################################
3604
3605package CFClient::UI::Root;
3606
3607our @ISA = CFClient::UI::Container::;
3608
3609use List::Util qw(min max);
3610
3611use CFClient::OpenGL;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 visible => 1,
3618 @_,
3619 );
3620
3621 Scalar::Util::weaken ($self->{root} = $self);
3622
3623 $self
3066} 3624}
3067 3625
3068sub size_request { 3626sub size_request {
3069 my ($self) = @_; 3627 my ($self) = @_;
3070 3628
3071 ($self->{w}, $self->{h}) 3629 ($self->{w}, $self->{h})
3072} 3630}
3073 3631
3632sub _to_pixel {
3633 my ($coord, $size, $max) = @_;
3634
3635 $coord =
3636 $coord eq "center" ? ($max - $size) * 0.5
3637 : $coord eq "max" ? $max
3638 : $coord;
3639
3640 $coord = 0 if $coord < 0;
3641 $coord = $max - $size if $coord > $max - $size;
3642
3643 int $coord + 0.5
3644}
3645
3074sub size_allocate { 3646sub invoke_size_allocate {
3075 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
3076 3648
3077 for my $child ($self->children) { 3649 for my $child ($self->children) {
3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3650 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079 3651
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3652 $X = $child->{force_x} if exists $child->{force_x};
3081 if exists $child->{req_x}; 3653 $Y = $child->{force_y} if exists $child->{force_y};
3082 3654
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3655 $X = _to_pixel $X, $W, $self->{w};
3084 if exists $child->{req_y}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
3085
3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088 3657
3089 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
3090 } 3659 }
3660
3661 1
3091} 3662}
3092 3663
3093sub coord2local { 3664sub coord2local {
3094 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
3095 3666
… …
3103} 3674}
3104 3675
3105sub update { 3676sub update {
3106 my ($self) = @_; 3677 my ($self) = @_;
3107 3678
3108 $self->check_size;
3109 $::WANT_REFRESH++; 3679 $::WANT_REFRESH++;
3110} 3680}
3111 3681
3112sub add { 3682sub add {
3113 my ($self, @children) = @_; 3683 my ($self, @children) = @_;
3114 3684
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3685 $_->{is_toplevel} = 1
3123 3686 for @children;
3124 # integerise window positions
3125 $child->{x} = int $child->{x};
3126 $child->{y} = int $child->{y};
3127 }
3128 3687
3129 $self->SUPER::add (@children); 3688 $self->SUPER::add (@children);
3130} 3689}
3131 3690
3132sub remove { 3691sub remove {
3133 my ($self, @children) = @_; 3692 my ($self, @children) = @_;
3134 3693
3135 $self->SUPER::remove (@children); 3694 $self->SUPER::remove (@children);
3695
3696 delete $self->{is_toplevel}
3697 for @children;
3136 3698
3137 while (@children) { 3699 while (@children) {
3138 my $w = pop @children; 3700 my $w = pop @children;
3139 push @children, $w->children; 3701 push @children, $w->children;
3140 $w->set_invisible; 3702 $w->set_invisible;
… …
3159 while ($self->{refresh_hook}) { 3721 while ($self->{refresh_hook}) {
3160 $_->() 3722 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3723 for values %{delete $self->{refresh_hook}};
3162 } 3724 }
3163 3725
3164 if ($self->{check_size}) { 3726 if ($self->{realloc}) {
3165 my @queue = ([], []); 3727 my %queue;
3728 my @queue;
3729 my $widget;
3166 3730
3167 for (;;) { 3731 outer:
3168 if ($self->{check_size}) { 3732 while () {
3169 # heuristic: check containers last 3733 if (my $realloc = delete $self->{realloc}) {
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3734 for $widget (values %$realloc) {
3171 for values %{delete $self->{check_size}} 3735 $widget->{visible} or next; # do not resize invisible widgets
3736
3737 $queue{$widget+0}++ and next; # duplicates are common
3738
3739 push @{ $queue[$widget->{visible}] }, $widget;
3740 }
3172 } 3741 }
3173 3742
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3743 while () {
3744 @queue or last outer;
3175 3745
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3746 $widget = pop @{ $queue[-1] || [] }
3177 ? @$widget{qw(user_w user_h)} 3747 and last;
3178 : $widget->size_request;
3179
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183 3748
3749 pop @queue;
3750 }
3751
3752 delete $queue{$widget+0};
3753
3754 my ($w, $h) = $widget->size_request;
3755
3756 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3757 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3758
3759 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3760 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3761
3762 $w = $widget->{force_w} if exists $widget->{force_w};
3763 $h = $widget->{force_h} if exists $widget->{force_h};
3764
3765 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3766 || delete $widget->{force_realloc}) {
3184 $widget->{req_w} = $w; 3767 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h; 3768 $widget->{req_h} = $h;
3186 3769
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3770 $self->{size_alloc}{$widget+0} = $widget;
3188 3771
3189 $widget->{parent}->check_size
3190 if $widget->{parent}; 3772 if (my $parent = $widget->{parent}) {
3773 $self->{realloc}{$parent+0} = $parent
3774 unless $queue{$parent+0};
3775
3776 $parent->{force_size_alloc} = 1;
3777 $self->{size_alloc}{$parent+0} = $parent;
3778 }
3191 } 3779 }
3780
3781 delete $self->{realloc}{$widget+0};
3192 } 3782 }
3193 } 3783 }
3194 3784
3195 while ($self->{size_alloc}) { 3785 while (my $size_alloc = delete $self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) { 3786 my @queue = sort { $b->{visible} <=> $a->{visible} }
3197 my ($widget, $w, $h) = @$_; 3787 values %$size_alloc;
3788
3789 while () {
3790 my $widget = pop @queue || last;
3791
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3198 3793
3199 $w = 0 if $w < 0; 3794 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3795 $h = 0 if $h < 0;
3201 3796
3797 $w = int $w + 0.5;
3798 $h = int $h + 0.5;
3799
3800 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801 $widget->{old_w} = $widget->{w};
3802 $widget->{old_h} = $widget->{h};
3803
3202 $widget->{w} = $w; 3804 $widget->{w} = $w;
3203 $widget->{h} = $h; 3805 $widget->{h} = $h;
3806
3204 $widget->emit (size_allocate => $w, $h); 3807 $widget->emit (size_allocate => $w, $h);
3808 }
3205 } 3809 }
3206 } 3810 }
3207 3811
3208 while ($self->{post_alloc_hook}) { 3812 while ($self->{post_alloc_hook}) {
3209 $_->() 3813 $_->()
3210 for values %{delete $self->{post_alloc_hook}}; 3814 for values %{delete $self->{post_alloc_hook}};
3211 } 3815 }
3816
3212 3817
3213 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3818 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3819 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215 glClear GL_COLOR_BUFFER_BIT; 3820 glClear GL_COLOR_BUFFER_BIT;
3216 3821
… …
3218 glLoadIdentity; 3823 glLoadIdentity;
3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3824 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3220 glMatrixMode GL_MODELVIEW; 3825 glMatrixMode GL_MODELVIEW;
3221 glLoadIdentity; 3826 glLoadIdentity;
3222 3827
3828 {
3829 package CFClient::UI::Base;
3830
3831 ($draw_x, $draw_y, $draw_w, $draw_h) =
3832 (0, 0, $self->{w}, $self->{h});
3833 }
3834
3223 $self->_draw; 3835 $self->_draw;
3224} 3836}
3225 3837
3226############################################################################# 3838#############################################################################
3227 3839

Diff Legend

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