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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.285 by root, Mon Jun 5 03:07:01 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};
232 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
233 delete $self->{visible}; 278 delete $self->{visible};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
238 $self->focus_out; 286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
239} 306}
240 307
241sub hide { 308sub hide {
242 my ($self) = @_; 309 my ($self) = @_;
243 310
… …
245 312
246 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
247 if $self->{parent}; 314 if $self->{parent};
248} 315}
249 316
250sub move { 317sub move_abs {
251 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
252 319
253 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
254 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
255 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
256 323
257 $self->update; 324 $self->update;
258} 325}
259 326
260sub set_size { 327sub set_size {
261 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
262 329
263 $self->{user_w} = $w; 330 $self->{force_w} = $w;
264 $self->{user_h} = $h; 331 $self->{force_h} = $h;
265 332
266 $self->check_size; 333 $self->realloc;
267} 334}
268 335
269sub size_request { 336sub size_request {
270 require Carp; 337 require Carp;
271 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
273 340
274sub configure { 341sub configure {
275 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
276 343
277 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
278 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
279 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
280 349
281 # use alignment to adjust x, y 350 # use alignment to adjust x, y
282 351
283 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
284 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
285
286 ($w, $h) = ($w2, $h2);
287 } 354 }
288 355
289 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
290 $self->{x} = $x; 357 $self->{x} = $x;
291 $self->{y} = $y; 358 $self->{y} = $y;
292 $self->update; 359 $self->update;
293 } 360 }
294 361
295 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
296 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
297 } 369 }
298} 370}
299 371
300sub size_allocate { 372sub size_allocate {
301 # nothing to be done 373 # nothing to be done
302} 374}
303 375
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
311sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
312} 382}
313 383
314sub set_max_size { 384sub set_max_size {
315 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
316 386
317 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
319} 391}
320 392
321sub set_tooltip { 393sub set_tooltip {
322 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
323 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
324 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
325 402
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
328 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
329 } 406 }
330} 407}
331 408
332# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
333sub coord2local { 410sub coord2local {
… …
370 447
371 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
372 unless $FOCUS; 449 unless $FOCUS;
373} 450}
374 451
375sub mouse_motion { } 452sub mouse_motion { 0 }
376sub button_up { } 453sub button_up { 0 }
377sub key_down { } 454sub key_down { 0 }
378sub key_up { } 455sub key_up { 0 }
379 456
380sub button_down { 457sub button_down {
381 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
382 459
383 $self->focus_in; 460 $self->focus_in;
384}
385 461
386sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
387sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
388sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
389sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
390sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
391 538
392sub draw { 539sub draw {
393 my ($self) = @_; 540 my ($self) = @_;
394 541
395 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
396 553
397 glPushMatrix; 554 glPushMatrix;
398 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
399 $self->_draw;
400 glPopMatrix;
401 556
402 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
403 my ($x, $y) = @$self{qw(x y)};
404
405 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
406 glEnable GL_BLEND; 559 glEnable GL_BLEND;
407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
408 glBegin GL_QUADS; 561 glBegin GL_QUADS;
409 glVertex $x , $y;
410 glVertex $x + $self->{w}, $y;
411 glVertex $x + $self->{w}, $y + $self->{h};
412 glVertex $x , $y + $self->{h};
413 glEnd;
414 glDisable GL_BLEND;
415 }
416
417 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix;
419 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 562 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
424 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
425 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
426 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
427 glPopMatrix; 580 glPopMatrix;
428 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
430} 586}
431 587
432sub _draw { 588sub _draw {
433 my ($self) = @_; 589 my ($self) = @_;
434 590
435 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
436}
437
438sub find_widget {
439 my ($self, $x, $y) = @_;
440
441 return () unless $self->{can_events};
442
443 return $self
444 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447 ()
448}
449
450sub set_parent {
451 my ($self, $parent) = @_;
452
453 Scalar::Util::weaken ($self->{parent} = $parent);
454
455 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size
457 unless exists $self->{req_w};
458
459 $self->show;
460}
461
462sub check_size {
463 my ($self, $forced) = @_;
464
465 $self->{force_alloc} = 1 if $forced;
466 $CFClient::UI::ROOT->{check_size}{$self} = $self;
467}
468
469sub update {
470 my ($self) = @_;
471
472 $self->{parent}->update
473 if $self->{parent};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493} 592}
494 593
495sub DESTROY { 594sub DESTROY {
496 my ($self) = @_; 595 my ($self) = @_;
497 596
… …
529 628
530 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
531 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
532 631
533 glEnable GL_BLEND; 632 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glColor @$color; 634 glColor_premultiply @$color;
536 635
537 glBegin GL_QUADS; 636 glBegin GL_QUADS;
538 glVertex 0 , 0; 637 glVertex 0 , 0;
539 glVertex 0 , $h; 638 glVertex 0 , $h;
540 glVertex $w, $h; 639 glVertex $w, $h;
… …
555 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
556 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
557} 656}
558 657
559sub size_request { 658sub size_request {
560 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
561} 662}
562 663
563sub draw { } 664sub draw { }
564 665
565############################################################################# 666#############################################################################
… …
569our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
570 671
571sub new { 672sub new {
572 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
573 674
574 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
575 676
576 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
577 children => [], 678 children => [],
578 can_events => 0, 679 can_events => 0,
579 %arg, 680 %arg,
580 ); 681 );
682
581 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
582 685
583 $self 686 $self
584} 687}
585 688
586sub add { 689sub add {
… …
594 $self->{children} = [ 697 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
597 ]; 700 ];
598 701
599 $self->check_size (1); 702 $self->realloc;
600 $self->update;
601} 703}
602 704
603sub children { 705sub children {
604 @{ $_[0]{children} } 706 @{ $_[0]{children} }
605} 707}
… …
610 delete $child->{parent}; 712 delete $child->{parent};
611 $child->hide; 713 $child->hide;
612 714
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 716
615 $self->check_size; 717 $self->realloc;
616 $self->update;
617} 718}
618 719
619sub clear { 720sub clear {
620 my ($self) = @_; 721 my ($self) = @_;
621 722
… …
625 for (@$children) { 726 for (@$children) {
626 delete $_->{parent}; 727 delete $_->{parent};
627 $_->hide; 728 $_->hide;
628 } 729 }
629 730
630 $self->check_size; 731 $self->realloc;
631 $self->update;
632} 732}
633 733
634sub find_widget { 734sub find_widget {
635 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
636 736
637 $x -= $self->{x}; 737 $x -= $self->{x};
638 $y -= $self->{y}; 738 $y -= $self->{y};
639 739
640 my $res; 740 my $res;
641 741
642 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
643 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
644 and return $res; 744 and return $res;
645 } 745 }
646 746
647 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
696 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
697} 797}
698 798
699############################################################################# 799#############################################################################
700 800
801# back-buffered drawing area
802
701package CFClient::UI::Window; 803package CFClient::UI::Window;
702 804
703our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
704 806
705use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
723 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
724 $self->update; 826 $self->update;
725} 827}
726 828
727sub _render { 829sub _render {
830 my ($self) = @_;
831
728 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
729} 833}
730 834
731sub render_child { 835sub render_child {
732 my ($self) = @_; 836 my ($self) = @_;
733 837
734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
735 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
736 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
737 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
738 $self->_render; 849 $self->_render;
739 }; 850 };
740} 851}
741 852
742sub _draw { 853sub _draw {
743 my ($self) = @_; 854 my ($self) = @_;
744 855
745 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
746 857
747 my $tex = $self->{texture} 858 my $tex = $self->{texture}
748 or return; 859 or return;
749 860
750 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
752 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
753 864
754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
755 866
756 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
757} 868}
… …
760 871
761package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
762 873
763our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
764 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
765sub size_request { 886sub size_request {
766 my ($self) = @_; 887 my ($self) = @_;
767 888
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769 890
770 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
771} 895}
772 896
773sub size_allocate { 897sub size_allocate {
774 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
775 899
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
777# $w = $self->{w}; 901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
778 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
779 $self->update; 906 $self->update;
780} 907}
781 908
782sub set_offset { 909sub set_offset {
783 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
817} 944}
818 945
819sub _render { 946sub _render {
820 my ($self) = @_; 947 my ($self) = @_;
821 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823 953
824 $self->SUPER::_render; 954 $self->SUPER::_render;
825} 955}
826 956
… …
829package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
830 960
831our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
832 962
833sub new { 963sub new {
834 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
835 967
836 my $self; 968 my $self;
837 969
838 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
839 vertical => 1, 971 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 973 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
843 }, 975 },
844 ; 976 ;
845 977
846 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
847 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
848 slider => $slider, 980 slider => $slider,
849 @_, 981 %arg,
850 ); 982 );
851 983
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
855 986
856 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 1004}
858 1005
859sub size_allocate { 1006sub size_allocate {
860 my ($self, $w, $h) = @_; 1007 my ($self, $w, $h) = @_;
861 1008
… …
890 1037
891 if ($self->{bg}) { 1038 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
893 1040
894 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
896 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
897 1044
898 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
899 glVertex 0 , 0; 1046 glVertex 0 , 0;
900 glVertex 0 , $h; 1047 glVertex 0 , $h;
901 glVertex $w, $h; 1048 glVertex $w, $h;
… …
914 1061
915our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
916 1063
917use CFClient::OpenGL; 1064use CFClient::OpenGL;
918 1065
919my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1073
923sub new { 1074sub new {
924 my $class = shift; 1075 my ($class, %arg) = @_;
925 1076
926 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
927 1078
928 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1082 border => 0.6,
932 is_toplevel => 1,
933 can_events => 1, 1083 can_events => 1,
934 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
935 ); 1087 );
936 1088
937 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
938 align => 0, 1090 align => 0,
939 valign => 1, 1091 valign => 1,
940 text => $self->{title}, 1092 text => $title,
941 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
942 1095
943 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
944} 1104}
945 1105
946sub border { 1106sub border {
947 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
948} 1108}
949 1109
950sub size_request { 1110sub size_request {
951 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
952 1115
953 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
954 1117
955 ( 1118 (
956 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
959} 1122}
960 1123
961sub size_allocate { 1124sub size_allocate {
962 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
963 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
964 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
966 1137
967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
968 if $self->{title};
969
970 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
971} 1139}
972 1140
973sub button_down { 1141sub button_down {
974 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
975 1143
… …
991 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
992 1160
993 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
995 1163
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999 $self->check_size; 1168 $self->realloc;
1000 }; 1169 };
1001 1170
1002 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1175 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1008 1177
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1179
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1013 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1014 } 1188 1
1015} 1189}
1016 1190
1017sub button_up { 1191sub button_up {
1018 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1019 1193
1020 delete $self->{motion}; 1194 !!delete $self->{motion}
1021} 1195}
1022 1196
1023sub mouse_motion { 1197sub mouse_motion {
1024 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1025 1199
1026 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1027} 1203}
1028 1204
1029sub _draw { 1205sub _draw {
1030 my ($self) = @_; 1206 my ($self) = @_;
1031 1207
1208 my $child = $self->{children}[0];
1209
1032 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1034 1212
1035 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037 1215
1038 my $border = $self->border; 1216 my $border = $self->border;
1039 1217
1040 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045 1223
1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1048 1226
1049 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1050 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1051 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1052
1053 glColor @{ $self->{bg} };
1054
1055 $bg->{s} = $rep_x;
1056 $bg->{t} = $rep_y;
1057 $bg->{wrap_mode} = 1;
1058 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 } 1232 }
1060 1233
1061 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1062 1235
1063 $self->{title}->draw if $self->{title};
1064
1065 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1066} 1242}
1067 1243
1068############################################################################# 1244#############################################################################
1069 1245
1070package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1078sub new { 1254sub new {
1079 my $class = shift; 1255 my $class = shift;
1080 1256
1081 $class->SUPER::new ( 1257 $class->SUPER::new (
1082 col_expand => [], 1258 col_expand => [],
1083 @_ 1259 @_,
1084 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1265}
1086 1266
1087sub add { 1267sub add {
1088 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1089 1269
1090 $child->set_parent ($self); 1270 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1092 1272
1093 $child->check_size; 1273 $self->realloc;
1094} 1274}
1095 1275
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1277sub clear {
1102 my ($self) = @_; 1278 my ($self) = @_;
1103 1279
1104 my @children = $self->children; 1280 my @children = $self->children;
1105 delete $self->{children}; 1281 delete $self->{children};
… …
1107 for (@children) { 1283 for (@children) {
1108 delete $_->{parent}; 1284 delete $_->{parent};
1109 $_->hide; 1285 $_->hide;
1110 } 1286 }
1111 1287
1112 $self->update; 1288 $self->realloc;
1113} 1289}
1114 1290
1115sub get_wh { 1291sub get_wh {
1116 my ($self) = @_; 1292 my ($self) = @_;
1117 1293
… …
1148sub size_allocate { 1324sub size_allocate {
1149 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1150 1326
1151 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1152 1328
1153 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1155 1331
1156 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1389 }
1214} 1390}
1215 1391
1216############################################################################# 1392#############################################################################
1217 1393
1218package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1395
1222our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1223 1397
1224sub size_request { 1398sub size_request {
1225 my ($self) = @_; 1399 my ($self) = @_;
1226 1400
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1228 1402 ? (
1229 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1405 )
1232 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1233} 1410}
1234 1411
1235sub size_allocate { 1412sub size_allocate {
1236 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1237 1414
1238 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1416 my $children = $self->{children};
1241 1417
1242 my @h = map $_->{req_w}, @$children; 1418 my @req;
1243 1419
1244 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1245 1421 @req = ($space / (@$children || 1)) x @$children;
1246 if ($req_h > $h) {
1247 # ah well, not enough space
1248 $_ *= $h / $req_h for @h;
1249 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1253 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1254 my $child = $children->[$_];
1255
1256 my $alloc_h = $h[$_];
1257 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258 $h[$_] = $alloc_h;
1259 } 1436 }
1260 } 1437 }
1261 1438
1262 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1263 1440
1264 my $y = 0; 1441 my $pos = 0;
1265 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1445
1270 $y += $h; 1446 $pos += $alloc;
1271 } 1447 }
1272 1448
1273 1 1449 1
1274} 1450}
1275 1451
1276############################################################################# 1452#############################################################################
1277 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1278package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1279 1470
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1283 1472
1284sub size_request { 1473sub new {
1285 my ($self) = @_; 1474 my $class = shift;
1286 1475
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1288 1477 vertical => 1,
1289 ( 1478 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1479 )
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300 my $children = $self->{children};
1301
1302 my @h = map $_->{req_h}, @$children;
1303
1304 my $req_h = List::Util::sum @h;
1305
1306 if ($req_h > $h) {
1307 # ah well, not enough space
1308 $_ *= $h / $req_h for @h;
1309 } else {
1310 my $exp = List::Util::sum map $_->{expand}, @$children;
1311 $exp ||= 1;
1312
1313 for (0 .. $#$children) {
1314 my $child = $children->[$_];
1315
1316 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317 }
1318 }
1319
1320 CFClient::UI::harmonize \@h;
1321
1322 my $y = 0;
1323 for (0 .. $#$children) {
1324 my $child = $children->[$_];
1325 my $h = $h[$_];
1326 $child->configure (0, $y, $w, $h);
1327
1328 $y += $h;
1329 }
1330
1331 1
1332} 1480}
1333 1481
1334############################################################################# 1482#############################################################################
1335 1483
1336package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1353 ellipsise => 3, # end 1501 ellipsise => 3, # end
1354 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1355 fontsize => 1, 1503 fontsize => 1,
1356 align => -1, 1504 align => -1,
1357 valign => -1, 1505 valign => -1,
1358 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1359 can_events => 0, 1508 can_events => 0,
1360 %arg 1509 %arg
1361 ); 1510 );
1362 1511
1363 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1390 1539
1391 delete $self->{texture}; 1540 delete $self->{texture};
1392 $self->SUPER::update; 1541 $self->SUPER::update;
1393} 1542}
1394 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1395sub set_text { 1551sub set_text {
1396 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1397 1553
1398 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1399 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1400 1556
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1403 1560
1561 $self->realloc;
1404 $self->update; 1562 $self->update;
1405 $self->check_size;
1406} 1563}
1407 1564
1408sub set_markup { 1565sub set_markup {
1409 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1410 1567
… …
1413 1570
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1572
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1418 1576
1577 $self->realloc;
1419 $self->update; 1578 $self->update;
1420 $self->check_size;
1421} 1579}
1422 1580
1423sub size_request { 1581sub size_request {
1424 my ($self) = @_; 1582 my ($self) = @_;
1425 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1426 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1427 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1592
1432 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1433 1594
1434 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1435 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1436 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1437 1598
1438 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1439 1600
1440 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1441 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1442 } 1603 }
1443 1604
1605 ($w, $h)
1444 ( 1606 }
1445 $w + $self->{padding} * 2,
1446 $h + $self->{padding} * 2,
1447 )
1448} 1607}
1449 1608
1450sub size_allocate { 1609sub size_allocate {
1451 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1452 1611
1612 delete $self->{ox};
1613
1453 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454} 1616}
1455 1617
1456sub set_fontsize { 1618sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1458 1620
1459 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1622 delete $self->{texture};
1461 1623
1462 $self->update; 1624 $self->realloc;
1463 $self->check_size;
1464} 1625}
1465 1626
1466sub _draw { 1627sub _draw {
1467 my ($self) = @_; 1628 my ($self) = @_;
1468 1629
… …
1474 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478 1639
1479 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1480 1642
1643 unless (exists $self->{ox}) {
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1484 1647
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1490 }; 1651 };
1491 1652
1492 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1655
1656 glColor_premultiply @{$self->{fg}}
1495 if ($tex->{format} == GL_ALPHA) { 1657 if $tex->{format} == GL_ALPHA;
1496 glColor @{$self->{fg}}; 1658
1497 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1498 } else {
1499 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1500 }
1501 1660
1502 glDisable GL_TEXTURE_2D; 1661 glDisable GL_TEXTURE_2D;
1503} 1662}
1504 1663
1505############################################################################# 1664#############################################################################
… …
1532 1691
1533 delete $self->{cur_h}; 1692 delete $self->{cur_h};
1534 1693
1535 return if $self->{text} eq $text; 1694 return if $self->{text} eq $text;
1536 1695
1537 delete $self->{texture};
1538
1539 $self->{last_activity} = $::NOW; 1696 $self->{last_activity} = $::NOW;
1540 $self->{text} = $text; 1697 $self->{text} = $text;
1541 1698
1542 $text =~ s/./*/g if $self->{hidden}; 1699 $text =~ s/./*/g if $self->{hidden};
1543 $self->{layout}->set_text ("$text "); 1700 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h};
1544 1702
1545 $self->_emit (changed => $self->{text}); 1703 $self->_emit (changed => $self->{text});
1704
1705 $self->realloc;
1706 $self->update;
1546} 1707}
1547 1708
1548sub set_text { 1709sub set_text {
1549 my ($self, $text) = @_; 1710 my ($self, $text) = @_;
1550 1711
1551 $self->{cursor} = length $text; 1712 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1713 $self->_set_text ($text);
1553 $self->update;
1554 $self->check_size;
1555} 1714}
1556 1715
1557sub get_text { 1716sub get_text {
1558 $_[0]{text} 1717 $_[0]{text}
1559} 1718}
… …
1562 my ($self) = @_; 1721 my ($self) = @_;
1563 1722
1564 my ($w, $h) = $self->SUPER::size_request; 1723 my ($w, $h) = $self->SUPER::size_request;
1565 1724
1566 ($w + 1, $h) # add 1 for cursor 1725 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1726}
1574 1727
1575sub key_down { 1728sub key_down {
1576 my ($self, $ev) = @_; 1729 my ($self, $ev) = @_;
1577 1730
… …
1595 $self->{cursor} = length $text; 1748 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1749 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1750 $self->_emit ('escape');
1598 } elsif ($uni) { 1751 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1752 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else {
1754 return 0;
1600 } 1755 }
1601 1756
1602 $self->_set_text ($text); 1757 $self->_set_text ($text);
1603 $self->update; 1758
1604 $self->check_size; 1759 $self->realloc;
1760
1761 1
1605} 1762}
1606 1763
1607sub focus_in { 1764sub focus_in {
1608 my ($self) = @_; 1765 my ($self) = @_;
1609 1766
… …
1624 utf8::encode $text; 1781 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1782 $self->{cursor} = length substr $text, 0, $idx;
1626 1783
1627 $self->_set_text ($self->{text}); 1784 $self->_set_text ($self->{text});
1628 $self->update; 1785 $self->update;
1786
1787 1
1629} 1788}
1630 1789
1631sub mouse_motion { 1790sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1791 my ($self, $ev, $x, $y) = @_;
1633# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1792# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793
1794 0
1634} 1795}
1635 1796
1636sub _draw { 1797sub _draw {
1637 my ($self) = @_; 1798 my ($self) = @_;
1638 1799
1639 local $self->{fg} = $self->{fg}; 1800 local $self->{fg} = $self->{fg};
1640 1801
1641 if ($FOCUS == $self) { 1802 if ($FOCUS == $self) {
1642 glColor @{$self->{active_bg}}; 1803 glColor_premultiply @{$self->{active_bg}};
1643 $self->{fg} = $self->{active_fg}; 1804 $self->{fg} = $self->{active_fg};
1644 } else { 1805 } else {
1645 glColor @{$self->{bg}}; 1806 glColor_premultiply @{$self->{bg}};
1646 } 1807 }
1647 1808
1648 glEnable GL_BLEND; 1809 glEnable GL_BLEND;
1649 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1810 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1650 glBegin GL_QUADS; 1811 glBegin GL_QUADS;
1651 glVertex 0 , 0; 1812 glVertex 0 , 0;
1652 glVertex 0 , $self->{h}; 1813 glVertex 0 , $self->{h};
1653 glVertex $self->{w}, $self->{h}; 1814 glVertex $self->{w}, $self->{h};
1654 glVertex $self->{w}, 0; 1815 glVertex $self->{w}, 0;
… …
1715 } else { 1876 } else {
1716 $self->set_text ($self->{history_saveback}); 1877 $self->set_text ($self->{history_saveback});
1717 } 1878 }
1718 1879
1719 } else { 1880 } else {
1720 $self->SUPER::key_down ($ev); 1881 return $self->SUPER::key_down ($ev)
1882 }
1883
1721 } 1884 1
1722
1723} 1885}
1724 1886
1725############################################################################# 1887#############################################################################
1726 1888
1727package CFClient::UI::Button; 1889package CFClient::UI::Button;
… …
1736 1898
1737sub new { 1899sub new {
1738 my $class = shift; 1900 my $class = shift;
1739 1901
1740 $class->SUPER::new ( 1902 $class->SUPER::new (
1741 padding => 4, 1903 padding_x => 4,
1904 padding_y => 4,
1742 fg => [1, 1, 1], 1905 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1906 active_fg => [0, 0, 1],
1744 can_hover => 1, 1907 can_hover => 1,
1745 align => 0, 1908 align => 0,
1746 valign => 0, 1909 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1918 my ($self, $ev, $x, $y) = @_;
1756 1919
1757 $self->emit ("activate") 1920 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1921 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1922 && $y >= 0 && $y < $self->{h};
1923
1924 1
1760} 1925}
1761 1926
1762sub _draw { 1927sub _draw {
1763 my ($self) = @_; 1928 my ($self) = @_;
1764 1929
1765 local $self->{fg} = $self->{fg}; 1930 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1766
1767 if ($GRAB == $self) {
1768 $self->{fg} = $self->{active_fg};
1769 }
1770 1931
1771 glEnable GL_TEXTURE_2D; 1932 glEnable GL_TEXTURE_2D;
1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1773 glColor 0, 0, 0, 1; 1934 glColor 0, 0, 0, 1;
1774 1935
… …
1793 1954
1794sub new { 1955sub new {
1795 my $class = shift; 1956 my $class = shift;
1796 1957
1797 $class->SUPER::new ( 1958 $class->SUPER::new (
1798 padding => 2, 1959 padding_x => 2,
1960 padding_y => 2,
1799 fg => [1, 1, 1], 1961 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 1962 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 1963 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 1964 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 1965 state => 0,
… …
1807} 1969}
1808 1970
1809sub size_request { 1971sub size_request {
1810 my ($self) = @_; 1972 my ($self) = @_;
1811 1973
1812 ($self->{padding} * 2 + 6) x 2 1974 (6) x 2
1813} 1975}
1814 1976
1815sub button_down { 1977sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1817 1979
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 1982 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 1983 $self->_emit (changed => $self->{state});
1984 } else {
1985 return 0
1986 }
1987
1822 } 1988 1
1823} 1989}
1824 1990
1825sub _draw { 1991sub _draw {
1826 my ($self) = @_; 1992 my ($self) = @_;
1827 1993
1828 $self->SUPER::_draw; 1994 $self->SUPER::_draw;
1829 1995
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1996 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 1997
1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1998 my ($w, $h) = @$self{qw(w h)};
1999
2000 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833 2001
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2002 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 2003
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2004 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 2005
… …
1992 2160
1993 my $h1 = $self->{h} * (1 - $ycut1); 2161 my $h1 = $self->{h} * (1 - $ycut1);
1994 my $h2 = $self->{h} * (1 - $ycut2); 2162 my $h2 = $self->{h} * (1 - $ycut2);
1995 2163
1996 glEnable GL_BLEND; 2164 glEnable GL_BLEND;
1997 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1998 glEnable GL_TEXTURE_2D; 2167 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 2169
2001 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2170 glBindTexture GL_TEXTURE_2D, $t1->{name};
2002 glBegin GL_QUADS; 2171 glBegin GL_QUADS;
… …
2102 fg => [1, 1, 1], 2271 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2272 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2273 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2274 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2275 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2276 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2277 min_h => $::WIDTH / 80,
2109 vertical => 0, 2278 vertical => 0,
2110 can_hover => 1, 2279 can_hover => 1,
2111 inner_pad => 0.02, 2280 inner_pad => 0.02,
2112 @_ 2281 @_
2113 ); 2282 );
… …
2116 $self->update; 2285 $self->update;
2117 2286
2118 $self 2287 $self
2119} 2288}
2120 2289
2290sub changed { }
2291
2121sub set_range { 2292sub set_range {
2122 my ($self, $range) = @_; 2293 my ($self, $range) = @_;
2123 2294
2124 $self->{range} = $range; 2295 ($range, $self->{range}) = ($self->{range}, $range);
2125 2296
2126 $self->update; 2297 $self->update
2298 if "@$range" ne "@{$self->{range}}";
2127} 2299}
2128 2300
2129sub set_value { 2301sub set_value {
2130 my ($self, $value) = @_; 2302 my ($self, $value) = @_;
2131 2303
… …
2150} 2322}
2151 2323
2152sub size_request { 2324sub size_request {
2153 my ($self) = @_; 2325 my ($self) = @_;
2154 2326
2155 my $w = $self->{req_w}; 2327 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2328}
2160 2329
2161sub button_down { 2330sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2331 my ($self, $ev, $x, $y) = @_;
2163 2332
2164 $self->SUPER::button_down ($ev, $x, $y); 2333 $self->SUPER::button_down ($ev, $x, $y);
2165 2334
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2336
2168 $self->mouse_motion ($ev, $x, $y); 2337 $self->mouse_motion ($ev, $x, $y)
2169} 2338}
2170 2339
2171sub mouse_motion { 2340sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2341 my ($self, $ev, $x, $y) = @_;
2173 2342
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2346 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2347
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2348 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2349
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2350 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2351 } else {
2352 return 0;
2353 }
2354
2182 } 2355 1
2183} 2356}
2184 2357
2185sub update { 2358sub update {
2186 my ($self) = @_; 2359 my ($self) = @_;
2187 2360
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2361 delete $self->{knob_w};
2362 $self->SUPER::update;
2363}
2364
2365sub _draw {
2366 my ($self) = @_;
2367
2368 unless ($self->{knob_w}) {
2189 $self->set_value ($self->{range}[0]); 2369 $self->set_value ($self->{range}[0]);
2190 2370
2191 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2371 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100; 2372 my $range = ($hi - $page - $lo) || 1e-100;
2193 2373
… …
2199 $value = ($value - $lo) / $range; 2379 $value = ($value - $lo) / $range;
2200 $value = $value * $self->{scale} + $self->{offset}; 2380 $value = $value * $self->{scale} + $self->{offset};
2201 2381
2202 $self->{knob_x} = $value - $knob_w * 0.5; 2382 $self->{knob_x} = $value - $knob_w * 0.5;
2203 $self->{knob_w} = $knob_w; 2383 $self->{knob_w} = $knob_w;
2204 }); 2384 }
2205
2206 $self->SUPER::update;
2207}
2208
2209sub _draw {
2210 my ($self) = @_;
2211 2385
2212 $self->SUPER::_draw (); 2386 $self->SUPER::_draw ();
2213 2387
2214 glScale $self->{w}, $self->{h}; 2388 glScale $self->{w}, $self->{h};
2215 2389
… …
2409 2583
2410 delete $self->{texture}; 2584 delete $self->{texture};
2411 } 2585 }
2412 2586
2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2414 glClearColor 0.5, 0.5, 0.5, 0; 2588 glClearColor 0, 0, 0, 0;
2415 glClear GL_COLOR_BUFFER_BIT; 2589 glClear GL_COLOR_BUFFER_BIT;
2416 2590
2417 my $top = int $self->{children}[1]{range}[0]; 2591 my $top = int $self->{children}[1]{range}[0];
2418 2592
2419 my $y0 = $top; 2593 my $y0 = $top;
… …
2454sub _draw { 2628sub _draw {
2455 my ($self) = @_; 2629 my ($self) = @_;
2456 2630
2457 glEnable GL_TEXTURE_2D; 2631 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2633 glColor 0, 0, 0, 1;
2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2634 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2461 glDisable GL_TEXTURE_2D; 2635 glDisable GL_TEXTURE_2D;
2462 2636
2463 $self->{children}[1]->draw; 2637 $self->{children}[1]->draw;
2464 2638
2465} 2639}
… …
2514 2688
2515sub new { 2689sub new {
2516 my $class = shift; 2690 my $class = shift;
2517 2691
2518 my $self = $class->SUPER::new ( 2692 my $self = $class->SUPER::new (
2519 state => 0, 2693 state => 0,
2520 connect_activate => \&toggle_flopper, 2694 on_activate => \&toggle_flopper,
2521 @_ 2695 @_
2522 ); 2696 );
2523 2697
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2698 $self
2530} 2699}
2531 2700
2532sub toggle_flopper { 2701sub toggle_flopper {
2533 my ($self) = @_; 2702 my ($self) = @_;
2534 2703
2535 # TODO: use animation 2704 $self->{other}->toggle_visibility;
2536 if ($self->{state} = !$self->{state}) {
2537 $CFClient::UI::ROOT->add ($self->{other});
2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2539 $self->_emit ("open");
2540 } else {
2541 $CFClient::UI::ROOT->remove ($self->{other});
2542 $self->_emit ("close");
2543 }
2544
2545 $self->_emit (changed => $self->{state});
2546} 2705}
2547 2706
2548############################################################################# 2707#############################################################################
2549 2708
2550package CFClient::UI::Tooltip; 2709package CFClient::UI::Tooltip;
… …
2563} 2722}
2564 2723
2565sub set_tooltip_from { 2724sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2725 my ($self, $widget) = @_;
2567 2726
2727 my $tooltip = $widget->{tooltip};
2728
2729 if ($ENV{CFPLUS_DEBUG} & 2) {
2730 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}";
2734 }
2735
2568 $self->add (new CFClient::UI::Label 2736 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2737 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2739 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2740 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2741 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2742 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2753
2586sub size_allocate { 2754sub size_allocate {
2587 my ($self, $w, $h) = @_; 2755 my ($self, $w, $h) = @_;
2588 2756
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2757 $self->SUPER::size_allocate ($w - 4, $h - 4);
2758}
2759
2760sub visibility_change {
2761 my ($self, $visible) = @_;
2762
2763 return unless $visible;
2764
2765 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 my $widget = $self->{owner}
2767 or return;
2768
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH;
2773
2774 $self->move_abs ($x, $y);
2775 });
2590} 2776}
2591 2777
2592sub _draw { 2778sub _draw {
2593 my ($self) = @_; 2779 my ($self) = @_;
2594 2780
… …
2611 glVertex $w, $h; 2797 glVertex $w, $h;
2612 glVertex $w, 0; 2798 glVertex $w, 0;
2613 glEnd; 2799 glEnd;
2614 2800
2615 glTranslate 2 - 0.375, 2 - 0.375; 2801 glTranslate 2 - 0.375, 2 - 0.375;
2802
2616 $self->SUPER::_draw; 2803 $self->SUPER::_draw;
2617} 2804}
2618 2805
2619############################################################################# 2806#############################################################################
2620 2807
… …
2626 2813
2627sub new { 2814sub new {
2628 my $class = shift; 2815 my $class = shift;
2629 2816
2630 my $self = $class->SUPER::new ( 2817 my $self = $class->SUPER::new (
2631 aspect => 1, 2818 aspect => 1,
2819 can_events => 0,
2632 @_, 2820 @_,
2633 ); 2821 );
2634 2822
2635 if ($self->{anim} && $self->{animspeed}) { 2823 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2824 Scalar::Util::weaken (my $widget = $self);
… …
2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2866 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2679 2867
2680 if ($tex) { 2868 if ($tex) {
2681 glEnable GL_TEXTURE_2D; 2869 glEnable GL_TEXTURE_2D;
2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2683 glColor 1, 1, 1, 1; 2871 glColor 0, 0, 0, 1;
2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2685 glDisable GL_TEXTURE_2D; 2873 glDisable GL_TEXTURE_2D;
2686 } 2874 }
2687} 2875}
2688 2876
… …
2695 $self->SUPER::DESTROY; 2883 $self->SUPER::DESTROY;
2696} 2884}
2697 2885
2698############################################################################# 2886#############################################################################
2699 2887
2700package CFClient::UI::InventoryItem; 2888package CFClient::UI::Buttonbar;
2701 2889
2702our @ISA = CFClient::UI::HBox::; 2890our @ISA = CFClient::UI::HBox::;
2703 2891
2704sub _item_to_desc { 2892# TODO: should actualyl wrap buttons and other goodies.
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729
2730sub new {
2731 my $class = shift;
2732
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table),
2821 @_,
2822 );
2823
2824 $self
2825}
2826
2827sub set_items {
2828 my ($self, $items) = @_;
2829
2830 $self->{scrolled}->clear;
2831 return unless $items;
2832
2833 my @items = sort {
2834 ($a->{type} <=> $b->{type})
2835 or ($a->{name} cmp $b->{name})
2836 } @$items;
2837
2838 $self->{real_items} = \@items;
2839
2840 for my $item (@items) {
2841 $item->{item} = $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845
2846 my $i = 0;
2847 for (@items) {
2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854}
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859}
2860 2893
2861############################################################################# 2894#############################################################################
2862 2895
2863package CFClient::UI::Menu; 2896package CFClient::UI::Menu;
2864 2897
… …
2905 # maybe save $GRAB? must be careful about events... 2938 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 2939 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 2940 $self->{button} = $ev->{button};
2908 2941
2909 $self->show; 2942 $self->show;
2910 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911} 2944}
2912 2945
2913sub mouse_motion { 2946sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2947 my ($self, $ev, $x, $y) = @_;
2915 2948
2916 # TODO: should use vbox->find_widget or so 2949 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 2951 $self->{hover} = $self->{item}{$HOVER};
2952
2953 0
2919} 2954}
2920 2955
2921sub button_up { 2956sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 2957 my ($self, $ev, $x, $y) = @_;
2923 2958
… …
2925 undef $GRAB; 2960 undef $GRAB;
2926 $self->hide; 2961 $self->hide;
2927 2962
2928 $self->_emit ("popdown"); 2963 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 2964 $self->{hover}[1]->() if $self->{hover};
2965 } else {
2966 return 0
2967 }
2968
2930 } 2969 1
2931} 2970}
2932 2971
2933############################################################################# 2972#############################################################################
2934 2973
2935package CFClient::UI::Statusbox; 2974package CFClient::UI::Multiplexer;
2936 2975
2937our @ISA = CFClient::UI::VBox::; 2976our @ISA = CFClient::UI::Container::;
2938 2977
2939sub new { 2978sub new {
2940 my $class = shift; 2979 my $class = shift;
2941 2980
2942 $class->SUPER::new ( 2981 my $self = $class->SUPER::new (
2982 @_,
2983 );
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987
2988 $self
2989}
2990
2991sub add {
2992 my ($self, @widgets) = @_;
2993
2994 $self->SUPER::add (@widgets);
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998}
2999
3000sub set_current_page {
3001 my ($self, $page_or_widget) = @_;
3002
3003 my $widget = ref $page_or_widget
3004 ? $page_or_widget
3005 : $self->{children}[$page_or_widget];
3006
3007 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009
3010 $self->_emit (page_changed => $self->{current});
3011
3012 $self->realloc;
3013}
3014
3015sub visible_children {
3016 $_[0]{current}
3017}
3018
3019sub size_request {
3020 my ($self) = @_;
3021
3022 $self->{current}->size_request
3023}
3024
3025sub size_allocate {
3026 my ($self, $w, $h) = @_;
3027
3028 $self->{current}->configure (0, 0, $w, $h);
3029}
3030
3031sub _draw {
3032 my ($self) = @_;
3033
3034 $self->{current}->draw;
3035}
3036
3037#############################################################################
3038
3039package CFClient::UI::Notebook;
3040
3041our @ISA = CFClient::UI::VBox::;
3042
3043sub new {
3044 my $class = shift;
3045
3046 my $self = $class->SUPER::new (
3047 buttonbar => (new CFClient::UI::Buttonbar),
3048 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3049 # filter => # will be put between multiplexer and $self
3050 @_,
3051 );
3052
3053 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3054 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3055
3056 $self
3057}
3058
3059sub add {
3060 my ($self, $title, $widget, $tooltip) = @_;
3061
3062 Scalar::Util::weaken $self;
3063
3064 $self->{buttonbar}->add (new CFClient::UI::Button
3065 markup => $title,
3066 tooltip => $tooltip,
3067 on_activate => sub { $self->set_current_page ($widget) },
3068 );
3069
3070 $self->{multiplexer}->add ($widget);
3071}
3072
3073sub set_current_page {
3074 my ($self, $page) = @_;
3075
3076 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current});
3078}
3079
3080#############################################################################
3081
3082package CFClient::UI::Statusbox;
3083
3084our @ISA = CFClient::UI::VBox::;
3085
3086sub new {
3087 my $class = shift;
3088
3089 my $self = $class->SUPER::new (
2943 fontsize => 0.8, 3090 fontsize => 0.8,
2944 @_, 3091 @_,
2945 ) 3092 );
3093
3094 Scalar::Util::weaken (my $this = $self);
3095
3096 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3097
3098 $self
2946} 3099}
2947 3100
2948sub reorder { 3101sub reorder {
2949 my ($self) = @_; 3102 my ($self) = @_;
2950 my $NOW = time; 3103 my $NOW = Time::HiRes::time;
3104
3105 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} };
2951 3109
2952 while (my ($k, $v) = each %{ $self->{item} }) { 3110 while (my ($k, $v) = each %{ $self->{item} }) {
2953 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3111 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2954 } 3112 }
2955 3113
… …
2958 my @items = sort { 3116 my @items = sort {
2959 $a->{pri} <=> $b->{pri} 3117 $a->{pri} <=> $b->{pri}
2960 or $b->{id} <=> $a->{id} 3118 or $b->{id} <=> $a->{id}
2961 } values %{ $self->{item} }; 3119 } values %{ $self->{item} };
2962 3120
3121 $self->{timer}->interval (1);
3122
2963 my $count = 10 + 1; 3123 my $count = 10 + 1;
2964 for my $item (@items) { 3124 for my $item (@items) {
2965 last unless --$count; 3125 last unless --$count;
2966 3126
2967 push @widgets, $item->{label} ||= do { 3127 my $label = $item->{label} ||= do {
2968 # TODO: doesn't handle markup well (read as: at all) 3128 # TODO: doesn't handle markup well (read as: at all)
2969 my $short = $item->{count} > 1 3129 my $short = $item->{count} > 1
2970 ? "<b>$item->{count} ×</b> $item->{text}" 3130 ? "<b>$item->{count} ×</b> $item->{text}"
2971 : $item->{text}; 3131 : $item->{text};
2972 3132
… …
2980 tooltip => $item->{tooltip}, 3140 tooltip => $item->{tooltip},
2981 tooltip_font => $::FONT_PROP, 3141 tooltip_font => $::FONT_PROP,
2982 tooltip_width => 0.67, 3142 tooltip_width => 0.67,
2983 fontsize => $item->{fontsize} || $self->{fontsize}, 3143 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44, 3144 max_w => $::WIDTH * 0.44,
2985 fg => $item->{fg}, 3145 fg => [@{ $item->{fg} }],
2986 can_events => 1, 3146 can_events => 1,
2987 can_hover => 1 3147 can_hover => 1
2988 }; 3148 };
3149
3150 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3151 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3152 $label->update;
3153 $label->set_max_size (undef, $label->{req_h} * $diff)
3154 if $diff < 1;
3155 $self->{timer}->interval (1/30);
3156 } else {
3157 $label->{fg}[3] = $item->{fg}[3] || 1;
3158 }
3159
3160 push @widgets, $label;
2989 } 3161 }
2990 3162
2991 $self->clear; 3163 $self->clear;
2992 $self->SUPER::add (reverse @widgets); 3164 $self->SUPER::add (reverse @widgets);
2993} 3165}
… …
2996 my ($self, $text, %arg) = @_; 3168 my ($self, $text, %arg) = @_;
2997 3169
2998 $text =~ s/^\s+//; 3170 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3171 $text =~ s/\s+$//;
3000 3172
3173 return unless $text;
3174
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3175 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3002 3176
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3177 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3178
3005 if (my $item = $self->{item}{$group}) { 3179 if (my $item = $self->{item}{$group}) {
3006 if ($item->{text} eq $text) { 3180 if ($item->{text} eq $text) {
… …
3036 3210
3037 $self->reorder; 3211 $self->reorder;
3038 $self->SUPER::reconfigure; 3212 $self->SUPER::reconfigure;
3039} 3213}
3040 3214
3215sub DESTROY {
3216 my ($self) = @_;
3217
3218 $self->{timer}->cancel;
3219
3220 $self->SUPER::DESTROY;
3221}
3222
3041############################################################################# 3223#############################################################################
3042 3224
3043package CFClient::UI::Root; 3225package CFClient::UI::Inventory;
3044 3226
3045our @ISA = CFClient::UI::Container::; 3227our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3228
3049sub new { 3229sub new {
3050 my $class = shift; 3230 my $class = shift;
3051 3231
3052 $class->SUPER::new ( 3232 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234 @_,
3235 );
3236
3237 $self
3238}
3239
3240sub set_items {
3241 my ($self, $items) = @_;
3242
3243 $self->{child}->clear;
3244 return unless $items;
3245
3246 my @items = sort {
3247 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name})
3249 } @$items;
3250
3251 $self->{real_items} = \@items;
3252
3253 my $row = 0;
3254 for my $item (@items) {
3255 CFClient::Item::update_widgets $item;
3256
3257 $self->{child}->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget});
3260
3261 $row++;
3262 }
3263}
3264
3265#############################################################################
3266
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 }
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::SpellList;
3465
3466our @ISA = CFClient::UI::Table::;
3467
3468sub new {
3469 my $class = shift;
3470
3471 my $self = $class->SUPER::new (
3472 binding => [],
3473 commands => [],
3053 @_, 3474 @_,
3054 ) 3475 )
3055} 3476}
3056 3477
3057sub configure { 3478# XXX: Do sorting? Argl...
3058 my ($self, $x, $y, $w, $h) = @_; 3479sub add_spell {
3059
3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
3063
3064sub check_size {
3065 my ($self) = @_; 3480 my ($self, $spell) = @_;
3481 $self->{spells}->{$spell->{name}} = $spell;
3066 3482
3067 $self->size_allocate ($self->{w}, $self->{h}) 3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3068 if $self->{w}; 3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510}
3511
3512sub remove_spell {
3513 my ($self, $spell) = @_;
3514 delete $self->{spells}->{$spell->{name}};
3515 $self->rebuild_spell_list;
3516}
3517
3518#############################################################################
3519
3520package CFClient::UI::Root;
3521
3522our @ISA = CFClient::UI::Container::;
3523
3524use List::Util qw(min max);
3525
3526use CFClient::OpenGL;
3527
3528sub new {
3529 my $class = shift;
3530
3531 my $self = $class->SUPER::new (
3532 visible => 1,
3533 @_,
3534 );
3535
3536 Scalar::Util::weaken ($self->{root} = $self);
3537
3538 $self
3069} 3539}
3070 3540
3071sub size_request { 3541sub size_request {
3072 my ($self) = @_; 3542 my ($self) = @_;
3073 3543
3074 ($self->{w}, $self->{h}) 3544 ($self->{w}, $self->{h})
3545}
3546
3547sub _to_pixel {
3548 my ($coord, $size, $max) = @_;
3549
3550 $coord =
3551 $coord eq "center" ? ($max - $size) * 0.5
3552 : $coord eq "max" ? $max
3553 : $coord;
3554
3555 $coord = 0 if $coord < 0;
3556 $coord = $max - $size if $coord > $max - $size;
3557
3558 int $coord + 0.5
3075} 3559}
3076 3560
3077sub size_allocate { 3561sub size_allocate {
3078 my ($self, $w, $h) = @_; 3562 my ($self, $w, $h) = @_;
3079 3563
3080 for my $child ($self->children) { 3564 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3565 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3566
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3567 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3568 $Y = $child->{force_y} if exists $child->{force_y};
3085 3569
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3570 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3571 $Y = _to_pixel $Y, $H, $self->{h};
3088
3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091 3572
3092 $child->configure ($X, $Y, $W, $H); 3573 $child->configure ($X, $Y, $W, $H);
3093 } 3574 }
3094} 3575}
3095 3576
… …
3106} 3587}
3107 3588
3108sub update { 3589sub update {
3109 my ($self) = @_; 3590 my ($self) = @_;
3110 3591
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3592 $::WANT_REFRESH++;
3113} 3593}
3114 3594
3115sub add { 3595sub add {
3116 my ($self, @children) = @_; 3596 my ($self, @children) = @_;
3117 3597
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
3124 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3598 $_->{is_toplevel} = 1
3126 3599 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3600
3132 $self->SUPER::add (@children); 3601 $self->SUPER::add (@children);
3133} 3602}
3134 3603
3135sub remove { 3604sub remove {
3136 my ($self, @children) = @_; 3605 my ($self, @children) = @_;
3137 3606
3138 $self->SUPER::remove (@children); 3607 $self->SUPER::remove (@children);
3608
3609 delete $self->{is_toplevel}
3610 for @children;
3139 3611
3140 while (@children) { 3612 while (@children) {
3141 my $w = pop @children; 3613 my $w = pop @children;
3142 push @children, $w->children; 3614 push @children, $w->children;
3143 $w->set_invisible; 3615 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3634 while ($self->{refresh_hook}) {
3163 $_->() 3635 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3636 for values %{delete $self->{refresh_hook}};
3165 } 3637 }
3166 3638
3167 if ($self->{check_size}) { 3639 if ($self->{realloc}) {
3168 my @queue = ([], []); 3640 my %queue;
3641 my @queue;
3642 my $widget;
3169 3643
3170 for (;;) { 3644 outer:
3171 if ($self->{check_size}) { 3645 while () {
3172 # heuristic: check containers last 3646 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3647 for $widget (values %$realloc) {
3174 for values %{delete $self->{check_size}} 3648 $widget->{visible} or next; # do not resize invisible widgets
3649
3650 $queue{$widget+0}++ and next; # duplicates are common
3651
3652 push @{ $queue[$widget->{visible}] }, $widget;
3653 }
3175 } 3654 }
3176 3655
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3656 while () {
3657 @queue or last outer;
3178 3658
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3659 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3660 and last;
3181 : $widget->size_request;
3182
3183 if (delete $widget->{force_alloc}
3184 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186 3661
3662 pop @queue;
3663 }
3664
3665 delete $queue{$widget+0};
3666
3667 my ($w, $h) = $widget->size_request;
3668
3669 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3670 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3671
3672 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3673 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3674
3675 $w = $widget->{force_w} if exists $widget->{force_w};
3676 $h = $widget->{force_h} if exists $widget->{force_h};
3677
3678 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3679 || delete $widget->{force_realloc}) {
3187 $widget->{req_w} = $w; 3680 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3681 $widget->{req_h} = $h;
3189 3682
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3683 $self->{size_alloc}{$widget+0} = $widget;
3191 3684
3192 $widget->{parent}->check_size
3193 if $widget->{parent}; 3685 if (my $parent = $widget->{parent}) {
3686 $self->{realloc}{$parent+0} = $parent
3687 unless $queue{$parent+0};
3688
3689 $parent->{force_size_alloc} = 1;
3690 $self->{size_alloc}{$parent+0} = $parent;
3691 }
3194 } 3692 }
3693
3694 delete $self->{realloc}{$widget+0};
3195 } 3695 }
3196 } 3696 }
3197 3697
3198 while ($self->{size_alloc}) { 3698 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3699 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 my ($widget, $w, $h) = @$_; 3700 values %$size_alloc;
3701
3702 while () {
3703 my $widget = pop @queue || last;
3704
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201 3706
3202 $w = 0 if $w < 0; 3707 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3708 $h = 0 if $h < 0;
3204 3709
3710 $w = int $w + 0.5;
3711 $h = int $h + 0.5;
3712
3713 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714 $widget->{old_w} = $widget->{w};
3715 $widget->{old_h} = $widget->{h};
3716
3205 $widget->{w} = $w; 3717 $widget->{w} = $w;
3206 $widget->{h} = $h; 3718 $widget->{h} = $h;
3719
3207 $widget->emit (size_allocate => $w, $h); 3720 $widget->emit (size_allocate => $w, $h);
3721 }
3208 } 3722 }
3209 } 3723 }
3210 3724
3211 while ($self->{post_alloc_hook}) { 3725 while ($self->{post_alloc_hook}) {
3212 $_->() 3726 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3727 for values %{delete $self->{post_alloc_hook}};
3214 } 3728 }
3729
3215 3730
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3731 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3732 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3733 glClear GL_COLOR_BUFFER_BIT;
3219 3734
… …
3221 glLoadIdentity; 3736 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3738 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3739 glLoadIdentity;
3225 3740
3741 {
3742 package CFClient::UI::Base;
3743
3744 ($draw_x, $draw_y, $draw_w, $draw_h) =
3745 (0, 0, $self->{w}, $self->{h});
3746 }
3747
3226 $self->_draw; 3748 $self->_draw;
3227} 3749}
3228 3750
3229############################################################################# 3751#############################################################################
3230 3752

Diff Legend

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