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.288 by root, Mon Jun 5 21:14:40 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 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
391 542
392sub draw { 543sub draw {
393 my ($self) = @_; 544 my ($self) = @_;
394 545
395 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
396 557
397 glPushMatrix; 558 glPushMatrix;
398 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
399 $self->_draw;
400 glPopMatrix;
401 560
402 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
403 my ($x, $y) = @$self{qw(x y)};
404
405 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
406 glEnable GL_BLEND; 563 glEnable GL_BLEND;
407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
408 glBegin GL_QUADS; 565 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; 566 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 567 glVertex $self->{w}, 0;
424 glVertex $self->{w}, $self->{h}; 568 glVertex $self->{w}, $self->{h};
425 glVertex 0 , $self->{h}; 569 glVertex 0 , $self->{h};
426 glEnd; 570 glEnd;
571 glDisable GL_BLEND;
572 }
573
574 if ($ENV{CFPLUS_DEBUG} & 1) {
575 glPushMatrix;
576 glColor 1, 1, 0, 1;
577 glTranslate 0.375, 0.375;
578 glBegin GL_LINE_LOOP;
579 glVertex 0 , 0;
580 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1;
583 glEnd;
427 glPopMatrix; 584 glPopMatrix;
428 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
430} 590}
431 591
432sub _draw { 592sub _draw {
433 my ($self) = @_; 593 my ($self) = @_;
434 594
435 warn "no draw defined for $self\n"; 595 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} 596}
494 597
495sub DESTROY { 598sub DESTROY {
496 my ($self) = @_; 599 my ($self) = @_;
497 600
… …
529 632
530 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
531 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
532 635
533 glEnable GL_BLEND; 636 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glColor @$color; 638 glColor_premultiply @$color;
536 639
537 glBegin GL_QUADS; 640 glBegin GL_QUADS;
538 glVertex 0 , 0; 641 glVertex 0 , 0;
539 glVertex 0 , $h; 642 glVertex 0 , $h;
540 glVertex $w, $h; 643 glVertex $w, $h;
… …
555 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
556 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
557} 660}
558 661
559sub size_request { 662sub size_request {
560 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
561} 666}
562 667
563sub draw { } 668sub draw { }
564 669
565############################################################################# 670#############################################################################
… …
569our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
570 675
571sub new { 676sub new {
572 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
573 678
574 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
575 680
576 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
577 children => [], 682 children => [],
578 can_events => 0, 683 can_events => 0,
579 %arg, 684 %arg,
580 ); 685 );
686
581 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
582 689
583 $self 690 $self
584} 691}
585 692
586sub add { 693sub add {
… …
594 $self->{children} = [ 701 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
597 ]; 704 ];
598 705
599 $self->check_size (1); 706 $self->realloc;
600 $self->update;
601} 707}
602 708
603sub children { 709sub children {
604 @{ $_[0]{children} } 710 @{ $_[0]{children} }
605} 711}
… …
610 delete $child->{parent}; 716 delete $child->{parent};
611 $child->hide; 717 $child->hide;
612 718
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 720
615 $self->check_size; 721 $self->realloc;
616 $self->update;
617} 722}
618 723
619sub clear { 724sub clear {
620 my ($self) = @_; 725 my ($self) = @_;
621 726
… …
625 for (@$children) { 730 for (@$children) {
626 delete $_->{parent}; 731 delete $_->{parent};
627 $_->hide; 732 $_->hide;
628 } 733 }
629 734
630 $self->check_size; 735 $self->realloc;
631 $self->update;
632} 736}
633 737
634sub find_widget { 738sub find_widget {
635 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
636 740
637 $x -= $self->{x}; 741 $x -= $self->{x};
638 $y -= $self->{y}; 742 $y -= $self->{y};
639 743
640 my $res; 744 my $res;
641 745
642 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
643 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
644 and return $res; 748 and return $res;
645 } 749 }
646 750
647 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
696 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
697} 801}
698 802
699############################################################################# 803#############################################################################
700 804
805# back-buffered drawing area
806
701package CFClient::UI::Window; 807package CFClient::UI::Window;
702 808
703our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
704 810
705use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
723 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
724 $self->update; 830 $self->update;
725} 831}
726 832
727sub _render { 833sub _render {
834 my ($self) = @_;
835
728 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
729} 837}
730 838
731sub render_child { 839sub render_child {
732 my ($self) = @_; 840 my ($self) = @_;
733 841
734 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
735 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
736 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
737 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
738 $self->_render; 853 $self->_render;
739 }; 854 };
740} 855}
741 856
742sub _draw { 857sub _draw {
743 my ($self) = @_; 858 my ($self) = @_;
744 859
745 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
746 861
747 my $tex = $self->{texture} 862 my $tex = $self->{texture}
748 or return; 863 or return;
749 864
750 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
752 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
753 868
754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
755 870
756 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
757} 872}
… …
760 875
761package CFClient::UI::ViewPort; 876package CFClient::UI::ViewPort;
762 877
763our @ISA = CFClient::UI::Window::; 878our @ISA = CFClient::UI::Window::;
764 879
880sub new {
881 my $class = shift;
882
883 $class->SUPER::new (
884 scroll_x => 0,
885 scroll_y => 1,
886 @_,
887 )
888}
889
765sub size_request { 890sub size_request {
766 my ($self) = @_; 891 my ($self) = @_;
767 892
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769 894
770 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
771} 899}
772 900
773sub size_allocate { 901sub size_allocate {
774 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
775 903
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 904 my $child = $self->child;
777# $w = $self->{w}; 905
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908
778 $self->child->configure (0, 0, $cw, $ch); 909 $self->child->configure (0, 0, $w, $h);
779 $self->update; 910 $self->update;
780} 911}
781 912
782sub set_offset { 913sub set_offset {
783 my ($self, $x, $y) = @_; 914 my ($self, $x, $y) = @_;
… …
817} 948}
818 949
819sub _render { 950sub _render {
820 my ($self) = @_; 951 my ($self) = @_;
821 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823 957
824 $self->SUPER::_render; 958 $self->SUPER::_render;
825} 959}
826 960
… …
829package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
830 964
831our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
832 966
833sub new { 967sub new {
834 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
835 971
836 my $self; 972 my $self;
837 973
838 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
839 vertical => 1, 975 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 976 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 977 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 978 $self->{vp}->set_offset (0, $_[1]);
843 }, 979 },
844 ; 980 ;
845 981
846 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
847 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
848 slider => $slider, 984 slider => $slider,
849 @_, 985 %arg,
850 ); 986 );
851 987
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
855 990
856 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
998}
999
1000sub update {
1001 my ($self) = @_;
1002
1003 $self->SUPER::update;
1004
1005 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 1008}
858 1009
859sub size_allocate { 1010sub size_allocate {
860 my ($self, $w, $h) = @_; 1011 my ($self, $w, $h) = @_;
861 1012
… …
890 1041
891 if ($self->{bg}) { 1042 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
893 1044
894 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
896 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
897 1048
898 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
899 glVertex 0 , 0; 1050 glVertex 0 , 0;
900 glVertex 0 , $h; 1051 glVertex 0 , $h;
901 glVertex $w, $h; 1052 glVertex $w, $h;
… …
914 1065
915our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
916 1067
917use CFClient::OpenGL; 1068use CFClient::OpenGL;
918 1069
919my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 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); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
922 1077
923sub new { 1078sub new {
924 my $class = shift; 1079 my ($class, %arg) = @_;
925 1080
926 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
927 1082
928 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1086 border => 0.6,
932 is_toplevel => 1,
933 can_events => 1, 1087 can_events => 1,
934 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
935 ); 1091 );
936 1092
937 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
938 align => 0, 1094 align => 0,
939 valign => 1, 1095 valign => 1,
940 text => $self->{title}, 1096 text => $title,
941 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
942 1099
943 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
944} 1108}
945 1109
946sub border { 1110sub border {
947 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
948} 1112}
949 1113
950sub size_request { 1114sub size_request {
951 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
952 1119
953 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
954 1121
955 ( 1122 (
956 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
959} 1126}
960 1127
961sub size_allocate { 1128sub size_allocate {
962 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
963 1130
1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1136
1137 my $border = $self->border;
1138
964 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
966 1141
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); 1142 $self->child->configure ($border, $border, $w, $h);
971} 1143}
972 1144
973sub button_down { 1145sub button_down {
974 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
975 1147
… …
991 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
992 1164
993 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
995 1167
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1170
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999 $self->check_size; 1172 $self->realloc;
1000 }; 1173 };
1001 1174
1002 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1179 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1008 1181
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1183
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1013 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
1014 } 1192 1
1015} 1193}
1016 1194
1017sub button_up { 1195sub button_up {
1018 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1019 1197
1020 delete $self->{motion}; 1198 !!delete $self->{motion}
1021} 1199}
1022 1200
1023sub mouse_motion { 1201sub mouse_motion {
1024 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
1025 1203
1026 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
1027} 1207}
1028 1208
1029sub _draw { 1209sub _draw {
1030 my ($self) = @_; 1210 my ($self) = @_;
1031 1211
1212 my $child = $self->{children}[0];
1213
1032 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1034 1216
1035 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037 1219
1038 my $border = $self->border; 1220 my $border = $self->border;
1039 1221
1040 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045 1227
1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1048 1230
1049 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1050 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1051 my $rep_y = $ch / $bg->{h}; 1234 $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); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 } 1236 }
1060 1237
1061 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1062 1239
1063 $self->{title}->draw if $self->{title};
1064
1065 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1066} 1246}
1067 1247
1068############################################################################# 1248#############################################################################
1069 1249
1070package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1078sub new { 1258sub new {
1079 my $class = shift; 1259 my $class = shift;
1080 1260
1081 $class->SUPER::new ( 1261 $class->SUPER::new (
1082 col_expand => [], 1262 col_expand => [],
1083 @_ 1263 @_,
1084 ) 1264 )
1265}
1266
1267sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1269}
1086 1270
1087sub add { 1271sub add {
1088 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1089 1273
1090 $child->set_parent ($self); 1274 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1092 1276
1093 $child->check_size; 1277 $self->realloc;
1094} 1278}
1095 1279
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1280# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1281sub clear {
1102 my ($self) = @_; 1282 my ($self) = @_;
1103 1283
1104 my @children = $self->children; 1284 my @children = $self->children;
1105 delete $self->{children}; 1285 delete $self->{children};
… …
1107 for (@children) { 1287 for (@children) {
1108 delete $_->{parent}; 1288 delete $_->{parent};
1109 $_->hide; 1289 $_->hide;
1110 } 1290 }
1111 1291
1112 $self->update; 1292 $self->realloc;
1113} 1293}
1114 1294
1115sub get_wh { 1295sub get_wh {
1116 my ($self) = @_; 1296 my ($self) = @_;
1117 1297
… …
1148sub size_allocate { 1328sub size_allocate {
1149 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1150 1330
1151 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
1152 1332
1153 my $req_w = sum @$ws; 1333 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1334 my $req_h = (sum @$hs) || 1;
1155 1335
1156 # TODO: nicer code && do row_expand 1336 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1337 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1338 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1339 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1393 }
1214} 1394}
1215 1395
1216############################################################################# 1396#############################################################################
1217 1397
1218package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1399
1222our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1223 1401
1224sub size_request { 1402sub size_request {
1225 my ($self) = @_; 1403 my ($self) = @_;
1226 1404
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1228 1406 ? (
1229 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1409 )
1232 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1233} 1414}
1234 1415
1235sub size_allocate { 1416sub size_allocate {
1236 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1237 1418
1238 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1420 my $children = $self->{children};
1241 1421
1242 my @h = map $_->{req_w}, @$children; 1422 my @req;
1243 1423
1244 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1245 1425 @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 { 1426 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1428 my $req = List::Util::sum @req;
1429
1430 if ($req > $space) {
1431 # ah well, not enough space
1432 $_ *= $space / $req for @req;
1433 } else {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1253 for (0 .. $#$children) { 1439 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 } 1440 }
1260 } 1441 }
1261 1442
1262 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1263 1444
1264 my $y = 0; 1445 my $pos = 0;
1265 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1449
1270 $y += $h; 1450 $pos += $alloc;
1271 } 1451 }
1272 1452
1273 1 1453 1
1274} 1454}
1275 1455
1276############################################################################# 1456#############################################################################
1277 1457
1458package CFClient::UI::HBox;
1459
1460our @ISA = CFClient::UI::Box::;
1461
1462sub new {
1463 my $class = shift;
1464
1465 $class->SUPER::new (
1466 vertical => 0,
1467 @_,
1468 )
1469}
1470
1471#############################################################################
1472
1278package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1279 1474
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1283 1476
1284sub size_request { 1477sub new {
1285 my ($self) = @_; 1478 my $class = shift;
1286 1479
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1288 1481 vertical => 1,
1289 ( 1482 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1483 )
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} 1484}
1333 1485
1334############################################################################# 1486#############################################################################
1335 1487
1336package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1353 ellipsise => 3, # end 1505 ellipsise => 3, # end
1354 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1355 fontsize => 1, 1507 fontsize => 1,
1356 align => -1, 1508 align => -1,
1357 valign => -1, 1509 valign => -1,
1358 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1359 can_events => 0, 1512 can_events => 0,
1360 %arg 1513 %arg
1361 ); 1514 );
1362 1515
1363 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1390 1543
1391 delete $self->{texture}; 1544 delete $self->{texture};
1392 $self->SUPER::update; 1545 $self->SUPER::update;
1393} 1546}
1394 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1395sub set_text { 1555sub set_text {
1396 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1397 1557
1398 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1399 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1400 1560
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1403 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1404 $self->update; 1566 $self->update;
1405 $self->check_size;
1406} 1567}
1407 1568
1408sub set_markup { 1569sub set_markup {
1409 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1410 1571
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1576
1416 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1417 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1418 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1419 $self->update; 1582 $self->update;
1420 $self->check_size;
1421} 1583}
1422 1584
1423sub size_request { 1585sub size_request {
1424 my ($self) = @_; 1586 my ($self) = @_;
1425 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1426 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1427 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1428 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1429 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1430 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1431 1596
1432 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1433 1598
1434 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1435 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1436 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1437 1602
1438 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1439 1604
1440 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1441 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1442 } 1607 }
1443 1608
1609 ($w, $h)
1444 ( 1610 }
1445 $w + $self->{padding} * 2,
1446 $h + $self->{padding} * 2,
1447 )
1448} 1611}
1449 1612
1450sub size_allocate { 1613sub size_allocate {
1451 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1452 1615
1616 delete $self->{ox};
1617
1453 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454} 1620}
1455 1621
1456sub set_fontsize { 1622sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1458 1624
1459 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1626 delete $self->{texture};
1461 1627
1462 $self->update; 1628 $self->realloc;
1463 $self->check_size;
1464} 1629}
1465 1630
1466sub _draw { 1631sub _draw {
1467 my ($self) = @_; 1632 my ($self) = @_;
1468 1633
… …
1474 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478 1643
1479 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1480 1646
1647 unless (exists $self->{ox}) {
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1484 1651
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1490 }; 1655 };
1491 1656
1492 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1658
1495 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1496 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1497 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1498 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1500 } 1666 }
1501 1667
1502 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1503} 1669}
… …
1532 1698
1533 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1534 1700
1535 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1536 1702
1537 delete $self->{texture};
1538
1539 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1540 $self->{text} = $text; 1704 $self->{text} = $text;
1541 1705
1542 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1543 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1544 1709
1545 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1546} 1714}
1547 1715
1548sub set_text { 1716sub set_text {
1549 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1550 1718
1551 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1720 $self->_set_text ($text);
1553 $self->update;
1554 $self->check_size;
1555} 1721}
1556 1722
1557sub get_text { 1723sub get_text {
1558 $_[0]{text} 1724 $_[0]{text}
1559} 1725}
… …
1562 my ($self) = @_; 1728 my ($self) = @_;
1563 1729
1564 my ($w, $h) = $self->SUPER::size_request; 1730 my ($w, $h) = $self->SUPER::size_request;
1565 1731
1566 ($w + 1, $h) # add 1 for cursor 1732 ($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} 1733}
1574 1734
1575sub key_down { 1735sub key_down {
1576 my ($self, $ev) = @_; 1736 my ($self, $ev) = @_;
1577 1737
… …
1595 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1757 $self->_emit ('escape');
1598 } elsif ($uni) { 1758 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1600 } 1762 }
1601 1763
1602 $self->_set_text ($text); 1764 $self->_set_text ($text);
1603 $self->update; 1765
1604 $self->check_size; 1766 $self->realloc;
1767
1768 1
1605} 1769}
1606 1770
1607sub focus_in { 1771sub focus_in {
1608 my ($self) = @_; 1772 my ($self) = @_;
1609 1773
… …
1624 utf8::encode $text; 1788 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1626 1790
1627 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1628 $self->update; 1792 $self->update;
1793
1794 1
1629} 1795}
1630 1796
1631sub mouse_motion { 1797sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1633# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1634} 1802}
1635 1803
1636sub _draw { 1804sub _draw {
1637 my ($self) = @_; 1805 my ($self) = @_;
1638 1806
1639 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1640 1808
1641 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1642 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1643 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1644 } else { 1812 } else {
1645 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1646 } 1814 }
1647 1815
1648 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1649 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1650 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1651 glVertex 0 , 0; 1819 glVertex 0 , 0;
1652 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1653 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1654 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1715 } else { 1883 } else {
1716 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1717 } 1885 }
1718 1886
1719 } else { 1887 } else {
1720 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1721 } 1891 1
1722
1723} 1892}
1724 1893
1725############################################################################# 1894#############################################################################
1726 1895
1727package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1736 1905
1737sub new { 1906sub new {
1738 my $class = shift; 1907 my $class = shift;
1739 1908
1740 $class->SUPER::new ( 1909 $class->SUPER::new (
1741 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1742 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1744 can_hover => 1, 1914 can_hover => 1,
1745 align => 0, 1915 align => 0,
1746 valign => 0, 1916 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1756 1926
1757 $self->emit ("activate") 1927 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1929 && $y >= 0 && $y < $self->{h};
1930
1931 1
1760} 1932}
1761 1933
1762sub _draw { 1934sub _draw {
1763 my ($self) = @_; 1935 my ($self) = @_;
1764 1936
1765 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1766
1767 if ($GRAB == $self) {
1768 $self->{fg} = $self->{active_fg};
1769 }
1770 1938
1771 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1773 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1774 1942
… …
1793 1961
1794sub new { 1962sub new {
1795 my $class = shift; 1963 my $class = shift;
1796 1964
1797 $class->SUPER::new ( 1965 $class->SUPER::new (
1798 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1799 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 1972 state => 0,
… …
1807} 1976}
1808 1977
1809sub size_request { 1978sub size_request {
1810 my ($self) = @_; 1979 my ($self) = @_;
1811 1980
1812 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1813} 1982}
1814 1983
1815sub button_down { 1984sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1817 1986
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1822 } 1995 1
1823} 1996}
1824 1997
1825sub _draw { 1998sub _draw {
1826 my ($self) = @_; 1999 my ($self) = @_;
1827 2000
1828 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1829 2002
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 2004
1832 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1833 2008
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 2010
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 2012
… …
1992 2167
1993 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
1994 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
1995 2170
1996 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
1997 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1998 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 2176
2001 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2002 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2102 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2109 vertical => 0, 2285 vertical => 0,
2110 can_hover => 1, 2286 can_hover => 1,
2111 inner_pad => 0.02, 2287 inner_pad => 0.02,
2112 @_ 2288 @_
2113 ); 2289 );
… …
2116 $self->update; 2292 $self->update;
2117 2293
2118 $self 2294 $self
2119} 2295}
2120 2296
2297sub changed { }
2298
2121sub set_range { 2299sub set_range {
2122 my ($self, $range) = @_; 2300 my ($self, $range) = @_;
2123 2301
2124 $self->{range} = $range; 2302 ($range, $self->{range}) = ($self->{range}, $range);
2125 2303
2126 $self->update; 2304 $self->update
2305 if "@$range" ne "@{$self->{range}}";
2127} 2306}
2128 2307
2129sub set_value { 2308sub set_value {
2130 my ($self, $value) = @_; 2309 my ($self, $value) = @_;
2131 2310
… …
2150} 2329}
2151 2330
2152sub size_request { 2331sub size_request {
2153 my ($self) = @_; 2332 my ($self) = @_;
2154 2333
2155 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2335}
2160 2336
2161sub button_down { 2337sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2163 2339
2164 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2165 2341
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2343
2168 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2169} 2345}
2170 2346
2171sub mouse_motion { 2347sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2173 2349
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2354
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2356
2181 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2182 } 2362 1
2183} 2363}
2184 2364
2185sub update { 2365sub update {
2186 my ($self) = @_; 2366 my ($self) = @_;
2187 2367
2188 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2189 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2190 2377
2191 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2193 2380
… …
2199 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2200 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2201 2388
2202 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2203 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2204 }); 2391 }
2205
2206 $self->SUPER::update;
2207}
2208
2209sub _draw {
2210 my ($self) = @_;
2211 2392
2212 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2213 2394
2214 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2215 2396
… …
2409 2590
2410 delete $self->{texture}; 2591 delete $self->{texture};
2411 } 2592 }
2412 2593
2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2414 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2415 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2416 2597
2417 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2418 2599
2419 my $y0 = $top; 2600 my $y0 = $top;
… …
2454sub _draw { 2635sub _draw {
2455 my ($self) = @_; 2636 my ($self) = @_;
2456 2637
2457 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2460 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2461 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2462 2643
2463 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2464 2645
2465} 2646}
… …
2514 2695
2515sub new { 2696sub new {
2516 my $class = shift; 2697 my $class = shift;
2517 2698
2518 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2519 state => 0, 2700 state => 0,
2520 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2521 @_ 2702 @_
2522 ); 2703 );
2523 2704
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2705 $self
2530} 2706}
2531 2707
2532sub toggle_flopper { 2708sub toggle_flopper {
2533 my ($self) = @_; 2709 my ($self) = @_;
2534 2710
2535 # TODO: use animation 2711 $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} 2712}
2547 2713
2548############################################################################# 2714#############################################################################
2549 2715
2550package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2563} 2729}
2564 2730
2565sub set_tooltip_from { 2731sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2567 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2568 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2746 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2748 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2760
2586sub size_allocate { 2761sub size_allocate {
2587 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2588 2763
2589 $self->SUPER::size_allocate ($w - 4, $h - 4); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
2766
2767sub visibility_change {
2768 my ($self, $visible) = @_;
2769
2770 return unless $visible;
2771
2772 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner}
2774 or return;
2775
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH;
2780
2781 $self->move_abs ($x, $y);
2782 });
2590} 2783}
2591 2784
2592sub _draw { 2785sub _draw {
2593 my ($self) = @_; 2786 my ($self) = @_;
2594 2787
… …
2611 glVertex $w, $h; 2804 glVertex $w, $h;
2612 glVertex $w, 0; 2805 glVertex $w, 0;
2613 glEnd; 2806 glEnd;
2614 2807
2615 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2616 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2617} 2811}
2618 2812
2619############################################################################# 2813#############################################################################
2620 2814
… …
2626 2820
2627sub new { 2821sub new {
2628 my $class = shift; 2822 my $class = shift;
2629 2823
2630 my $self = $class->SUPER::new ( 2824 my $self = $class->SUPER::new (
2631 aspect => 1, 2825 aspect => 1,
2826 can_events => 0,
2632 @_, 2827 @_,
2633 ); 2828 );
2634 2829
2635 if ($self->{anim} && $self->{animspeed}) { 2830 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2831 Scalar::Util::weaken (my $widget = $self);
… …
2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2679 2874
2680 if ($tex) { 2875 if ($tex) {
2681 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2683 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2685 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2686 } 2881 }
2687} 2882}
2688 2883
… …
2695 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2696} 2891}
2697 2892
2698############################################################################# 2893#############################################################################
2699 2894
2700package CFClient::UI::InventoryItem; 2895package CFClient::UI::Buttonbar;
2701 2896
2702our @ISA = CFClient::UI::HBox::; 2897our @ISA = CFClient::UI::HBox::;
2703 2898
2704sub _item_to_desc { 2899# 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 2900
2861############################################################################# 2901#############################################################################
2862 2902
2863package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2864 2904
… …
2905 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 2946 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2908 2948
2909 $self->show; 2949 $self->show;
2910 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2911} 2951}
2912 2952
2913sub mouse_motion { 2953sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2915 2955
2916 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2919} 2961}
2920 2962
2921sub button_up { 2963sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2923 2965
… …
2925 undef $GRAB; 2967 undef $GRAB;
2926 $self->hide; 2968 $self->hide;
2927 2969
2928 $self->_emit ("popdown"); 2970 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2930 } 2976 1
2931} 2977}
2932 2978
2933############################################################################# 2979#############################################################################
2934 2980
2935package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2936 2982
2937our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2938 2984
2939sub new { 2985sub new {
2940 my $class = shift; 2986 my $class = shift;
2941 2987
2942 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2943 fontsize => 0.8, 3097 fontsize => 0.8,
2944 @_, 3098 @_,
2945 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2946} 3106}
2947 3107
2948sub reorder { 3108sub reorder {
2949 my ($self) = @_; 3109 my ($self) = @_;
2950 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2951 3116
2952 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2953 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2954 } 3119 }
2955 3120
… …
2958 my @items = sort { 3123 my @items = sort {
2959 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2960 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2961 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2962 3127
3128 $self->{timer}->interval (1);
3129
2963 my $count = 10 + 1; 3130 my $count = 10 + 1;
2964 for my $item (@items) { 3131 for my $item (@items) {
2965 last unless --$count; 3132 last unless --$count;
2966 3133
2967 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2968 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2969 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2970 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2971 : $item->{text}; 3138 : $item->{text};
2972 3139
… …
2980 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2981 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2982 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2983 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2985 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2986 can_events => 1, 3153 can_events => 1,
2987 can_hover => 1 3154 can_hover => 1
2988 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2989 } 3168 }
2990 3169
2991 $self->clear; 3170 $self->clear;
2992 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2993} 3172}
… …
2996 my ($self, $text, %arg) = @_; 3175 my ($self, $text, %arg) = @_;
2997 3176
2998 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
3000 3179
3180 return unless $text;
3181
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3002 3183
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3185
3005 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
3006 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
3036 3217
3037 $self->reorder; 3218 $self->reorder;
3038 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
3039} 3220}
3040 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
3041############################################################################# 3230#############################################################################
3042 3231
3043package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
3044 3233
3045our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3235
3049sub new { 3236sub new {
3050 my $class = shift; 3237 my $class = shift;
3051 3238
3052 $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
3053 @_, 3481 @_,
3054 ) 3482 )
3055} 3483}
3056 3484
3057sub configure { 3485# XXX: Do sorting? Argl...
3058 my ($self, $x, $y, $w, $h) = @_; 3486sub add_spell {
3059
3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
3063
3064sub check_size {
3065 my ($self) = @_; 3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
3066 3489
3067 $self->size_allocate ($self->{w}, $self->{h}) 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3068 if $self->{w}; 3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root;
3528
3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3532
3533use CFClient::OpenGL;
3534
3535sub new {
3536 my $class = shift;
3537
3538 my $self = $class->SUPER::new (
3539 visible => 1,
3540 @_,
3541 );
3542
3543 Scalar::Util::weaken ($self->{root} = $self);
3544
3545 $self
3069} 3546}
3070 3547
3071sub size_request { 3548sub size_request {
3072 my ($self) = @_; 3549 my ($self) = @_;
3073 3550
3074 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
3075} 3566}
3076 3567
3077sub size_allocate { 3568sub size_allocate {
3078 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
3079 3570
3080 for my $child ($self->children) { 3571 for my $child ($self->children) {
3081 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3082 3573
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3085 3576
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3578 $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 3579
3092 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
3093 } 3581 }
3094} 3582}
3095 3583
… …
3106} 3594}
3107 3595
3108sub update { 3596sub update {
3109 my ($self) = @_; 3597 my ($self) = @_;
3110 3598
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
3113} 3600}
3114 3601
3115sub add { 3602sub add {
3116 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3117 3604
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; 3605 $_->{is_toplevel} = 1
3126 3606 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3607
3132 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3133} 3609}
3134 3610
3135sub remove { 3611sub remove {
3136 my ($self, @children) = @_; 3612 my ($self, @children) = @_;
3137 3613
3138 $self->SUPER::remove (@children); 3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3139 3618
3140 while (@children) { 3619 while (@children) {
3141 my $w = pop @children; 3620 my $w = pop @children;
3142 push @children, $w->children; 3621 push @children, $w->children;
3143 $w->set_invisible; 3622 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3163 $_->() 3642 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3165 } 3644 }
3166 3645
3167 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3168 my @queue = ([], []); 3647 my %queue;
3648 my @queue;
3649 my $widget;
3169 3650
3170 for (;;) { 3651 outer:
3171 if ($self->{check_size}) { 3652 while () {
3172 # heuristic: check containers last 3653 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3654 for $widget (values %$realloc) {
3174 for values %{delete $self->{check_size}} 3655 $widget->{visible} or next; # do not resize invisible widgets
3656
3657 $queue{$widget+0}++ and next; # duplicates are common
3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3175 } 3661 }
3176 3662
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3663 while () {
3664 @queue or last outer;
3178 3665
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3666 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3667 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 3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3187 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3189 3689
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3191 3691
3192 $widget->{parent}->check_size
3193 if $widget->{parent}; 3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3194 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3195 } 3702 }
3196 } 3703 }
3197 3704
3198 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 my ($widget, $w, $h) = @$_; 3707 values %$size_alloc;
3708
3709 while () {
3710 my $widget = pop @queue || last;
3711
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3201 3713
3202 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3204 3716
3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3205 $widget->{w} = $w; 3724 $widget->{w} = $w;
3206 $widget->{h} = $h; 3725 $widget->{h} = $h;
3726
3207 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3208 } 3729 }
3209 } 3730 }
3210 3731
3211 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3212 $_->() 3733 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3214 } 3735 }
3736
3215 3737
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3219 3741
… …
3221 glLoadIdentity; 3743 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3746 glLoadIdentity;
3225 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3226 $self->_draw; 3755 $self->_draw;
3227} 3756}
3228 3757
3229############################################################################# 3758#############################################################################
3230 3759

Diff Legend

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