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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.300 by root, Wed Jun 7 22:06:43 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;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 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;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $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.]+$/;
181 $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};
182 $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};
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
183 } 190 }
184 } 191 }
185 192
186 reconfigure_widgets; 193 reconfigure_widgets;
187} 194}
… …
196 203
197sub new { 204sub new {
198 my $class = shift; 205 my $class = shift;
199 206
200 my $self = bless { 207 my $self = bless {
201 x => 0, 208 x => "center",
202 y => 0, 209 y => "center",
203 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
204 can_events => 1, 213 can_events => 1,
205 @_ 214 @_
206 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 218
208 for (keys %$self) { 219 for (keys %$self) {
209 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
211 } 222 }
212 } 223 }
213 224
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
221 } 235 }
222 236
223 $self 237 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 238}
235 239
236sub destroy { 240sub destroy {
237 my ($self) = @_; 241 my ($self) = @_;
238 242
… …
240 %$self = (); 244 %$self = ();
241} 245}
242 246
243sub show { 247sub show {
244 my ($self) = @_; 248 my ($self) = @_;
249
245 return if $self->{parent}; 250 return if $self->{parent};
246 251
247 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
248}
249
250sub center {
251 my ($self) = @_;
252
253 $CFClient::UI::ROOT->on_post_alloc (
254 "center_$self" => sub {
255 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
256 },
257 );
258
259 $self->update;
260} 253}
261 254
262sub set_visible { 255sub set_visible {
263 my ($self) = @_; 256 my ($self) = @_;
264 257
265 return if $self->{visible}; 258 return if $self->{visible};
266 259
267 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
268 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
269 262
270 $self->emit (visibility_change => 1) 263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
271} 268}
272 269
273sub set_invisible { 270sub set_invisible {
274 my ($self) = @_; 271 my ($self) = @_;
275 272
276 return unless $self->{visible}; 273 return unless $self->{visible};
277 274
278 # broken show/hide model 275 $_->set_invisible for $self->children;
279 276
280 delete $self->{root}; 277 delete $self->{root};
281 delete $self->{visible}; 278 delete $self->{visible};
282 279
283 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
284 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
285 282
286 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
287 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
288 285
289 $self->focus_out; 286 $self->focus_out;
290 287
291 $self->emit (visibility_change => 0); 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;
292} 306}
293 307
294sub hide { 308sub hide {
295 my ($self) = @_; 309 my ($self) = @_;
296 310
… …
298 312
299 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
300 if $self->{parent}; 314 if $self->{parent};
301} 315}
302 316
303sub move { 317sub move_abs {
304 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
305 319
306 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
307 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
308 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
309 323
310 $self->update; 324 $self->update;
311} 325}
312 326
313sub set_size { 327sub set_size {
314 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
315 329
316 $self->{def_w} = $w; 330 $self->{force_w} = $w;
317 $self->{def_h} = $h; 331 $self->{force_h} = $h;
318 332
319 $self->check_size; 333 $self->realloc;
320} 334}
321 335
322sub size_request { 336sub size_request {
323 require Carp; 337 require Carp;
324 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
326 340
327sub configure { 341sub configure {
328 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
329 343
330 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
331 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
332 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
333 349
334 # use alignment to adjust x, y 350 # use alignment to adjust x, y
335 351
336 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
337 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
338
339 ($w, $h) = ($w2, $h2);
340 } 354 }
341 355
342 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
343 $self->{x} = $x; 357 $self->{x} = $x;
344 $self->{y} = $y; 358 $self->{y} = $y;
345 $self->update; 359 $self->update;
346 } 360 }
347 361
348 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349 $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;
350 } 369 }
351} 370}
352 371
353sub size_allocate { 372sub size_allocate {
354 # nothing to be done 373 # nothing to be done
355} 374}
356 375
357sub reconfigure {
358 my ($self) = @_;
359
360 $self->check_size (1);
361 $self->update;
362}
363
364sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
365} 382}
366 383
367sub set_max_size { 384sub set_max_size {
368 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
369 386
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
372} 391}
373 392
374sub set_tooltip { 393sub set_tooltip {
375 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
376 395
… …
381 400
382 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
383 402
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 406 }
388} 407}
389 408
390# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
391sub coord2local { 410sub coord2local {
… …
428 447
429 $::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
430 unless $FOCUS; 449 unless $FOCUS;
431} 450}
432 451
433sub mouse_motion { } 452sub mouse_motion { 0 }
434sub button_up { } 453sub button_up { 0 }
435sub key_down { } 454sub key_down { 0 }
436sub key_up { } 455sub key_up { 0 }
437 456
438sub button_down { 457sub button_down {
439 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
440 459
441 $self->focus_in; 460 $self->focus_in;
442}
443 461
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
448sub 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
449 538
450sub draw { 539sub draw {
451 my ($self) = @_; 540 my ($self) = @_;
452 541
453 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);
454 553
455 glPushMatrix; 554 glPushMatrix;
456 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
457 $self->_draw;
458 glPopMatrix;
459 556
460 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
461 my ($x, $y) = @$self{qw(x y)};
462
463 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
464 glEnable GL_BLEND; 559 glEnable GL_BLEND;
465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
466 glBegin GL_QUADS; 561 glBegin GL_QUADS;
467 glVertex $x , $y; 562 glVertex 0 , 0;
468 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
469 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
470 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
471 glEnd; 566 glEnd;
472 glDisable GL_BLEND; 567 glDisable GL_BLEND;
473 } 568 }
474 569
475 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
476 glPushMatrix; 571 glPushMatrix;
477 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
479 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0; 575 glVertex 0 , 0;
481 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
482 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
483 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
484 glEnd; 579 glEnd;
485 glPopMatrix; 580 glPopMatrix;
486 #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;
487 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
488} 586}
489 587
490sub _draw { 588sub _draw {
491 my ($self) = @_; 589 my ($self) = @_;
492 590
493 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
494}
495
496sub find_widget {
497 my ($self, $x, $y) = @_;
498
499 return () unless $self->{can_events};
500
501 return $self
502 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
503 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
504
505 ()
506}
507
508sub set_parent {
509 my ($self, $parent) = @_;
510
511 Scalar::Util::weaken ($self->{parent} = $parent);
512
513 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
514
515 $self->check_size;
516}
517
518sub check_size {
519 my ($self, $forced) = @_;
520
521 $self->{force_alloc} = 1 if $forced;
522 $CFClient::UI::ROOT->{check_size}{$self} = $self;
523}
524
525sub update {
526 my ($self) = @_;
527
528 $self->{parent}->update
529 if $self->{parent};
530}
531
532sub connect {
533 my ($self, $signal, $cb) = @_;
534
535 push @{ $self->{signal_cb}{$signal} }, $cb;
536}
537
538sub _emit {
539 my ($self, $signal, @args) = @_;
540
541 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
542}
543
544sub emit {
545 my ($self, $signal, @args) = @_;
546
547 $self->_emit ($signal, @args)
548 || $self->$signal (@args);
549}
550
551sub visibility_change {
552 #my ($self, $visible) = @_;
553} 592}
554 593
555sub DESTROY { 594sub DESTROY {
556 my ($self) = @_; 595 my ($self) = @_;
557 596
… …
589 628
590 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
591 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
592 631
593 glEnable GL_BLEND; 632 glEnable GL_BLEND;
594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
595 glColor @$color; 634 glColor_premultiply @$color;
596 635
597 glBegin GL_QUADS; 636 glBegin GL_QUADS;
598 glVertex 0 , 0; 637 glVertex 0 , 0;
599 glVertex 0 , $h; 638 glVertex 0 , $h;
600 glVertex $w, $h; 639 glVertex $w, $h;
… …
615 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
616 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
617} 656}
618 657
619sub size_request { 658sub size_request {
620 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
621} 662}
622 663
623sub draw { } 664sub draw { }
624 665
625############################################################################# 666#############################################################################
… …
629our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
630 671
631sub new { 672sub new {
632 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
633 674
634 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
635 676
636 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
637 children => [], 678 children => [],
638 can_events => 0, 679 can_events => 0,
639 %arg, 680 %arg,
640 ); 681 );
682
641 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
642 685
643 $self 686 $self
644} 687}
645 688
646sub add { 689sub add {
… …
654 $self->{children} = [ 697 $self->{children} = [
655 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
656 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
657 ]; 700 ];
658 701
659 $self->check_size (1); 702 $self->realloc;
660 $self->update;
661} 703}
662 704
663sub children { 705sub children {
664 @{ $_[0]{children} } 706 @{ $_[0]{children} }
665} 707}
… …
670 delete $child->{parent}; 712 delete $child->{parent};
671 $child->hide; 713 $child->hide;
672 714
673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674 716
675 $self->check_size (1); 717 $self->realloc;
676 $self->update;
677} 718}
678 719
679sub clear { 720sub clear {
680 my ($self) = @_; 721 my ($self) = @_;
681 722
… …
685 for (@$children) { 726 for (@$children) {
686 delete $_->{parent}; 727 delete $_->{parent};
687 $_->hide; 728 $_->hide;
688 } 729 }
689 730
690 $self->check_size; 731 $self->realloc;
691 $self->update;
692} 732}
693 733
694sub find_widget { 734sub find_widget {
695 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
696 736
697 $x -= $self->{x}; 737 $x -= $self->{x};
698 $y -= $self->{y}; 738 $y -= $self->{y};
699 739
700 my $res; 740 my $res;
701 741
702 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
703 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
704 and return $res; 744 and return $res;
705 } 745 }
706 746
707 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
756 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
757} 797}
758 798
759############################################################################# 799#############################################################################
760 800
801# back-buffered drawing area
802
761package CFClient::UI::Window; 803package CFClient::UI::Window;
762 804
763our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
764 806
765use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
783 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
784 $self->update; 826 $self->update;
785} 827}
786 828
787sub _render { 829sub _render {
830 my ($self) = @_;
831
788 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
789} 833}
790 834
791sub render_child { 835sub render_child {
792 my ($self) = @_; 836 my ($self) = @_;
793 837
794 $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 {
795 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
796 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
797 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
798 $self->_render; 849 $self->_render;
799 }; 850 };
800} 851}
801 852
802sub _draw { 853sub _draw {
803 my ($self) = @_; 854 my ($self) = @_;
804 855
805 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
806 857
807 my $tex = $self->{texture} 858 my $tex = $self->{texture}
808 or return; 859 or return;
809 860
810 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
813 864
814 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
815 866
816 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
817} 868}
… …
833} 884}
834 885
835sub size_request { 886sub size_request {
836 my ($self) = @_; 887 my ($self) = @_;
837 888
838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
839 890
840 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
842 893
843 ($w, $h) 894 ($w, $h)
844} 895}
845 896
846sub size_allocate { 897sub size_allocate {
847 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
848 899
900 my $child = $self->child;
901
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851 904
852 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
853 $self->update; 906 $self->update;
854} 907}
855 908
… …
891} 944}
892 945
893sub _render { 946sub _render {
894 my ($self) = @_; 947 my ($self) = @_;
895 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
896 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897 953
898 $self->SUPER::_render; 954 $self->SUPER::_render;
899} 955}
900 956
… …
903package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
904 960
905our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
906 962
907sub new { 963sub new {
908 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
909 967
910 my $self; 968 my $self;
911 969
912 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
913 vertical => 1, 971 vertical => 1,
… …
918 ; 976 ;
919 977
920 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
921 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
922 slider => $slider, 980 slider => $slider,
923 @_, 981 %arg,
924 ); 982 );
925 983
926 $self->{vp}->add ($self->{scrolled});
927 $self->add ($self->{vp});
928 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
929 986
930 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
931} 994}
932 995
933sub update { 996sub update {
934 my ($self) = @_; 997 my ($self) = @_;
935 998
… …
974 1037
975 if ($self->{bg}) { 1038 if ($self->{bg}) {
976 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
977 1040
978 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
979 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
980 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
981 1044
982 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
983 glVertex 0 , 0; 1046 glVertex 0 , 0;
984 glVertex 0 , $h; 1047 glVertex 0 , $h;
985 glVertex $w, $h; 1048 glVertex $w, $h;
… …
998 1061
999our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
1000 1063
1001use CFClient::OpenGL; 1064use CFClient::OpenGL;
1002 1065
1003my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1005 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);
1006 1073
1007sub new { 1074sub new {
1008 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1009 1078
1010 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1082 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1083 can_events => 1,
1016 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1017 ); 1087 );
1018 1088
1019 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1020 align => 0, 1090 align => 0,
1021 valign => 1, 1091 valign => 1,
1022 text => $self->{title}, 1092 text => $title,
1023 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1024 1095
1025 $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};
1026} 1104}
1027 1105
1028sub border { 1106sub border {
1029 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1030} 1108}
1031 1109
1032sub size_request { 1110sub size_request {
1033 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1034 1115
1035 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1036 1117
1037 ( 1118 (
1038 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1041} 1122}
1042 1123
1043sub size_allocate { 1124sub size_allocate {
1044 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1045 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
1046 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1048 1137
1049 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1050 if $self->{title};
1051
1052 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1053} 1139}
1054 1140
1055sub button_down { 1141sub button_down {
1056 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1057 1143
… …
1073 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1074 1160
1075 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1077 1163
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1166
1083 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1084 }; 1169 };
1085 1170
1086 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1175 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1092 1177
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1179
1095 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1097 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1101 } 1188 1
1102} 1189}
1103 1190
1104sub button_up { 1191sub button_up {
1105 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1106 1193
1107 delete $self->{motion}; 1194 !!delete $self->{motion}
1108} 1195}
1109 1196
1110sub mouse_motion { 1197sub mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1112 1199
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1114} 1203}
1115 1204
1116sub _draw { 1205sub _draw {
1117 my ($self) = @_; 1206 my ($self) = @_;
1118 1207
1208 my $child = $self->{children}[0];
1209
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1212
1122 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1215
1125 my $border = $self->border; 1216 my $border = $self->border;
1126 1217
1127 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1223
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1135 1226
1136 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1139
1140 glColor @{ $self->{bg} };
1141
1142 $bg->{s} = $rep_x;
1143 $bg->{t} = $rep_y;
1144 $bg->{wrap_mode} = 1;
1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1232 }
1147 1233
1148 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1149 1235
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1153} 1242}
1154 1243
1155############################################################################# 1244#############################################################################
1156 1245
1157package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1180 1269
1181 $child->set_parent ($self); 1270 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1183 1272
1184 $self->check_size (1); 1273 $self->realloc;
1185} 1274}
1186 1275
1187# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1277sub clear {
1189 my ($self) = @_; 1278 my ($self) = @_;
… …
1194 for (@children) { 1283 for (@children) {
1195 delete $_->{parent}; 1284 delete $_->{parent};
1196 $_->hide; 1285 $_->hide;
1197 } 1286 }
1198 1287
1199 $self->check_size (1); 1288 $self->realloc;
1200 $self->update;
1201} 1289}
1202 1290
1203sub get_wh { 1291sub get_wh {
1204 my ($self) = @_; 1292 my ($self) = @_;
1205 1293
… …
1413 ellipsise => 3, # end 1501 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1415 fontsize => 1, 1503 fontsize => 1,
1416 align => -1, 1504 align => -1,
1417 valign => -1, 1505 valign => -1,
1418 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1419 can_events => 0, 1508 can_events => 0,
1420 %arg 1509 %arg
1421 ); 1510 );
1422 1511
1423 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1450 1539
1451 delete $self->{texture}; 1540 delete $self->{texture};
1452 $self->SUPER::update; 1541 $self->SUPER::update;
1453} 1542}
1454 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1455sub set_text { 1551sub set_text {
1456 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1457 1553
1458 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1459 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1460 1556
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1463 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1464 $self->update; 1562 $self->update;
1465 $self->check_size;
1466} 1563}
1467 1564
1468sub set_markup { 1565sub set_markup {
1469 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1470 1567
… …
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1572
1476 $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;
1477 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1478 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1479 $self->update; 1578 $self->update;
1480 $self->check_size;
1481} 1579}
1482 1580
1483sub size_request { 1581sub size_request {
1484 my ($self) = @_; 1582 my ($self) = @_;
1485 1583
1584 $self->{size_req} ||= do {
1486 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1487 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1491 1590
1492 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1493 1592
1494 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1495 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1496 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1596
1498 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1499 1598
1500 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1502 } 1604 };
1503 1605
1504 ( 1606 @{ $self->{size_req} }
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1607}
1509 1608
1510sub size_allocate { 1609sub size_allocate {
1511 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1512 1611
1612 delete $self->{ox};
1613
1513 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1514} 1616}
1515 1617
1516sub set_fontsize { 1618sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1518 1620
1519 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1622 delete $self->{texture};
1521 1623
1522 $self->update; 1624 $self->realloc;
1523 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1524} 1633}
1525 1634
1526sub _draw { 1635sub _draw {
1527 my ($self) = @_; 1636 my ($self) = @_;
1528 1637
… …
1534 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1647
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1540 1650
1651 unless (exists $self->{ox}) {
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1544 1655
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1659 };
1551 1660
1552 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1554 1665
1555 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1556 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1557 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1558 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1560 } 1673 }
1561 1674
1562 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1563} 1676}
1564 1677
… …
1581 can_hover => 1, 1694 can_hover => 1,
1582 can_focus => 1, 1695 can_focus => 1,
1583 valign => 0, 1696 valign => 0,
1584 can_events => 1, 1697 can_events => 1,
1585 #text => ... 1698 #text => ...
1699 #hidden => "*",
1586 @_ 1700 @_
1587 ) 1701 )
1588} 1702}
1589 1703
1590sub _set_text { 1704sub _set_text {
… …
1592 1706
1593 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1594 1708
1595 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1596 1710
1597 delete $self->{texture};
1598
1599 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1600 $self->{text} = $text; 1712 $self->{text} = $text;
1601 1713
1602 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1603 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1604 1717
1605 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1606} 1722}
1607 1723
1608sub set_text { 1724sub set_text {
1609 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1610 1726
1611 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1728 $self->_set_text ($text);
1613 $self->update;
1614 $self->check_size;
1615} 1729}
1616 1730
1617sub get_text { 1731sub get_text {
1618 $_[0]{text} 1732 $_[0]{text}
1619} 1733}
… …
1649 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1652 } elsif ($uni) { 1766 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1654 } 1770 }
1655 1771
1656 $self->_set_text ($text); 1772 $self->_set_text ($text);
1657 $self->update; 1773
1658 $self->check_size; 1774 $self->realloc;
1775
1776 1
1659} 1777}
1660 1778
1661sub focus_in { 1779sub focus_in {
1662 my ($self) = @_; 1780 my ($self) = @_;
1663 1781
… …
1678 utf8::encode $text; 1796 utf8::encode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1680 1798
1681 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1682 $self->update; 1800 $self->update;
1801
1802 1
1683} 1803}
1684 1804
1685sub mouse_motion { 1805sub mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1687# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808
1809 0
1688} 1810}
1689 1811
1690sub _draw { 1812sub _draw {
1691 my ($self) = @_; 1813 my ($self) = @_;
1692 1814
1693 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1694 1816
1695 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1696 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1697 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1698 } else { 1820 } else {
1699 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1700 } 1822 }
1701 1823
1702 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1705 glVertex 0 , 0; 1827 glVertex 0 , 0;
1706 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1707 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1708 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1769 } else { 1891 } else {
1770 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1771 } 1893 }
1772 1894
1773 } else { 1895 } else {
1774 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1775 } 1899 1
1776
1777} 1900}
1778 1901
1779############################################################################# 1902#############################################################################
1780 1903
1781package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1790 1913
1791sub new { 1914sub new {
1792 my $class = shift; 1915 my $class = shift;
1793 1916
1794 $class->SUPER::new ( 1917 $class->SUPER::new (
1795 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1796 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1798 can_hover => 1, 1922 can_hover => 1,
1799 align => 0, 1923 align => 0,
1800 valign => 0, 1924 valign => 0,
… …
1809 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1810 1934
1811 $self->emit ("activate") 1935 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1814} 1940}
1815 1941
1816sub _draw { 1942sub _draw {
1817 my ($self) = @_; 1943 my ($self) = @_;
1818 1944
1819 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1820
1821 if ($GRAB == $self) {
1822 $self->{fg} = $self->{active_fg};
1823 }
1824 1946
1825 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1827 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1828 1950
… …
1847 1969
1848sub new { 1970sub new {
1849 my $class = shift; 1971 my $class = shift;
1850 1972
1851 $class->SUPER::new ( 1973 $class->SUPER::new (
1852 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1853 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 1978 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 1979 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 1980 state => 0,
… …
1861} 1984}
1862 1985
1863sub size_request { 1986sub size_request {
1864 my ($self) = @_; 1987 my ($self) = @_;
1865 1988
1866 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1867} 1990}
1868 1991
1869sub button_down { 1992sub button_down {
1870 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1871 1994
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1876 } 2003 1
1877} 2004}
1878 2005
1879sub _draw { 2006sub _draw {
1880 my ($self) = @_; 2007 my ($self) = @_;
1881 2008
1882 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1883 2010
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 2012
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2013 my ($w, $h) = @$self{qw(w h)};
2014
2015 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 2016
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 2018
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 2020
… …
2046 2175
2047 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2048 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2049 2178
2050 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2051 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2052 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 2184
2055 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2056 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2156 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2288 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2289 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2290 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2163 vertical => 0, 2293 vertical => 0,
2164 can_hover => 1, 2294 can_hover => 1,
2165 inner_pad => 0.02, 2295 inner_pad => 0.02,
2166 @_ 2296 @_
2167 ); 2297 );
… …
2170 $self->update; 2300 $self->update;
2171 2301
2172 $self 2302 $self
2173} 2303}
2174 2304
2305sub changed { }
2306
2175sub set_range { 2307sub set_range {
2176 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2177 2309
2178 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2179 2311
2180 $self->update
2181 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2182} 2316}
2183 2317
2184sub set_value { 2318sub set_value {
2185 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2186 2320
… …
2205} 2339}
2206 2340
2207sub size_request { 2341sub size_request {
2208 my ($self) = @_; 2342 my ($self) = @_;
2209 2343
2210 my $w = $self->{req_w}; 2344 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2345}
2215 2346
2216sub button_down { 2347sub button_down {
2217 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2218 2349
2219 $self->SUPER::button_down ($ev, $x, $y); 2350 $self->SUPER::button_down ($ev, $x, $y);
2220 2351
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2353
2223 $self->mouse_motion ($ev, $x, $y); 2354 $self->mouse_motion ($ev, $x, $y)
2224} 2355}
2225 2356
2226sub mouse_motion { 2357sub mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2358 my ($self, $ev, $x, $y) = @_;
2228 2359
… …
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2363 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2364
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2365 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2366
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2367 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2368 } else {
2369 return 0;
2370 }
2371
2237 } 2372 1
2238} 2373}
2239 2374
2240sub update { 2375sub update {
2241 my ($self) = @_; 2376 my ($self) = @_;
2242 2377
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2378 delete $self->{knob_w};
2379 $self->SUPER::update;
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 unless ($self->{knob_w}) {
2244 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2245 2387
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2248 2390
… …
2254 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2256 2398
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2259 }); 2401 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2402
2267 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2268 2404
2269 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2270 2406
… …
2331sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2332sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2333 2469
2334############################################################################# 2470#############################################################################
2335 2471
2336package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2337 2473
2338our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2339 2475
2340use CFClient::OpenGL; 2476use CFClient::OpenGL;
2341 2477
… …
2343 my $class = shift; 2479 my $class = shift;
2344 2480
2345 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2346 fontsize => 1, 2482 fontsize => 1,
2347 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2348 #font => default_font 2485 #font => default_font
2349 @_, 2486 @_,
2350 2487
2351 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2352 par => [], 2489 par => [],
… …
2375 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2376 2513
2377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2378 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2379 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2380 2518
2381 $self->reflow; 2519 $self->reflow;
2382} 2520}
2383 2521
2384sub text_size { 2522sub text_size {
… …
2386 2524
2387 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2388 2526
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2392 2531
2393 $layout->size 2532 $layout->size
2394} 2533}
2395 2534
… …
2434 2573
2435 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2436 2575
2437 delete $self->{texture}; 2576 delete $self->{texture};
2438 2577
2439 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2440 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2441 2580
2442 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2443 my $height = 0; 2582 my $height = 0;
2444 2583
… …
2447 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2448 2587
2449 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2450 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2451 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2452 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2453 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2454 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2455 $_->[1] = $h; 2595 $_->[1] = $h;
2456 } 2596 }
… …
2459 } 2599 }
2460 2600
2461 $self->{height} = $height; 2601 $self->{height} = $height;
2462 2602
2463 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2464 2604
2465 delete $self->{texture}; 2605 delete $self->{texture};
2466 } 2606 }
2467 2607
2468 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2469 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2470 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2471 2611
2472 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2473 2613
2474 my $y0 = $top; 2614 my $y0 = $top;
… …
2488 my $h = $par->[1]; 2628 my $h = $par->[1];
2489 2629
2490 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2491 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2492 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2493 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2494 2635
2495 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2496 2637
2497 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2509sub _draw { 2650sub _draw {
2510 my ($self) = @_; 2651 my ($self) = @_;
2511 2652
2512 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2515 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2516 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2517 2658
2518 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2519 2660
2520} 2661}
… …
2603} 2744}
2604 2745
2605sub set_tooltip_from { 2746sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2747 my ($self, $widget) = @_;
2607 2748
2749 my $tooltip = $widget->{tooltip};
2750
2751 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}";
2756 }
2757
2758 $tooltip =~ s/^\n+//;
2759 $tooltip =~ s/\n+$//;
2760
2608 $self->add (new CFClient::UI::Label 2761 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2762 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2763 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2764 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2765 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2766 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2767 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2625 2778
2626sub size_allocate { 2779sub size_allocate {
2627 my ($self, $w, $h) = @_; 2780 my ($self, $w, $h) = @_;
2628 2781
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2782 $self->SUPER::size_allocate ($w - 4, $h - 4);
2783}
2784
2785sub visibility_change {
2786 my ($self, $visible) = @_;
2787
2788 return unless $visible;
2789
2790 $self->{root}->on_post_alloc ("move_$self" => sub {
2791 my $widget = $self->{owner}
2792 or return;
2793
2794 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2795
2796 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2797 if $x + $self->{w} > $self->{root}{w};
2798
2799 $self->move_abs ($x, $y);
2800 });
2630} 2801}
2631 2802
2632sub _draw { 2803sub _draw {
2633 my ($self) = @_; 2804 my ($self) = @_;
2634 2805
… …
2651 glVertex $w, $h; 2822 glVertex $w, $h;
2652 glVertex $w, 0; 2823 glVertex $w, 0;
2653 glEnd; 2824 glEnd;
2654 2825
2655 glTranslate 2 - 0.375, 2 - 0.375; 2826 glTranslate 2 - 0.375, 2 - 0.375;
2827
2656 $self->SUPER::_draw; 2828 $self->SUPER::_draw;
2657} 2829}
2658 2830
2659############################################################################# 2831#############################################################################
2660 2832
… …
2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2891 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2720 2892
2721 if ($tex) { 2893 if ($tex) {
2722 glEnable GL_TEXTURE_2D; 2894 glEnable GL_TEXTURE_2D;
2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2895 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724 glColor 1, 1, 1, 1; 2896 glColor 0, 0, 0, 1;
2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2897 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726 glDisable GL_TEXTURE_2D; 2898 glDisable GL_TEXTURE_2D;
2727 } 2899 }
2728} 2900}
2729 2901
… …
2736 $self->SUPER::DESTROY; 2908 $self->SUPER::DESTROY;
2737} 2909}
2738 2910
2739############################################################################# 2911#############################################################################
2740 2912
2741package CFClient::UI::Inventory; 2913package CFClient::UI::Buttonbar;
2742 2914
2743our @ISA = CFClient::UI::ScrolledWindow::; 2915our @ISA = CFClient::UI::HBox::;
2744 2916
2745sub new { 2917# TODO: should actualyl wrap buttons and other goodies.
2746 my $class = shift;
2747
2748 my $self = $class->SUPER::new (
2749 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2750 @_,
2751 );
2752
2753 $self
2754}
2755
2756sub set_items {
2757 my ($self, $items) = @_;
2758
2759 $self->{scrolled}->clear;
2760 return unless $items;
2761
2762 my @items = sort {
2763 ($a->{type} <=> $b->{type})
2764 or ($a->{name} cmp $b->{name})
2765 } @$items;
2766
2767 $self->{real_items} = \@items;
2768
2769 my $row = 0;
2770 for my $item (@items) {
2771 CFClient::Item::update_widgets $item;
2772
2773 $self->{scrolled}->add (0, $row, $item->{face_widget});
2774 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2775 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2776
2777 $row++;
2778 }
2779}
2780 2918
2781############################################################################# 2919#############################################################################
2782 2920
2783package CFClient::UI::Menu; 2921package CFClient::UI::Menu;
2784 2922
… …
2796 ); 2934 );
2797 2935
2798 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2936 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2799 2937
2800 for my $item (@{ $self->{items} }) { 2938 for my $item (@{ $self->{items} }) {
2801 my ($widget, $cb) = @$item; 2939 my ($widget, $cb, $tooltip) = @$item;
2802 2940
2803 # handle various types of items, only text for now 2941 # handle various types of items, only text for now
2804 if (!ref $widget) { 2942 if (!ref $widget) {
2805 $widget = new CFClient::UI::Label 2943 $widget = new CFClient::UI::Label
2806 can_hover => 1, 2944 can_hover => 1,
2807 can_events => 1, 2945 can_events => 1,
2808 text => $widget; 2946 markup => $widget,
2947 tooltip => $tooltip
2809 } 2948 }
2810 2949
2811 $self->{item}{$widget} = $item; 2950 $self->{item}{$widget} = $item;
2812 2951
2813 $self->{vbox}->add ($widget); 2952 $self->{vbox}->add ($widget);
… …
2825 # maybe save $GRAB? must be careful about events... 2964 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 2965 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 2966 $self->{button} = $ev->{button};
2828 2967
2829 $self->show; 2968 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2969 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 2970}
2832 2971
2833sub mouse_motion { 2972sub mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 2973 my ($self, $ev, $x, $y) = @_;
2835 2974
2836 # TODO: should use vbox->find_widget or so 2975 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2976 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 2977 $self->{hover} = $self->{item}{$HOVER};
2978
2979 0
2839} 2980}
2840 2981
2841sub button_up { 2982sub button_up {
2842 my ($self, $ev, $x, $y) = @_; 2983 my ($self, $ev, $x, $y) = @_;
2843 2984
… …
2845 undef $GRAB; 2986 undef $GRAB;
2846 $self->hide; 2987 $self->hide;
2847 2988
2848 $self->_emit ("popdown"); 2989 $self->_emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 2990 $self->{hover}[1]->() if $self->{hover};
2991 } else {
2992 return 0
2993 }
2994
2850 } 2995 1
2851} 2996}
2852 2997
2853############################################################################# 2998#############################################################################
2854 2999
2855package CFClient::UI::Statusbox; 3000package CFClient::UI::Multiplexer;
2856 3001
2857our @ISA = CFClient::UI::VBox::; 3002our @ISA = CFClient::UI::Container::;
2858 3003
2859sub new { 3004sub new {
2860 my $class = shift; 3005 my $class = shift;
2861 3006
2862 $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
3008 @_,
3009 );
3010
3011 $self->{current} = $self->{children}[0]
3012 if @{ $self->{children} };
3013
3014 $self
3015}
3016
3017sub add {
3018 my ($self, @widgets) = @_;
3019
3020 $self->SUPER::add (@widgets);
3021
3022 $self->{current} = $self->{children}[0]
3023 if @{ $self->{children} };
3024}
3025
3026sub set_current_page {
3027 my ($self, $page_or_widget) = @_;
3028
3029 my $widget = ref $page_or_widget
3030 ? $page_or_widget
3031 : $self->{children}[$page_or_widget];
3032
3033 $self->{current} = $widget;
3034 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3035
3036 $self->_emit (page_changed => $self->{current});
3037
3038 $self->realloc;
3039}
3040
3041sub visible_children {
3042 $_[0]{current}
3043}
3044
3045sub size_request {
3046 my ($self) = @_;
3047
3048 $self->{current}->size_request
3049}
3050
3051sub size_allocate {
3052 my ($self, $w, $h) = @_;
3053
3054 $self->{current}->configure (0, 0, $w, $h);
3055}
3056
3057sub _draw {
3058 my ($self) = @_;
3059
3060 $self->{current}->draw;
3061}
3062
3063#############################################################################
3064
3065package CFClient::UI::Notebook;
3066
3067our @ISA = CFClient::UI::VBox::;
3068
3069sub new {
3070 my $class = shift;
3071
3072 my $self = $class->SUPER::new (
3073 buttonbar => (new CFClient::UI::Buttonbar),
3074 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3075 # filter => # will be put between multiplexer and $self
3076 @_,
3077 );
3078
3079 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3080 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3081
3082 $self
3083}
3084
3085sub add {
3086 my ($self, $title, $widget, $tooltip) = @_;
3087
3088 Scalar::Util::weaken $self;
3089
3090 $self->{buttonbar}->add (new CFClient::UI::Button
3091 markup => $title,
3092 tooltip => $tooltip,
3093 on_activate => sub { $self->set_current_page ($widget) },
3094 );
3095
3096 $self->{multiplexer}->add ($widget);
3097}
3098
3099sub set_current_page {
3100 my ($self, $page) = @_;
3101
3102 $self->{multiplexer}->set_current_page ($page);
3103 $self->_emit (page_changed => $self->{multiplexer}{current});
3104}
3105
3106#############################################################################
3107
3108package CFClient::UI::Combobox;
3109
3110use utf8;
3111
3112our @ISA = CFClient::UI::Button::;
3113
3114sub new {
3115 my $class = shift;
3116
3117 my $self = $class->SUPER::new (
3118 options => [], # [value, title, longdesc], ...
3119 value => undef,
3120 @_,
3121 );
3122
3123 $self->_set_value ($self->{value});
3124
3125 $self
3126}
3127
3128sub button_down {
3129 my ($self, $ev) = @_;
3130
3131 my @menu_items;
3132
3133 for (@{ $self->{options} }) {
3134 my ($value, $title, $tooltip) = @$_;
3135
3136 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3137 }
3138
3139 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3140}
3141
3142sub _set_value {
3143 my ($self, $value) = @_;
3144
3145 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3146 or return;
3147
3148 $self->{value} = $item->[0];
3149 $self->set_markup ("$item->[1] ⇓");
3150 $self->set_tooltip ($item->[2]);
3151}
3152
3153sub set_value {
3154 my ($self, $value) = @_;
3155
3156 return unless $self->{value} ne $value;
3157
3158 $self->_set_value ($value);
3159 $self->_emit (changed => $value);
3160}
3161
3162#############################################################################
3163
3164package CFClient::UI::Statusbox;
3165
3166our @ISA = CFClient::UI::VBox::;
3167
3168sub new {
3169 my $class = shift;
3170
3171 my $self = $class->SUPER::new (
2863 fontsize => 0.8, 3172 fontsize => 0.8,
2864 @_, 3173 @_,
2865 ) 3174 );
3175
3176 Scalar::Util::weaken (my $this = $self);
3177
3178 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3179
3180 $self
2866} 3181}
2867 3182
2868sub reorder { 3183sub reorder {
2869 my ($self) = @_; 3184 my ($self) = @_;
2870 my $NOW = time; 3185 my $NOW = Time::HiRes::time;
3186
3187 # freeze display when hovering over any label
3188 return if $CFClient::UI::TOOLTIP->{owner}
3189 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3190 values %{ $self->{item} };
2871 3191
2872 while (my ($k, $v) = each %{ $self->{item} }) { 3192 while (my ($k, $v) = each %{ $self->{item} }) {
2873 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3193 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2874 } 3194 }
2875 3195
… …
2878 my @items = sort { 3198 my @items = sort {
2879 $a->{pri} <=> $b->{pri} 3199 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id} 3200 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} }; 3201 } values %{ $self->{item} };
2882 3202
3203 $self->{timer}->interval (1);
3204
2883 my $count = 10 + 1; 3205 my $count = 10 + 1;
2884 for my $item (@items) { 3206 for my $item (@items) {
2885 last unless --$count; 3207 last unless --$count;
2886 3208
2887 push @widgets, $item->{label} ||= do { 3209 my $label = $item->{label} ||= do {
2888 # TODO: doesn't handle markup well (read as: at all) 3210 # TODO: doesn't handle markup well (read as: at all)
2889 my $short = $item->{count} > 1 3211 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}" 3212 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text}; 3213 : $item->{text};
2892 3214
… …
2900 tooltip => $item->{tooltip}, 3222 tooltip => $item->{tooltip},
2901 tooltip_font => $::FONT_PROP, 3223 tooltip_font => $::FONT_PROP,
2902 tooltip_width => 0.67, 3224 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize}, 3225 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44, 3226 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg}, 3227 fg => [@{ $item->{fg} }],
2906 can_events => 1, 3228 can_events => 1,
2907 can_hover => 1 3229 can_hover => 1
2908 }; 3230 };
3231
3232 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3233 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3234 $label->update;
3235 $label->set_max_size (undef, $label->{req_h} * $diff)
3236 if $diff < 1;
3237 $self->{timer}->interval (1/30);
3238 } else {
3239 $label->{fg}[3] = $item->{fg}[3] || 1;
3240 }
3241
3242 push @widgets, $label;
2909 } 3243 }
2910 3244
2911 $self->clear; 3245 $self->clear;
2912 $self->SUPER::add (reverse @widgets); 3246 $self->SUPER::add (reverse @widgets);
2913} 3247}
… …
2918 $text =~ s/^\s+//; 3252 $text =~ s/^\s+//;
2919 $text =~ s/\s+$//; 3253 $text =~ s/\s+$//;
2920 3254
2921 return unless $text; 3255 return unless $text;
2922 3256
2923 my $timeout = time + ((delete $arg{timeout}) || 60); 3257 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2924 3258
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3259 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926 3260
2927 if (my $item = $self->{item}{$group}) { 3261 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) { 3262 if ($item->{text} eq $text) {
2929 $item->{count}++; 3263 $item->{count}++;
2930 } else { 3264 } else {
2931 $item->{count} = 1; 3265 $item->{count} = 1;
2932 $item->{text} = $item->{tooltip} = $text; 3266 $item->{text} = $item->{tooltip} = $text;
2933 } 3267 }
2934 $item->{id} = ++$self->{id}; 3268 $item->{id} += 0.2;#d#
2935 $item->{timeout} = $timeout; 3269 $item->{timeout} = $timeout;
2936 delete $item->{label}; 3270 delete $item->{label};
2937 } else { 3271 } else {
2938 $self->{item}{$group} = { 3272 $self->{item}{$group} = {
2939 id => ++$self->{id}, 3273 id => ++$self->{id},
… …
2958 3292
2959 $self->reorder; 3293 $self->reorder;
2960 $self->SUPER::reconfigure; 3294 $self->SUPER::reconfigure;
2961} 3295}
2962 3296
3297sub DESTROY {
3298 my ($self) = @_;
3299
3300 $self->{timer}->cancel;
3301
3302 $self->SUPER::DESTROY;
3303}
3304
2963############################################################################# 3305#############################################################################
2964 3306
2965package CFClient::UI::Root; 3307package CFClient::UI::Inventory;
2966 3308
2967our @ISA = CFClient::UI::Container::; 3309our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969use CFClient::OpenGL;
2970 3310
2971sub new { 3311sub new {
2972 my $class = shift; 3312 my $class = shift;
2973 3313
2974 $class->SUPER::new ( 3314 my $self = $class->SUPER::new (
3315 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3316 @_,
3317 );
3318
3319 $self
3320}
3321
3322sub set_items {
3323 my ($self, $items) = @_;
3324
3325 $self->{child}->clear;
3326 return unless $items;
3327
3328 my @items = sort {
3329 ($a->{type} <=> $b->{type})
3330 or ($a->{name} cmp $b->{name})
3331 } @$items;
3332
3333 $self->{real_items} = \@items;
3334
3335 my $row = 0;
3336 for my $item (@items) {
3337 CFClient::Item::update_widgets $item;
3338
3339 $self->{child}->add (0, $row, $item->{face_widget});
3340 $self->{child}->add (1, $row, $item->{desc_widget});
3341 $self->{child}->add (2, $row, $item->{weight_widget});
3342
3343 $row++;
3344 }
3345}
3346
3347#############################################################################
3348
3349package CFClient::UI::BindEditor;
3350
3351our @ISA = CFClient::UI::FancyFrame::;
3352
3353sub new {
3354 my $class = shift;
3355
3356 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3357
3358 $self->add (my $vb = new CFClient::UI::VBox);
3359
3360
3361 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3362 text => "start recording",
3363 tooltip => "Start/Stops recording of actions."
3364 ."All subsequent actions after the recording started will be captured."
3365 ."The actions are displayed after the record was stopped."
3366 ."To bind the action you have to click on the 'Bind' button",
3367 on_activate => sub {
3368 unless ($self->{recording}) {
3369 $self->start;
3370 } else {
3371 $self->stop;
3372 }
3373 });
3374
3375 $vb->add (new CFClient::UI::Label text => "Actions:");
3376 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3377
3378 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3379 $vb->add (my $hb = new CFClient::UI::HBox);
3380 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3381 $hb->add (new CFClient::UI::Button
3382 text => "bind",
3383 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3384 on_activate => sub {
3385 $self->ask_for_bind;
3386 });
3387
3388 $vb->add (my $hb = new CFClient::UI::HBox);
3389 $hb->add (new CFClient::UI::Button
3390 text => "ok",
3391 expand => 1,
3392 tooltip => "This closes the binding editor and saves the binding",
3393 on_activate => sub {
3394 $self->hide;
3395 $self->commit;
3396 });
3397
3398 $hb->add (new CFClient::UI::Button
3399 text => "cancel",
3400 expand => 1,
3401 tooltip => "This closes the binding editor without saving",
3402 on_activate => sub {
3403 $self->hide;
3404 $self->{binding_cancel}->()
3405 if $self->{binding_cancel};
3406 });
3407
3408 $self->update_binding_widgets;
3409
3410 $self
3411}
3412
3413sub commit {
3414 my ($self) = @_;
3415 my ($mod, $sym, $cmds) = $self->get_binding;
3416 if ($sym != 0 && @$cmds > 0) {
3417 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3418 ."'. Don't forget 'Save Config'!");
3419 $self->{binding_change}->($mod, $sym, $cmds)
3420 if $self->{binding_change};
3421 } else {
3422 $::STATUSBOX->add ("No action bound, no key or action specified!");
3423 $self->{binding_cancel}->()
3424 if $self->{binding_cancel};
3425 }
3426}
3427
3428sub start {
3429 my ($self) = @_;
3430
3431 $self->{rec_btn}->set_text ("stop recording");
3432 $self->{recording} = 1;
3433 $self->clear_command_list;
3434 $::CONN->start_record if $::CONN;
3435}
3436
3437sub stop {
3438 my ($self) = @_;
3439
3440 $self->{rec_btn}->set_text ("start recording");
3441 $self->{recording} = 0;
3442
3443 my $rec;
3444 $rec = $::CONN->stop_record if $::CONN;
3445 return unless ref $rec eq 'ARRAY';
3446 $self->set_command_list ($rec);
3447}
3448
3449
3450sub ask_for_bind_and_commit {
3451 my ($self) = @_;
3452 $self->ask_for_bind (1);
3453}
3454
3455sub ask_for_bind {
3456 my ($self, $commit) = @_;
3457
3458 CFClient::Binder::open_binding_dialog (sub {
3459 my ($mod, $sym) = @_;
3460 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3461 $self->update_binding_widgets;
3462 $self->commit if $commit;
3463 });
3464}
3465
3466# $mod and $sym are the modifiers and key symbol
3467# $cmds is a array ref of strings (the commands)
3468# $cb is the callback that is executed on OK
3469# $ccb is the callback that is executed on CANCEL and
3470# when the binding was unsuccessful on OK
3471sub set_binding {
3472 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3473
3474 $self->clear_command_list;
3475 $self->{recording} = 0;
3476 $self->{rec_btn}->set_text ("start recording");
3477
3478 $self->{binding} = [$mod, $sym];
3479 $self->{commands} = $cmds;
3480
3481 $self->{binding_change} = $cb;
3482 $self->{binding_cancel} = $ccb;
3483
3484 $self->update_binding_widgets;
3485}
3486
3487# this is a shortcut method that asks for a binding
3488# and then just binds it.
3489sub do_quick_binding {
3490 my ($self, $cmds) = @_;
3491 $self->set_binding (undef, undef, $cmds, sub {
3492 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3493 });
3494 $self->ask_for_bind (1);
3495}
3496
3497sub update_binding_widgets {
3498 my ($self) = @_;
3499 my ($mod, $sym, $cmds) = $self->get_binding;
3500 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3501 $self->set_command_list ($cmds);
3502}
3503
3504sub get_binding {
3505 my ($self) = @_;
3506 return (
3507 $self->{binding}->[0],
3508 $self->{binding}->[1],
3509 [ grep { defined $_ } @{$self->{commands}} ]
3510 );
3511}
3512
3513sub clear_command_list {
3514 my ($self) = @_;
3515 $self->{cmdbox}->clear ();
3516}
3517
3518sub set_command_list {
3519 my ($self, $cmds) = @_;
3520
3521 $self->{cmdbox}->clear ();
3522 $self->{commands} = $cmds;
3523
3524 my $idx = 0;
3525
3526 for (@$cmds) {
3527 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3528
3529 my $i = $idx;
3530 $hb->add (new CFClient::UI::Label text => $_);
3531 $hb->add (new CFClient::UI::Button
3532 text => "delete",
3533 tooltip => "Deletes the action from the record",
3534 on_activate => sub {
3535 $self->{cmdbox}->remove ($hb);
3536 $cmds->[$i] = undef;
3537 });
3538
3539
3540 $idx++
3541 }
3542}
3543
3544#############################################################################
3545
3546package CFClient::UI::SpellList;
3547
3548our @ISA = CFClient::UI::Table::;
3549
3550sub new {
3551 my $class = shift;
3552
3553 my $self = $class->SUPER::new (
3554 binding => [],
3555 commands => [],
3556 @_,
3557 )
3558}
3559
3560my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3561
3562my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3563 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3564my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3565 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3566my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3567 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3568my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3569 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3570my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3571 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3572
3573sub rebuild_spell_list {
3574 my ($self) = @_;
3575
3576 $CFClient::UI::ROOT->on_refresh ($self => sub {
3577 $self->clear;
3578
3579 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3580 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3581 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3582 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3583 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3584
3585 my $row = 0;
3586
3587 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3588 my $spell = $self->{spell}{$_};
3589
3590 $row++;
3591
3592 my $spell_cb = sub {
3593 my ($widget, $ev) = @_;
3594
3595 if ($ev->{button} == 1) {
3596 $::CONN->user_send ("cast $spell->{name}");
3597 } elsif ($ev->{button} == 2) {
3598 $::CONN->user_send ("invoke $spell->{name}");
3599 } elsif ($ev->{button} == 3) {
3600 (new CFClient::UI::Menu
3601 items => [
3602 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3603 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3604 ],
3605 )->popup ($ev);
3606 } else {
3607 return 0;
3608 }
3609
3610 1
3611 };
3612
3613 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3614
3615 #TODO: add path info to tooltip
3616 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3617
3618 $self->add (0, $row, new CFClient::UI::Face
3619 face => $spell->{face},
3620 can_hover => 1,
3621 can_events => 1,
3622 tooltip => $tooltip,
3623 on_button_down => $spell_cb,
3624 );
3625
3626 $self->add (1, $row, new CFClient::UI::Label
3627 expand => 1,
3628 text => $spell->{name},
3629 can_hover => 1,
3630 can_events => 1,
3631 tooltip => $tooltip,
3632 on_button_down => $spell_cb,
3633 );
3634
3635 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3636 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3637 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3638 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3639 }
3640 });
3641}
3642
3643sub add_spell {
3644 my ($self, $spell) = @_;
3645
3646 $self->{spell}->{$spell->{name}} = $spell;
3647 $self->rebuild_spell_list;
3648}
3649
3650sub remove_spell {
3651 my ($self, $spell) = @_;
3652
3653 delete $self->{spell}->{$spell->{name}};
3654 $self->rebuild_spell_list;
3655}
3656
3657#############################################################################
3658
3659package CFClient::UI::Root;
3660
3661our @ISA = CFClient::UI::Container::;
3662
3663use List::Util qw(min max);
3664
3665use CFClient::OpenGL;
3666
3667sub new {
3668 my $class = shift;
3669
3670 my $self = $class->SUPER::new (
2975 visible => 1, 3671 visible => 1,
2976 @_, 3672 @_,
2977 ) 3673 );
2978}
2979 3674
2980sub configure { 3675 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3676
2983 $self->{w} = $w; 3677 $self
2984 $self->{h} = $h;
2985}
2986
2987sub check_size {
2988 my ($self) = @_;
2989
2990 $self->size_allocate ($self->{w}, $self->{h})
2991 if $self->{w};
2992} 3678}
2993 3679
2994sub size_request { 3680sub size_request {
2995 my ($self) = @_; 3681 my ($self) = @_;
2996 3682
2997 ($self->{w}, $self->{h}) 3683 ($self->{w}, $self->{h})
3684}
3685
3686sub _to_pixel {
3687 my ($coord, $size, $max) = @_;
3688
3689 $coord =
3690 $coord eq "center" ? ($max - $size) * 0.5
3691 : $coord eq "max" ? $max
3692 : $coord;
3693
3694 $coord = 0 if $coord < 0;
3695 $coord = $max - $size if $coord > $max - $size;
3696
3697 int $coord + 0.5
2998} 3698}
2999 3699
3000sub size_allocate { 3700sub size_allocate {
3001 my ($self, $w, $h) = @_; 3701 my ($self, $w, $h) = @_;
3002 3702
3003 for my $child ($self->children) { 3703 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3704 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3705
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3706 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3707 $Y = $child->{force_y} if exists $child->{force_y};
3008 3708
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3709 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3710 $Y = _to_pixel $Y, $H, $self->{h};
3011
3012 delete @$child{qw(req_x req_y)};
3013
3014 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3015 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3016 3711
3017 $child->configure ($X, $Y, $W, $H); 3712 $child->configure ($X, $Y, $W, $H);
3018 } 3713 }
3019} 3714}
3020 3715
… …
3031} 3726}
3032 3727
3033sub update { 3728sub update {
3034 my ($self) = @_; 3729 my ($self) = @_;
3035 3730
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3731 $::WANT_REFRESH++;
3038} 3732}
3039 3733
3040sub add { 3734sub add {
3041 my ($self, @children) = @_; 3735 my ($self, @children) = @_;
3042 3736
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3737 $_->{is_toplevel} = 1
3045 3738 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3739
3051 $self->SUPER::add (@children); 3740 $self->SUPER::add (@children);
3052
3053 for (my @widgets = @children; my $w = pop @widgets; ) {
3054 push @widgets, $w->children;
3055 $w->set_visible;
3056 }
3057
3058} 3741}
3059 3742
3060sub remove { 3743sub remove {
3061 my ($self, @children) = @_; 3744 my ($self, @children) = @_;
3062 3745
3063 $self->SUPER::remove (@children); 3746 $self->SUPER::remove (@children);
3747
3748 delete $self->{is_toplevel}
3749 for @children;
3064 3750
3065 while (@children) { 3751 while (@children) {
3066 my $w = pop @children; 3752 my $w = pop @children;
3067 push @children, $w->children; 3753 push @children, $w->children;
3068 $w->set_invisible; 3754 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3773 while ($self->{refresh_hook}) {
3088 $_->() 3774 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3775 for values %{delete $self->{refresh_hook}};
3090 } 3776 }
3091 3777
3092 if ($self->{check_size}) { 3778 if ($self->{realloc}) {
3779 my %queue;
3093 my @queue; 3780 my @queue;
3781 my $widget;
3094 3782
3095 for (;;) { 3783 outer:
3096 if ($self->{check_size}) { 3784 while () {
3097 #TODO use array-of-depth approach 3785 if (my $realloc = delete $self->{realloc}) {
3786 for $widget (values %$realloc) {
3787 $widget->{visible} or next; # do not resize invisible widgets
3098 3788
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3789 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3790
3791 push @{ $queue[$widget->{visible}] }, $widget;
3792 }
3101 } 3793 }
3102 3794
3795 while () {
3796 @queue or last outer;
3797
3103 my $widget = pop @queue || last; 3798 $widget = pop @{ $queue[-1] || [] }
3104 3799 and last;
3105 defined $widget->{visible} or last; # do not resize invisible widgets
3106
3107 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3108 ? @$widget{qw(def_w def_h)}
3109 : $widget->size_request;
3110
3111 if (delete $widget->{force_alloc}
3112 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3113 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3114 3800
3801 pop @queue;
3802 }
3803
3804 delete $queue{$widget+0};
3805
3806 my ($w, $h) = $widget->size_request;
3807
3808 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3809 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3810
3811 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3812 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3813
3814 $w = $widget->{force_w} if exists $widget->{force_w};
3815 $h = $widget->{force_h} if exists $widget->{force_h};
3816
3817 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3818 || delete $widget->{force_realloc}) {
3115 $widget->{req_w} = $w; 3819 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3820 $widget->{req_h} = $h;
3117 3821
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3822 $self->{size_alloc}{$widget+0} = $widget;
3119 3823
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 3824 if (my $parent = $widget->{parent}) {
3825 $self->{realloc}{$parent+0} = $parent
3826 unless $queue{$parent+0};
3827
3828 $parent->{force_size_alloc} = 1;
3829 $self->{size_alloc}{$parent+0} = $parent;
3830 }
3122 } 3831 }
3832
3833 delete $self->{realloc}{$widget+0};
3123 } 3834 }
3124 } 3835 }
3125 3836
3126 while ($self->{size_alloc}) { 3837 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3838 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3839 values %$size_alloc;
3840
3841 while () {
3842 my $widget = pop @queue || last;
3843
3844 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3845
3130 $w = 0 if $w < 0; 3846 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3847 $h = 0 if $h < 0;
3132 3848
3849 $w = int $w + 0.5;
3850 $h = int $h + 0.5;
3851
3852 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3853 $widget->{old_w} = $widget->{w};
3854 $widget->{old_h} = $widget->{h};
3855
3133 $widget->{w} = $w; 3856 $widget->{w} = $w;
3134 $widget->{h} = $h; 3857 $widget->{h} = $h;
3858
3135 $widget->emit (size_allocate => $w, $h); 3859 $widget->emit (size_allocate => $w, $h);
3860 }
3136 } 3861 }
3137 } 3862 }
3138 3863
3139 while ($self->{post_alloc_hook}) { 3864 while ($self->{post_alloc_hook}) {
3140 $_->() 3865 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 3866 for values %{delete $self->{post_alloc_hook}};
3142 } 3867 }
3868
3143 3869
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3870 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3871 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 3872 glClear GL_COLOR_BUFFER_BIT;
3147 3873
… …
3149 glLoadIdentity; 3875 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3876 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 3877 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 3878 glLoadIdentity;
3153 3879
3880 {
3881 package CFClient::UI::Base;
3882
3883 ($draw_x, $draw_y, $draw_w, $draw_h) =
3884 (0, 0, $self->{w}, $self->{h});
3885 }
3886
3154 $self->_draw; 3887 $self->_draw;
3155} 3888}
3156 3889
3157############################################################################# 3890#############################################################################
3158 3891

Diff Legend

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