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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.285 by root, Mon Jun 5 03:07:01 2006 UTC

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

Diff Legend

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