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.287 by root, Mon Jun 5 05:31:13 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;
1494 1654
1495 if ($tex->{format} == GL_ALPHA) { 1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1496 glColor @{$self->{fg}}; 1657 glColor @{$self->{fg}};
1497 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1498 } else { 1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1500 } 1662 }
1501 1663
1502 glDisable GL_TEXTURE_2D; 1664 glDisable GL_TEXTURE_2D;
1503} 1665}
… …
1532 1694
1533 delete $self->{cur_h}; 1695 delete $self->{cur_h};
1534 1696
1535 return if $self->{text} eq $text; 1697 return if $self->{text} eq $text;
1536 1698
1537 delete $self->{texture};
1538
1539 $self->{last_activity} = $::NOW; 1699 $self->{last_activity} = $::NOW;
1540 $self->{text} = $text; 1700 $self->{text} = $text;
1541 1701
1542 $text =~ s/./*/g if $self->{hidden}; 1702 $text =~ s/./*/g if $self->{hidden};
1543 $self->{layout}->set_text ("$text "); 1703 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h};
1544 1705
1545 $self->_emit (changed => $self->{text}); 1706 $self->_emit (changed => $self->{text});
1707
1708 $self->realloc;
1709 $self->update;
1546} 1710}
1547 1711
1548sub set_text { 1712sub set_text {
1549 my ($self, $text) = @_; 1713 my ($self, $text) = @_;
1550 1714
1551 $self->{cursor} = length $text; 1715 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1716 $self->_set_text ($text);
1553 $self->update;
1554 $self->check_size;
1555} 1717}
1556 1718
1557sub get_text { 1719sub get_text {
1558 $_[0]{text} 1720 $_[0]{text}
1559} 1721}
… …
1562 my ($self) = @_; 1724 my ($self) = @_;
1563 1725
1564 my ($w, $h) = $self->SUPER::size_request; 1726 my ($w, $h) = $self->SUPER::size_request;
1565 1727
1566 ($w + 1, $h) # add 1 for cursor 1728 ($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} 1729}
1574 1730
1575sub key_down { 1731sub key_down {
1576 my ($self, $ev) = @_; 1732 my ($self, $ev) = @_;
1577 1733
… …
1595 $self->{cursor} = length $text; 1751 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1752 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1753 $self->_emit ('escape');
1598 } elsif ($uni) { 1754 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1755 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else {
1757 return 0;
1600 } 1758 }
1601 1759
1602 $self->_set_text ($text); 1760 $self->_set_text ($text);
1603 $self->update; 1761
1604 $self->check_size; 1762 $self->realloc;
1763
1764 1
1605} 1765}
1606 1766
1607sub focus_in { 1767sub focus_in {
1608 my ($self) = @_; 1768 my ($self) = @_;
1609 1769
… …
1624 utf8::encode $text; 1784 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1785 $self->{cursor} = length substr $text, 0, $idx;
1626 1786
1627 $self->_set_text ($self->{text}); 1787 $self->_set_text ($self->{text});
1628 $self->update; 1788 $self->update;
1789
1790 1
1629} 1791}
1630 1792
1631sub mouse_motion { 1793sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1794 my ($self, $ev, $x, $y) = @_;
1633# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796
1797 0
1634} 1798}
1635 1799
1636sub _draw { 1800sub _draw {
1637 my ($self) = @_; 1801 my ($self) = @_;
1638 1802
1639 local $self->{fg} = $self->{fg}; 1803 local $self->{fg} = $self->{fg};
1640 1804
1641 if ($FOCUS == $self) { 1805 if ($FOCUS == $self) {
1642 glColor @{$self->{active_bg}}; 1806 glColor_premultiply @{$self->{active_bg}};
1643 $self->{fg} = $self->{active_fg}; 1807 $self->{fg} = $self->{active_fg};
1644 } else { 1808 } else {
1645 glColor @{$self->{bg}}; 1809 glColor_premultiply @{$self->{bg}};
1646 } 1810 }
1647 1811
1648 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1649 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1650 glBegin GL_QUADS; 1814 glBegin GL_QUADS;
1651 glVertex 0 , 0; 1815 glVertex 0 , 0;
1652 glVertex 0 , $self->{h}; 1816 glVertex 0 , $self->{h};
1653 glVertex $self->{w}, $self->{h}; 1817 glVertex $self->{w}, $self->{h};
1654 glVertex $self->{w}, 0; 1818 glVertex $self->{w}, 0;
… …
1715 } else { 1879 } else {
1716 $self->set_text ($self->{history_saveback}); 1880 $self->set_text ($self->{history_saveback});
1717 } 1881 }
1718 1882
1719 } else { 1883 } else {
1720 $self->SUPER::key_down ($ev); 1884 return $self->SUPER::key_down ($ev)
1885 }
1886
1721 } 1887 1
1722
1723} 1888}
1724 1889
1725############################################################################# 1890#############################################################################
1726 1891
1727package CFClient::UI::Button; 1892package CFClient::UI::Button;
… …
1736 1901
1737sub new { 1902sub new {
1738 my $class = shift; 1903 my $class = shift;
1739 1904
1740 $class->SUPER::new ( 1905 $class->SUPER::new (
1741 padding => 4, 1906 padding_x => 4,
1907 padding_y => 4,
1742 fg => [1, 1, 1], 1908 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1909 active_fg => [0, 0, 1],
1744 can_hover => 1, 1910 can_hover => 1,
1745 align => 0, 1911 align => 0,
1746 valign => 0, 1912 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1921 my ($self, $ev, $x, $y) = @_;
1756 1922
1757 $self->emit ("activate") 1923 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1924 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1925 && $y >= 0 && $y < $self->{h};
1926
1927 1
1760} 1928}
1761 1929
1762sub _draw { 1930sub _draw {
1763 my ($self) = @_; 1931 my ($self) = @_;
1764 1932
1765 local $self->{fg} = $self->{fg}; 1933 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1766
1767 if ($GRAB == $self) {
1768 $self->{fg} = $self->{active_fg};
1769 }
1770 1934
1771 glEnable GL_TEXTURE_2D; 1935 glEnable GL_TEXTURE_2D;
1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1936 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1773 glColor 0, 0, 0, 1; 1937 glColor 0, 0, 0, 1;
1774 1938
… …
1793 1957
1794sub new { 1958sub new {
1795 my $class = shift; 1959 my $class = shift;
1796 1960
1797 $class->SUPER::new ( 1961 $class->SUPER::new (
1798 padding => 2, 1962 padding_x => 2,
1963 padding_y => 2,
1799 fg => [1, 1, 1], 1964 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 1965 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 1966 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 1967 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 1968 state => 0,
… …
1807} 1972}
1808 1973
1809sub size_request { 1974sub size_request {
1810 my ($self) = @_; 1975 my ($self) = @_;
1811 1976
1812 ($self->{padding} * 2 + 6) x 2 1977 (6) x 2
1813} 1978}
1814 1979
1815sub button_down { 1980sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1817 1982
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 1985 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 1986 $self->_emit (changed => $self->{state});
1987 } else {
1988 return 0
1989 }
1990
1822 } 1991 1
1823} 1992}
1824 1993
1825sub _draw { 1994sub _draw {
1826 my ($self) = @_; 1995 my ($self) = @_;
1827 1996
1828 $self->SUPER::_draw; 1997 $self->SUPER::_draw;
1829 1998
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1999 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 2000
1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2001 my ($w, $h) = @$self{qw(w h)};
2002
2003 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833 2004
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2005 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 2006
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2007 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 2008
… …
1992 2163
1993 my $h1 = $self->{h} * (1 - $ycut1); 2164 my $h1 = $self->{h} * (1 - $ycut1);
1994 my $h2 = $self->{h} * (1 - $ycut2); 2165 my $h2 = $self->{h} * (1 - $ycut2);
1995 2166
1996 glEnable GL_BLEND; 2167 glEnable GL_BLEND;
1997 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1998 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 2172
2001 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2173 glBindTexture GL_TEXTURE_2D, $t1->{name};
2002 glBegin GL_QUADS; 2174 glBegin GL_QUADS;
… …
2102 fg => [1, 1, 1], 2274 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2275 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2276 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2277 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2278 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2279 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2280 min_h => $::WIDTH / 80,
2109 vertical => 0, 2281 vertical => 0,
2110 can_hover => 1, 2282 can_hover => 1,
2111 inner_pad => 0.02, 2283 inner_pad => 0.02,
2112 @_ 2284 @_
2113 ); 2285 );
… …
2116 $self->update; 2288 $self->update;
2117 2289
2118 $self 2290 $self
2119} 2291}
2120 2292
2293sub changed { }
2294
2121sub set_range { 2295sub set_range {
2122 my ($self, $range) = @_; 2296 my ($self, $range) = @_;
2123 2297
2124 $self->{range} = $range; 2298 ($range, $self->{range}) = ($self->{range}, $range);
2125 2299
2126 $self->update; 2300 $self->update
2301 if "@$range" ne "@{$self->{range}}";
2127} 2302}
2128 2303
2129sub set_value { 2304sub set_value {
2130 my ($self, $value) = @_; 2305 my ($self, $value) = @_;
2131 2306
… …
2150} 2325}
2151 2326
2152sub size_request { 2327sub size_request {
2153 my ($self) = @_; 2328 my ($self) = @_;
2154 2329
2155 my $w = $self->{req_w}; 2330 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2331}
2160 2332
2161sub button_down { 2333sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2334 my ($self, $ev, $x, $y) = @_;
2163 2335
2164 $self->SUPER::button_down ($ev, $x, $y); 2336 $self->SUPER::button_down ($ev, $x, $y);
2165 2337
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2339
2168 $self->mouse_motion ($ev, $x, $y); 2340 $self->mouse_motion ($ev, $x, $y)
2169} 2341}
2170 2342
2171sub mouse_motion { 2343sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2344 my ($self, $ev, $x, $y) = @_;
2173 2345
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2349 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2350
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2351 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2352
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2353 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2354 } else {
2355 return 0;
2356 }
2357
2182 } 2358 1
2183} 2359}
2184 2360
2185sub update { 2361sub update {
2186 my ($self) = @_; 2362 my ($self) = @_;
2187 2363
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2364 delete $self->{knob_w};
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370
2371 unless ($self->{knob_w}) {
2189 $self->set_value ($self->{range}[0]); 2372 $self->set_value ($self->{range}[0]);
2190 2373
2191 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2374 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100; 2375 my $range = ($hi - $page - $lo) || 1e-100;
2193 2376
… …
2199 $value = ($value - $lo) / $range; 2382 $value = ($value - $lo) / $range;
2200 $value = $value * $self->{scale} + $self->{offset}; 2383 $value = $value * $self->{scale} + $self->{offset};
2201 2384
2202 $self->{knob_x} = $value - $knob_w * 0.5; 2385 $self->{knob_x} = $value - $knob_w * 0.5;
2203 $self->{knob_w} = $knob_w; 2386 $self->{knob_w} = $knob_w;
2204 }); 2387 }
2205
2206 $self->SUPER::update;
2207}
2208
2209sub _draw {
2210 my ($self) = @_;
2211 2388
2212 $self->SUPER::_draw (); 2389 $self->SUPER::_draw ();
2213 2390
2214 glScale $self->{w}, $self->{h}; 2391 glScale $self->{w}, $self->{h};
2215 2392
… …
2409 2586
2410 delete $self->{texture}; 2587 delete $self->{texture};
2411 } 2588 }
2412 2589
2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2414 glClearColor 0.5, 0.5, 0.5, 0; 2591 glClearColor 0, 0, 0, 0;
2415 glClear GL_COLOR_BUFFER_BIT; 2592 glClear GL_COLOR_BUFFER_BIT;
2416 2593
2417 my $top = int $self->{children}[1]{range}[0]; 2594 my $top = int $self->{children}[1]{range}[0];
2418 2595
2419 my $y0 = $top; 2596 my $y0 = $top;
… …
2454sub _draw { 2631sub _draw {
2455 my ($self) = @_; 2632 my ($self) = @_;
2456 2633
2457 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2636 glColor 0, 0, 0, 1;
2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2461 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2462 2639
2463 $self->{children}[1]->draw; 2640 $self->{children}[1]->draw;
2464 2641
2465} 2642}
… …
2514 2691
2515sub new { 2692sub new {
2516 my $class = shift; 2693 my $class = shift;
2517 2694
2518 my $self = $class->SUPER::new ( 2695 my $self = $class->SUPER::new (
2519 state => 0, 2696 state => 0,
2520 connect_activate => \&toggle_flopper, 2697 on_activate => \&toggle_flopper,
2521 @_ 2698 @_
2522 ); 2699 );
2523 2700
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2701 $self
2530} 2702}
2531 2703
2532sub toggle_flopper { 2704sub toggle_flopper {
2533 my ($self) = @_; 2705 my ($self) = @_;
2534 2706
2535 # TODO: use animation 2707 $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} 2708}
2547 2709
2548############################################################################# 2710#############################################################################
2549 2711
2550package CFClient::UI::Tooltip; 2712package CFClient::UI::Tooltip;
… …
2563} 2725}
2564 2726
2565sub set_tooltip_from { 2727sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2728 my ($self, $widget) = @_;
2567 2729
2730 my $tooltip = $widget->{tooltip};
2731
2732 if ($ENV{CFPLUS_DEBUG} & 2) {
2733 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}";
2737 }
2738
2568 $self->add (new CFClient::UI::Label 2739 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2740 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2742 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2743 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2744 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2745 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2756
2586sub size_allocate { 2757sub size_allocate {
2587 my ($self, $w, $h) = @_; 2758 my ($self, $w, $h) = @_;
2588 2759
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2760 $self->SUPER::size_allocate ($w - 4, $h - 4);
2761}
2762
2763sub visibility_change {
2764 my ($self, $visible) = @_;
2765
2766 return unless $visible;
2767
2768 $self->{root}->on_post_alloc ("move_$self" => sub {
2769 my $widget = $self->{owner}
2770 or return;
2771
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH;
2776
2777 $self->move_abs ($x, $y);
2778 });
2590} 2779}
2591 2780
2592sub _draw { 2781sub _draw {
2593 my ($self) = @_; 2782 my ($self) = @_;
2594 2783
… …
2611 glVertex $w, $h; 2800 glVertex $w, $h;
2612 glVertex $w, 0; 2801 glVertex $w, 0;
2613 glEnd; 2802 glEnd;
2614 2803
2615 glTranslate 2 - 0.375, 2 - 0.375; 2804 glTranslate 2 - 0.375, 2 - 0.375;
2805
2616 $self->SUPER::_draw; 2806 $self->SUPER::_draw;
2617} 2807}
2618 2808
2619############################################################################# 2809#############################################################################
2620 2810
… …
2626 2816
2627sub new { 2817sub new {
2628 my $class = shift; 2818 my $class = shift;
2629 2819
2630 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2631 aspect => 1, 2821 aspect => 1,
2822 can_events => 0,
2632 @_, 2823 @_,
2633 ); 2824 );
2634 2825
2635 if ($self->{anim} && $self->{animspeed}) { 2826 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2827 Scalar::Util::weaken (my $widget = $self);
… …
2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2679 2870
2680 if ($tex) { 2871 if ($tex) {
2681 glEnable GL_TEXTURE_2D; 2872 glEnable GL_TEXTURE_2D;
2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2683 glColor 1, 1, 1, 1; 2874 glColor 0, 0, 0, 1;
2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2685 glDisable GL_TEXTURE_2D; 2876 glDisable GL_TEXTURE_2D;
2686 } 2877 }
2687} 2878}
2688 2879
… …
2695 $self->SUPER::DESTROY; 2886 $self->SUPER::DESTROY;
2696} 2887}
2697 2888
2698############################################################################# 2889#############################################################################
2699 2890
2700package CFClient::UI::InventoryItem; 2891package CFClient::UI::Buttonbar;
2701 2892
2702our @ISA = CFClient::UI::HBox::; 2893our @ISA = CFClient::UI::HBox::;
2703 2894
2704sub _item_to_desc { 2895# 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 2896
2861############################################################################# 2897#############################################################################
2862 2898
2863package CFClient::UI::Menu; 2899package CFClient::UI::Menu;
2864 2900
… …
2905 # maybe save $GRAB? must be careful about events... 2941 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 2942 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 2943 $self->{button} = $ev->{button};
2908 2944
2909 $self->show; 2945 $self->show;
2910 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2946 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911} 2947}
2912 2948
2913sub mouse_motion { 2949sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2950 my ($self, $ev, $x, $y) = @_;
2915 2951
2916 # TODO: should use vbox->find_widget or so 2952 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 2954 $self->{hover} = $self->{item}{$HOVER};
2955
2956 0
2919} 2957}
2920 2958
2921sub button_up { 2959sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 2960 my ($self, $ev, $x, $y) = @_;
2923 2961
… …
2925 undef $GRAB; 2963 undef $GRAB;
2926 $self->hide; 2964 $self->hide;
2927 2965
2928 $self->_emit ("popdown"); 2966 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 2967 $self->{hover}[1]->() if $self->{hover};
2968 } else {
2969 return 0
2970 }
2971
2930 } 2972 1
2931} 2973}
2932 2974
2933############################################################################# 2975#############################################################################
2934 2976
2935package CFClient::UI::Statusbox; 2977package CFClient::UI::Multiplexer;
2936 2978
2937our @ISA = CFClient::UI::VBox::; 2979our @ISA = CFClient::UI::Container::;
2938 2980
2939sub new { 2981sub new {
2940 my $class = shift; 2982 my $class = shift;
2941 2983
2942 $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2985 @_,
2986 );
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990
2991 $self
2992}
2993
2994sub add {
2995 my ($self, @widgets) = @_;
2996
2997 $self->SUPER::add (@widgets);
2998
2999 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} };
3001}
3002
3003sub set_current_page {
3004 my ($self, $page_or_widget) = @_;
3005
3006 my $widget = ref $page_or_widget
3007 ? $page_or_widget
3008 : $self->{children}[$page_or_widget];
3009
3010 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012
3013 $self->_emit (page_changed => $self->{current});
3014
3015 $self->realloc;
3016}
3017
3018sub visible_children {
3019 $_[0]{current}
3020}
3021
3022sub size_request {
3023 my ($self) = @_;
3024
3025 $self->{current}->size_request
3026}
3027
3028sub size_allocate {
3029 my ($self, $w, $h) = @_;
3030
3031 $self->{current}->configure (0, 0, $w, $h);
3032}
3033
3034sub _draw {
3035 my ($self) = @_;
3036
3037 $self->{current}->draw;
3038}
3039
3040#############################################################################
3041
3042package CFClient::UI::Notebook;
3043
3044our @ISA = CFClient::UI::VBox::;
3045
3046sub new {
3047 my $class = shift;
3048
3049 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self
3053 @_,
3054 );
3055
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3058
3059 $self
3060}
3061
3062sub add {
3063 my ($self, $title, $widget, $tooltip) = @_;
3064
3065 Scalar::Util::weaken $self;
3066
3067 $self->{buttonbar}->add (new CFClient::UI::Button
3068 markup => $title,
3069 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) },
3071 );
3072
3073 $self->{multiplexer}->add ($widget);
3074}
3075
3076sub set_current_page {
3077 my ($self, $page) = @_;
3078
3079 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current});
3081}
3082
3083#############################################################################
3084
3085package CFClient::UI::Statusbox;
3086
3087our @ISA = CFClient::UI::VBox::;
3088
3089sub new {
3090 my $class = shift;
3091
3092 my $self = $class->SUPER::new (
2943 fontsize => 0.8, 3093 fontsize => 0.8,
2944 @_, 3094 @_,
2945 ) 3095 );
3096
3097 Scalar::Util::weaken (my $this = $self);
3098
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100
3101 $self
2946} 3102}
2947 3103
2948sub reorder { 3104sub reorder {
2949 my ($self) = @_; 3105 my ($self) = @_;
2950 my $NOW = time; 3106 my $NOW = Time::HiRes::time;
3107
3108 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} };
2951 3112
2952 while (my ($k, $v) = each %{ $self->{item} }) { 3113 while (my ($k, $v) = each %{ $self->{item} }) {
2953 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3114 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2954 } 3115 }
2955 3116
… …
2958 my @items = sort { 3119 my @items = sort {
2959 $a->{pri} <=> $b->{pri} 3120 $a->{pri} <=> $b->{pri}
2960 or $b->{id} <=> $a->{id} 3121 or $b->{id} <=> $a->{id}
2961 } values %{ $self->{item} }; 3122 } values %{ $self->{item} };
2962 3123
3124 $self->{timer}->interval (1);
3125
2963 my $count = 10 + 1; 3126 my $count = 10 + 1;
2964 for my $item (@items) { 3127 for my $item (@items) {
2965 last unless --$count; 3128 last unless --$count;
2966 3129
2967 push @widgets, $item->{label} ||= do { 3130 my $label = $item->{label} ||= do {
2968 # TODO: doesn't handle markup well (read as: at all) 3131 # TODO: doesn't handle markup well (read as: at all)
2969 my $short = $item->{count} > 1 3132 my $short = $item->{count} > 1
2970 ? "<b>$item->{count} ×</b> $item->{text}" 3133 ? "<b>$item->{count} ×</b> $item->{text}"
2971 : $item->{text}; 3134 : $item->{text};
2972 3135
… …
2980 tooltip => $item->{tooltip}, 3143 tooltip => $item->{tooltip},
2981 tooltip_font => $::FONT_PROP, 3144 tooltip_font => $::FONT_PROP,
2982 tooltip_width => 0.67, 3145 tooltip_width => 0.67,
2983 fontsize => $item->{fontsize} || $self->{fontsize}, 3146 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44, 3147 max_w => $::WIDTH * 0.44,
2985 fg => $item->{fg}, 3148 fg => [@{ $item->{fg} }],
2986 can_events => 1, 3149 can_events => 1,
2987 can_hover => 1 3150 can_hover => 1
2988 }; 3151 };
3152
3153 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3154 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3155 $label->update;
3156 $label->set_max_size (undef, $label->{req_h} * $diff)
3157 if $diff < 1;
3158 $self->{timer}->interval (1/30);
3159 } else {
3160 $label->{fg}[3] = $item->{fg}[3] || 1;
3161 }
3162
3163 push @widgets, $label;
2989 } 3164 }
2990 3165
2991 $self->clear; 3166 $self->clear;
2992 $self->SUPER::add (reverse @widgets); 3167 $self->SUPER::add (reverse @widgets);
2993} 3168}
… …
2996 my ($self, $text, %arg) = @_; 3171 my ($self, $text, %arg) = @_;
2997 3172
2998 $text =~ s/^\s+//; 3173 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3174 $text =~ s/\s+$//;
3000 3175
3176 return unless $text;
3177
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3178 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3002 3179
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3180 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3181
3005 if (my $item = $self->{item}{$group}) { 3182 if (my $item = $self->{item}{$group}) {
3006 if ($item->{text} eq $text) { 3183 if ($item->{text} eq $text) {
… …
3036 3213
3037 $self->reorder; 3214 $self->reorder;
3038 $self->SUPER::reconfigure; 3215 $self->SUPER::reconfigure;
3039} 3216}
3040 3217
3218sub DESTROY {
3219 my ($self) = @_;
3220
3221 $self->{timer}->cancel;
3222
3223 $self->SUPER::DESTROY;
3224}
3225
3041############################################################################# 3226#############################################################################
3042 3227
3043package CFClient::UI::Root; 3228package CFClient::UI::Inventory;
3044 3229
3045our @ISA = CFClient::UI::Container::; 3230our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3231
3049sub new { 3232sub new {
3050 my $class = shift; 3233 my $class = shift;
3051 3234
3052 $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3237 @_,
3238 );
3239
3240 $self
3241}
3242
3243sub set_items {
3244 my ($self, $items) = @_;
3245
3246 $self->{child}->clear;
3247 return unless $items;
3248
3249 my @items = sort {
3250 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name})
3252 } @$items;
3253
3254 $self->{real_items} = \@items;
3255
3256 my $row = 0;
3257 for my $item (@items) {
3258 CFClient::Item::update_widgets $item;
3259
3260 $self->{child}->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget});
3263
3264 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 }
3463}
3464
3465#############################################################################
3466
3467package CFClient::UI::SpellList;
3468
3469our @ISA = CFClient::UI::Table::;
3470
3471sub new {
3472 my $class = shift;
3473
3474 my $self = $class->SUPER::new (
3475 binding => [],
3476 commands => [],
3053 @_, 3477 @_,
3054 ) 3478 )
3055} 3479}
3056 3480
3057sub configure { 3481# XXX: Do sorting? Argl...
3058 my ($self, $x, $y, $w, $h) = @_; 3482sub add_spell {
3059
3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
3063
3064sub check_size {
3065 my ($self) = @_; 3483 my ($self, $spell) = @_;
3484 $self->{spells}->{$spell->{name}} = $spell;
3066 3485
3067 $self->size_allocate ($self->{w}, $self->{h}) 3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3068 if $self->{w}; 3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513}
3514
3515sub remove_spell {
3516 my ($self, $spell) = @_;
3517 delete $self->{spells}->{$spell->{name}};
3518 $self->rebuild_spell_list;
3519}
3520
3521#############################################################################
3522
3523package CFClient::UI::Root;
3524
3525our @ISA = CFClient::UI::Container::;
3526
3527use List::Util qw(min max);
3528
3529use CFClient::OpenGL;
3530
3531sub new {
3532 my $class = shift;
3533
3534 my $self = $class->SUPER::new (
3535 visible => 1,
3536 @_,
3537 );
3538
3539 Scalar::Util::weaken ($self->{root} = $self);
3540
3541 $self
3069} 3542}
3070 3543
3071sub size_request { 3544sub size_request {
3072 my ($self) = @_; 3545 my ($self) = @_;
3073 3546
3074 ($self->{w}, $self->{h}) 3547 ($self->{w}, $self->{h})
3548}
3549
3550sub _to_pixel {
3551 my ($coord, $size, $max) = @_;
3552
3553 $coord =
3554 $coord eq "center" ? ($max - $size) * 0.5
3555 : $coord eq "max" ? $max
3556 : $coord;
3557
3558 $coord = 0 if $coord < 0;
3559 $coord = $max - $size if $coord > $max - $size;
3560
3561 int $coord + 0.5
3075} 3562}
3076 3563
3077sub size_allocate { 3564sub size_allocate {
3078 my ($self, $w, $h) = @_; 3565 my ($self, $w, $h) = @_;
3079 3566
3080 for my $child ($self->children) { 3567 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3568 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3569
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3570 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3571 $Y = $child->{force_y} if exists $child->{force_y};
3085 3572
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3573 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3574 $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 3575
3092 $child->configure ($X, $Y, $W, $H); 3576 $child->configure ($X, $Y, $W, $H);
3093 } 3577 }
3094} 3578}
3095 3579
… …
3106} 3590}
3107 3591
3108sub update { 3592sub update {
3109 my ($self) = @_; 3593 my ($self) = @_;
3110 3594
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3595 $::WANT_REFRESH++;
3113} 3596}
3114 3597
3115sub add { 3598sub add {
3116 my ($self, @children) = @_; 3599 my ($self, @children) = @_;
3117 3600
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; 3601 $_->{is_toplevel} = 1
3126 3602 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3603
3132 $self->SUPER::add (@children); 3604 $self->SUPER::add (@children);
3133} 3605}
3134 3606
3135sub remove { 3607sub remove {
3136 my ($self, @children) = @_; 3608 my ($self, @children) = @_;
3137 3609
3138 $self->SUPER::remove (@children); 3610 $self->SUPER::remove (@children);
3611
3612 delete $self->{is_toplevel}
3613 for @children;
3139 3614
3140 while (@children) { 3615 while (@children) {
3141 my $w = pop @children; 3616 my $w = pop @children;
3142 push @children, $w->children; 3617 push @children, $w->children;
3143 $w->set_invisible; 3618 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3637 while ($self->{refresh_hook}) {
3163 $_->() 3638 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3639 for values %{delete $self->{refresh_hook}};
3165 } 3640 }
3166 3641
3167 if ($self->{check_size}) { 3642 if ($self->{realloc}) {
3168 my @queue = ([], []); 3643 my %queue;
3644 my @queue;
3645 my $widget;
3169 3646
3170 for (;;) { 3647 outer:
3171 if ($self->{check_size}) { 3648 while () {
3172 # heuristic: check containers last 3649 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3650 for $widget (values %$realloc) {
3174 for values %{delete $self->{check_size}} 3651 $widget->{visible} or next; # do not resize invisible widgets
3652
3653 $queue{$widget+0}++ and next; # duplicates are common
3654
3655 push @{ $queue[$widget->{visible}] }, $widget;
3656 }
3175 } 3657 }
3176 3658
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3659 while () {
3660 @queue or last outer;
3178 3661
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3662 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3663 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 3664
3665 pop @queue;
3666 }
3667
3668 delete $queue{$widget+0};
3669
3670 my ($w, $h) = $widget->size_request;
3671
3672 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3673 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3674
3675 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3676 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3677
3678 $w = $widget->{force_w} if exists $widget->{force_w};
3679 $h = $widget->{force_h} if exists $widget->{force_h};
3680
3681 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3682 || delete $widget->{force_realloc}) {
3187 $widget->{req_w} = $w; 3683 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3684 $widget->{req_h} = $h;
3189 3685
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3686 $self->{size_alloc}{$widget+0} = $widget;
3191 3687
3192 $widget->{parent}->check_size
3193 if $widget->{parent}; 3688 if (my $parent = $widget->{parent}) {
3689 $self->{realloc}{$parent+0} = $parent
3690 unless $queue{$parent+0};
3691
3692 $parent->{force_size_alloc} = 1;
3693 $self->{size_alloc}{$parent+0} = $parent;
3694 }
3194 } 3695 }
3696
3697 delete $self->{realloc}{$widget+0};
3195 } 3698 }
3196 } 3699 }
3197 3700
3198 while ($self->{size_alloc}) { 3701 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3702 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 my ($widget, $w, $h) = @$_; 3703 values %$size_alloc;
3704
3705 while () {
3706 my $widget = pop @queue || last;
3707
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201 3709
3202 $w = 0 if $w < 0; 3710 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3711 $h = 0 if $h < 0;
3204 3712
3713 $w = int $w + 0.5;
3714 $h = int $h + 0.5;
3715
3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w};
3718 $widget->{old_h} = $widget->{h};
3719
3205 $widget->{w} = $w; 3720 $widget->{w} = $w;
3206 $widget->{h} = $h; 3721 $widget->{h} = $h;
3722
3207 $widget->emit (size_allocate => $w, $h); 3723 $widget->emit (size_allocate => $w, $h);
3724 }
3208 } 3725 }
3209 } 3726 }
3210 3727
3211 while ($self->{post_alloc_hook}) { 3728 while ($self->{post_alloc_hook}) {
3212 $_->() 3729 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3730 for values %{delete $self->{post_alloc_hook}};
3214 } 3731 }
3732
3215 3733
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3734 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3735 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3736 glClear GL_COLOR_BUFFER_BIT;
3219 3737
… …
3221 glLoadIdentity; 3739 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3741 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3742 glLoadIdentity;
3225 3743
3744 {
3745 package CFClient::UI::Base;
3746
3747 ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h});
3749 }
3750
3226 $self->_draw; 3751 $self->_draw;
3227} 3752}
3228 3753
3229############################################################################# 3754#############################################################################
3230 3755

Diff Legend

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