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

Diff Legend

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