ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.306 by root, Sun Jun 18 17:39:36 2006 UTC

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

Diff Legend

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